gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 20:17:25 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 20:17:25 +0100
commit: 62f82c107c3904ac6917ece47301d2999c7dd90e (patch)
tree: 48ddfc2291e77d0e3ad80f6d7c5f403d84ae8414
parent: 7fe80ac8764ccbf354f82029a6bce4f96dbb8d5d (diff)
283 files changed, 2258 insertions, 5909 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d3d79b02a201..8e50503ecc31 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index cf52a9278d17..eb9e1d366d83 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -2,9 +2,11 @@ DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
+DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
 EBUILD acme-0.23.0.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
 EBUILD acme-0.24.0.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
 EBUILD acme-0.25.0.ebuild 1261 BLAKE2B deaeeb535df0859ac91c7265460717146f92b7d528e729129f3d47b7cb446f80f85b7a9bbcfdb4aab975f7a88cf131a97d8005aed7ebd3ede6a14cd3dec1940a SHA512 d0e1304021d226c957f448632b05efc51e5b77b773546847686c1061e8dfe26656cf3b34503fd9eb307908bbd7d2b480e7e0d9d17a47602e057184d4f56b17f5
 EBUILD acme-0.25.1.ebuild 1261 BLAKE2B deaeeb535df0859ac91c7265460717146f92b7d528e729129f3d47b7cb446f80f85b7a9bbcfdb4aab975f7a88cf131a97d8005aed7ebd3ede6a14cd3dec1940a SHA512 d0e1304021d226c957f448632b05efc51e5b77b773546847686c1061e8dfe26656cf3b34503fd9eb307908bbd7d2b480e7e0d9d17a47602e057184d4f56b17f5
+EBUILD acme-0.26.0.ebuild 1261 BLAKE2B deaeeb535df0859ac91c7265460717146f92b7d528e729129f3d47b7cb446f80f85b7a9bbcfdb4aab975f7a88cf131a97d8005aed7ebd3ede6a14cd3dec1940a SHA512 d0e1304021d226c957f448632b05efc51e5b77b773546847686c1061e8dfe26656cf3b34503fd9eb307908bbd7d2b480e7e0d9d17a47602e057184d4f56b17f5
 EBUILD acme-9999.ebuild 1261 BLAKE2B fd84623bd4510a088e0d27017f4e30a9b5214d1983298905163a4d944fb63bb1240b650a0ae1079398ccdd3c232fa58672b80f260deff64da0d62ef72c9d6a6f SHA512 0da048ccbf900d3dbde6b3d175a435e1337316d29bb900127c0429c434585a0f864aea1ba8af8262c1878ce77203d52d032614ca9722c063d7bf73607ea41cc0
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.26.0.ebuild b/app-crypt/acme/acme-0.26.0.ebuild
new file mode 100644
index 000000000000..7c82dc6d67c0
--- /dev/null
+++ b/app-crypt/acme/acme-0.26.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index efa85291767a..612fecfc5a17 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -2,9 +2,11 @@ DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
+DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
 EBUILD certbot-apache-0.23.0.ebuild 1074 BLAKE2B a5f786cf12bd0b6bfdafa4f7fb1d2b89666e82f8adecdaa002a6ddc815fb6e84991f197efb2368f9dbf50fffbf38bf856b934b143e6b9e14316902f1cd2b67ff SHA512 5de3ed6d1e4f28a32cd8844c358d1f7a6bb20106afb9f1fb01985a355129d20743183e7619575b3c47aaefab839230cb729e50926e54ba1d52bfd5f9de490825
 EBUILD certbot-apache-0.24.0.ebuild 1074 BLAKE2B a5f786cf12bd0b6bfdafa4f7fb1d2b89666e82f8adecdaa002a6ddc815fb6e84991f197efb2368f9dbf50fffbf38bf856b934b143e6b9e14316902f1cd2b67ff SHA512 5de3ed6d1e4f28a32cd8844c358d1f7a6bb20106afb9f1fb01985a355129d20743183e7619575b3c47aaefab839230cb729e50926e54ba1d52bfd5f9de490825
 EBUILD certbot-apache-0.25.0.ebuild 1075 BLAKE2B 9348daf5bb723ad14a97eabb5cfb751a141a705164efc7926998388b43eb66c8c69355aa189b4813d4aff5b995bafe34c69fe8d4d6002401ef5634ea4a719351 SHA512 3eb9691a553afa71ccbcfa0878710a04925c9f9cbed44b414548206668793731a10179b931081e590cbcbe209de9786aa75f03075b995736a32c7da71b25c561
 EBUILD certbot-apache-0.25.1.ebuild 1075 BLAKE2B 9348daf5bb723ad14a97eabb5cfb751a141a705164efc7926998388b43eb66c8c69355aa189b4813d4aff5b995bafe34c69fe8d4d6002401ef5634ea4a719351 SHA512 3eb9691a553afa71ccbcfa0878710a04925c9f9cbed44b414548206668793731a10179b931081e590cbcbe209de9786aa75f03075b995736a32c7da71b25c561
-EBUILD certbot-apache-9999.ebuild 1076 BLAKE2B f8e3f65b1d57e8eaf3b53805c23a6701dd471137d46a8d96ce925e9f6f7f43f1cdc73ae6101e42eb58e4cf3a6ad7e03977ab4e551ccf76908fbb0678378fd7c7 SHA512 9a73ec2564bb1f7f1ba1e0bfea3a3b6aa50d1c6d653524f862d020b088d11d7835bc2888740738804b38f93d41e29a7d1d1f8996212db63d03d3556ef39e000e
+EBUILD certbot-apache-0.26.0.ebuild 1076 BLAKE2B f5d78faa967a989ae85d7ab072dc7e4faff4825c4cf35d5f00af2817fdbc1a9c22d215043d673692634c51dc60e2a5cfcf73b5c286a4d35abb8e5e4e89268e5b SHA512 1ff731a1ab08da68b5932b527403f7c1cdc5372020211ba4b44fa5b9eb74db19bacdad424a1e841dc664519b9c383155e8eac60a3e6597f3280b5518deba6d3e
+EBUILD certbot-apache-9999.ebuild 1076 BLAKE2B f5d78faa967a989ae85d7ab072dc7e4faff4825c4cf35d5f00af2817fdbc1a9c22d215043d673692634c51dc60e2a5cfcf73b5c286a4d35abb8e5e4e89268e5b SHA512 1ff731a1ab08da68b5932b527403f7c1cdc5372020211ba4b44fa5b9eb74db19bacdad424a1e841dc664519b9c383155e8eac60a3e6597f3280b5518deba6d3e
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.26.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.26.0.ebuild
new file mode 100644
index 000000000000..ab98ef4612cf
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.26.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 2f2c9cd3e8a5..ab98ef4612cf 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -23,8 +23,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
 
-RDEPEND=">=app-crypt/certbot-0.21.1[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.21.1[${PYTHON_USEDEP}]
+RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index a12161a513ef..6e5ed5fadd01 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -2,9 +2,11 @@ DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
+DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
 EBUILD certbot-nginx-0.23.0.ebuild 1006 BLAKE2B fa6f8d964f53d9c2e27f7d7392ed5694d0828f7820518a4505902842a41b69afd30345c33d439a412b9ccc501c3524f5478b2f6ed5cda733ebbc2aa10fade0de SHA512 92201d17d53635f1978dceb67bca39abaa529da052fd4d49480041496b6511cebfa3e1d56e242b0cfe294caa154997126c0fbb705e0cb50ae9ec4758f5b828b8
 EBUILD certbot-nginx-0.24.0.ebuild 1008 BLAKE2B ac4f94a0747dd797fb853dda9bb1a48791e030c027776cd65bc2f0bc491c5753b19392d77454c12fd216e6eb7ad087fa1ef03323e7cdcbb334684ef8e20b91d3 SHA512 319deb49333190fe536ec3ac8b97ecb78c10f9987fe6f725188b0a357e2eedc7ea83a84e1c80efb3c1deed328b97feed049b461a198fbd87327dd46695b3fda6
 EBUILD certbot-nginx-0.25.0.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
 EBUILD certbot-nginx-0.25.1.ebuild 1010 BLAKE2B ae0cb79945bbafdb6c8e92a2b6727acb5878ff815721f5b5748e18a26fec5bc4fb007eb5d54898ae543b596091c08ca84067c8a16a6ef783d8335a401ae09333 SHA512 908f0ef63246fbaab7d2acc99b606d6aa96b271dca4564a037a99f35df58646cb72dbc790cbfe1e61fd4ec246fcc2b5097817c4bd79bbfacb5d511d1eb5e2cd7
-EBUILD certbot-nginx-9999.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
+EBUILD certbot-nginx-0.26.0.ebuild 1010 BLAKE2B 61d9476418271ad692d76133e2a4ed7f4ddb41c6b952e7915dcb009e885305efbe9e70aba04cb43c8e1509a3f6a801ffd53de09c518d9eba68dd81c881c15de1 SHA512 d824ecb5938fa25e248e476cfc95724aceea8ae9c5c30c18b6b392a3005c4e807469d37e1b806e1f7673a30058c10ffe73cbd8864ebc32f6b7d65043a03c4375
+EBUILD certbot-nginx-9999.ebuild 1010 BLAKE2B 61d9476418271ad692d76133e2a4ed7f4ddb41c6b952e7915dcb009e885305efbe9e70aba04cb43c8e1509a3f6a801ffd53de09c518d9eba68dd81c881c15de1 SHA512 d824ecb5938fa25e248e476cfc95724aceea8ae9c5c30c18b6b392a3005c4e807469d37e1b806e1f7673a30058c10ffe73cbd8864ebc32f6b7d65043a03c4375
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.26.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.26.0.ebuild
new file mode 100644
index 000000000000..bda8ab5ae6d7
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.26.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index dd9e6e8b4372..bda8ab5ae6d7 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -25,8 +25,8 @@ IUSE=""
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	>=app-crypt/certbot-0.21.1[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.21.1[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 8f4e0876935c..44b75fc403f9 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -2,9 +2,11 @@ DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
+DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
 EBUILD certbot-0.23.0.ebuild 1551 BLAKE2B 83b35abe2b04e6375e317dc1d7e02385cadaa6b688035e4754b171f65abe8859ad82d5fed76540c1c6db352cb3b50150f333ec3d3b7536537672cb382152cca2 SHA512 59275447bd956db66b5c6b8e51600337827cf621359a77e089ad2d1e804b77097637e49e94c84881cac3dfea38dfb76c9ddc13289a012a956f1d78046ad50db5
 EBUILD certbot-0.24.0.ebuild 1551 BLAKE2B 83b35abe2b04e6375e317dc1d7e02385cadaa6b688035e4754b171f65abe8859ad82d5fed76540c1c6db352cb3b50150f333ec3d3b7536537672cb382152cca2 SHA512 59275447bd956db66b5c6b8e51600337827cf621359a77e089ad2d1e804b77097637e49e94c84881cac3dfea38dfb76c9ddc13289a012a956f1d78046ad50db5
 EBUILD certbot-0.25.0.ebuild 1553 BLAKE2B 5ebfd6bbb0a4f13b9b81742322af2e71907039a63168dc6dcc46f97e00840beba308e113bf4188c7df03c18212339ca508f32cdc6408822683233983a1316117 SHA512 c5541ddcfb5b4e018a78b9f5184dc0cd05041b46b7eedd96d761478822e3e8a7251877790b35d641c692705512d22dfcd6d24dff2914b9893648f400cd8d6a16
 EBUILD certbot-0.25.1.ebuild 1553 BLAKE2B 5ebfd6bbb0a4f13b9b81742322af2e71907039a63168dc6dcc46f97e00840beba308e113bf4188c7df03c18212339ca508f32cdc6408822683233983a1316117 SHA512 c5541ddcfb5b4e018a78b9f5184dc0cd05041b46b7eedd96d761478822e3e8a7251877790b35d641c692705512d22dfcd6d24dff2914b9893648f400cd8d6a16
-EBUILD certbot-9999.ebuild 1553 BLAKE2B 0d0bbdc14866fbb2fa2fd55bfe2f0dec53d5a3d4a8fd826c0a07b805abe39ccc25c5df41480dd7fda92d9d47516e860b9dafe7f9ffcb442499eb822ab192ffb5 SHA512 955985ab7d487375d4ac466c5e38a5e3f437f2d4e83894ce6eba582a3362316f71d43aa5431f0c295dbc80b5458f947d593b8b2e76d58720425405949db8d7d7
+EBUILD certbot-0.26.0.ebuild 1553 BLAKE2B a9167ba71ebda3d61452d3c5b335660e587d166853efe3a400008b59b8df56aeaa378d8d7862096d17ab8f6d787bba172129deb6fe6bef4dfe6c7d750fcfb414 SHA512 0e45b16bdb0ccdb1af6a8d238f1284c7d6d7b27328b5880584bbff3e64367636926563bbc6e0c7101256df076183576b05cdfc16ec42822a785a331f85432ba4
+EBUILD certbot-9999.ebuild 1553 BLAKE2B a9167ba71ebda3d61452d3c5b335660e587d166853efe3a400008b59b8df56aeaa378d8d7862096d17ab8f6d787bba172129deb6fe6bef4dfe6c7d750fcfb414 SHA512 0e45b16bdb0ccdb1af6a8d238f1284c7d6d7b27328b5880584bbff3e64367636926563bbc6e0c7101256df076183576b05cdfc16ec42822a785a331f85432ba4
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.26.0.ebuild b/app-crypt/certbot/certbot-0.26.0.ebuild
new file mode 100644
index 000000000000..021424b910a3
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.26.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	dev-python/josepy[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests -v ${PN} || die
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index f21b72555c81..021424b910a3 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -24,7 +24,7 @@ IUSE="test"
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	>app-crypt/acme-0.21.1[${PYTHON_USEDEP}]
+	>app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 8ad74531f11e..09a8bca846fe 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -2,6 +2,6 @@ AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9
 AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f
 DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
-EBUILD efitools-1.7.0.ebuild 786 BLAKE2B 8a842f23c5e7ec1afa535dfd7448503a1313cd026eaab72961a517ca223d04ac521cd6ce7c98c920de079c33549b164aa544b44fdfe73c76bd46e7444da2fb28 SHA512 40132fc48114b2baebb590e1b6ac4a32961c1ab6d7393ecf80223fab6bffb6cccc8da1123c67f967602982a23ecc82a1f106856d39ba73862ce5ddf2162d3e18
-EBUILD efitools-1.8.1.ebuild 1348 BLAKE2B fedfa56aa7e7397104b0ad32484e145a2cf1a1cf9caa7cec8e8d84d6c861a2c4f705d6b43998b27eebbce28de04a47c73c8dfc9dd7653079ea07c58ef02ab51c SHA512 9edd70850f64534bcd8c48d7d87ae5dba074f8bae0b884208ed888055853832e2452550e302963e509c89185f10010b5d22081b07ddd92ca7db73951292e1216
+EBUILD efitools-1.7.0.ebuild 787 BLAKE2B 9c2daade67b20bb4fb7b38413ff174695a40889e509c0828f68fc8d1eb1a0d0c7ed2cdc32d05608cff53317c4ca4db3133ec041cb86ffdac2b1d1287c00c3043 SHA512 66b40139afd0f071db68891152a25c9d6993be948e100817b26eb3fa547d09580bd4e9bfff8916c58a7f2bd38bfe4221edd1452d58a59e251629f5689f88740e
+EBUILD efitools-1.8.1.ebuild 1349 BLAKE2B ffc55485773daf9bfab8069f8c6b1cce41daef3bcd6d5df82868aeec8e0c8fc83f69b2b4cf9565b66f8e03ada9042637902d54516772ff850d79c17423c595b4 SHA512 e686d262e3973b1fe727d960d3b97bb284b1d3795644a2dccb89204b377db0e30d2b435174ed5d622f00da2256994a4c997fe92fdc2954dfe1964d25a1ab0ef5
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/efitools/efitools-1.7.0.ebuild b/app-crypt/efitools/efitools-1.7.0.ebuild
index 63c9fbec0513..c47c9b03a9e0 100644
--- a/app-crypt/efitools/efitools-1.7.0.ebuild
+++ b/app-crypt/efitools/efitools-1.7.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	sys-apps/help2man
 	>=sys-boot/gnu-efi-3.0u
-	app-crypt/sbsigntool
+	app-crypt/sbsigntools
 	virtual/pkgconfig
 	dev-perl/File-Slurp"
 
diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild
index 6ede95860eb5..94d636eec260 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	sys-apps/util-linux"
 
 DEPEND="${RDEPEND}
-	app-crypt/sbsigntool
+	app-crypt/sbsigntools
 	dev-perl/File-Slurp
 	static? ( ${LIB_DEPEND} )
 	sys-apps/help2man
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 78c46c7bc679..2e0abd6d2d02 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,20 +1,6 @@
-AUX gnupg-2.1.20-gpg-Fix-typo.patch 843 BLAKE2B 6e7c56d54ef0b0a1e14030a7636bd35dedca8d22a49b6feb5616a474b150b90d703d9b928204946cc71016a84bea1183bba9ddd3323acb83a1d41027650fb61d SHA512 eb451eedb3e0282f3b7d10d0b12753a55b6bd92b2cdfc1dce5a9ffe1f0015cc598193193a8c8292371fb285517016d69ec70b7820f9dc0047e33b2e3f16214ed
-AUX gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch 2987 BLAKE2B eff568f4988b147a9d1aba77965222fcbfc2e9c3efef8eed9ce58f1c7058214ece62046435c90227d8fce1829f3131387f59598676d1359320f61b441018eb85 SHA512 2cf3147638c69f49b4d792a01321b5892f882fc67a1aee8f51f9b35761e6961e9c46d9abc92b0e5250a85b7145e69ba9583b3ce2323943587feb52a029e95deb
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
-AUX gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch 1342 BLAKE2B d494d544e9bbfd4115b58cc0117171d7792b44158e48032ddfdbacaff38cc5aebae4e1f1d46fa814ea40504441c8288937a5cfa7d475246cd301061176969e7c SHA512 171ae5092b9cab26446a2c4fe12137f5f1e92ba1d3c542a52900c14c488d902dfad84594473063f7eacb65ff7cefadb88239534498245f79f16ce8c58005f99c
 DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bce12a8a90938565322c34e2eeb8e5432932f5c9344a76aa4528b66051141536c062d9923a79d12a0767421bb017 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984
-DIST gnupg-2.1.15.tar.bz2 5723689 BLAKE2B 48889c0a5445b5b76b027debd6a4711930694e7440b76c06a7da1db5e7989eeae791e4c7a29e60a9d0b862c167374016d908aaa54165a44268f072075cdd9690 SHA512 69c943e853e1a37e8b17b3bc34e1503f14bc8f189fa9f3ac6644bcc98ccce6eaef64da20ff9dd1c8de3a7789ea577167984ccf3ac286cac50752e6f7c2f42ab1
-DIST gnupg-2.1.20.tar.bz2 6456128 BLAKE2B 009a8b8163701f5f5e269caea315a81f4c90c32ec19d501e9fd180bdd3a21454956549b433eb81e98c7a22c4c551eed666d9f3e59ea8e55ed2545ddf49334151 SHA512 14a9890bc64e143f87cff121dd298d490d78dbd34e36883e0f25763ff9064e5706a7632893d7c5d0e8e9b8cf9cdb0d378b4ce1715348729f0fc080455b61eca9
-DIST gnupg-2.2.4.tar.bz2 6571487 BLAKE2B ec678470e574fdc9f057cc727cbb902ce525f76adae740722731e318032707d0f72873628024c2070a72c21321f2b8da16153edeafcb4ddeba72de59ff5c73bd SHA512 3d5c93b7662433103e9549d066a6b1a0c09d595851fab712d2ee844a55157e952a8a2dd5deff70fa8dd6817481f81c3fe5135603bca03206857310d04c1067a8
-DIST gnupg-2.2.6.tar.bz2 6605028 BLAKE2B 2de6f8d32e551a8af5c41b7e6220a43645472b3b7f25b168a54343c4279f412d5d8f7a5142451504192259b3fe4a3e3242d12520dadc385f466dd701a803073a SHA512 ad0861c86c1886f701ae05e7cd439449cf0684a7bf461ca2b729c5e93833ee36f8438cd4d7f73a4c60e57060f3d8f4890a809b2bbc31b083f9f61d2f66ccacc4
-DIST gnupg-2.2.7.tar.bz2 6631100 BLAKE2B 81a66a8f738fc2b42d923ccda7d6cbfffc8e938970c04fe02c0146202f2e97fa88d5263aee2f3051e141169f4f02f72ccc53ac831bb57d42740130e3122fa454 SHA512 f858b275876d38b9d3a60e5428574f1008a73a948f67a2fa43bcf1970a5dbb60ec3f0e2b2271243229465eb9b22124e216894f0b3d72004acf3ed0c3481da33d
 DIST gnupg-2.2.8.tar.bz2 6632465 BLAKE2B e13bdfb2b17f87dd2122da5a489318bfcefec26c0fbb65dc6a36034314985bbd405cb22cfaf9bffa4c7928657cbc63d363f16b77d00bf86737b73c73ffbce4f2 SHA512 24271ec2663b941ed5e72e2179b48ac73d5cd838292aa9d4954952b11713f4b466f30e6af632b22c9e7c284350e300a07046d41d0ab73dcbd1639b303cd09007
 EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
-EBUILD gnupg-2.1.15.ebuild 4570 BLAKE2B c88be887786ba1823e7950828039432d08c51053886ac187b3e0d86470e67fd9731b940ae54f25f46c7484d0fcf52db485f1368b56ccc9aa66baa99f0510a3f0 SHA512 385f5c40a42559e3b686d16dedc2ca442dd0a075514184e67eef97624cc419bd0bfc7f7ca6fdd3dc549cb4e3beafce656b725adcf201d27b151dab6456346875
-EBUILD gnupg-2.1.20-r1.ebuild 3102 BLAKE2B 7e63763d5989d876aec29eec09fe9bda9a83a26a0bdda97bb1c2a2bf95b7e7c2d6a727b068b8e6dedc7b07c747486c1f00badf603c03a5ec97cee6747b4138ec SHA512 68eafca6339bab0f118c5ff9119a984ee2b7432942929d429a430c053da568ed7729d13a507d073bebc8a273e74eb40f66585ef84cc9b83181f2ea5d6990d615
-EBUILD gnupg-2.2.4-r2.ebuild 3270 BLAKE2B fe28baa02fab59b834d43a932539aef99319438ac841454a95bcf0bebc867aecd514ea7f65b7fbdc0a3c87961852bff6628cef93128faf78332620e110db1d4e SHA512 dfe66cad026daba6b56096e99da472ead7aabcc8e1bfaed76e8891a860fbf9d6ca1560f32eaa02ca3f0dc687aa1826718cd2823ccf10da6f1ff0bc30fd003045
-EBUILD gnupg-2.2.4.ebuild 3202 BLAKE2B 15937df613d5f8c91cf186643983659f431c8f25dbcf0d69db6dc4f02145d587c81cd6a1a62053d492fbe59f2efa921147e72e588f3da52c0a94d7b8e27cc95e SHA512 180a4dec88ac9b800db26cca8a98dba57f8624d08c2167221e90b16ad873f2c113385b98a1abe716ac3eb752d159f8f5cd95a2c69d4150ffa03cf34b7534ee79
-EBUILD gnupg-2.2.6.ebuild 3219 BLAKE2B 1f481af4f31c3298ea6aa3a233c6ca183698957636490bf92737558b936798ae0c06110bc1e9d37f7975fe1a69974a6d06cdfc9e2d9e2c378e5ab644bee9ce2d SHA512 8a8320f58a40f6dd2504346d91474568c40c6527d018e48dacfec81723697dc204d399fa1e7caaef598528132d8d0d8e268590fcb859ba4aeeae72c7b35ef119
-EBUILD gnupg-2.2.7.ebuild 3219 BLAKE2B 1f481af4f31c3298ea6aa3a233c6ca183698957636490bf92737558b936798ae0c06110bc1e9d37f7975fe1a69974a6d06cdfc9e2d9e2c378e5ab644bee9ce2d SHA512 8a8320f58a40f6dd2504346d91474568c40c6527d018e48dacfec81723697dc204d399fa1e7caaef598528132d8d0d8e268590fcb859ba4aeeae72c7b35ef119
-EBUILD gnupg-2.2.8.ebuild 3211 BLAKE2B 96dac795e2055cf21bc71e7f76519b79f7de5cebdac942cadf95e3d7c66c422688c01d33a15e643815709753656ae03bf83632c8af36b68f4af49112286e47e7 SHA512 2058f685e307210eae134f8550b953530036be5e63d66aef16a2b58dc075dc787dea4c82d4d20cc8ac0a298b45be1aa751962354c05735c0e7740f4f3209d041
+EBUILD gnupg-2.2.8.ebuild 3209 BLAKE2B 59e3d8e013e62af26653917e524a51ea1804dc77bbf164157ec85344f0df4655bd60c090487790820717bf3fc7864da76dc5edf5709d50446afbc1bb81bac737 SHA512 ebfc7525a171336c97b957102ec798f87f454296ce3f6904f8dad6e2f9a5b00c689663120c8eede207f520660ba2ee12c52065b6f65f788d8c29e5fd2b23ba50
 MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069
diff --git a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch b/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch
deleted file mode 100644
index 292fc264ac84..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 692208fd6c1547cc7dd2062a1d1c9499bc0a8be4 Mon Sep 17 00:00:00 2001
-From: Justus Winter <justus@g10code.com>
-Date: Mon, 8 May 2017 13:52:39 +0200
-Subject: [PATCH] gpg: Fix typo.
-
---
-Signed-off-by: Justus Winter <justus@g10code.com>
----
- g10/packet.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/g10/packet.h b/g10/packet.h
-index a10495c..d42510d 100644
---- a/g10/packet.h
-+++ b/g10/packet.h
-@@ -623,7 +623,7 @@ struct parse_packet_ctx_s
-   iobuf_t inp;       /* The input stream with the packets.  */
-   struct packet_struct last_pkt; /* The last parsed packet.  */
-   int free_last_pkt; /* Indicates that LAST_PKT must be freed.  */
--  int skip_meta;     /* Skip right trust packets.  */
-+  int skip_meta;     /* Skip ring trust packets.  */
- };
- typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
- 
--- 
-2.10.2
-
diff --git a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch b/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch
deleted file mode 100644
index 58568db47d2a..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 22739433e98be80e46fe7d01d52a9627c1aebaae Mon Sep 17 00:00:00 2001
-From: Justus Winter <justus@g10code.com>
-Date: Mon, 8 May 2017 14:24:00 +0200
-Subject: [PATCH] gpg: Properly account for ring trust packets.
-
-* g10/keyring.c (keyring_get_keyblock): Use the parser's packet count
-instead of counting ourself.
-* g10/packet.h (struct parse_packet_ctx_s): New field
-'n_parsed_packets'.
-(init_parse_packet): Initialize new field.
-* g10/parse-packet.c (parse): Count packets.
---
-
-The 'keyring' keystore depends on the number of packets for delete and
-update operations.  With the rework of the ring trust packets, the
-trust packets were no longer properly accounted for leading to keyring
-corruptions.
-
-The 'keybox' store was not affected.
-
-GnuPG-bug-id: 3123
-GnuPG-bug-id: 3135
-GnuPG-bug-id: 3144
-Fixes-commit: a8895c99a7d0750132477d80cd66caaf3a709113
-Signed-off-by: Justus Winter <justus@g10code.com>
----
- g10/keyring.c      | 4 ++--
- g10/packet.h       | 2 ++
- g10/parse-packet.c | 3 +++
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/g10/keyring.c b/g10/keyring.c
-index e223f0f..50f1b82 100644
---- a/g10/keyring.c
-+++ b/g10/keyring.c
-@@ -409,11 +409,11 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
-     pkt = xmalloc (sizeof *pkt);
-     init_packet (pkt);
-     init_parse_packet (&parsectx, a);
--    hd->found.n_packets = 0;;
-+    hd->found.n_packets = 0;
-     lastnode = NULL;
-     save_mode = set_packet_list_mode(0);
-     while ((rc=parse_packet (&parsectx, pkt)) != -1) {
--        hd->found.n_packets++;
-+        hd->found.n_packets = parsectx.n_parsed_packets;
-         if (gpg_err_code (rc) == GPG_ERR_UNKNOWN_PACKET) {
- 	    free_packet (pkt, &parsectx);
- 	    init_packet (pkt);
-diff --git a/g10/packet.h b/g10/packet.h
-index d42510d..cf2121c 100644
---- a/g10/packet.h
-+++ b/g10/packet.h
-@@ -624,6 +624,7 @@ struct parse_packet_ctx_s
-   struct packet_struct last_pkt; /* The last parsed packet.  */
-   int free_last_pkt; /* Indicates that LAST_PKT must be freed.  */
-   int skip_meta;     /* Skip ring trust packets.  */
-+  unsigned int n_parsed_packets;	/* Number of parsed packets.  */
- };
- typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
- 
-@@ -633,6 +634,7 @@ typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
-     (a)->last_pkt.pkt.generic= NULL;\
-     (a)->free_last_pkt = 0;         \
-     (a)->skip_meta = 0;             \
-+    (a)->n_parsed_packets = 0;      \
-   } while (0)
- 
- #define deinit_parse_packet(a) do { \
-diff --git a/g10/parse-packet.c b/g10/parse-packet.c
-index fa44f83..dbb7af8 100644
---- a/g10/parse-packet.c
-+++ b/g10/parse-packet.c
-@@ -764,6 +764,9 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
-                 partial? (new_ctb ? " partial" : " indeterminate") :"",
-                 new_ctb? " new-ctb":"");
- 
-+  /* Count it.  */
-+  ctx->n_parsed_packets++;
-+
-   pkt->pkttype = pkttype;
-   rc = GPG_ERR_UNKNOWN_PACKET;	/* default error */
-   switch (pkttype)
--- 
-2.10.2
-
diff --git a/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch b/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch
deleted file mode 100644
index 53843900b9f3..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b7f48a0095a5b010b94f8192f4adc1adf8697567 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 31 Jan 2018 16:57:19 +0100
-Subject: [PATCH] dirmngr: Handle failures related to missing IPv6 gracefully
-
-Handle the two possible connect failures related to missing IPv6 support
-gracefully by marking the host dead and retrying with another one.
-If IPv6 is disabled via procfs, connect() will return EADDRNOTAVAIL.
-If IPv6 is not compiled into the kernel, it will return EAFNOSUPPORT.
-This makes it possible to use dual-stack hkp servers on hosts not having
-IPv6 without random connection failures.
----
- dirmngr/ks-engine-hkp.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index 4a0b08f4f..a9bb93666 100644
---- a/dirmngr/ks-engine-hkp.c
-+++ b/dirmngr/ks-engine-hkp.c
-@@ -1353,6 +1353,8 @@ handle_send_request_error (ctrl_t ctrl, gpg_error_t err, const char *request,
-     case GPG_ERR_UNKNOWN_HOST:
-     case GPG_ERR_NETWORK:
-     case GPG_ERR_EIO:  /* Sometimes used by estream cookie functions.  */
-+    case GPG_ERR_EADDRNOTAVAIL:  /* e.g. when IPv6 is disabled */
-+    case GPG_ERR_EAFNOSUPPORT:  /* e.g. when IPv6 is not compiled in */
-       if (mark_host_dead (request) && *tries_left)
-         retry = 1;
-       break;
--- 
-2.16.1
-
diff --git a/app-crypt/gnupg/gnupg-2.1.15.ebuild b/app-crypt/gnupg/gnupg-2.1.15.ebuild
deleted file mode 100644
index 2e4b59ef30a0..000000000000
--- a/app-crypt/gnupg/gnupg-2.1.15.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-MY_P="${P/_/-}"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc +gnutls ldap nls readline selinux smartcard tofu tools usb"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/npth-1.2
-	>=dev-libs/libassuan-2.4.3
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.24
-	>=dev-libs/libksba-1.3.4
-	>=net-misc/curl-7.10
-	gnutls? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	tofu? ( >=dev-db/sqlite-3.7 )
-	"
-COMMON_DEPEND_BINS="app-crypt/pinentry
-		   !app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	if use smartcard; then
-		myconf+=(
-			--enable-scdaemon
-			$(use_enable usb ccid-driver)
-		)
-	else
-		myconf+=( --disable-scdaemon )
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		--without-adns \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable gnutls) \
-		$(use_with ldap) \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_enable tofu) \
-		$(use_enable tools wks-tools) \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd doc
-		emake html
-	fi
-}
-
-src_install() {
-	default
-
-	use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
-		tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
-	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
-	# The help*txt files are read from the datadir by GnuPG directly.
-	# They do not work if compressed or moved!
-	#rm "${ED}"/usr/share/gnupg/help* || die
-
-	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
-		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
-	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
-	if use doc; then
-		dohtml doc/gnupg.html/* doc/*.png
-	fi
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer."
-	elog
-
-	if use smartcard; then
-		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
-		elog " - sys-apps/pcsc-lite and a compatible reader device;"
-		elog " - dev-libs/openct and a compatible reader device;"
-		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
-		elog ""
-		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
-		elog "app-crypt/ccid first."
-	fi
-
-	ewarn "Please remember to restart gpg-agent if a different version"
-	ewarn "of the agent is currently used. If you are unsure of the gpg"
-	ewarn "agent you are using please run 'killall gpg-agent',"
-	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "If upgrading from a version prior than 2.1 you might have to re-import"
-		elog "secret keys after restarting the gpg-agent as the new version is using"
-		elog "a new storage mechanism."
-		elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
-	fi
-}
diff --git a/app-crypt/gnupg/gnupg-2.1.20-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.20-r1.ebuild
deleted file mode 100644
index 5ce9f46cd62e..000000000000
--- a/app-crypt/gnupg/gnupg-2.1.20-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-LICENSE="GPL-3"
-
-MY_P="${P/_/-}"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/npth-1.2
-	>=dev-libs/libassuan-2.4.3
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.24
-	>=dev-libs/libksba-1.3.4
-	>=net-misc/curl-7.10
-	gnutls? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	tofu? ( >=dev-db/sqlite-3.7 )
-	"
-COMMON_DEPEND_BINS="app-crypt/pinentry
-	!app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-gpg-Fix-typo.patch"
-	"${FILESDIR}/${P}-gpg-Properly-account-for-ring-trust-packets.patch"
-	"${FILESDIR}/${P}-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_configure() {
-	local myconf=()
-
-	if use smartcard; then
-		myconf+=(
-			--enable-scdaemon
-			$(use_enable usb ccid-driver)
-		)
-	else
-		myconf+=( --disable-scdaemon )
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable gnutls) \
-		$(use_enable nls) \
-		$(use_enable tofu) \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
-	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
deleted file mode 100644
index 7cb0b0782823..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/npth-1.2
-	>=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.24
-	>=dev-libs/libksba-1.3.4
-	>=net-misc/curl-7.10
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	tofu? ( >=dev-db/sqlite-3.7 )
-	"
-COMMON_DEPEND_BINS="app-crypt/pinentry
-	!app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-	"${FILESDIR}/${P}-dirmngr-Handle-failures-related-to-missing-IPv6.patch"
-)
-
-src_configure() {
-	local myconf=()
-
-	if use smartcard; then
-		myconf+=(
-			--enable-scdaemon
-			$(use_enable usb ccid-driver)
-		)
-	else
-		myconf+=( --disable-scdaemon )
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable ssl gnutls) \
-		$(use_enable nls) \
-		$(use_enable tofu) \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		--enable-all-tests \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.4.ebuild b/app-crypt/gnupg/gnupg-2.2.4.ebuild
deleted file mode 100644
index b1cc1026789d..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.4.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/npth-1.2
-	>=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.24
-	>=dev-libs/libksba-1.3.4
-	>=net-misc/curl-7.10
-	gnutls? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	tofu? ( >=dev-db/sqlite-3.7 )
-	"
-COMMON_DEPEND_BINS="app-crypt/pinentry
-	!app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_configure() {
-	local myconf=()
-
-	if use smartcard; then
-		myconf+=(
-			--enable-scdaemon
-			$(use_enable usb ccid-driver)
-		)
-	else
-		myconf+=( --disable-scdaemon )
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable gnutls) \
-		$(use_enable nls) \
-		$(use_enable tofu) \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		--enable-all-tests \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.6.ebuild b/app-crypt/gnupg/gnupg-2.2.6.ebuild
deleted file mode 100644
index badbebb0518f..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.6.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/npth-1.2
-	>=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.24
-	>=dev-libs/libksba-1.3.4
-	>=net-misc/curl-7.10
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	tofu? ( >=dev-db/sqlite-3.7 )
-	virtual/mta
-	"
-COMMON_DEPEND_BINS="app-crypt/pinentry
-	!app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_configure() {
-	local myconf=()
-
-	if use smartcard; then
-		myconf+=(
-			--enable-scdaemon
-			$(use_enable usb ccid-driver)
-		)
-	else
-		myconf+=( --disable-scdaemon )
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable ssl gnutls) \
-		$(use_enable nls) \
-		$(use_enable tofu) \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		--enable-all-tests \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.7.ebuild b/app-crypt/gnupg/gnupg-2.2.7.ebuild
deleted file mode 100644
index badbebb0518f..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.7.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/npth-1.2
-	>=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.24
-	>=dev-libs/libksba-1.3.4
-	>=net-misc/curl-7.10
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	tofu? ( >=dev-db/sqlite-3.7 )
-	virtual/mta
-	"
-COMMON_DEPEND_BINS="app-crypt/pinentry
-	!app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_configure() {
-	local myconf=()
-
-	if use smartcard; then
-		myconf+=(
-			--enable-scdaemon
-			$(use_enable usb ccid-driver)
-		)
-	else
-		myconf+=( --disable-scdaemon )
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable ssl gnutls) \
-		$(use_enable nls) \
-		$(use_enable tofu) \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		--enable-all-tests \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.8.ebuild b/app-crypt/gnupg/gnupg-2.2.8.ebuild
index b7e58af2f24b..a7cb03c7e859 100644
--- a/app-crypt/gnupg/gnupg-2.2.8.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 4815001cd4d8..05ec65f2b70d 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,6 +1,6 @@
 DIST libsecret-0.18.5.tar.xz 508556 BLAKE2B e3410dd113dfa1f4ebb78a47f90e23455eb8f82466d4607aa469c04adc84aa3181bfdb7dcb4ff459fd2aa49c315ffd52fd2d3a4929694909fe65af637b65482b SHA512 4ee297b556d3b555b6ca9f5eb5cc87425b782491d0550a75873aac0f7019b123f437f0731c85bb058fc65b50a589d54d0697657a50bef4ac2952e9e40a916b5c
 DIST libsecret-0.18.6.tar.xz 487836 BLAKE2B d38a41743142d33e634d77bbf55ccab044def9658b3f50bd3f8cec9be6372ad1a56dcc4de58126cba1246c16da2863c003bf14ea6c8a90d8667658cf492f4b9a SHA512 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
 EBUILD libsecret-0.18.5.ebuild 1587 BLAKE2B 5bc76ca976d6fb5747df1fc877a66789b2260322b40e4a0c01e125d35423f813d84964f0cd7e8ce24eca3a009d3071660037a5c40de1364f343bcb06272761fb SHA512 2b8a057d68fae082f3485e20f1e2c868842d23d2ea49b4e42f3e67d2a684581e517b6d9b4d9daa0a25799f560ce276feff6cdec064082ce38f3d364f7c32ec74
-EBUILD libsecret-0.18.6-r1.ebuild 2669 BLAKE2B d43110c7522f8b0b4859755217e172b5d0cd82b6f3a94f950c2243a6fe1db1d73d8175eeea5c0022190f090907a9fd5e0e7aa6eed514201bf985af5dbcb4e8a3 SHA512 902b0c7f8a88a3e4287e24fcbf6423a82bdc4747c93843144b98009bd5df13ea6d4825f478ffd9d20304d01c19a31490cadb414bc9ddb939ed857708e8a59336
+EBUILD libsecret-0.18.6-r1.ebuild 2667 BLAKE2B ce87c3edccd6b4dc544581e35a8d4585f7307b874a3877d6b0eb0ab4d24219ebfb542138b2bb9af5a2344199a9cfd00aafba0c8b911be1b79af6334b7b7ca9e2 SHA512 0a2387d37fe23e652ed514fa01e7821fbe2be3d70fef1c4437b19965cfcb777fc0fd4d883198aec6bfb02ee1b2a25b0744932e2b389cc097274c37d6d2e0e32a
 EBUILD libsecret-0.18.6.ebuild 2117 BLAKE2B a84646e1f775dd6a3e4d2bc3bbb06a9e4a63cd363b71ddfc43feb46967486fe37dd322acd5f767d86f5e68bf2cce97a21d5bdbfb1f13b383ce59e3672fa4ff5a SHA512 9e6e9f150f3e2d8077f50c2bebf807f6785d3ca8ac230c71582521b817469cfb3b86ef71bdad14bea17896d6ef372dbe68672e63deca8be9c40ba980b3b8742a
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
index 14e2d2ecfa8a..a28beccceb86 100644
--- a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="+crypt +introspection test vala"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/sbsigntool/Manifest b/app-crypt/sbsigntools/Manifest
index 188aa58f7319..f860b2c7ad5e 100644
--- a/app-crypt/sbsigntool/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@@ -1,9 +1,9 @@
 AUX 0002-image.c-clear-image-variable.patch 822 BLAKE2B acb775f625ecd081d9b3d7e497b066218e82d2dc13f80c473c25361dc85098ee15e5f14530334e47c33fe7cc9b2349ffb1aaba7abe4fdd33bfdde05ed9191c39 SHA512 004ba118cbe8fe5cc291888966e5994373c0b9d8149bc5c652a72971138fab5e64d721061c69e8b864d6ca5cdb4ffa193520156941b6bd9c998b256f8d72697b
 AUX 0003-Fix-for-multi-sign.patch 1452 BLAKE2B eaa6e39c18d13f3819d5852eda27eb5a8d589241224965392f1b1e067b5cb9ff0ece7fa83697e5fb6f5f8dd0acec15b7bbe57fcd5f761fcb2e8e1fc51193641f SHA512 2aba55a116536e7f41e4aac2fd33eeb92cf89b14bcdd8b93b6e9dc9bdaf2f0162134e56f7d365640445bf801ad8590f6d49f14cdf80b791324647067d52ae435
-AUX sbsigntool-0.9.1-openssl-1.1.0-compat.patch 4727 BLAKE2B 3b47c8086220cf12778bf5cd6018627a30ea349677eeb2cfcd1eaa1b83a25d39499ab21a1a123181a51f4138624c17e574050216f59c480e38d9774936f8b6f0 SHA512 6946e1d67161345088aee3ab54129b6e904b6008f2b275ab4eb55ed24fb2b866029f7d7ca856c5dfe76c395580f04709ad1be974369a1b4954b9e87cf812fd4b
+AUX sbsigntools-0.9.1-openssl-1.1.0-compat.patch 4727 BLAKE2B 3b47c8086220cf12778bf5cd6018627a30ea349677eeb2cfcd1eaa1b83a25d39499ab21a1a123181a51f4138624c17e574050216f59c480e38d9774936f8b6f0 SHA512 6946e1d67161345088aee3ab54129b6e904b6008f2b275ab4eb55ed24fb2b866029f7d7ca856c5dfe76c395580f04709ad1be974369a1b4954b9e87cf812fd4b
 DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 8fbf27463d30c1895930628a145be2d521ae4f6adb7af3299bf2f5f4319fd643df0a07347ef6851bd41d233af4c3fc5f77002771af1c43aa0f20665aef2390b8 SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09
-DIST sbsigntool-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
 DIST sbsigntool_0.6.orig.tar.gz 212375 BLAKE2B fab9141c7fbfa01ec24f975503ac83be4ae0664251a1311afb3d95124fec3750ce20a5ffab35b6965d4ee4585ab4ee91f25ae49488214a983b6fc006071d0968 SHA512 ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c
-EBUILD sbsigntool-0.6-r2.ebuild 1063 BLAKE2B a1df369ad39fd98c81efb0c7b3f6fa43491739a3ccf36d3e5578e3dc017fef6ff8a0ec6067fb4e5f835b96dc4950d40ebeea398340a51e4aefaa9a964f59d0b1 SHA512 e9874cf541046004e0a0f2cffb4159a758eb5b878b7f3a9ecab7f36600c0b3abfa5798b69f223145d4d62df38d98f17b67319170ed6ec4209ee45c1e6c127ce5
-EBUILD sbsigntool-0.9.1-r1.ebuild 1334 BLAKE2B d773ec47da3c841c03673d852c2e32d1cea27c357028656050f3704ec1e0c7e456e712f237f90ef3dd5160a06619a8149ed24f22335e548b9bc3a718f5f5a428 SHA512 e3b42039618e185567e243f8c78756378cf0c75dd417018a658c2142bf8e9ef146f2e4e44235daa9d5d8972c7fc5c4aa1f113151c16d00800df4203f55a32fbc
+DIST sbsigntools-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
+EBUILD sbsigntools-0.6-r2.ebuild 1116 BLAKE2B 1e571c2018b72de8a454a380042897678f2308e8afab91b5e90c99eff266950e7374fc099b28d0d22b1a560bf6784eb6c77345c2b92e302f9ed98c80d4f3c45a SHA512 c11a43f77549f884c3a7c55333a62970239142340bc7ee6b85d029e3a07ee47a0b71265878ad99778bc7e48d7b0cee68c0e358bc8d914a0590796490e98aaba0
+EBUILD sbsigntools-0.9.1-r1.ebuild 1303 BLAKE2B c388a296e1395690072dd579dd762cd55c2f9f30fc31bfc1d54fbd6a2a6233c40a11bbe958f1cf7918637e952b8770618c947303bbd6a98f043c657dd653e63a SHA512 9779ebe157dab6501b6a8c98ed78fac81128394ae485e97c262985ce0ced84e97d5e2095f548aa38158d08cc235a5f81438ded30e6a84808e9a007994b7a964b
 MISC metadata.xml 291 BLAKE2B 0aeb75750176d719f10db508a8924d0bf2fe75e8544b275a7c7e11c44320ce4f7819febb093dd3083a33a998a225f2a3b882407a8ffc03d1a57d03cbfc0a7ff2 SHA512 f7a520fc9a216ff983bd3d361c6ddb3b635eb5dcd94ed042e7c5d0beb0b4e10cdb231e2b4ace599ebb93d4bb46e071a744f1a780ec83f451bb2ee6bad4c2d8cc
diff --git a/app-crypt/sbsigntool/files/0002-image.c-clear-image-variable.patch b/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
index dfe183e66cd2..dfe183e66cd2 100644
--- a/app-crypt/sbsigntool/files/0002-image.c-clear-image-variable.patch
+++ b/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
diff --git a/app-crypt/sbsigntool/files/0003-Fix-for-multi-sign.patch b/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
index f42c69616d13..f42c69616d13 100644
--- a/app-crypt/sbsigntool/files/0003-Fix-for-multi-sign.patch
+++ b/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
diff --git a/app-crypt/sbsigntool/files/sbsigntool-0.9.1-openssl-1.1.0-compat.patch b/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch
index 2f9364f246ee..2f9364f246ee 100644
--- a/app-crypt/sbsigntool/files/sbsigntool-0.9.1-openssl-1.1.0-compat.patch
+++ b/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch
diff --git a/app-crypt/sbsigntool/metadata.xml b/app-crypt/sbsigntools/metadata.xml
index 20001d6eb7ad..20001d6eb7ad 100644
--- a/app-crypt/sbsigntool/metadata.xml
+++ b/app-crypt/sbsigntools/metadata.xml
diff --git a/app-crypt/sbsigntool/sbsigntool-0.6-r2.ebuild b/app-crypt/sbsigntools/sbsigntools-0.6-r2.ebuild
index 464a4e833fb6..519693684dce 100644
--- a/app-crypt/sbsigntool/sbsigntool-0.6-r2.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.6-r2.ebuild
@@ -3,11 +3,13 @@
 
 EAPI="5"
 
+MY_PN="${PN::-1}"
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
 HOMEPAGE="https://launchpad.net/ubuntu/+source/sbsigntool"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -23,6 +25,8 @@ DEPEND="${RDEPEND}
 	sys-libs/binutils-libs
 	virtual/pkgconfig"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_prepare() {
 	local iarch
 	case ${ARCH} in
diff --git a/app-crypt/sbsigntool/sbsigntool-0.9.1-r1.ebuild b/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
index 70e47576c088..f87b1609d9d3 100644
--- a/app-crypt/sbsigntool/sbsigntool-0.9.1-r1.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
@@ -3,12 +3,14 @@
 
 EAPI="6"
 
+MY_PN="${PN::-1}"
+
 inherit eutils autotools
 
 DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}s.git/snapshot/${PN}s-${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${PN}-0.8-ccan.tar.gz"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot/${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${MY_PN}-0.8-ccan.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
 SLOT="0"
@@ -24,8 +26,6 @@ DEPEND="${RDEPEND}
 	sys-libs/binutils-libs
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}s-${PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-openssl-1.1.0-compat.patch
 )
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index c36da354630b..d544a61c770e 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index afcf431c5d03..b281f3e59a70 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -5,6 +5,6 @@ DIST doxygen-1.8.13.src.tar.gz 4893912 BLAKE2B 3eb7eb6e7d122f681a9af8caf8a33789d
 DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
 DIST doxywizard.png 4231 BLAKE2B c71e30fee273c7410bc6b65e171a864066e088d474785f5e24b5500806af1217a6e12e93c5b81a488e2d216bfa59aeed332a092515dbbf8b640d8f7320dda50a SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5
 EBUILD doxygen-1.8.13-r1.ebuild 3743 BLAKE2B 27ff1130731c6205ba3332a00a5b2d5175e3f5980ffffdb8dec65ae8ff1ad2893f48dca1ca77d07eb7be1b8d03509e17b752b02b44fce10601705af6b6c93f38 SHA512 aa8d218d2044b769787a82482a0483b219e17c656c3e8ad806fdda2026430bd63654113676caee8572bfeb1bc82aae6f54b55f0dee9e7b0ca723f1fb773352d2
-EBUILD doxygen-1.8.14-r1.ebuild 3067 BLAKE2B f217ee2a681ea54c7dd3e6d952ce488b50dcdfe556af2d894234b1051431423217fad45e771a2dcbfe1cd14af988bb2f4097694a890ade51032859bab4fa97c4 SHA512 b2f07d638370f4a4ddc93c9980b989bd853af4a76aa7e7703f0ac9bbcb7e3bb5a194cb3fa96e1e446ba3d14d1b70f8bdcf4a3ed2fa84e924fecbbd04728a442c
+EBUILD doxygen-1.8.14-r1.ebuild 3066 BLAKE2B 321dcdc108c3e1576972eecc8dbd6a6969102c10dfd4e5234ae775503cfc32be75c5e867353a050b069dace3dfc9db722b7a674a5a4843db3f43fc27df845783 SHA512 5438c64af40abac3dfeb7b278b613e7f8c10708a472382eeba6c2c04adb4faf61d4ab10f9624468e8a4a5ebff6ce1717e3a6ad7fd295f714cad3d46097acef4d
 EBUILD doxygen-9999.ebuild 3097 BLAKE2B 6bd1e6c6fd59342bd060f4b4dcfe19997ade7cd570401d8306c67b49eabc9487af84ddb768682d749d2ac045072cbc33f28ccce3fdffbca8e971f1be733c9c05 SHA512 84a7175f62eac4cc2af66cf24e395e53779c2e0ed776aab3d6a0dcba0efc97ef20f8bb2c7b1c64fc7341f0ab333c0a0d6872a82e52dc5b4ee26b00065eada392
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
index a02338b0a3fd..0c4dcac73052 100644
--- a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 68636e756b82..53febd0f3480 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,5 +1,7 @@
 DIST gnucash-docs-3.0.tar.gz 92420576 BLAKE2B 95d8c310b3616b44a814c7c5d6e8b1b586eef12831ea967818bef302e0dde3f0ab8e1b1d4fd0d504173625d87d54738a392ad3d53b8bfa079fd5ba87ac3a2d91 SHA512 908694725de6d9595cb73d4b334f157287a864ff7ba1057bdff7c0fb55660c5828a6b5c1e868eea7fbd0fca4b3b594fb3989092f270446dbd56c07479c6036cf
 DIST gnucash-docs-3.1.tar.gz 92421041 BLAKE2B b169d26cb9fb07a265fb5b8fc492fa8b0ed240be094278416d54542dd4ca074b3d4a182421b75d09c1f6c435891c5637aed646f0d11bdd57a9b71cbc999676dd SHA512 4af1f0b895cc928c109ae4f883efd1b483a5b318e02fcd6ca4ff7631ed4e13bc0f89f28b2f8ea895f9e37f596eb7b84e84732dfac6b2d4fe98b7405603149339
+DIST gnucash-docs-3.2.tar.gz 92387447 BLAKE2B dac502975f885b777c1e91a7ea574789947e1dddfd3239c05973ce57fec41a6d78e605ef37aaf721db4aa4d2bc8f2dda7ed76cc4dc97dd49e30618414e262f15 SHA512 a58a583a457377f529223ced083fb64460b3b0c75a423db08c7f9542711be98fd59bd776bf77309ff91d1c46f22a5ae882d8c0a8ec3fc834d7a8028a95028aad
 EBUILD gnucash-docs-3.0.ebuild 861 BLAKE2B 16e5e35a8c624de231dab411108eb463f1d151312c5e33eec0f4b78f3efaec73a505149373297ee0376ea6576e83982325254c19a3e808f733a70c748e4451ac SHA512 33c547e298a0f2d601977e59ad3a19af7036ec4af5aef73de8f0d5fde47e1c4a878b34abd56e6e9fcfa4cfea7ddd9c9c8324ad17b1145a29c80236d55e022497
 EBUILD gnucash-docs-3.1.ebuild 861 BLAKE2B 16e5e35a8c624de231dab411108eb463f1d151312c5e33eec0f4b78f3efaec73a505149373297ee0376ea6576e83982325254c19a3e808f733a70c748e4451ac SHA512 33c547e298a0f2d601977e59ad3a19af7036ec4af5aef73de8f0d5fde47e1c4a878b34abd56e6e9fcfa4cfea7ddd9c9c8324ad17b1145a29c80236d55e022497
-MISC metadata.xml 444 BLAKE2B d5ab61b0738eb3124b32f94da3b3f38ef8993039a4797eab95f0c2c2af427c6262cdb2b5885d0e4dfc659e15bad9c492db706f134f8128595eeef6afbcd4b663 SHA512 7a97c9139b410b8054093bd666c6043e6383e5b3ad9f19a52e7b4d2aaafa1b915082408d575064e7be1f0c4b14eae660837d608e88956a4e51fa1c647a19b5b2
+EBUILD gnucash-docs-3.2.ebuild 1117 BLAKE2B f68483cfdb850d339e4f76e9cce3b82ce32da8f8b2337231e82a39961bcf81248afbfdbf73d83dbc16d48951866d2a98efbe9695d3ee47147d90708a362944e9 SHA512 59114685ef55798b79420eb595f621048223c30bd0e31ab977bd01ce7b96dc544bafd306eb3ac7da361ab52145c6f13239db8147af88f07b829b5d52e0c73dd5
+MISC metadata.xml 496 BLAKE2B a668cda0f44d550b086c539edbd5eeb93092fee992621cbd655b5c30e3bfd658fcd0a65d4140f2f9ba4d368438c224bac887e86e6d36b730afd4a24c195fc448 SHA512 19e5631659fe0153e6f2de3bcc8dc5eb1615dc3e6a3493d71ea0d5e18df48fe64fef31819883add93cd1da425ebea0aa82f62b0052bdc328773b8a3c0bfca26a
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.2.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.2.ebuild
new file mode 100644
index 000000000000..2c74afab6f13
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-3.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="C de it ja pt ru"
+PLOCALE_BACKUP="C"
+
+inherit autotools gnome2 l10n
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+for my_locale in ${PLOCALES}; do
+	IUSE+=" l10n_${my_locale}"
+done
+
+DEPEND="
+	app-text/docbook-xml-dtd
+	app-text/docbook-xsl-stylesheets
+	app-text/rarian
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local doc_type lang
+
+	for doc_type in help guide ; do
+		for lang in $(l10n_get_locales); do
+			cd "${S}/${doc_type}/${lang}" || die
+			emake DESTDIR="${D}" install
+		done
+	done
+
+	cd "${S}" || die
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	has_version dev-java/fop || elog "You need dev-java/fop to generate pdf files."
+	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
+}
diff --git a/app-doc/gnucash-docs/metadata.xml b/app-doc/gnucash-docs/metadata.xml
index dc94f737b786..e0724f47e4bb 100644
--- a/app-doc/gnucash-docs/metadata.xml
+++ b/app-doc/gnucash-docs/metadata.xml
@@ -9,6 +9,9 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<use>
+		<flag name="l10n_C">English</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">gnucash</remote-id>
 	</upstream>
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index af20f29a603d..47eb2a0822b0 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -7,5 +7,5 @@ EBUILD kicad-doc-4.0.1.ebuild 1702 BLAKE2B 25e9163660ab32e5350156eb99954752aed07
 EBUILD kicad-doc-4.0.4.ebuild 1713 BLAKE2B 22c4ccbcc9a1bbe3f85fda803ca5d5ea965c774056a6cc7ea181a1800a7f534dce6b9629f3876f75fffc63babd9b5b7dccfadcf657d7b683fae9d61640e9ef11 SHA512 9c90258b230aae7fe88df026f71597a9361065fdc6b11a1691d373719d7cc7e0b3cd416e03ef62a422273d7d8ae68b0783e9445cbbf4c24c148e27f312a1b098
 EBUILD kicad-doc-4.0.5.ebuild 1599 BLAKE2B c7e154d4c6c4524e7c829cd45c73c1a9c3b8c4f004ae07f664f35a38645cab4681a7a3c20b73275df85648b646dec2c31a5ad011b7b31f9512e2199d3cb007f3 SHA512 238958b3496854a8537c92aa442f19f63e0c9fde6fc130c21456ac4c0a44000c5cfd0568265d81f60362bbf7a53bc2534fad88605c0f473dda56fa74714c57d9
 EBUILD kicad-doc-4.0.6.ebuild 1189 BLAKE2B 11d17858b76064e3647c3237bb2d3ab33e9c6edfeae9e10d98fb2a79926d63ec8a278b548d0f5079ecf43ce105c0d922e1e7305a1d0b633e295175180eb44476 SHA512 fd175c78d99afe8db250c3fcb4ccb55fe5122afbc9e271b483b534a832bf8543de2bc7a2dc3fda09753f03867c41c2358cb9ae93db1aa88484faa320258063f0
-EBUILD kicad-doc-4.0.7.ebuild 1189 BLAKE2B 11d17858b76064e3647c3237bb2d3ab33e9c6edfeae9e10d98fb2a79926d63ec8a278b548d0f5079ecf43ce105c0d922e1e7305a1d0b633e295175180eb44476 SHA512 fd175c78d99afe8db250c3fcb4ccb55fe5122afbc9e271b483b534a832bf8543de2bc7a2dc3fda09753f03867c41c2358cb9ae93db1aa88484faa320258063f0
+EBUILD kicad-doc-4.0.7.ebuild 1187 BLAKE2B 44eb1d3012c24f431f255b4203109398c3cbb4de0e068c81bad2034c866b9f00b8bf91e9941e8dbe23857359d72e9948d561cbc66dcfb1d8162da23f08950ff4 SHA512 9d36ba68ac9dcc0be7ea28832a424288e46b2226bda91d2b13318323789b8479eee913f5a793fda3ef47bec6877cbabccac607c1c5d648a4621df82faab39405
 MISC metadata.xml 821 BLAKE2B 631ca1c015a9e76858685a08e77512ad495bd6a95c41e307363bceee3fa48cb627eea89d004f2ddf293785452535f468f6fd9a717440e0ff022673a8fbbc3929 SHA512 07b69d4deccfa4edcc50e6652ff5f8af8fe265dd8887996c1c1d3d02691d578a139c3ba7b81e63eedc257664d32e1d74e4d24175e5d73ac2ac4f62fdee9531bb
diff --git a/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild b/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild
index 500e861d7bb3..13732e326c4a 100644
--- a/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="html +pdf"
 LANGS="en fr it ja nl pl"
 for lang in ${LANGS}; do
diff --git a/app-doc/phrack-all/Manifest b/app-doc/phrack-all/Manifest
index 9bcdb22411b1..fe6309fa86ff 100644
--- a/app-doc/phrack-all/Manifest
+++ b/app-doc/phrack-all/Manifest
@@ -1,2 +1,2 @@
-EBUILD phrack-all-68.ebuild 453 BLAKE2B 2563981130f0e03db5e08dd75365ad7256632b6db6485b17f9f0155cecd2a378bd8ea815b03308b07d903800d4b0390549020aef34c215f82b1e0d40ed357a75 SHA512 3ebdc0224cb1d87381fa84b8429c8e90ed59cb8715345a3d1304f38ab8f92b772701e3540b7e8c98bf19bf3c414dd49138cc85dc5488f32ff8e438593cef1b36
+EBUILD phrack-all-69.ebuild 453 BLAKE2B 53f162902cbc5eec62349b67d240426da503b0330b7ea17633796dd3e365742dce61faa0b3a756ccf6348062ad49fd44b75cdec0084608e7b0de4fe8606e2d06 SHA512 352c43cbb7b5e18afa08387d2c02ef235b5476d70b9892c18104d1a41e69759fffaa934b42bbe8a3354ea4df6250571f3ddee19f697f15b478c4d1bcd6ff71d7
 MISC metadata.xml 495 BLAKE2B 393063c45f88a55d9b1efe777900caaa82f862b3bd43f7773d24f6f2028462be4005483d8ed87a93b6cb14d8fbaa4779943f6667d0ea4ca512b387383065a1ee SHA512 9e82c249ca4e74ebf718e080d582d5dd2349b9bab7c585c601d8a771cac2400b007a525cd8a1e22cc7e06f209c8df585902f183bae91b9f3ba99e3120102d367
diff --git a/app-doc/phrack-all/phrack-all-68.ebuild b/app-doc/phrack-all/phrack-all-69.ebuild
index da4b9a3af3d1..7e0646ed3d03 100644
--- a/app-doc/phrack-all/phrack-all-68.ebuild
+++ b/app-doc/phrack-all/phrack-all-69.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="Hacker magazine by the community, for the community (all issues)"
@@ -13,4 +13,4 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-RDEPEND=$(printf '=app-doc/phrack-%02i ' {1..68})
+RDEPEND=$(printf '=app-doc/phrack-%02i ' {1..69})
diff --git a/app-doc/phrack/Manifest b/app-doc/phrack/Manifest
index d59a9af38539..0d85bf9c339d 100644
--- a/app-doc/phrack/Manifest
+++ b/app-doc/phrack/Manifest
@@ -63,75 +63,77 @@ DIST phrack65.tar.gz 1253258 BLAKE2B 37036bbf5cec34bcbdba0b36b66759102895e9b6847
 DIST phrack66.tar.gz 447757 BLAKE2B 4722dfeb0ecaa37505b1780419127594dcf67b5b904f05551c442b897c383d272f6bb096557a2718aeb265f2ab65903b9f0d9124722514d7aa89ed00b8df1aa5 SHA512 c7400538d80953d6a8276efff8f0673060d7e6cf071ce4e82a0b388b2c9b8ca46910b4807d6ef273aacfdb37d3574ed2d9959256baead4e6f8e50deb442579e0
 DIST phrack67.tar.gz 1959219 BLAKE2B 4a0936868895a77ea6d406a07d5ac0e217c793635b23406c2c01e0137e51c187544e31476baf06d60ff465f0f5b421933dbc78dcb05a26652d6b4a5c362eb75c SHA512 9aac722f0be59ec96c3ac6a9999efbfdc67b2a3c21561633d2cf77dab39fc21e587ab0af653551e1e2f454fd8881d2e1c67355cf0fc3288c6cd671d916f3e892
 DIST phrack68.tar.gz 1895423 BLAKE2B a859f6be22e1c9df9142518b89f1f0ea573ceeda787637449fe31092d2b4ac230d7b48cf5444c935b2fb893f14bbe889bf3d8af2f3623e6614e5d089fc8d2981 SHA512 8f24b3572232c54c9725dd0998408343c47018e890f8a95ed827aeb19377134de516d42e83a94fc5a36b48fad22fc074d4e5ff2102ad64abd497817aa0618399
+DIST phrack69.tar.gz 1623078 BLAKE2B b18e84757f0cd0ae1ec312d584fc5f211c78ff39c7887ef3ab12f7cdc84c7fa3b97a835f8aae039f046e153258c3609b8ddd08b7421b93f71b637d899488c977 SHA512 87dd424ea6ae1d9c2e06fb6ab6188673cf0263d203d89e0c6d3f38de4edaa066a3534d9e55d2fef86c1f71488b71aad3c7c6b3a7771dd6d74a3a9eee621a39be
 DIST phrack7.tar.gz 35745 BLAKE2B ff68eee01896293dbcd09d88df9b3d8cab839f1890f0fb9fc46dfd1bb7e5b15bed5fa3f3b8f2dd7ace6277020296e1a2ac522704e1a91529ef6dd3ab4de6adff SHA512 a87aa7fd989eb2e6dcff56a2022b63bc91737ec8b7d30235053a2446c275f83ba7d6e2aa09981d9b45deeb4d20e5076dbeeedd10c620bf5df508ad03b66f217a
 DIST phrack8.tar.gz 40211 BLAKE2B af0f5a526270efb8b3268d58c747cc9804609ec761e44ed5cc827b8ffd666227b125f0f481ada2f94d3d76f91d2e26b81e5689a907fbb56498e57a3f99bc0966 SHA512 0cda9f27de118b12db30c92996af58ef74838894fd1165f49001991c90513b7b5c036d9fdf15e58192e1b679655515bfa281c44aa20a776d440c9fab05dfbaf9
 DIST phrack9.tar.gz 35163 BLAKE2B 36048dc53efa4fe5cd15c5802055c1e511a48594c42da7771ec37adb5a353498997db171f1bd50589b77df13529d06a2aa773b870431d45ac45a98c61652d7b5 SHA512 234d3855c92dbac4ceba46ba0bf275cd9674a78c2f1e4f98e52df77b95c91876feaaa4e16529c9913bf19eb4859977a54c5b32b13f43d3eceb4c1f2d16812759
-EBUILD phrack-01.ebuild 523 BLAKE2B 0973b941de06dc5068aedddf990c8f4ff8b70e518a8b4977d16319774cb72e3586ce0072990ba24c42908b90b4b00c2cd9be8e5f2de9ee2108f5c4b9f0e2ae66 SHA512 2262fb781f64d9f8d6e156195464a70b9c72a73adafff367a766974356e7891d96311b7f117dedb92126198aaca76b338798d948b96c40e74c6bc068f672ddb6
-EBUILD phrack-02.ebuild 523 BLAKE2B 0973b941de06dc5068aedddf990c8f4ff8b70e518a8b4977d16319774cb72e3586ce0072990ba24c42908b90b4b00c2cd9be8e5f2de9ee2108f5c4b9f0e2ae66 SHA512 2262fb781f64d9f8d6e156195464a70b9c72a73adafff367a766974356e7891d96311b7f117dedb92126198aaca76b338798d948b96c40e74c6bc068f672ddb6
-EBUILD phrack-03.ebuild 523 BLAKE2B 0973b941de06dc5068aedddf990c8f4ff8b70e518a8b4977d16319774cb72e3586ce0072990ba24c42908b90b4b00c2cd9be8e5f2de9ee2108f5c4b9f0e2ae66 SHA512 2262fb781f64d9f8d6e156195464a70b9c72a73adafff367a766974356e7891d96311b7f117dedb92126198aaca76b338798d948b96c40e74c6bc068f672ddb6
-EBUILD phrack-04.ebuild 523 BLAKE2B 0973b941de06dc5068aedddf990c8f4ff8b70e518a8b4977d16319774cb72e3586ce0072990ba24c42908b90b4b00c2cd9be8e5f2de9ee2108f5c4b9f0e2ae66 SHA512 2262fb781f64d9f8d6e156195464a70b9c72a73adafff367a766974356e7891d96311b7f117dedb92126198aaca76b338798d948b96c40e74c6bc068f672ddb6
-EBUILD phrack-05.ebuild 523 BLAKE2B 0973b941de06dc5068aedddf990c8f4ff8b70e518a8b4977d16319774cb72e3586ce0072990ba24c42908b90b4b00c2cd9be8e5f2de9ee2108f5c4b9f0e2ae66 SHA512 2262fb781f64d9f8d6e156195464a70b9c72a73adafff367a766974356e7891d96311b7f117dedb92126198aaca76b338798d948b96c40e74c6bc068f672ddb6
-EBUILD phrack-06.ebuild 523 BLAKE2B 0973b941de06dc5068aedddf990c8f4ff8b70e518a8b4977d16319774cb72e3586ce0072990ba24c42908b90b4b00c2cd9be8e5f2de9ee2108f5c4b9f0e2ae66 SHA512 2262fb781f64d9f8d6e156195464a70b9c72a73adafff367a766974356e7891d96311b7f117dedb92126198aaca76b338798d948b96c40e74c6bc068f672ddb6
-EBUILD phrack-07.ebuild 523 BLAKE2B 0973b941de06dc5068aedddf990c8f4ff8b70e518a8b4977d16319774cb72e3586ce0072990ba24c42908b90b4b00c2cd9be8e5f2de9ee2108f5c4b9f0e2ae66 SHA512 2262fb781f64d9f8d6e156195464a70b9c72a73adafff367a766974356e7891d96311b7f117dedb92126198aaca76b338798d948b96c40e74c6bc068f672ddb6
-EBUILD phrack-08.ebuild 523 BLAKE2B 0973b941de06dc5068aedddf990c8f4ff8b70e518a8b4977d16319774cb72e3586ce0072990ba24c42908b90b4b00c2cd9be8e5f2de9ee2108f5c4b9f0e2ae66 SHA512 2262fb781f64d9f8d6e156195464a70b9c72a73adafff367a766974356e7891d96311b7f117dedb92126198aaca76b338798d948b96c40e74c6bc068f672ddb6
-EBUILD phrack-09.ebuild 523 BLAKE2B 0973b941de06dc5068aedddf990c8f4ff8b70e518a8b4977d16319774cb72e3586ce0072990ba24c42908b90b4b00c2cd9be8e5f2de9ee2108f5c4b9f0e2ae66 SHA512 2262fb781f64d9f8d6e156195464a70b9c72a73adafff367a766974356e7891d96311b7f117dedb92126198aaca76b338798d948b96c40e74c6bc068f672ddb6
-EBUILD phrack-10.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-11.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-12.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-13.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-14.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-15.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-16.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-17.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-18.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-19.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-20.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-21.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-22.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-23.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-24.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-25.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-26.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-27.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-28.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-29.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-30.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-31.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-32.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-33.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-34.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-35.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-36.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-37.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-38.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-39.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-40.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-41.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-42.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-43.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-44.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-45.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-46.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-47.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-48.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-49.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-50.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-51.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-52.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-53.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-54.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-55.ebuild 523 BLAKE2B 9d18f69ad7f01eebdacc9617fd9c3112a1c5b42bdc81a9d9b3f553f5b8ad0879e3ffdc07940063dbcbcabacf76ec559f71de6cbbbb09a7548fdd6dd369a21641 SHA512 78296189972c56e08b44ed9c041f2f7f7578e5a0a0e7bb233d5b7184fe47a2744d698dab27a0b69b14c3dd35c769c4129514eb4593e8b15e8ad8a6890c475790
-EBUILD phrack-56.ebuild 523 BLAKE2B 9d18f69ad7f01eebdacc9617fd9c3112a1c5b42bdc81a9d9b3f553f5b8ad0879e3ffdc07940063dbcbcabacf76ec559f71de6cbbbb09a7548fdd6dd369a21641 SHA512 78296189972c56e08b44ed9c041f2f7f7578e5a0a0e7bb233d5b7184fe47a2744d698dab27a0b69b14c3dd35c769c4129514eb4593e8b15e8ad8a6890c475790
-EBUILD phrack-57.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-58.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-59.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-60.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-61.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-62.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-63.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-64.ebuild 517 BLAKE2B 36fd49b46cf8ea64f0bcf7cb55e61a768bf340cdd96b584b8223fee6b0840ad6bf6abfdc56f89b873557a25234529752ef9d4ac5189878f8e19f0b172f868604 SHA512 150908f11c2c0358e8ddf9b1057e58bbe9fd6123088ab3c2c3de10b02159d7c47ce470ba3908757643f0820a999620481e7bebe895966f2600687813fed601b4
-EBUILD phrack-65.ebuild 517 BLAKE2B 36fd49b46cf8ea64f0bcf7cb55e61a768bf340cdd96b584b8223fee6b0840ad6bf6abfdc56f89b873557a25234529752ef9d4ac5189878f8e19f0b172f868604 SHA512 150908f11c2c0358e8ddf9b1057e58bbe9fd6123088ab3c2c3de10b02159d7c47ce470ba3908757643f0820a999620481e7bebe895966f2600687813fed601b4
-EBUILD phrack-66.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-67.ebuild 517 BLAKE2B 36fd49b46cf8ea64f0bcf7cb55e61a768bf340cdd96b584b8223fee6b0840ad6bf6abfdc56f89b873557a25234529752ef9d4ac5189878f8e19f0b172f868604 SHA512 150908f11c2c0358e8ddf9b1057e58bbe9fd6123088ab3c2c3de10b02159d7c47ce470ba3908757643f0820a999620481e7bebe895966f2600687813fed601b4
-EBUILD phrack-68.ebuild 517 BLAKE2B 36fd49b46cf8ea64f0bcf7cb55e61a768bf340cdd96b584b8223fee6b0840ad6bf6abfdc56f89b873557a25234529752ef9d4ac5189878f8e19f0b172f868604 SHA512 150908f11c2c0358e8ddf9b1057e58bbe9fd6123088ab3c2c3de10b02159d7c47ce470ba3908757643f0820a999620481e7bebe895966f2600687813fed601b4
+EBUILD phrack-01.ebuild 496 BLAKE2B 6df0105849be08da0c71ee43135743a06adecbcf4cb8cf437c11131c81ab530c2cce1e3b088c3b14161bc4c977d75524bc038ccd9398e05ff0000b6af5684405 SHA512 0cf82c60d8079b61f7ec2412abb7c07681e31daa268b0a0bae56d3b95d8e4f37314b8a9b7589bbeef009b72a9c9019a7b3bbb09d7e0e4af62dcb9a63e853eb94
+EBUILD phrack-02.ebuild 496 BLAKE2B 6df0105849be08da0c71ee43135743a06adecbcf4cb8cf437c11131c81ab530c2cce1e3b088c3b14161bc4c977d75524bc038ccd9398e05ff0000b6af5684405 SHA512 0cf82c60d8079b61f7ec2412abb7c07681e31daa268b0a0bae56d3b95d8e4f37314b8a9b7589bbeef009b72a9c9019a7b3bbb09d7e0e4af62dcb9a63e853eb94
+EBUILD phrack-03.ebuild 496 BLAKE2B 6df0105849be08da0c71ee43135743a06adecbcf4cb8cf437c11131c81ab530c2cce1e3b088c3b14161bc4c977d75524bc038ccd9398e05ff0000b6af5684405 SHA512 0cf82c60d8079b61f7ec2412abb7c07681e31daa268b0a0bae56d3b95d8e4f37314b8a9b7589bbeef009b72a9c9019a7b3bbb09d7e0e4af62dcb9a63e853eb94
+EBUILD phrack-04.ebuild 496 BLAKE2B 6df0105849be08da0c71ee43135743a06adecbcf4cb8cf437c11131c81ab530c2cce1e3b088c3b14161bc4c977d75524bc038ccd9398e05ff0000b6af5684405 SHA512 0cf82c60d8079b61f7ec2412abb7c07681e31daa268b0a0bae56d3b95d8e4f37314b8a9b7589bbeef009b72a9c9019a7b3bbb09d7e0e4af62dcb9a63e853eb94
+EBUILD phrack-05.ebuild 496 BLAKE2B 6df0105849be08da0c71ee43135743a06adecbcf4cb8cf437c11131c81ab530c2cce1e3b088c3b14161bc4c977d75524bc038ccd9398e05ff0000b6af5684405 SHA512 0cf82c60d8079b61f7ec2412abb7c07681e31daa268b0a0bae56d3b95d8e4f37314b8a9b7589bbeef009b72a9c9019a7b3bbb09d7e0e4af62dcb9a63e853eb94
+EBUILD phrack-06.ebuild 496 BLAKE2B 6df0105849be08da0c71ee43135743a06adecbcf4cb8cf437c11131c81ab530c2cce1e3b088c3b14161bc4c977d75524bc038ccd9398e05ff0000b6af5684405 SHA512 0cf82c60d8079b61f7ec2412abb7c07681e31daa268b0a0bae56d3b95d8e4f37314b8a9b7589bbeef009b72a9c9019a7b3bbb09d7e0e4af62dcb9a63e853eb94
+EBUILD phrack-07.ebuild 496 BLAKE2B 6df0105849be08da0c71ee43135743a06adecbcf4cb8cf437c11131c81ab530c2cce1e3b088c3b14161bc4c977d75524bc038ccd9398e05ff0000b6af5684405 SHA512 0cf82c60d8079b61f7ec2412abb7c07681e31daa268b0a0bae56d3b95d8e4f37314b8a9b7589bbeef009b72a9c9019a7b3bbb09d7e0e4af62dcb9a63e853eb94
+EBUILD phrack-08.ebuild 496 BLAKE2B 6df0105849be08da0c71ee43135743a06adecbcf4cb8cf437c11131c81ab530c2cce1e3b088c3b14161bc4c977d75524bc038ccd9398e05ff0000b6af5684405 SHA512 0cf82c60d8079b61f7ec2412abb7c07681e31daa268b0a0bae56d3b95d8e4f37314b8a9b7589bbeef009b72a9c9019a7b3bbb09d7e0e4af62dcb9a63e853eb94
+EBUILD phrack-09.ebuild 496 BLAKE2B 6df0105849be08da0c71ee43135743a06adecbcf4cb8cf437c11131c81ab530c2cce1e3b088c3b14161bc4c977d75524bc038ccd9398e05ff0000b6af5684405 SHA512 0cf82c60d8079b61f7ec2412abb7c07681e31daa268b0a0bae56d3b95d8e4f37314b8a9b7589bbeef009b72a9c9019a7b3bbb09d7e0e4af62dcb9a63e853eb94
+EBUILD phrack-10.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-11.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-12.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-13.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-14.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-15.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-16.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-17.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-18.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-19.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-20.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-21.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-22.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-23.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-24.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-25.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-26.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-27.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-28.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-29.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-30.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-31.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-32.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-33.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-34.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-35.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-36.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-37.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-38.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-39.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-40.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-41.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-42.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-43.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-44.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-45.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-46.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-47.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-48.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-49.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-50.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-51.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-52.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-53.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-54.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-55.ebuild 496 BLAKE2B 19e321491b99aaafe31d54636aa3589e8fc6c776ccfc8b900fea9ccd40fce4c38edd1ef0e79f0e8d3bad5e4ec78958deb4b81da5ccb25cb4f37b40b6d02ac668 SHA512 4070f71d9360b102ac9b474a03a6b6f944e4052ecb61f5f109e79ac64470dd900ff89acbe5d142c41dfee9711b1ecc2ceacc2ebd5c9bfa736eeb0f9e7d791d26
+EBUILD phrack-56.ebuild 496 BLAKE2B 19e321491b99aaafe31d54636aa3589e8fc6c776ccfc8b900fea9ccd40fce4c38edd1ef0e79f0e8d3bad5e4ec78958deb4b81da5ccb25cb4f37b40b6d02ac668 SHA512 4070f71d9360b102ac9b474a03a6b6f944e4052ecb61f5f109e79ac64470dd900ff89acbe5d142c41dfee9711b1ecc2ceacc2ebd5c9bfa736eeb0f9e7d791d26
+EBUILD phrack-57.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-58.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-59.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-60.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-61.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-62.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-63.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-64.ebuild 490 BLAKE2B 85a5fa7b072cd593407a6078ce6d782806abc6741fe9b93d96e84956931a36384b3cc695d245ec10cfc23064bb7d528b7b1bde705384a568500e851af3aca886 SHA512 f53b0edd300e5761a5672bc18b7d72841a12eb59d8a1ee764877c66ea7b42beae3ce73e5d79b660e837c9081254f39a21d58a7ce85b811796565be38388c9fe8
+EBUILD phrack-65.ebuild 490 BLAKE2B 85a5fa7b072cd593407a6078ce6d782806abc6741fe9b93d96e84956931a36384b3cc695d245ec10cfc23064bb7d528b7b1bde705384a568500e851af3aca886 SHA512 f53b0edd300e5761a5672bc18b7d72841a12eb59d8a1ee764877c66ea7b42beae3ce73e5d79b660e837c9081254f39a21d58a7ce85b811796565be38388c9fe8
+EBUILD phrack-66.ebuild 492 BLAKE2B 1968557bf072f8836b67e3c11e85bed9ade8987e1addee93bc5a74a6f146341367cc3f11acfda54a9b77b5dffbc67e9590d2e4565ef8c9f882da87256d371f1b SHA512 e39c564bc9b206d82b6a45f8ef4bcc72eee82eef3f4ac0d4af80593fa541fa2a05e3b6f28ecb0855cdf4f592ed4e9cb5754d934385fa47f85042a28e2da0b239
+EBUILD phrack-67.ebuild 490 BLAKE2B 85a5fa7b072cd593407a6078ce6d782806abc6741fe9b93d96e84956931a36384b3cc695d245ec10cfc23064bb7d528b7b1bde705384a568500e851af3aca886 SHA512 f53b0edd300e5761a5672bc18b7d72841a12eb59d8a1ee764877c66ea7b42beae3ce73e5d79b660e837c9081254f39a21d58a7ce85b811796565be38388c9fe8
+EBUILD phrack-68.ebuild 490 BLAKE2B 85a5fa7b072cd593407a6078ce6d782806abc6741fe9b93d96e84956931a36384b3cc695d245ec10cfc23064bb7d528b7b1bde705384a568500e851af3aca886 SHA512 f53b0edd300e5761a5672bc18b7d72841a12eb59d8a1ee764877c66ea7b42beae3ce73e5d79b660e837c9081254f39a21d58a7ce85b811796565be38388c9fe8
+EBUILD phrack-69.ebuild 484 BLAKE2B a77d90cffca889aafd1d518bc92489e3023aefadb2e1c023ad96968f3a8c4269ce26fd28a0169b14fbffc0bf04f1be2c8ca0426ebd41fc822fa0dc3ffc60cb7a SHA512 c231ff6da11f77de7b0ad4c44b73cd31a4285268d7f5e7cd21612c0da5683af4bcbae8f12b77c5cad8d45ac9783f32bbe4027b728773754d6086a3bb0e29a031
 MISC metadata.xml 495 BLAKE2B 393063c45f88a55d9b1efe777900caaa82f862b3bd43f7773d24f6f2028462be4005483d8ed87a93b6cb14d8fbaa4779943f6667d0ea4ca512b387383065a1ee SHA512 9e82c249ca4e74ebf718e080d582d5dd2349b9bab7c585c601d8a771cac2400b007a525cd8a1e22cc7e06f209c8df585902f183bae91b9f3ba99e3120102d367
diff --git a/app-doc/phrack/phrack-01.ebuild b/app-doc/phrack/phrack-01.ebuild
index d3516502066b..4d45e669d0ca 100644
--- a/app-doc/phrack/phrack-01.ebuild
+++ b/app-doc/phrack/phrack-01.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV:1:2}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-02.ebuild b/app-doc/phrack/phrack-02.ebuild
index d3516502066b..4d45e669d0ca 100644
--- a/app-doc/phrack/phrack-02.ebuild
+++ b/app-doc/phrack/phrack-02.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV:1:2}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-03.ebuild b/app-doc/phrack/phrack-03.ebuild
index d3516502066b..4d45e669d0ca 100644
--- a/app-doc/phrack/phrack-03.ebuild
+++ b/app-doc/phrack/phrack-03.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV:1:2}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-04.ebuild b/app-doc/phrack/phrack-04.ebuild
index d3516502066b..4d45e669d0ca 100644
--- a/app-doc/phrack/phrack-04.ebuild
+++ b/app-doc/phrack/phrack-04.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV:1:2}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-05.ebuild b/app-doc/phrack/phrack-05.ebuild
index d3516502066b..4d45e669d0ca 100644
--- a/app-doc/phrack/phrack-05.ebuild
+++ b/app-doc/phrack/phrack-05.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV:1:2}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-06.ebuild b/app-doc/phrack/phrack-06.ebuild
index d3516502066b..4d45e669d0ca 100644
--- a/app-doc/phrack/phrack-06.ebuild
+++ b/app-doc/phrack/phrack-06.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV:1:2}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-07.ebuild b/app-doc/phrack/phrack-07.ebuild
index d3516502066b..4d45e669d0ca 100644
--- a/app-doc/phrack/phrack-07.ebuild
+++ b/app-doc/phrack/phrack-07.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV:1:2}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-08.ebuild b/app-doc/phrack/phrack-08.ebuild
index d3516502066b..4d45e669d0ca 100644
--- a/app-doc/phrack/phrack-08.ebuild
+++ b/app-doc/phrack/phrack-08.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV:1:2}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-09.ebuild b/app-doc/phrack/phrack-09.ebuild
index d3516502066b..4d45e669d0ca 100644
--- a/app-doc/phrack/phrack-09.ebuild
+++ b/app-doc/phrack/phrack-09.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV:1:2}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-10.ebuild b/app-doc/phrack/phrack-10.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-10.ebuild
+++ b/app-doc/phrack/phrack-10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-11.ebuild b/app-doc/phrack/phrack-11.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-11.ebuild
+++ b/app-doc/phrack/phrack-11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-12.ebuild b/app-doc/phrack/phrack-12.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-12.ebuild
+++ b/app-doc/phrack/phrack-12.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-13.ebuild b/app-doc/phrack/phrack-13.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-13.ebuild
+++ b/app-doc/phrack/phrack-13.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-14.ebuild b/app-doc/phrack/phrack-14.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-14.ebuild
+++ b/app-doc/phrack/phrack-14.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-15.ebuild b/app-doc/phrack/phrack-15.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-15.ebuild
+++ b/app-doc/phrack/phrack-15.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-16.ebuild b/app-doc/phrack/phrack-16.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-16.ebuild
+++ b/app-doc/phrack/phrack-16.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-17.ebuild b/app-doc/phrack/phrack-17.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-17.ebuild
+++ b/app-doc/phrack/phrack-17.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-18.ebuild b/app-doc/phrack/phrack-18.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-18.ebuild
+++ b/app-doc/phrack/phrack-18.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-19.ebuild b/app-doc/phrack/phrack-19.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-19.ebuild
+++ b/app-doc/phrack/phrack-19.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-20.ebuild b/app-doc/phrack/phrack-20.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-20.ebuild
+++ b/app-doc/phrack/phrack-20.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-21.ebuild b/app-doc/phrack/phrack-21.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-21.ebuild
+++ b/app-doc/phrack/phrack-21.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-22.ebuild b/app-doc/phrack/phrack-22.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-22.ebuild
+++ b/app-doc/phrack/phrack-22.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-23.ebuild b/app-doc/phrack/phrack-23.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-23.ebuild
+++ b/app-doc/phrack/phrack-23.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-24.ebuild b/app-doc/phrack/phrack-24.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-24.ebuild
+++ b/app-doc/phrack/phrack-24.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-25.ebuild b/app-doc/phrack/phrack-25.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-25.ebuild
+++ b/app-doc/phrack/phrack-25.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-26.ebuild b/app-doc/phrack/phrack-26.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-26.ebuild
+++ b/app-doc/phrack/phrack-26.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-27.ebuild b/app-doc/phrack/phrack-27.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-27.ebuild
+++ b/app-doc/phrack/phrack-27.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-28.ebuild b/app-doc/phrack/phrack-28.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-28.ebuild
+++ b/app-doc/phrack/phrack-28.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-29.ebuild b/app-doc/phrack/phrack-29.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-29.ebuild
+++ b/app-doc/phrack/phrack-29.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-30.ebuild b/app-doc/phrack/phrack-30.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-30.ebuild
+++ b/app-doc/phrack/phrack-30.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-31.ebuild b/app-doc/phrack/phrack-31.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-31.ebuild
+++ b/app-doc/phrack/phrack-31.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-32.ebuild b/app-doc/phrack/phrack-32.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-32.ebuild
+++ b/app-doc/phrack/phrack-32.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-33.ebuild b/app-doc/phrack/phrack-33.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-33.ebuild
+++ b/app-doc/phrack/phrack-33.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-34.ebuild b/app-doc/phrack/phrack-34.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-34.ebuild
+++ b/app-doc/phrack/phrack-34.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-35.ebuild b/app-doc/phrack/phrack-35.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-35.ebuild
+++ b/app-doc/phrack/phrack-35.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-36.ebuild b/app-doc/phrack/phrack-36.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-36.ebuild
+++ b/app-doc/phrack/phrack-36.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-37.ebuild b/app-doc/phrack/phrack-37.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-37.ebuild
+++ b/app-doc/phrack/phrack-37.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-38.ebuild b/app-doc/phrack/phrack-38.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-38.ebuild
+++ b/app-doc/phrack/phrack-38.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-39.ebuild b/app-doc/phrack/phrack-39.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-39.ebuild
+++ b/app-doc/phrack/phrack-39.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-40.ebuild b/app-doc/phrack/phrack-40.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-40.ebuild
+++ b/app-doc/phrack/phrack-40.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-41.ebuild b/app-doc/phrack/phrack-41.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-41.ebuild
+++ b/app-doc/phrack/phrack-41.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-42.ebuild b/app-doc/phrack/phrack-42.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-42.ebuild
+++ b/app-doc/phrack/phrack-42.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-43.ebuild b/app-doc/phrack/phrack-43.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-43.ebuild
+++ b/app-doc/phrack/phrack-43.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-44.ebuild b/app-doc/phrack/phrack-44.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-44.ebuild
+++ b/app-doc/phrack/phrack-44.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-45.ebuild b/app-doc/phrack/phrack-45.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-45.ebuild
+++ b/app-doc/phrack/phrack-45.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-46.ebuild b/app-doc/phrack/phrack-46.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-46.ebuild
+++ b/app-doc/phrack/phrack-46.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-47.ebuild b/app-doc/phrack/phrack-47.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-47.ebuild
+++ b/app-doc/phrack/phrack-47.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-48.ebuild b/app-doc/phrack/phrack-48.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-48.ebuild
+++ b/app-doc/phrack/phrack-48.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-49.ebuild b/app-doc/phrack/phrack-49.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-49.ebuild
+++ b/app-doc/phrack/phrack-49.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-50.ebuild b/app-doc/phrack/phrack-50.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-50.ebuild
+++ b/app-doc/phrack/phrack-50.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-51.ebuild b/app-doc/phrack/phrack-51.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-51.ebuild
+++ b/app-doc/phrack/phrack-51.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-52.ebuild b/app-doc/phrack/phrack-52.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-52.ebuild
+++ b/app-doc/phrack/phrack-52.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-53.ebuild b/app-doc/phrack/phrack-53.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-53.ebuild
+++ b/app-doc/phrack/phrack-53.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-54.ebuild b/app-doc/phrack/phrack-54.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-54.ebuild
+++ b/app-doc/phrack/phrack-54.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-55.ebuild b/app-doc/phrack/phrack-55.ebuild
index 8ac036c70655..a68dca61aa9a 100644
--- a/app-doc/phrack/phrack-55.ebuild
+++ b/app-doc/phrack/phrack-55.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/Phrack${PV}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-56.ebuild b/app-doc/phrack/phrack-56.ebuild
index 8ac036c70655..a68dca61aa9a 100644
--- a/app-doc/phrack/phrack-56.ebuild
+++ b/app-doc/phrack/phrack-56.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/Phrack${PV}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-57.ebuild b/app-doc/phrack/phrack-57.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-57.ebuild
+++ b/app-doc/phrack/phrack-57.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-58.ebuild b/app-doc/phrack/phrack-58.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-58.ebuild
+++ b/app-doc/phrack/phrack-58.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-59.ebuild b/app-doc/phrack/phrack-59.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-59.ebuild
+++ b/app-doc/phrack/phrack-59.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-60.ebuild b/app-doc/phrack/phrack-60.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-60.ebuild
+++ b/app-doc/phrack/phrack-60.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-61.ebuild b/app-doc/phrack/phrack-61.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-61.ebuild
+++ b/app-doc/phrack/phrack-61.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-62.ebuild b/app-doc/phrack/phrack-62.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-62.ebuild
+++ b/app-doc/phrack/phrack-62.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-63.ebuild b/app-doc/phrack/phrack-63.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-63.ebuild
+++ b/app-doc/phrack/phrack-63.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-64.ebuild b/app-doc/phrack/phrack-64.ebuild
index 4a1959fc9c1b..3834d99b906e 100644
--- a/app-doc/phrack/phrack-64.ebuild
+++ b/app-doc/phrack/phrack-64.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${PV}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-65.ebuild b/app-doc/phrack/phrack-65.ebuild
index 4a1959fc9c1b..3834d99b906e 100644
--- a/app-doc/phrack/phrack-65.ebuild
+++ b/app-doc/phrack/phrack-65.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${PV}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-66.ebuild b/app-doc/phrack/phrack-66.ebuild
index aae3293c9a53..d1bbb0cd43bb 100644
--- a/app-doc/phrack/phrack-66.ebuild
+++ b/app-doc/phrack/phrack-66.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-67.ebuild b/app-doc/phrack/phrack-67.ebuild
index 4a1959fc9c1b..3834d99b906e 100644
--- a/app-doc/phrack/phrack-67.ebuild
+++ b/app-doc/phrack/phrack-67.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${PV}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-68.ebuild b/app-doc/phrack/phrack-68.ebuild
index 4a1959fc9c1b..3834d99b906e 100644
--- a/app-doc/phrack/phrack-68.ebuild
+++ b/app-doc/phrack/phrack-68.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${PN}${PV}
 DESCRIPTION="A Hacker magazine by the community, for the community"
@@ -16,6 +16,5 @@ IUSE=""
 S=${WORKDIR}/${PV}
 
 src_install() {
-	insinto /usr/share/doc/${PN}
-	doins *
+	dodoc -r *
 }
diff --git a/app-doc/phrack/phrack-69.ebuild b/app-doc/phrack/phrack-69.ebuild
new file mode 100644
index 000000000000..d7dab6e2ac98
--- /dev/null
+++ b/app-doc/phrack/phrack-69.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}${PV}
+DESCRIPTION="A Hacker magazine by the community, for the community"
+HOMEPAGE="http://www.phrack.org/"
+SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
+
+LICENSE="phrack"
+SLOT="${PV}"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	dodoc -r *
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 65ea1385f70e..e2f31ab06431 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 2c518a7e761e..49612f4ef9bf 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,3 +1,3 @@
-EBUILD emacs-vcs-26.1.9999.ebuild 12780 BLAKE2B d1cd16d616bf716322d37714653716dbbdc20ceb26ca0ada0e859f57bac434bf7b67d0d767ada655786e6a5216926a042a2363b0b70cb4c49c63baed17c4df9e SHA512 2ef9daa2a935a8b2ac1fa74f809373727f9d58d2a61ffef5dd18cbeedb6863a94e78acc618978a64657a38e3a21946b14e993b1bdeaa5ba94564988e942b4a39
-EBUILD emacs-vcs-27.0.9999.ebuild 12778 BLAKE2B b7212e209607c5e527c49d82591f234ce42ea3ab1d7a5979ae3d7e3594de58c5e1634bd7768e56d56f542b303a752229ac217d2ede09fbddd03c652d45846f2b SHA512 2c1a2b10dbd180517fb75fe438caf15e9fa2493cce2a6b04f1e4abca56dab19a63583e9a8459cef61a17ed9f6fe54e5206c880b1507224306982604c3c6c0be5
+EBUILD emacs-vcs-26.1.9999.ebuild 12790 BLAKE2B b241bfb349fd889b8f3bd083dcbd2e907e1370ec9b7c4f9662008cf08eea42e330380b744c2fba4cd98210b29fde0e760bdf06256f24ba362a4cca4c68a13d89 SHA512 683d53948f6f9e75c9771866971d601ea5364a8a377b639bc0e753def9a80d9b7259c02e7162a8c4e8c512e8cf7164672c43280b3120d6745df9450e91decdd5
+EBUILD emacs-vcs-27.0.9999.ebuild 12788 BLAKE2B f3620bf7836f4dee2f4b0165cbf42589411d61167292beec6fbce7748eebfd75d2eabd94287a223a7e455bae971ad23a1afeaf75a6c86401edf4fcc9e9e363df SHA512 f1ca9064125f2566472f3f638b835da13153aa3d5bd070c23e415397c331f9db87ebf493828d888d1abb89330bccf8cfcd26fb6ca9c6cb1f81531b8f96118e57
 MISC metadata.xml 2799 BLAKE2B 0b1f8190aa0a7884ce80e712caafa063e053e5b100bbf56ca97156e1b99cc32bd22caa20297ca0249b50b3991444b05d33c49051eabad56f20e799fd6c5e7d54 SHA512 cc0a8ac18f7366e0384528b963c9f2de4c6faabca3cfdf4abd92456feb70454c95df125ec0648806614ac0daaabf198acad0bd349295bf7b01b159db96fbece4
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
index 20578fca5aca..abc0aef998ed 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
 
@@ -112,9 +112,10 @@ RDEPEND="sys-libs/ncurses:0=
 	)"
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
 	X? ( x11-base/xorg-proto )"
+
+BDEPEND="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
 #	pax_kernel? ( sys-apps/attr )
 
 if [[ ${PV##*.} = 9999 ]]; then
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index b8ba118cce43..542cd77830f4 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
 
@@ -112,9 +112,10 @@ RDEPEND="sys-libs/ncurses:0=
 	)"
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
 	X? ( x11-base/xorg-proto )"
+
+BDEPEND="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
 #	pax_kernel? ( sys-apps/attr )
 
 if [[ ${PV##*.} = 9999 ]]; then
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index b4da72f6bd8a..948837697b88 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,11 +8,13 @@ DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aa
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3-patches-1.tar.xz 1252 BLAKE2B 33c3c8e32b85f548201d4988d3aaf94e6440ab4727fced17aa26f00fd5665b755d3add254a764f579736bbfbc90716ff800e3ad5b8e7bd5d5c2370d31451e4b1 SHA512 09371a789a7c742b4e18f45a4c4e063a5392d0684899eb8be8c7415af9fe3c306083c62f18abc6a15c4fe76dd6ae3ac5c9b002c962971e59379cc187926a0c15
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
+DIST emacs-26.1-patches-1.tar.xz 1296 BLAKE2B 5e3cef3130b35a362d67f853686625d207e9af29ffb27753b6aa00327e30cc06b3cd7ed339b214b12fb00137654521c21e2252ecd83a79258bb9636406ab032c SHA512 6e4b0bdbf98d5130a6cd41fb0a8c3d641bf0b8d46f150d1f10f2d659e0418c14198d8990df13f3266437bb128f5fc7db8456458f5f547f2c12cc59da4fea3c8e
 DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25d13ec5e0bee9ec6a65e80c52c870162b4671e80a82f8310784c802924609f2f87d504b1a97617c44d859566f SHA512 537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2
 EBUILD emacs-18.59-r11.ebuild 4358 BLAKE2B d5db4c011da9c728092eeb75f8708c7ab3729497be75fec58553de3df47a12a54e0845c1a4bc5a07c1080a305d0fdf8033370c0c5692ca3ae7caa617637d8fea SHA512 9637184ba4c9f51da3eef13625b5de4a1af283ada88c2a4f6fe6f03447907ac37e05ae69abbef514bd0024f748f1cc458567f4480e0e23fd4db26905bfa0b4f9
 EBUILD emacs-18.59-r12.ebuild 4414 BLAKE2B 73ac8bfad69df23c494194c3df2933ae5e9bfe57c3516ddaf2df9160a3316b1a85bee4a69ad0e7a81bd8c1ed4e7636eda79a24aa9df0d1a322fed28a73f58dc7 SHA512 ec790db2ce8a9fc73e222c9cd78113b59717c378690a56bf5632b581f924bb640a507a1185dede45fc0598f66a954b61af38ab56c3a9717bde5ac75ed1d2eb3d
-EBUILD emacs-23.4-r17.ebuild 11421 BLAKE2B 88c04aabc068027d0ef6d9a1199d22c90f7b400e9b88396d04e39d8d7981c2601fc08c0881f1cddd310b47a1dd8122f80f2288f9a30eb6f08b35f7b2591e7903 SHA512 d59446d471cc210bcfb20b0d8c0553eb8a47109c301fe6f63de2fa5ec93536e76684619ea6e19dd8543cb52918eaf21569711b6cf4b65dc22948e4171d2d09f0
-EBUILD emacs-24.5-r5.ebuild 11139 BLAKE2B c85b922bae742dc6ee475a937b000e0900d991379d65ade60e20a3de7a9adda271707945b9f543df7017c614a0f30cbaea5c57fd5b4fd7699bdc99f8b7cff468 SHA512 9539a8a4fb5032992cfa6d4a972a482e5015291895412faf4d2923137c271a665cad25a38a2cd3d43fa3535c62c82b4de5a45ae8ae72963ab90cdbf710d1bac5
-EBUILD emacs-25.3-r4.ebuild 11630 BLAKE2B 765d1ed69b11ba40726443522b0d620cea9b78b838a10d404e3d73366aa26de5801d293be006e5899bdbf6ad4164798dd96c389e935182dfa0c1038339eedbce SHA512 6909cdf101f5858e89e8f0df7ee507f84b7818e55ad5d06f35d533eb906627b57df8992768cc5fa845746fb897269aa3c2d9cb416d776233b9916e7cb4f5defe
+EBUILD emacs-23.4-r17.ebuild 11518 BLAKE2B 1b44754cac7d35ac41597c68f2e7f8716d8c647e217141ee80943619220a599fc73cc5abec00b6e056f11d792e4a4a843c48f2b1cae863173888bbbeedecb3f2 SHA512 100b5565754d44904d18ce6cf90da7fea48f51223bce30f0d946283a93f526dbde01e142b10aaab74ab02bd3124f96eef8d251887de99619c20610f540663bfc
+EBUILD emacs-24.5-r5.ebuild 11236 BLAKE2B 841894ba951ae0eac88feebba0f421ec9f9d7c20d0bd0834d270987f948cea1a8016c54f04a869099365969c0889a4ea5f086510fb2d05a5c2f40376fec54617 SHA512 046f7e6c2baf11db3bec94906f33a71dbe25eaf72fbc16f212768490e0a463739c4f66390cf47fa224a6ae27302c24377b3d563fe9e72d0df72b07cf5930c8f4
+EBUILD emacs-25.3-r4.ebuild 11727 BLAKE2B 5f4b8c4ab165378be40a8601cd1eca6ce59236cdf275ac93fa7965cf5461b78fe5528034c066a35c81b7884096a54b4b134a0382cbcb2da0de094c28c054291f SHA512 a181e11cdf7cbb3731bfec5d77904a4473908a043d228a664a9592ff4c01db5ec8bb322459646febb3e697a2e883ceeee3f7e2a5d8f1c5b1ccd4968467b63e16
+EBUILD emacs-26.1-r1.ebuild 12160 BLAKE2B 18c8991f5ceca5b8c5c93e345beee16d98630ea3d25eb5aed005d454b3293180963ad230f274347e50a971e46817cc17589042dfbc1dee622086e3f68aecf1e7 SHA512 56fe3cb8557a97f198af2dd2594d9f214481870c850f7db8b348d0c8c11173fef517dead5f4dcb0455924d3057993fb81fc9424de9919cc222b80d4175ea1498
 EBUILD emacs-26.1.ebuild 11997 BLAKE2B d6c4e7936d79816231d36c87a10e71c75705b9095b08d1cd8e5b267909997ac5f6dcee7cdc0bcccbcfe344f768461799292a3ca498baba7fe56b382053a63769 SHA512 31134efc2349c475dd4e6d02ca865c87a90dcad9804bbe41a90036de51b819b015d72769b9783d0fd3bdb937ba04496ee95da4b75430ca6ef5b661e0fa8b0a40
 MISC metadata.xml 2741 BLAKE2B aa5276abe676055d9ce3a95dd3ab9208ca1b03676854a26e0309907c7d5aae466cd2746b43db6d2303bda2d1fd650191cf87c8cd983a040d66c9e57dfd59a830 SHA512 136a8328c80529ff045dd183770e629a6a0e9fc0b49258e994023636ec917aea1477be60898b86636071a94f9cccc6e80b06e173c15024cf3a794a2d0f968335
diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild
index a2456d6cbd3b..99eac1719fdd 100644
--- a/app-editors/emacs/emacs-23.4-r17.ebuild
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@@ -134,6 +134,9 @@ src_configure() {
 		replace-flags "-O[3-9]" -O2
 	fi
 
+	# Don't trigger a floating point exception for NaNs on alpha
+	use alpha && append-flags -mieee
+
 	local myconf
 
 	if use alsa && ! use sound; then
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
index d1f8e3fe6d66..d06860523d92 100644
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -125,6 +125,9 @@ src_configure() {
 		replace-flags "-O[3-9]" -O2
 	fi
 
+	# Don't trigger a floating point exception for NaNs on alpha
+	use alpha && append-flags -mieee
+
 	local myconf
 
 	if use alsa; then
diff --git a/app-editors/emacs/emacs-25.3-r4.ebuild b/app-editors/emacs/emacs-25.3-r4.ebuild
index c6d29908c41b..6911c651218c 100644
--- a/app-editors/emacs/emacs-25.3-r4.ebuild
+++ b/app-editors/emacs/emacs-25.3-r4.ebuild
@@ -127,6 +127,9 @@ src_configure() {
 		replace-flags "-O[3-9]" -O2
 	fi
 
+	# Don't trigger a floating point exception for NaNs on alpha
+	use alpha && append-flags -mieee
+
 	local myconf
 
 	if use alsa; then
diff --git a/app-editors/emacs/emacs-26.1-r1.ebuild b/app-editors/emacs/emacs-26.1-r1.ebuild
new file mode 100644
index 000000000000..97b7b1294852
--- /dev/null
+++ b/app-editors/emacs/emacs-26.1-r1.ebuild
@@ -0,0 +1,387 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common flag-o-matic multilib readme.gentoo-r1
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses:0=
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/gtk+:3
+				x11-libs/libXcomposite
+			)
+			!xwidgets? (
+				gtk3? ( x11-libs/gtk+:3 )
+				!gtk3? ( x11-libs/gtk+:2 )
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+BDEPEND="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+#	pax_kernel? ( sys-apps/attr )
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}"
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+
+src_prepare() {
+	eapply ../patch
+	eapply_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	#AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	# Don't trigger a floating point exception for NaNs on alpha
+	use alpha && append-flags -mieee
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			if use xwidgets; then
+				myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
+			else
+				myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+				myconf+=" --without-xwidgets"
+			fi
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gpm) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+src_install () {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+		|| die "moving emacs man page failed"
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}/usr/$(get_libdir)"
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+		strongly recommended that you use app-admin/emacs-updater to rebuild
+		all byte-compiled elisp files of the installed Emacs packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index 3439347d11d7..6cfbb4573155 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -7,5 +7,5 @@ DIST joe-4.6.tar.gz 1895046 BLAKE2B fbf53d3b5b066cb32bb26b08d7d314a3bb89ac5ae22d
 EBUILD joe-4.2.ebuild 1170 BLAKE2B c1d8e1c49a3cbcc8dba6c6d679bb0b7e543e5b7ce5b2cde63c5a1970d1c4e2312f751323d4ebcddf1612465e526551756528548db4f4aeb04c93e14df2acfd6a SHA512 e0b51d75d14eb5bc34fd8628ce36f77cb4154965fe8189fccbb2d5d4a4dc746f6ccee09b13a50347a532619b06f13ec254c0c1fd37caaefa9886ca1e6e8504c9
 EBUILD joe-4.3-r1.ebuild 1303 BLAKE2B 7359e4551103885dc2f31f6a0813095bc08b04db37697beb90b1ef89fd682352e8cf835a638dd14fb10016ff49716a34e2623f4f60c632cabe8e9709d0c87301 SHA512 a93ff4ceea8a3fabca0b5c8ffbe0a610ccb446e6ab77ac161c4b6b4a6d63b6ba72fbc7328e0f3b6973ed8808909de0751499d696a2b2e76c705852086ef73d5a
 EBUILD joe-4.4.ebuild 1303 BLAKE2B 7359e4551103885dc2f31f6a0813095bc08b04db37697beb90b1ef89fd682352e8cf835a638dd14fb10016ff49716a34e2623f4f60c632cabe8e9709d0c87301 SHA512 a93ff4ceea8a3fabca0b5c8ffbe0a610ccb446e6ab77ac161c4b6b4a6d63b6ba72fbc7328e0f3b6973ed8808909de0751499d696a2b2e76c705852086ef73d5a
-EBUILD joe-4.6.ebuild 1474 BLAKE2B be443fd13e4e0bec6b8863458f65085fbf3d894653d75ad3759dce49d75c4866f26c050b338a750429e65dd4d1c17a362319bdd677ebd32a10724c98f851aa3c SHA512 5db0cde98a3803d25702f07216e3d2fae57019565d2161135764bd8e8e55ee324c1fa71e1bff0630417e3838bde2676f05e3262cfb2f659260ba265105cd5113
+EBUILD joe-4.6.ebuild 1473 BLAKE2B 68c33a26c049a333012daed4dc3cbe96b5c3594c77381747178a35c44445d620bdc6d52e4e1bac66cffeb4d9a9d7c407ade8951c6d74fca76e8454198b1518a6 SHA512 6b46979a7aad8f18a08c8df1172ace41f0baffefae79c5fed7f8d3aa3905d2948ae576dd633ca4df47ce1fb0f234606ba8ad8a44508712651048bb6b8bc144ec
 MISC metadata.xml 914 BLAKE2B 9af1e6230a119f778ed4404922ba650ceadb0ae58966cefd2df8b4424efd2b813a5c9805a1796623028308172fc9bf94b6effc9b9b7f34b0d1de9c484150a8eb SHA512 12324115a08719acf2377848a9cb930b4ad69764624a1cf093e4ef3e124fef85e059476a0f1b353314a03d97089fe0c518adf47f2da102f7492a1e612c420b15
diff --git a/app-editors/joe/joe-4.6.ebuild b/app-editors/joe/joe-4.6.ebuild
index 9b3d14f553dc..73407dbf4711 100644
--- a/app-editors/joe/joe-4.6.ebuild
+++ b/app-editors/joe/joe-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 6742000b42e6..67a705cfb541 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
 DIST mg-20171014.tar.gz 141045 BLAKE2B a5b3bda6ff3b6416093069b471762687c2279737aa05b297ccd3077aff195cf52831566768613a81dcc977a27ac5ffd6e8a1874aa1010b6d90f4c678b6825cee SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56
 DIST mg-20180408.tar.gz 141988 BLAKE2B db7da46fb0160acf8695f05234ed0c8e9a45e4239dc3abd433ddfb8b66e2b1aa550ffc4b409486a8990881d791ed73269a8ab78f6846cd4f0bee67761c11d281 SHA512 25fceb18fcbe63010e7a2e107aa5c30356938be2e04ff48869a12b5018dbb83bcf4dc70b03674713516616037247952a51454a28ca418cdc7b020d1f415f8701
 EBUILD mg-20171014.ebuild 1047 BLAKE2B ee8886aaabefaeb4005d711eb0520c4508407ff0d44c1b1a0094b025764242c9ff35df8808288b7b9df3a48120d0f00de880b454d1fb7176c0c570e5a3781e07 SHA512 e2f54dbdccc36ed6055b96c69246507c085fd88bb5bd136a05e8d2c364c0c887dc866405116fe1f28d63a03392c82da2abb2bee34db1075490cb3cbce24e92b0
-EBUILD mg-20180408.ebuild 1068 BLAKE2B 089d8611fa73cc860537ae5609dc0d356460c316aa6a5e643a7d667b2012d10a59bd15f05da4929f38f9171238b7a5bad3c9893deb2aae3ad74ad291e1d1e9eb SHA512 fdbbd9cd633aa0fa5fa89eb2b3459ea996b4cc8ec4728a89b85e7304b7c011e6a61ab58cefd61ca9ded21975611916e270b42f33b35ae6d06a2b59da8b83a4a5
+EBUILD mg-20180408.ebuild 1067 BLAKE2B 3ed53a0b87ea634bf765910a35f1b00005734f98d6bb0b8bc2579281de1fbf6cfed29d72a964e521e1b1c94d63b19030d474c6eb1468e62957043e25a5ad3a9a SHA512 d7757132baf374b65f3e6dce63dafc5183bd65518d72a53a06d8a401835de59b719c9f0c2c5ad0d7701c4567929eb526f623104516d7ee79cbea77918fce7504
 MISC metadata.xml 384 BLAKE2B 86ad99174028addfaef8bb9f143949161c8d1d81f2e946b3aa9088bd644b61ce97869d0a0b669abcff56e925fe8757d77f6123a2dfe340b8620db2ae84ba0b55 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf
diff --git a/app-editors/mg/mg-20180408.ebuild b/app-editors/mg/mg-20180408.ebuild
index 3ba0ac54b0de..a7eea4e9015c 100644
--- a/app-editors/mg/mg-20180408.ebuild
+++ b/app-editors/mg/mg-20180408.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index abeeba4b54bb..ff1c18802451 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,5 +1,5 @@
 DIST mousepad-0.4.0.tar.bz2 578483 BLAKE2B d723ee7dc721703cfc46ad359dbf37c676ba12db4c8f4e874e1578b203a1f35cc077229ccbc9950b82e1784042f191018734cfaa09785b6b602388011db4a7b0 SHA512 5196abd04268d1ace118dc485b72bfcfb7f9175eeaf52bc97c08c1646371d26401403a3bb199d882380bcb998547c65af9bd054f0365afd846c0ad74d3c3b1fe
 DIST mousepad-0.4.1.tar.bz2 644161 BLAKE2B 656245afb38423cff7eb8a038c8247d9023e10eb85f574f25fd4fad50b0316cbe125630ddff330adb91c49eec9ee3ed67ecd0546b9fecb065c832882b3e42145 SHA512 2ffbb4245a3344437bd41f9f28cc066ae45062f6b6d169aa274e933f033c434f0b10845ccf42ab846dcad25ae7cee36ea6619bfb6889e8cd41c994be87b77be8
-EBUILD mousepad-0.4.0-r1.ebuild 1027 BLAKE2B aeb9e173b9c4a08d04d53c5ce54b33e056c20d2f2fdadc61048eea6e51b73d613850affba9f83707cf190541d29f7432bfa514e7d1614c37df6cd4705d0e07e5 SHA512 5e68a193a93757c1450a3e63aa5a97712c91434ffddba4e64d3c82d61b3b5f1d318c4d9b2e73f12728090230220f5be3d85d10afb448c967f391e8c8a63bb1f9
-EBUILD mousepad-0.4.1.ebuild 991 BLAKE2B dc764fd32a8783b80ee5fe37a3ef119dc6dbdfa34e6d2fba9e5adcfcd2763441948142ce5d531d659327aaccd8336bc242648d1f7f3fba4a066c1e3596a1e8c2 SHA512 9d06995a198b9ccc6093c3d198e9d4659884c4ff45a1e33c72d3e75d34e3b4e487aaa729e085663d9141c48e7d32f480b1470990bcd6a041cfdf51754022d555
+EBUILD mousepad-0.4.0-r1.ebuild 1038 BLAKE2B 13e3b71311815f929ce27f769acbbd6125655c377eecf53837f0dc7db4b40c81cb9df26205ebe559a3117b4fe1981f353cd2ee5b84409897c7a1f7e246a36d28 SHA512 72ee6c2efb7add6ce32834423be4ac131b771ca02ed0dd444b6829add27843b7e3205c2d6dbeb8be532e6fffe199e5d20982dabfe0188320354571cdc87e77c5
+EBUILD mousepad-0.4.1.ebuild 1002 BLAKE2B 8e625e065ec75d47cda76adf2bf42b2aac79c816af471c67045992039c3e0e832b651d439d4e85b7576255a1b4599305e47112c26ff0cfdf67dce9b38ae8b751 SHA512 693bad643771bd8a603c119a783dd32aa45c6e2bf9d2623704c5a8c437a7bad26f8826bca21abdc290cfae10c6ac163190180ea6900700321ffb9ed9e6e5da5a
 MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
diff --git a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild b/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
index c9dbd50b21e2..e9ce62e3020a 100644
--- a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
+++ b/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
@@ -6,7 +6,7 @@ inherit gnome2-utils xdg-utils
 
 DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
 HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-editors/mousepad/mousepad-0.4.1.ebuild b/app-editors/mousepad/mousepad-0.4.1.ebuild
index b1fbf67bac64..b9f379a428ba 100644
--- a/app-editors/mousepad/mousepad-0.4.1.ebuild
+++ b/app-editors/mousepad/mousepad-0.4.1.ebuild
@@ -6,7 +6,7 @@ inherit gnome2-utils xdg-utils
 
 DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
 HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 38d50fb84bac..b96d27907cf1 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,5 +1,5 @@
-DIST okteta-0.25.0.tar.xz 951328 BLAKE2B eaa294fbcaf2257dac42084bd7e6494aa6878a9b21a2a832ca2f13ac4fca550f1dca55311a4a9e4b0102f73f16e5ad993a3f8e068f79a5f6e664c477e6412b37 SHA512 651a6d01833427df6ad7cb5d5e319fcc46113a214189702574647e87921d97db5381f2e5e797c3d8b7f1ba314eac6334aef738e648e82d9c1c9198144152a90c
+DIST okteta-0.25.1.tar.xz 951952 BLAKE2B 180cb7426b85cc8598f774d50556fe26d95d11e7c8b5be542a38fd4fa1c0479b401e6be59e7ca86eabba805c2a5d2ea2d818960cb218d173fd87db23f9c5525f SHA512 67e594ee1674176cbf506ca1191ced748bf6aec268d57211e052552f9673c359ccb3fefd403b5cf63e04f63a4fd3b42b0d21ef8eefcbac999081d58505df2174
 DIST okteta-17.12.3.tar.xz 962772 BLAKE2B 4a347db4db1d248ccb73e2ab77d4b10449ccea2e1e23ae7770a338f1c96f3990de4a3362b566abde29d47ef4b1084614e219ea646e4b0704ecac048a4559d921 SHA512 d89bcd46001336d912f2d3f08247cdb13a02688316f078455e851feae03b638688683df2779c19089481b69baa2a582fd063d3180ebe66962ab249fc39c3850d
-EBUILD okteta-0.25.0.ebuild 1605 BLAKE2B 7c5a9e81733f75e9cd2ef29ce31a6c17cec9d8c49d90beeecb6407f73843b3a1a0009306dfd4e2e7d0d7620ccc1adbcbf6a1748a9e53b5858a7983c9c4617736 SHA512 82c9fc2dba9978f4671ab98d3b981377b94f5bb71c30050ff2a40e66852eda4f9fb2498289cbb402b0d2ad2d372c3d23d030c632a29cde25ae577588478782c7
+EBUILD okteta-0.25.1.ebuild 1605 BLAKE2B 7c5a9e81733f75e9cd2ef29ce31a6c17cec9d8c49d90beeecb6407f73843b3a1a0009306dfd4e2e7d0d7620ccc1adbcbf6a1748a9e53b5858a7983c9c4617736 SHA512 82c9fc2dba9978f4671ab98d3b981377b94f5bb71c30050ff2a40e66852eda4f9fb2498289cbb402b0d2ad2d372c3d23d030c632a29cde25ae577588478782c7
 EBUILD okteta-17.12.3.ebuild 1600 BLAKE2B e68d7db197867765954cdd58adfb44574135aa17f5e2059cb67f6c79fd692317b9f6cf7c870a79b13223c6ccced6c96e5d29acddee915d950d6b64faf61f3b61 SHA512 6e58c656f55f854a4fe64579880f51a75d8f09bb656bb74784490fa91fa1e238a4c3e006c99fa3064187f65cfb7fe942cc9e049f943c2c55415c2e607a92475d
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.25.0.ebuild b/app-editors/okteta/okteta-0.25.1.ebuild
index 89727e9e83b1..89727e9e83b1 100644
--- a/app-editors/okteta/okteta-0.25.0.ebuild
+++ b/app-editors/okteta/okteta-0.25.1.ebuild
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 4d4cfcacf6bb..37a260b64d5a 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 5e50fae6342d..27be46526d57 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -4,5 +4,5 @@ DIST org-9.0.4.tar.gz 4431853 BLAKE2B 1ecb8fa08597e08a6143cdf5d262274472eb5b245f
 DIST org-9.1.13.tar.gz 4625532 BLAKE2B c7044913b8fd0bde43fa1ff0f4bc9963ebce1cda17753fe7642aff914603a4278e7396acf2236c27334f2b9a009bd9e3310ec6144d851e121c3f6ec6516ad6c7 SHA512 a1cb1b2a8db082b7f7a03e90109352bad219808cb506af30082b87fc2c6d66733ce304df4379542e7a85e20c213e1cbc8bf4c9d6c9777fea393a88755129c4bf
 EBUILD org-mode-8.3.2-r1.ebuild 1777 BLAKE2B f05cf006f13a39b5cdc62da3e5ba742c88b2cbdc64787218e0f2862095637714e2319c406327ce69649ac163e2e9f8cf06031d8e9464337b051ebb71da56f67f SHA512 2e5c6790fc10a7df5859ff7893ad6b37417099152e8021b306f536fcd92f7c4b2b3ca2477f268ff166b7eea92cd0c1b76ff0c3db3da4003c6181e6480959e126
 EBUILD org-mode-9.0.4.ebuild 1778 BLAKE2B b5a6c58c509c1531f9327bf7551c76eb49612061635eddb7d71a50371edb2f7e09e637d76ef30c5c7f4f63e1a24c9b9d45ad0421f43b5bf4513e8eff71c75c1a SHA512 6ebb922aec745216d6b10b4e025ffc30ecd6cb8c937396ddce75a0589b1b2ab0a953c1e10fb623a3b078822d3b2db6a10283078d8db48a83a2dfffc288b64065
-EBUILD org-mode-9.1.13.ebuild 1752 BLAKE2B 0bcf52b7aff010686b11318c57bb7519599ba20d3e2270c7f7598e571b5a65c92a503e93ea8f4d321061198f4a7e93cf9446ecde1517f5d8260b7094f93ffd57 SHA512 62055fbbe00a9e617fa8c48f64e91b442b1806fa949c6081d90cf778315b70c9a626b4492816519255320543d032461d350b32a0c28cce2607c5c234b4086dd2
+EBUILD org-mode-9.1.13.ebuild 1750 BLAKE2B f2e0c7a8921ca7583cd9417294cc3c692097694777cb6f0024361748dc88ff95bee545a1746073df475451b082f6795aec84633b14235714a60e8fe3fd6db8e4 SHA512 350915aedb567f6752dfef8debb8ac5d3c34a6a582341925ce03f52d7909c07a6bd86ee53ad579b3479442448136ee85f45b5976ff8f32c5d36d7cc40f27a1b7
 MISC metadata.xml 1368 BLAKE2B 2680c11ca69b9acd8b96b6dc76586037bd1b7ce0e9cdc183781742f373ce8d0be5b8820b7fa4d18c4f59523e10d3b40df3edbba5178169fb993bacc8d10cdfe1 SHA512 6c557a3a3ecb9b1993bd8c976d0a81460cd1ecc6e53fbaeb0d086e8d78497485a1b34470b72a73e779878b4947a22d61ef36259037cf6ff0315a823e15e09c66
diff --git a/app-emacs/org-mode/org-mode-9.1.13.ebuild b/app-emacs/org-mode/org-mode-9.1.13.ebuild
index 4316aa21b88c..f4c866b2b0d5 100644
--- a/app-emacs/org-mode/org-mode-9.1.13.ebuild
+++ b/app-emacs/org-mode/org-mode-9.1.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-macos"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 407b91ed862b..ef97b01cf16d 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index e25c798da2f5..0bbe2c2ea4cc 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -3,10 +3,12 @@ DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 36c96a9e3cba22578daff31e46d9a876095
 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519 SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
 DIST containerd-1.0.3_p20180223.tar.gz 5029605 BLAKE2B bd3f74ad70c7de9a73397e401e49459d1724376434265dddddd51cf09ccd940ecf63dacf0dc7270175d99e473c224ab238c0c29b0e03d41ddf9295ef37b90586 SHA512 a4999c1eb16c40178e3ee63f4001d4826d2dc6f353f768fbfdc6b7e0962d0f4431014fdedc712f36aee1e05554fecf1917ac48c1e25818b6c80a423ed7edddd9
 DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d SHA512 34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42
+DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f SHA512 429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd
 EBUILD containerd-1.0.1.ebuild 1238 BLAKE2B 58cebf0f2ec0958892599bbbe2f518e42cf6d98a91880c1393bbff38d51958b918ccd838d92e7a39bda493b1b4c52d1ecfa02ffb2dbb9ba46b165acf47abe1a7 SHA512 3e3013ed0bec752ddff0bc524cb6c003b8c41db036201f9212bff1a298abf4486c64b7d65e3fd1e9d972e53b2c18d1d87f5f9db12d28ef9bca7f4c4981b6ce3d
 EBUILD containerd-1.0.3.ebuild 1238 BLAKE2B 57722c15880f5484d32e4ab7247210ff96588b1f66537c10cac26e08da553eb636995e0db4959847795542c8354ee1d6a32dfc074bb97ae6496f53aad72cca07 SHA512 55a5317e985b95878e31b2b28907bff8a10b35ae90cc3c83e24534f1d0f33aeccdf321b1bdf34ecc0450853218476015a546b6191817d7747567d573a80aa2cc
 EBUILD containerd-1.0.3_p20180223-r1.ebuild 1375 BLAKE2B 13216281e1705042ca721693a9c77174243e83b2384ad4272d03f460688da50e55b45eeb4f7d23d5eac4c57b6434e5c7f2675ffb1eecf244f9fa4ceed7638244 SHA512 a9d25044e4aed1c35cc4cf5e51c825405ed2549a2e48decdb3ae30abf54ed43385e4049809bc5d1a8f7e3c966e1ed980ab325d339c6ad882dfac4ba05b86f9b9
 EBUILD containerd-1.0.3_p20180223.ebuild 1302 BLAKE2B b6d58ed568a7e402b1417c8fcfd9bb6d07ad57017859a50f178abc65b776eb6100c9067c8c7ce36a275368c0ceb84d72e81e0beada64a82d4caf88a01025dbeb SHA512 73f29cb43c6f819e859a758513fedd8ac67816ea6ef18435b34aafe1e1e564169927a2d7c54b0bde6816f64e3f840f0c75cb09b0742ccf17f46602e6a7e89c7a
 EBUILD containerd-1.1.0.ebuild 1289 BLAKE2B af1f7b19a91f90ece5ffa24f9282d0b7ebda179590b949c30d3d172b0c7829fb3e4d0a615a6d3fa94d548cdb1735ec0e38c8bd28d040dec272b9bc51cfffa733 SHA512 823c1d1dbf754d94f6143a173b893f837ac643eeae9510105699af3725a2b5d529cb9c98e5d1afdaab7c456e72a4d10440b9ccedea9537c21069bfefec3a2094
+EBUILD containerd-1.1.1.ebuild 1289 BLAKE2B e5ace69d6c9a0cd9271ae86da50bd75a224c2cc6c5d04b5dfee43cee92f4fa3084337978a409408c4dc447ea86964e4ec22868bffaae547bbd0ea3dec6b4299f SHA512 9ea0297903f3317aff7de788300920b3a30a77c892c6942f2a2e99e22da8b3aad25af24db398f890e760c0c707eb1acad9caa8a158d140064a8c5fff6e2826e7
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
 MISC metadata.xml 985 BLAKE2B fbef8e091234b75e89ef860f1b43114cfefa79ab65b434592bf4f8699ef1c95b6e126e7f848e401b9c1bb1d9c0ed67a86f0147169aaa3727bc26029d9f92d869 SHA512 d6ef315f79b599a8d47fda31e6e6a8c82e6dd52c3ca8339984ea72b43d6dd255d1b46fb7c566771231eba208796d3438b39cac22e0823430d9f59fafdef96147
diff --git a/app-emulation/containerd/containerd-1.1.1.ebuild b/app-emulation/containerd/containerd-1.1.1.ebuild
new file mode 100644
index 000000000000..d3c39d6cfab5
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="d64c661f1d51c48782c9cec8fda7604785f93587"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+btrfs hardened"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )"
+RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
+	>=app-emulation/runc-1.0.0_rc4 )
+	sys-libs/libseccomp"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	local options=( $(usex btrfs "" "no_btrfs") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+	dobin bin/containerd{-shim,-stress,} bin/ctr
+}
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 2a631ffae35f..72bf73337e34 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,5 +1,5 @@
 DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29 SHA512 f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581
 DIST docker-compose-1.21.2.tar.gz 294070 BLAKE2B c27ce8708f20385ee3f072c4aa832a42dc975d08d71d9e61ce3a822055d606db7e1e7b6e182523e64115922416d5c1baeca14897a241e84873a97aa755bce539 SHA512 6392582d8c6c321458b1163336f1c902548cc250f9ab5b765d144287b006ef6dacdc47199fafbb6efe426e382325b94986aa159df08dec4974a71968862a8435
 EBUILD docker-compose-1.19.0.ebuild 2421 BLAKE2B a65d845d78d53347d4c863d522f87a29b2e26bd8309c2f5e10d4e1c119aba85e92a63dfd3340183509046822d28e70c45e0e2d7f284fd4e9d12ba89847f7284a SHA512 5e993e855076b450709e1c30958b2cb7710624b880e6b0d86d38c5de14a216cf9960f883c6c1ccab7c892d503b2ee9fac58a1c17e754e4ee55e167f8efb76771
-EBUILD docker-compose-1.21.2.ebuild 2425 BLAKE2B 2e2de9361b045256109f654352aa57ef894aff5525341e2f014ac517d036d0c5b1525cc65fb6dc151aee9e791535a9261fef67ad5806df2c5cae8e97078c0695 SHA512 c2b463b2dedd822c04ca93b5463b66342f8676cc59a9a55bb9d685ed67408574a0bf691549a9106218aa4a5f429a5b1af47eb3b85465f0cb475d37e59047494f
+EBUILD docker-compose-1.21.2-r1.ebuild 2425 BLAKE2B f843c549ec46b148b41640834e838f979fa6f3233ff0da9452bd1ff496802cbc42bd90fdb20dbf8a335505616e0f9fdd7358d34a056d3bfaf96caa1ac879dfb1 SHA512 6b252def3e8afc17d0e9d5a86a7afe118f58f3f207bcf194f2ecf1d91c00495f38b10808a2b538034f8be95944d8904894fdbe1976425ddeba6b26fe97c207ba
 MISC metadata.xml 322 BLAKE2B 4d738cf090acd0f720b7805c8dd1a2288a1779dcf4af21ab5aeb4cf81b609d0bd2a18cbe79c165f9c9e60b993a8b864e1e5c61cfa773c57b08aef468d93a0391 SHA512 6ecf808eb20a0f475101524b1f4b29db49d4fce9bc3408b3e806e225e4de7b5f0c7af019809c329969f25dd050ba164a09effccefea0d2ada8e8bcf9790d39f2
diff --git a/app-emulation/docker-compose/docker-compose-1.21.2.ebuild b/app-emulation/docker-compose/docker-compose-1.21.2-r1.ebuild
index 2e64dd53e966..face1dd8c686 100644
--- a/app-emulation/docker-compose/docker-compose-1.21.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.21.2-r1.ebuild
@@ -23,7 +23,7 @@ CDEPEND="
 	<dev-python/cached-property-2[${PYTHON_USEDEP}]
 	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
 	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-3.3.0[${PYTHON_USEDEP}]
 	<dev-python/docker-py-4.0[${PYTHON_USEDEP}]
 	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
 	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
diff --git a/app-emulation/fuse-utils/Manifest b/app-emulation/fuse-utils/Manifest
index a3acf3639f08..7c24f499415c 100644
--- a/app-emulation/fuse-utils/Manifest
+++ b/app-emulation/fuse-utils/Manifest
@@ -1,5 +1,5 @@
-DIST fuse-utils-1.4.0.tar.gz 499865 BLAKE2B 23a09e88a468b207fa1b0782535251729d8212092da6d04c2732171ebb88e453a9df1f9af3056fa3114f4e6717a4e54c95d5b1a71477980f54d274b05e0c210b SHA512 dafedc66659c0f89d90bed2dcdc76aecddd91818db5f843d7480c78eaaa4c298531936af1fe34a4997ca23aab7b32dabf4b8bc03a552e75370edfd56aee0c2b4
 DIST fuse-utils-1.4.1.tar.gz 500533 BLAKE2B 58d75c336e0b46b500b614ce858978391986c0950f011986860c86ce153227a5116859aafb26ffbef8f5989e32e7df6fe77974943277e83c64ccee1217409b54 SHA512 973ae172fa38dab27da4b305bbcaad95ba8d2c3d60a9a1e7d8032113b66536506a458fc0ef5d1faf3b2082255a0d54d6bbbf7eaac4c2981b6a77bc7afae9974b
-EBUILD fuse-utils-1.4.0.ebuild 771 BLAKE2B b90ba227465b04ad33797ae1e181aa4ec789c9cd2108b42d1cbeb7312d2822bdc38495b71413441fcf100c6a1bceae22721a0ae574384f2b361c86d045757311 SHA512 84c53a9ccb3ec7d1122ec0b2d8d3017e392743f37bf7eea0013c4a02b9b2bf0dd4db1904af622fa83261baf3573cffe7031ebe88d1adfbbc804a455a110caf6f
+DIST fuse-utils-1.4.3.tar.gz 501006 BLAKE2B 0637fe05b71416e89eb61e3618ff45bd71250201924fb3741a4c5b9898d09b30acecba9957baeaa864c2c9cfe1bcb9cb38a2af83368bc5729221cec36a1eda47 SHA512 13404d1be81a2de9262cd79cce9dd8dc3f17238fdbb75da8a724b76b0976c03f34da9978af36b808103fedcf3f5d5da4bb10f251c5510127d59ca8de5607b99e
 EBUILD fuse-utils-1.4.1.ebuild 795 BLAKE2B 1d8b35a30ddf6666d07126e21982a70177d92a99f4a683d5a06b88ad01e198c8c503c811bee8c7a7366e293343d6f56f6c15d45f3edfc68cc85cd18d4fe2fac8 SHA512 5f66b459eb53570b8ac1df8332cf8a1d9a151692a3e7a3c17403ac2ae55884f41c963130c697cbe5a8096022d5e8c5ba6edcf3e15df6133c1848c87a356803de
+EBUILD fuse-utils-1.4.3.ebuild 795 BLAKE2B 13acba2469ffdad7e89436efd518aeb2767565506217971e2df1d5e12e06733e88d63c05f5aa4f3c64385787271a1e8e31cbc4b04ad04d71bd205d73cf3a3387 SHA512 b1392dcee95f6ad700c1acba03934eefde74e6aa9d005738468c9fd5b069c3c29ed1614fee54483d13231588456d43cce9854eb4e0eeec713eca08800a22999f
 MISC metadata.xml 602 BLAKE2B 434afcae9b53d97c7c5ed9f4c5dca410f6f5b39716b751a5a04458a9420652b8403dbbe1d24f73ebaebea34f45f7d6138ade181388772a5294419c86fd033d78 SHA512 42657b608b54739aa7d1cc56c7172bac79b00d327594334e13c471fa52c5d2e026aedff351758b5a292bc89b19d340ee04727ed5a551b9f6c944b096762dae17
diff --git a/app-emulation/fuse-utils/fuse-utils-1.4.0.ebuild b/app-emulation/fuse-utils/fuse-utils-1.4.3.ebuild
index 84c472b51b3b..fb8728c0836b 100644
--- a/app-emulation/fuse-utils/fuse-utils-1.4.0.ebuild
+++ b/app-emulation/fuse-utils/fuse-utils-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="audiofile gcrypt jpeg png zlib"
 
-RDEPEND=">=app-emulation/libspectrum-1.4.1[gcrypt?,zlib?]
+RDEPEND=">=app-emulation/libspectrum-1.4.4[gcrypt?,zlib?]
 	audiofile? ( >=media-libs/audiofile-0.3.6 )
 	jpeg? ( virtual/jpeg:0 )
 	png? ( media-libs/libpng:0 )
@@ -21,10 +21,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
-	econf \
-		$(use_with audiofile) \
-		$(use_with gcrypt libgcrypt) \
-		$(use_with jpeg libjpeg) \
-		$(use_with png libpng) \
+	local myconf=(
+		$(use_with audiofile)
+		$(use_with gcrypt libgcrypt)
+		$(use_with jpeg libjpeg)
+		$(use_with png libpng)
 		$(use_with zlib)
+	)
+	econf "${myconf[@]}"
 }
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index eaafd0a7ffaa..57d63ae0b1a1 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,5 +1,5 @@
-DIST fuse-1.5.2.tar.gz 1626746 BLAKE2B 38236b9457e975fe227e2a19ed0fb80cac022fbb0bd8fcb1e51666103c4abe8960b1bd166fc1d12ab4e0f32954f7c3f59625d57d456313f75ca023bf51477e0b SHA512 45507834eb70d1e74c8f58017f4ae0bb54e2560456eeadfa8b6888a1c79e9c9443cccb7ae9733b96a895f94040be820c57a7d698115c2f483e64ebc4fd734268
 DIST fuse-1.5.3.tar.gz 1627487 BLAKE2B d942f0131ce713e8592abec6443015aca3f1ae73739f1db0eae84a19e4320fd8bffbd7d36afaf65b08cf059305f85a8854d39d46519ed7abd3705b11156d069c SHA512 6596f789a685c46752c46b2432953c0d9abb620b23541cdbfc066c224fcba47ac7be75db678e2ff76622a7d02cc81b7dfeae672dfdaee1085d2ae5f768a4d8c0
-EBUILD fuse-1.5.2.ebuild 1683 BLAKE2B 33346f57ba010e229850efe44c67a60054c1ec1a5396f68a3a560668da9a955f5b9f9bdf7056f729dc1ce3447d2afc09394a3ff5e78c72c3cd305d848d1e0f6e SHA512 7847feacb66510323681665de612fdb4496c3228ba23c6f357f12e2f790296d6be9f86b4058177e5d469985e2729d7682d5556c43e0f97f72c304025b36946d7
+DIST fuse-1.5.5.tar.gz 1629577 BLAKE2B b4765047507049b2fa3547d47384df2c5e6de75b74b7aa8d3549ca47ae6f3dad53a37fc48112db86426ce3d2d84711aa029d158c75eba89214761ed82d7ab57a SHA512 186635b632df9767b9ffcbba484370adc47833bd06240474db9c4dfe88b03209e15fc0c86a2f200b2cc7bd95ad93bf1f93f38d7f669b5c163f68e80802fb1041
 EBUILD fuse-1.5.3.ebuild 1711 BLAKE2B 91bd43861b0adc2e12b4e2db17d2f4c1909380b8b939b441ae4d34477ff9b7c317419c33abd17003f4c5e554c69f836425b33057f67d178e432f3ca7eb4ea784 SHA512 ac190f7174f18ae7c288a544b39724ce0014e2b38c95ff8f7626d64b96172ddbe27271a377fd5b3728f3d8d6c2984a17e2351d723d84e134d2827f30e7bb6404
+EBUILD fuse-1.5.5.ebuild 1711 BLAKE2B d81e148140fb353bb82cfef956bc946272e49f6c3e4fb121dfc0e75d472c3e0821b244529eaed00b4b4a251e776dbab62fbd99d042134ba0f88e501cc44fcfda SHA512 d2274c47e7ef1ee7a29c12d59033a2f2f34b33d7d7e9cd8a3a80402a7f5c38bd8b16e5a72cc1b71cd6d9cb334c56077571b719d6e85e89c3959f957c675d2c6a
 MISC metadata.xml 731 BLAKE2B d157625420632cf041ce0d877f243e6d2fcfd62f8b487691bca757ed38e5d5173aaec623528b3e33cbcc09347464f9c26c3c50190dd28ebdd2f3b86ea0609d51 SHA512 c0a922b5cc6900b9fa7d219dc1cecbed616af7f77d018065e8b5d6f6da6350c4d9d4ba3004b8f34ebc97da22c7d4f4f8b59119098877c199abcc334dff933342
diff --git a/app-emulation/fuse/fuse-1.5.2.ebuild b/app-emulation/fuse/fuse-1.5.5.ebuild
index de133ea69920..e93691a5006d 100644
--- a/app-emulation/fuse/fuse-1.5.2.ebuild
+++ b/app-emulation/fuse/fuse-1.5.5.ebuild
@@ -16,7 +16,7 @@ IUSE="alsa ao backend-fbcon backend-sdl backend-svga backend-X gpm joystick meml
 REQUIRED_USE="?? ( backend-fbcon backend-sdl backend-svga backend-X )"
 
 RDEPEND="
-	>=app-emulation/libspectrum-1.4.1
+	>=app-emulation/libspectrum-1.4.4
 	dev-libs/glib:2
 	alsa? ( media-libs/alsa-lib )
 	ao? ( media-libs/libao )
@@ -62,3 +62,7 @@ src_configure() {
 
 	econf "${myconf[@]}"
 }
+
+src_test() {
+	emake test
+}
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index 2250305b13d3..e75537b3c387 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -1,5 +1,5 @@
-DIST img-0.4.5.tar.gz 5635062 BLAKE2B 7161225494c8db0f6a91cda186d9c5804eff9f5fec5645dd1b61ac5f76de10ad8d63f2723030b9e3e886f292ce2c4a8d1e325c0adff759893b6455dc2c540e51 SHA512 ca427127b716f69d474912fad1e8a24008d671c3da266560466a1ff54690439fc3bc04b736f3ae3e12534a708ad4f6b9a6c910334dfc68ce2e1f63ecb1a5cac5
 DIST img-0.4.6.tar.gz 5635103 BLAKE2B 88e0ae3bdc0b9e1784d4d67635d119084a5e9dbe258b55da10f549b97f2d566f312226687bef0d28ad1ae3b13c764a44071bfe10ec0a189ad4bcf0bc8c83df5f SHA512 7f75d66237fe5ccf5923774e1d40ef04d9447f3e7de6641167679a1bf5b6305880a046e664fa7adb93dc4bd28e9f0e1ee790ecf2a225aa98b0202e47b8d01987
-EBUILD img-0.4.5.ebuild 921 BLAKE2B 2e83f9f376a86f0951fa8f252339f727771d4570553eea41973a774f27856e4b210f898dfd58b1947e063667f96e7b3d4abf3dab7172d1ae31bd4679fcd6fc54 SHA512 f1951feee4341b4540253ef1b89eeeeae51a1d60cb1a76d456cda775ac2bf635d4fa4de2c28a314ce055480400bfcf6032ecd480b7c6e1221b7035bad7f1ede4
+DIST img-0.4.7.tar.gz 5642840 BLAKE2B 0cff71ad2e3ee7e7a21273bd7171a1cafb51b932a55981081bcd809f62c463e8a58d739ed5e7e46355a596650e272a90b848eb6c1818e948e6512cb07ac5fc5e SHA512 23e059537baedf20c17724f972db2fa2b81677bf7d62ce3f78cabde9984f10923f4fe56d3f02252f578b15e06112066c5ea7e6b41d61554bcafc618cca85d014
 EBUILD img-0.4.6.ebuild 921 BLAKE2B a0fc0c56c0bc10a929fa4932d1095f8d6e3f1af6bd65125eb85f8011fefdcc5e89aa12ba0755ea75b562cfe3f23c60d42ed1b7e094dddefc487ecd3e34baee71 SHA512 78ee9d32a0493d3d1bd8bd4611d81a25dfc69502a56e1b4ec5000d0f8c3356dd8f72569866ed74e75959834801a24536465316b34180905b693e5353a15c7cc9
+EBUILD img-0.4.7.ebuild 921 BLAKE2B 5993ad25c6e4aeec106c4919eae7748bafabb977151953c2f66944b282f70f327dd716916d4a4e6243463119ddef8c409d8837bcc04fa755215392a505087100 SHA512 e7a44443f989aade1b86db9fb7114b843cc3323b218fcd2f813354d8e79c7b21462d84cf3ee32b9269e82026bc51d59d0bf3f24eb80e97d778c598fd419cc9dd
 MISC metadata.xml 326 BLAKE2B bade1307a8d5bd0a9945fbb417b8506b7aaa4b66d5a502e18af1f7b008e325b5514e0fc018932396aba1116b5a3c11b12b89c43d925f7e97c8a75efcd9ef4f3d SHA512 a75050de970991e19edf7b7560ca46d27c959b9a91dcf87d40d31532c85c7af24ab29743d7295c731a3153774d33b03afa5c92470ca0c0c572d50c6ec65e5692
diff --git a/app-emulation/img/img-0.4.5.ebuild b/app-emulation/img/img-0.4.7.ebuild
index dc566ad24047..2b843d8ad2b3 100644
--- a/app-emulation/img/img-0.4.5.ebuild
+++ b/app-emulation/img/img-0.4.7.ebuild
@@ -6,7 +6,7 @@ inherit golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/genuinetools/img"
 EGIT_COMMIT="v${PV}"
-GIT_COMMIT="64f47e3c5a9bdd2a8d4189aa981d4a7e2de862ae"
+GIT_COMMIT="e76c25809631da79d0071966901675f9acb16edb"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
diff --git a/app-emulation/libspectrum/Manifest b/app-emulation/libspectrum/Manifest
index ceb7587b76f8..e4456e926fba 100644
--- a/app-emulation/libspectrum/Manifest
+++ b/app-emulation/libspectrum/Manifest
@@ -1,5 +1,5 @@
-DIST libspectrum-1.4.1.tar.gz 516697 BLAKE2B 863030fabf37b03f15af389d8ab625f0f54c439153900e8b44bfefe2196fd576fbed9c23a6d2cfd7b07ca804a20329d8e646d3b7741ee1ded3d42246e36f203d SHA512 550d96c2432400a5b6ba86534acc0a2786dcdb9a8c847caf7768f1053cdbe0825d208128713a3f4b7fa42547bb3eac56329433a4c0a6753eec3ba9623eef5bf5
 DIST libspectrum-1.4.2.tar.gz 568052 BLAKE2B 84ffa5b2ac376c72d309c623610e5e30ebc98ab81a4505ffd88c8fc88145c6d63a112c60a57585c827b352e0a73ec330fc9f3601a714d1a6ad522cc40105d171 SHA512 391eb6fd805ab5a7ba5186ced8aa06be8b25973512860bfd0680585120a9617a1406f9327a7acb3ad7b7e473be8214c9b228d8b4adcf45a8bf3d3b6d27ee4d6f
-EBUILD libspectrum-1.4.1.ebuild 790 BLAKE2B 319b8ae423bf32068618e876405c94889150649f641f6ef1a6701a8fdd087ea99d83a25f16e17dd5a830c99972b82b2ed1abf666f48b53052dafef05ee3a3050 SHA512 8795b9d3a42652558a5943b7b944d911cbf9b90b30e22ab05f7006d0d111285b418c8c9ad9c2aa70fe38448b5ea158f72e2aada2d99931aed779e884358e85c5
+DIST libspectrum-1.4.4.tar.gz 568684 BLAKE2B b6ab4fc4173e7de9a7c3b14fda03420a56f02c5c590770158443bc37bee99a55dd3bdf6864f8ca33adb5ed59f4abd5c5b97736456ba2e6e6aaa2b49e07097cc4 SHA512 83bb9242010d49898531bb62e0d4d55439b0b6a548b57a7932f074429aca70cf252dfb195e9751384510b08c98bd6bc8eefd8cb3f82b0c8d07fa245ba66e9fe2
 EBUILD libspectrum-1.4.2.ebuild 910 BLAKE2B 334a3b3005951bdebc9ed43cec776e0e09a7f059cf66665a4fdf6f2534c60692dd9ec95eaef3e888cd3358af813a22413339e9b000714aa3d2a4007b02df84cc SHA512 24c577692feff84a71731142e88f5937eb82a75ff7b3f60b5df4a7e8a0c10c9d307baaa312d0d8f519225d0f1a8abd17a3377f0922e6a59924d9a5440e06ae4e
+EBUILD libspectrum-1.4.4.ebuild 910 BLAKE2B 334a3b3005951bdebc9ed43cec776e0e09a7f059cf66665a4fdf6f2534c60692dd9ec95eaef3e888cd3358af813a22413339e9b000714aa3d2a4007b02df84cc SHA512 24c577692feff84a71731142e88f5937eb82a75ff7b3f60b5df4a7e8a0c10c9d307baaa312d0d8f519225d0f1a8abd17a3377f0922e6a59924d9a5440e06ae4e
 MISC metadata.xml 941 BLAKE2B 7ac8ef35dfa24899f6990e5c92f5c2f70328575196308cd28f6dab967b9c39e73dabfea007c0cbf4a90bf73f5739d9c4a17b22cbe8c670b3a2d5531d47763520 SHA512 79cbe79daa7805ab944614d7d8370bc82e3ce6ecab7218112163ca118198bf176a1a06c87f8e24117f0a293d6dcc1cd0c02477e56655d66eb9b928c7ba7fabdc
diff --git a/app-emulation/libspectrum/libspectrum-1.4.1.ebuild b/app-emulation/libspectrum/libspectrum-1.4.4.ebuild
index 89d3021f9a99..75e11f4bc844 100644
--- a/app-emulation/libspectrum/libspectrum-1.4.1.ebuild
+++ b/app-emulation/libspectrum/libspectrum-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,11 +22,19 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
-	econf \
-		$(use_with audiofile libaudiofile) \
-		$(use_with bzip2 bzip2) \
-		$(use_with gcrypt libgcrypt) \
-		$(use_with zlib zlib)
+	local myconf=(
+		$(use_with audiofile libaudiofile)
+		$(use_with bzip2)
+		$(use_with gcrypt libgcrypt)
+		$(use_with zlib)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# check only builds test executable but doesn't run it
+	emake check
+	./test/test || die
 }
 
 src_install() {
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 7aaf828211a2..f94619a99b4a 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -1,6 +1,8 @@
+AUX vagrant-r1.in 1872 BLAKE2B a129780601946f3c53b1cb84dfce33d6cc912069dd784cb49e971990aad3a0c89dfcb26a83e8841fc5bd6353bb1b7d525e0e6794d3192f34bef273360abad450 SHA512 983d479aafd7954ed5b3a7a7158b9b84925ff6d3d52251be52c86caa97b0f319c8d79902357d4c16822852a3bbc6db113ecf1c907a49de40c480871d906fd1d5
 AUX vagrant.in 1872 BLAKE2B 9a5f7f98d1aa0713b2e9777b8d4b5d01f7fc23068c7d920e5117150850547d8809d4d30ef8617e3316ab678bee7a73d3c7bccf732920baf469aea801f2bfced7 SHA512 0adb540aa4a8925de7cf5099357aa555c36ea9afc819ee9f24028e318c46ab9d41bcf4543eddeda70b8c1ba97c3742f0b6544c03e4c20f2ede41edc8938c48f5
 DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5
 DIST vagrant-2.1.2.tar.gz 1218801 BLAKE2B 742f27ca6c28c9738c09ef61c742be07121b5a804fa401115520633e5840c62c8e879fae078c5532704f6f6f7d7a9081d48e3f7570cfe6e6dd84f8df244a34ae SHA512 d9a2612697842885d23d1a9a452ef9d8b03defa4e6f7a808725ac7c3a87300affcfdd89ee3a42334259601e19f1e56bfd86a5aa7b404eac26bc22dcfd4a57751
 EBUILD vagrant-2.1.1.ebuild 2075 BLAKE2B 412016e151348fa62e3f94376a81e7c3420c70ac0dfbe8796314a5e2db27a9929c90087ca4e6ed56ef74bb9895ae7fdedc60ea4d5161ffac5c7727604c2ecd40 SHA512 1da7a6a487a76f98bf41da3f99312c1046ee98f36ce2fa3375d3284378c92feb01ab26539e4676d542f64cc2efe39d8f0f1a736072720c3d6ded73752c0992af
+EBUILD vagrant-2.1.2-r1.ebuild 2085 BLAKE2B b3a07bb29f54786bd9b7393e5deef15b0e15c089809eddd87d09ae68e281aaf39079371e568f09ba6ff517893d0fcb1615cdc2aa8cf05c5ff632c9fda1e64fb6 SHA512 77ed7e9942fad7c94b7fe4d625135da0a82f3372d9344a8ac257542f17fb7c1fc39a06283ffe11fe4dae3c6d51031a97e4b88b6d29cd521c1839591261943bc9
 EBUILD vagrant-2.1.2.ebuild 2075 BLAKE2B 412016e151348fa62e3f94376a81e7c3420c70ac0dfbe8796314a5e2db27a9929c90087ca4e6ed56ef74bb9895ae7fdedc60ea4d5161ffac5c7727604c2ecd40 SHA512 1da7a6a487a76f98bf41da3f99312c1046ee98f36ce2fa3375d3284378c92feb01ab26539e4676d542f64cc2efe39d8f0f1a736072720c3d6ded73752c0992af
 MISC metadata.xml 526 BLAKE2B ccdcda8f6095d1efa5a66bd3ef549d1039c719a4aaaa89efa2e776f466e38602f636d0d538a235a29bf0a5ea581bde659d4a77b6b4231da4c51e06913269aaad SHA512 784f97e3a9e96beba6afb232c46e6c42fe318b471125e48926363d9aec430ff4d37d74c82d2ee4efd1e036f89de2fe37415121dbbdd050a56954ba12d666b328
diff --git a/app-emulation/vagrant/files/vagrant-r1.in b/app-emulation/vagrant/files/vagrant-r1.in
new file mode 100644
index 000000000000..ee5e48c21541
--- /dev/null
+++ b/app-emulation/vagrant/files/vagrant-r1.in
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+#
+# This is a wrapper to properly execute Vagrant within the embedded
+# Vagrant installation directory. This sets up proper environmental variables
+# so that everything loads and compiles to proper directories.
+
+for r in ruby25 ruby24 ruby23; do
+  # not all ruby versions are guaranteed to be installed
+  if ! command -v "${r}" >/dev/null 2>&1; then
+    continue
+  fi
+
+  VAGRANT_DIR="$( "${r}" -e 'print Gem::default_path[-1] + "/gems/vagrant-@VAGRANT_VERSION@"' )"
+
+  # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit
+  export VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant"
+
+  if [ -f ${VAGRANT_EXECUTABLE} ] ;then
+    ruby="${r}"
+    break
+  fi
+done
+
+if [ -z ${ruby} ]; then
+  echo "Error: failed to find any usable ruby"
+  exit 1
+fi
+
+# Export GEM_HOME based on VAGRANT_HOME
+#
+# This needs to be set because Bundler includes gem paths
+# from RubyGems' Gem.paths.
+if [ -z ${VAGRANT_HOME} ]; then
+  VAGRANT_HOME="~/.vagrant.d"
+fi
+export GEM_HOME="${VAGRANT_HOME}/gems"
+
+# SSL certs
+export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"
+
+# Export an environmental variable to say we're in a Vagrant
+# installer created environment.
+export VAGRANT_INSTALLER_ENV=1
+
+# This is currently used only in Vagrant::Plugin::Manager.system_plugins_file
+# to locate plugins configuration file.
+export VAGRANT_INSTALLER_EMBEDDED_DIR="/var/lib/vagrant"
+export VAGRANT_INSTALLER_VERSION=2
+
+# Export the OS as an environmental variable that Vagrant can access
+# so that it can behave better.
+export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)"
+
+# Allow to install plugins even with deps in different slots (Bug #628648)
+export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1
+
+# Make it work with rvm (Bugs #474476 #628648)
+unset GEM_HOME GEM_PATH
+
+# Call the actual Vagrant bin with our arguments
+exec "${ruby}" "${VAGRANT_EXECUTABLE}" "$@"
diff --git a/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild b/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..c41ac30accbd
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="A tool for building and distributing development environments"
+HOMEPAGE="https://vagrantup.com/"
+SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+virtualbox"
+RESTRICT="test"
+
+RDEPEND="${RDEPEND}
+	app-arch/libarchive
+	net-misc/curl
+	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-0.6.0
+	>=dev-ruby/erubis-2.7.0
+	<dev-ruby/i18n-0.8.0:*
+	>=dev-ruby/listen-3.1.5
+	>=dev-ruby/hashicorp-checkpoint-0.1.5
+	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
+	>=dev-ruby/net-ssh-4.2.0:*
+	>=dev-ruby/net-sftp-2.1
+	>=dev-ruby/net-scp-1.2.0
+	|| ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 )
+	>=dev-ruby/nokogiri-1.7.1
+	<dev-ruby/mime-types-3:*
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/rake-12.0.0
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# loosen dependencies
+	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
+		-e '/ruby_dep/s/<=/>=/' \
+		-i ${PN}.gemspec || die
+
+	# remove windows-specific gems
+	sed -e '/wdm\|win32-\|winrm/d' \
+		-i ${PN}.gemspec || die
+
+	# remove bsd-specific gems
+	sed -e '/rb-kqueue/d' \
+		-i ${PN}.gemspec || die
+
+	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die
+}
+
+all_ruby_install() {
+	newbashcomp contrib/bash/completion.sh ${PN}
+	all_fakegem_install
+
+	# provide executable similar to upstream:
+	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+	dobin "${PN}"
+
+	# directory for plugins.json
+	keepdir /var/lib/vagrant
+}
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index ad4869c5497e..98b6faa7aef0 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -2,18 +2,18 @@ DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a0642
 DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
 DIST wine-3.10.tar.xz 20485784 BLAKE2B 3a5e9ca948880a3bc979c33e797296d156425438c2502c3d2c50a6d5241e485bdc081ff195b0647cfa1db1cab247e941f02d0511f7b94dc0037fa24e2e61eb5c SHA512 bb1a1d8e8ad7f48d9fcf48ebbf0ebbb8e3b45ea211736bd7837144ea34b373f74955d3c0ccc4cdc44020eea23c8af8e67252e1c5cd6115e11419ad5f6ef24843
 DIST wine-3.11.tar.xz 20501100 BLAKE2B 793fe0a83ed13f4ca436c710198ffcbde5e0109d9890551a410b1d836d79adf4060f0cc7e20861eb806878db79f8003023821ac1b0d72a0710235412863c4576 SHA512 8f7226364648ec30eb77f1848ee6bf01be2445fd96f902309575ac1f6ece31bf54d415516fcda76ae438010a36a9d4846d22cc37365aac4a230701376f9589d7
-DIST wine-3.9.tar.xz 20508952 BLAKE2B 6fbf22673588963c483b7b31e82287c09e15b579b8f57267e2731768f95a1f986954bb473ee0dfa2428802fe9331b8599a01c782dd1152d36ce2002b6a4e6bde SHA512 4c4e5a741a61b9427c175e015177df5806638736f7dfd92098ed95239d41a373cbab876c054d3c948e1db6a7de359db3babd63bc194edc8c2c3be28b58f75e64
+DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
 DIST wine-d3d9-2.0.tar.gz 48373 BLAKE2B 80370a7519141030a7e54c2ea5db410b2bf1cde8d8389618487c52e4ff40f87cf7b0f9087331bb43fa6436e1b9936de9cc00a02b9ab9ce6528635a245e6a8b3f SHA512 a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1
 DIST wine-d3d9-3.10.tar.gz 50540 BLAKE2B c9127e5504cbf0d0fe338645bc2d8ed6f71db1174f8ab8ff9e92457745f5ccf6ac8bd043442a5a250b9da7e0c157113682cbf184041488ef6ebaecce2bebdafc SHA512 6397005616ab6424ba9e5c289e935c15b3b789717d887afb28bee1b30912052d6c47495d9b91952c38da7be03382dd0dc708fea42f7fe4c6221cf315c5faa810
 DIST wine-d3d9-3.11.tar.gz 50540 BLAKE2B c9c6469fb0dfff9be5cf50796f47a747d02c736a22b186ec561c0dcc3715a0da1cfce24e852da075685ea3047131d98cf506810ab7d555fd91ca334dbf8c315c SHA512 57ebadc6764c36a925c8e9130b3b436513795bb53e96566a88c22337b37a8c3efcb84aada19d3e5dd6ae2eb24f64b46a33376027600cb7863254369b4555de05
-DIST wine-d3d9-3.9.tar.gz 50551 BLAKE2B 3f77b541b39172dd606bcd9083bae71e75c7b5cf129132dffe1e2261519c5e330aff92545169ce6148d35d292fda9a7367f3bb3951e9777d68c9c1bfd6659e3f SHA512 bdc0ce6e1d0bb247ae6421b4a3a6c600453647105f679113c7db78984ec7154b0728140facd2e3e1a64f0ff0969ab93c2829e72557c42f7a7ad05faf1c906499
+DIST wine-d3d9-3.12.tar.gz 50544 BLAKE2B 68c58a8800facf910b72e07f8be77d260060175da25583d3e6562cbe18c4fa1cf2fe0f5d109747e6901677231483adf02a0f1d76105e66733faf1e932c75e876 SHA512 9beb98528600b6699a6112abaf037d73a7cd0e791de04dee2c1874075b9b99a24438df92421802eb89e1285e1235e6a36b6cd7260757fc43d7f8cb3b913296ad
 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960 SHA512 51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
 DIST wine-staging-3.10.tar.gz 9943542 BLAKE2B 412319529e6fe9bb21a4629e1ae1896fe47a413a7ab688d6245fd5b85aa2969be040df3fa8d0ad6185617c814c7b69df891c9067260de28e505298695a6776ea SHA512 baae31ce569c06f8ac5ffc579d8f3bb95de55c50b83c1db13eaaeaee5c8c5b3b7fb6028d69dce6645ac697692372a65be8d60532123a94e0f5fcd0778d2082c5
 DIST wine-staging-3.11.tar.gz 9950753 BLAKE2B bffc6a86b652695d9ed4e0e2ce6f165e45fc2f6fb7e898704fd22624b1b0497ae35319b2444b49ee62eb8d0e308dd32148af64e38f480ce4408170aa2c91a828 SHA512 811a8668c3747f02850928a99bc66612937c38d98068dddec47bffe427d00c7c83b172f12807e1cb609d83c00e978949f913877bfbf5d8443a5ad29011c03545
-DIST wine-staging-3.9.tar.gz 9932873 BLAKE2B 9a0bb5689b1d2cff6e133f0dd94cc13b63f59ef9e5b129aaf48501317a75aadbf27058fe8cc436816501cbe416c285504d9c98504024f9a0606ee4c4afc48e4b SHA512 4f52937621b7e5a3f4b3e52ecba8c7d318c621e76c8e4ce3be176d56b382bf06e3a0453d37c3b725df63f0a7349f53a7c075148c7e1ed89a028696538e31acad
+DIST wine-staging-3.12.tar.gz 9936375 BLAKE2B 5c48fb1037d39ce6ab78c03a002b2edfc2fc434c0f661bb6def050becd7411998b9ae763db99bda3b5190e3e6ab355699806d976d01f813904080c6156dafb7e SHA512 166f991f7c8f59df656f3fb28150a8e26e48d1ff6906b3eccd31cb84524e28efe7e7df00eadc21881940308ccc4b4edebcb2a71bdd03ba3de5beb1cf42e2f058
 EBUILD wine-any-2.0-r1.ebuild 20915 BLAKE2B 7ff1002e303dd2a083267fbf24e4b6cb0e3ff620d6bbf78b8fb15d66fb4d11669812233f1edeea0f46e75b9a0c8a9e63244aa4bebb594b95d158d55fc2506e6d SHA512 8e1bd0d4391f1e9336f9c39ce46d97f921f70cae75d961bc8fe8c7ec6c51bbba621c19a3171f0c351ce6e038d37a7f9a73f6f0bb4622f176e5a994e4a989b2e7
 EBUILD wine-any-3.10.ebuild 20939 BLAKE2B 6398dbe0506755239701eaf5cae9f2cbeb6d72376430bc018f3dfd03b374d06f909879b5c965a0b7fc1fa7be1b1668e62cd64e836cf8a6163c2977f17d6bf472 SHA512 23b1c71c7736ab423747ed69c9f5b591cd569bfc81be48f5d0d8778acc010a8bf3f95f51c4b975026a9670d9db2160bdf7b709e64eb48e8f3586883eeb034ae2
 EBUILD wine-any-3.11.ebuild 20850 BLAKE2B 602ff47811c6b486aa28f338d6b8838b303ee9b0078b6d7b775cb62c2fa3bb864ac9c4ee39122be4c4a8f40de72b512e701fe8ec83ab27463a7df4c7c5fe6b67 SHA512 0240bfd7bb01322ed053118fd3a65cec336493e33ecbb8f5db10505e8500a50b4136e2d323ce7af3a58c53396e2c7635203fddef21343924007e59c519ee8820
-EBUILD wine-any-3.9.ebuild 20939 BLAKE2B 6398dbe0506755239701eaf5cae9f2cbeb6d72376430bc018f3dfd03b374d06f909879b5c965a0b7fc1fa7be1b1668e62cd64e836cf8a6163c2977f17d6bf472 SHA512 23b1c71c7736ab423747ed69c9f5b591cd569bfc81be48f5d0d8778acc010a8bf3f95f51c4b975026a9670d9db2160bdf7b709e64eb48e8f3586883eeb034ae2
+EBUILD wine-any-3.12.ebuild 20850 BLAKE2B 602ff47811c6b486aa28f338d6b8838b303ee9b0078b6d7b775cb62c2fa3bb864ac9c4ee39122be4c4a8f40de72b512e701fe8ec83ab27463a7df4c7c5fe6b67 SHA512 0240bfd7bb01322ed053118fd3a65cec336493e33ecbb8f5db10505e8500a50b4136e2d323ce7af3a58c53396e2c7635203fddef21343924007e59c519ee8820
 EBUILD wine-any-9999.ebuild 20850 BLAKE2B 602ff47811c6b486aa28f338d6b8838b303ee9b0078b6d7b775cb62c2fa3bb864ac9c4ee39122be4c4a8f40de72b512e701fe8ec83ab27463a7df4c7c5fe6b67 SHA512 0240bfd7bb01322ed053118fd3a65cec336493e33ecbb8f5db10505e8500a50b4136e2d323ce7af3a58c53396e2c7635203fddef21343924007e59c519ee8820
 MISC metadata.xml 3853 BLAKE2B c5e0b577bb1af561b8ee2d8adaa4dcd249e517ccba03d7b832ba9b0626108c9c3ad3c9ca9988eaf19ad2ecdc6e9fc61a3a992d92ff697d48eba8d45d2c338dfc SHA512 738bd810704414e76668e8c46d2eedc884df93493d94391f38c8dedf4a97cfb36c7f3c8855973c7c07382883be81d6919b3ea634bf7f6b919f6ec22b5aff6898
diff --git a/app-emulation/wine-any/wine-any-3.9.ebuild b/app-emulation/wine-any/wine-any-3.12.ebuild
index 17171df2844a..e713de98aba4 100644
--- a/app-emulation/wine-any/wine-any-3.9.ebuild
+++ b/app-emulation/wine-any/wine-any-3.12.ebuild
@@ -48,13 +48,12 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
 	osmesa? ( opengl )
 	pipelight? ( staging )
-	s3tc? ( staging )
 	test? ( abi_x86_32 )
 	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
@@ -145,7 +144,6 @@ RDEPEND="${COMMON_DEPEND}
 	pulseaudio? (
 		realtime? ( sys-auth/rtkit )
 	)
-	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
 	samba? ( >=net-fs/samba-3.0.25[winbind] )
 	selinux? ( sec-policy/selinux-wine )
 	udisks? ( sys-fs/udisks:2 )"
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index eb89cb0356ac..05482633614e 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -2,14 +2,14 @@ DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a0642
 DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
 DIST wine-3.10.tar.xz 20485784 BLAKE2B 3a5e9ca948880a3bc979c33e797296d156425438c2502c3d2c50a6d5241e485bdc081ff195b0647cfa1db1cab247e941f02d0511f7b94dc0037fa24e2e61eb5c SHA512 bb1a1d8e8ad7f48d9fcf48ebbf0ebbb8e3b45ea211736bd7837144ea34b373f74955d3c0ccc4cdc44020eea23c8af8e67252e1c5cd6115e11419ad5f6ef24843
 DIST wine-3.11.tar.xz 20501100 BLAKE2B 793fe0a83ed13f4ca436c710198ffcbde5e0109d9890551a410b1d836d79adf4060f0cc7e20861eb806878db79f8003023821ac1b0d72a0710235412863c4576 SHA512 8f7226364648ec30eb77f1848ee6bf01be2445fd96f902309575ac1f6ece31bf54d415516fcda76ae438010a36a9d4846d22cc37365aac4a230701376f9589d7
-DIST wine-3.9.tar.xz 20508952 BLAKE2B 6fbf22673588963c483b7b31e82287c09e15b579b8f57267e2731768f95a1f986954bb473ee0dfa2428802fe9331b8599a01c782dd1152d36ce2002b6a4e6bde SHA512 4c4e5a741a61b9427c175e015177df5806638736f7dfd92098ed95239d41a373cbab876c054d3c948e1db6a7de359db3babd63bc194edc8c2c3be28b58f75e64
+DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
 DIST wine-d3d9-2.0.tar.gz 48373 BLAKE2B 80370a7519141030a7e54c2ea5db410b2bf1cde8d8389618487c52e4ff40f87cf7b0f9087331bb43fa6436e1b9936de9cc00a02b9ab9ce6528635a245e6a8b3f SHA512 a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1
 DIST wine-d3d9-3.10.tar.gz 50540 BLAKE2B c9127e5504cbf0d0fe338645bc2d8ed6f71db1174f8ab8ff9e92457745f5ccf6ac8bd043442a5a250b9da7e0c157113682cbf184041488ef6ebaecce2bebdafc SHA512 6397005616ab6424ba9e5c289e935c15b3b789717d887afb28bee1b30912052d6c47495d9b91952c38da7be03382dd0dc708fea42f7fe4c6221cf315c5faa810
 DIST wine-d3d9-3.11.tar.gz 50540 BLAKE2B c9c6469fb0dfff9be5cf50796f47a747d02c736a22b186ec561c0dcc3715a0da1cfce24e852da075685ea3047131d98cf506810ab7d555fd91ca334dbf8c315c SHA512 57ebadc6764c36a925c8e9130b3b436513795bb53e96566a88c22337b37a8c3efcb84aada19d3e5dd6ae2eb24f64b46a33376027600cb7863254369b4555de05
-DIST wine-d3d9-3.9.tar.gz 50551 BLAKE2B 3f77b541b39172dd606bcd9083bae71e75c7b5cf129132dffe1e2261519c5e330aff92545169ce6148d35d292fda9a7367f3bb3951e9777d68c9c1bfd6659e3f SHA512 bdc0ce6e1d0bb247ae6421b4a3a6c600453647105f679113c7db78984ec7154b0728140facd2e3e1a64f0ff0969ab93c2829e72557c42f7a7ad05faf1c906499
+DIST wine-d3d9-3.12.tar.gz 50544 BLAKE2B 68c58a8800facf910b72e07f8be77d260060175da25583d3e6562cbe18c4fa1cf2fe0f5d109747e6901677231483adf02a0f1d76105e66733faf1e932c75e876 SHA512 9beb98528600b6699a6112abaf037d73a7cd0e791de04dee2c1874075b9b99a24438df92421802eb89e1285e1235e6a36b6cd7260757fc43d7f8cb3b913296ad
 EBUILD wine-d3d9-2.0-r1.ebuild 18408 BLAKE2B d076c6114c7a8044803c22cc9e3b2ade886c2c5fe95f476fcb69558058733d1e75f178a956ebd5fde2c753690cc120df3c3161293af97031043d59a5f4ba4e7c SHA512 c6e0d90d32af5981ab83093680c0119c39c0843d818672270a83e9d40c5cf368641818fc8e82f29c7de07759cfc18d94990f400564987693c17bd24acb18f413
 EBUILD wine-d3d9-3.10.ebuild 18573 BLAKE2B 8bc4d2359a4652beaee2ac1b7b459ad03408f2c0d2ff9145ff3889ffa5660797d8378f9e73c612e923d5121ba5af79b5f85fc2d4e81f0129033e5c6147e264c1 SHA512 8558b0e5c6f06bdbca8f26c9a47c9e0befba46a0a80282a90911e416f5b21f2f08a1299a0b4919ae701df1e5ad1db541d50058e3b55b03744e9643c1f1b96c46
 EBUILD wine-d3d9-3.11.ebuild 18573 BLAKE2B 8bc4d2359a4652beaee2ac1b7b459ad03408f2c0d2ff9145ff3889ffa5660797d8378f9e73c612e923d5121ba5af79b5f85fc2d4e81f0129033e5c6147e264c1 SHA512 8558b0e5c6f06bdbca8f26c9a47c9e0befba46a0a80282a90911e416f5b21f2f08a1299a0b4919ae701df1e5ad1db541d50058e3b55b03744e9643c1f1b96c46
-EBUILD wine-d3d9-3.9.ebuild 18573 BLAKE2B 8bc4d2359a4652beaee2ac1b7b459ad03408f2c0d2ff9145ff3889ffa5660797d8378f9e73c612e923d5121ba5af79b5f85fc2d4e81f0129033e5c6147e264c1 SHA512 8558b0e5c6f06bdbca8f26c9a47c9e0befba46a0a80282a90911e416f5b21f2f08a1299a0b4919ae701df1e5ad1db541d50058e3b55b03744e9643c1f1b96c46
+EBUILD wine-d3d9-3.12.ebuild 18573 BLAKE2B 8bc4d2359a4652beaee2ac1b7b459ad03408f2c0d2ff9145ff3889ffa5660797d8378f9e73c612e923d5121ba5af79b5f85fc2d4e81f0129033e5c6147e264c1 SHA512 8558b0e5c6f06bdbca8f26c9a47c9e0befba46a0a80282a90911e416f5b21f2f08a1299a0b4919ae701df1e5ad1db541d50058e3b55b03744e9643c1f1b96c46
 EBUILD wine-d3d9-9999.ebuild 18573 BLAKE2B 8bc4d2359a4652beaee2ac1b7b459ad03408f2c0d2ff9145ff3889ffa5660797d8378f9e73c612e923d5121ba5af79b5f85fc2d4e81f0129033e5c6147e264c1 SHA512 8558b0e5c6f06bdbca8f26c9a47c9e0befba46a0a80282a90911e416f5b21f2f08a1299a0b4919ae701df1e5ad1db541d50058e3b55b03744e9643c1f1b96c46
 MISC metadata.xml 3320 BLAKE2B bbf5e79928f29d124d8a7dd947aa42fdf690d0d7f8905a0e0f43185b7026d4dde787809844ce230c3ab285a3c476c807973b899589d0d383931c96c9f1d54966 SHA512 14e380383fa5345cbd6c5366456f8d122c7bccbf54db863945e5c7673457f29f97e629ec3538030bd991f254d0262045a2d97a467cb100e80e1989728ba65c96
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild
index 76dbf2536327..76dbf2536327 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 73838a42212e..c06680b5fdf5 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -3,5 +3,5 @@ DIST wine-mono-4.7.0.msi 64625152 BLAKE2B 9c533d9f9a5cec6aefa66ed916e88f0a03ab76
 DIST wine-mono-4.7.1.msi 56470528 BLAKE2B b1b9dd832f725cb70b80889c08db524540c389c4eb8c990415f0c1b4a17274fc96390808c943bd0ff42c79f4bbb376b3d599d31ed42b5ebcb4be79dbc273eeec SHA512 d47f21fa3ddb31522366056a2062cf7b77eec0a12f96dc05326561c9d2604405128441ff40d1b9567a6e6cd1c19ee03444d2ba02dd3b8dd2d150030dfb52f765
 EBUILD wine-mono-4.6.4.ebuild 504 BLAKE2B 1a454ab2e605655328cc00e7ae539b83fcb8f3f3efca9e4873cb5b9c7036e71e696005a21ab0420cf110a07496b3772a8164eafe1dda7591d02155538ea75367 SHA512 cd729b803383bd1416152ac70567ed6a8231b87ccec1bbd47768abf08dd1bbced711c9356c42759d1e9458fb35b9edd438f2b58c40ef80d15f9bdf5a8b7b4605
 EBUILD wine-mono-4.7.0.ebuild 506 BLAKE2B 6219e5761bf91cfc349d872085991688cfee7b9ed5b5aad964f7580e26fa0cc213e21e20a0afcf7f0dae315a27c022511d089f2c2aaea8c7d8cd97033e7b81c1 SHA512 64b8eceae407dba1f415c113c2f1c0a5342a178850d940c22e49bc483e8c4eab2efcb34a1a053d28e8fa0637f3386a9846b1a90ab4baaa84e3b9fb9d71267bc3
-EBUILD wine-mono-4.7.1.ebuild 505 BLAKE2B e38e5310ccbd840f1e976cd2a91a410183b1f38d6bdafb5cddc90dc89b7ff33cb90e68c0b021b1697776a82fba6733f14df29d0666e5bf847602591f80b18c29 SHA512 72afe513a0c9a1607dc5c6a310349273d2eba85f0d0139fad3a972d6341fb1ec802a960471d142fb6347fa8c770756d349b4ece0ae852849edb5e7973e751a8b
+EBUILD wine-mono-4.7.1.ebuild 504 BLAKE2B 6f8fa48c32e6ea7e3a768fb04b8255ddf503b5a584ad2015358dd35476ddac5b092bb5d887bde7ca89928442bb03d6f6e398998a7fc30d3fcde958fadb66fab7 SHA512 8531ae9d10aa4d40c7fe2c59eea82007b494bcb6c546253d9211e773c23d8bc61cc67e3dc563219957f9d6364572c00400ae5178bc2ea88e23b9915ae47e4258
 MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c
diff --git a/app-emulation/wine-mono/wine-mono-4.7.1.ebuild b/app-emulation/wine-mono/wine-mono-4.7.1.ebuild
index 3c2d7e0b0851..4070337553f3 100644
--- a/app-emulation/wine-mono/wine-mono-4.7.1.ebuild
+++ b/app-emulation/wine-mono/wine-mono-4.7.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="!!app-emulation/wine:0"
 
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 5f0a090804f4..5145b3343ed0 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,14 +2,14 @@ DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a0642
 DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
 DIST wine-3.10.tar.xz 20485784 BLAKE2B 3a5e9ca948880a3bc979c33e797296d156425438c2502c3d2c50a6d5241e485bdc081ff195b0647cfa1db1cab247e941f02d0511f7b94dc0037fa24e2e61eb5c SHA512 bb1a1d8e8ad7f48d9fcf48ebbf0ebbb8e3b45ea211736bd7837144ea34b373f74955d3c0ccc4cdc44020eea23c8af8e67252e1c5cd6115e11419ad5f6ef24843
 DIST wine-3.11.tar.xz 20501100 BLAKE2B 793fe0a83ed13f4ca436c710198ffcbde5e0109d9890551a410b1d836d79adf4060f0cc7e20861eb806878db79f8003023821ac1b0d72a0710235412863c4576 SHA512 8f7226364648ec30eb77f1848ee6bf01be2445fd96f902309575ac1f6ece31bf54d415516fcda76ae438010a36a9d4846d22cc37365aac4a230701376f9589d7
-DIST wine-3.9.tar.xz 20508952 BLAKE2B 6fbf22673588963c483b7b31e82287c09e15b579b8f57267e2731768f95a1f986954bb473ee0dfa2428802fe9331b8599a01c782dd1152d36ce2002b6a4e6bde SHA512 4c4e5a741a61b9427c175e015177df5806638736f7dfd92098ed95239d41a373cbab876c054d3c948e1db6a7de359db3babd63bc194edc8c2c3be28b58f75e64
+DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960 SHA512 51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
 DIST wine-staging-3.10.tar.gz 9943542 BLAKE2B 412319529e6fe9bb21a4629e1ae1896fe47a413a7ab688d6245fd5b85aa2969be040df3fa8d0ad6185617c814c7b69df891c9067260de28e505298695a6776ea SHA512 baae31ce569c06f8ac5ffc579d8f3bb95de55c50b83c1db13eaaeaee5c8c5b3b7fb6028d69dce6645ac697692372a65be8d60532123a94e0f5fcd0778d2082c5
 DIST wine-staging-3.11.tar.gz 9950753 BLAKE2B bffc6a86b652695d9ed4e0e2ce6f165e45fc2f6fb7e898704fd22624b1b0497ae35319b2444b49ee62eb8d0e308dd32148af64e38f480ce4408170aa2c91a828 SHA512 811a8668c3747f02850928a99bc66612937c38d98068dddec47bffe427d00c7c83b172f12807e1cb609d83c00e978949f913877bfbf5d8443a5ad29011c03545
-DIST wine-staging-3.9.tar.gz 9932873 BLAKE2B 9a0bb5689b1d2cff6e133f0dd94cc13b63f59ef9e5b129aaf48501317a75aadbf27058fe8cc436816501cbe416c285504d9c98504024f9a0606ee4c4afc48e4b SHA512 4f52937621b7e5a3f4b3e52ecba8c7d318c621e76c8e4ce3be176d56b382bf06e3a0453d37c3b725df63f0a7349f53a7c075148c7e1ed89a028696538e31acad
+DIST wine-staging-3.12.tar.gz 9936375 BLAKE2B 5c48fb1037d39ce6ab78c03a002b2edfc2fc434c0f661bb6def050becd7411998b9ae763db99bda3b5190e3e6ab355699806d976d01f813904080c6156dafb7e SHA512 166f991f7c8f59df656f3fb28150a8e26e48d1ff6906b3eccd31cb84524e28efe7e7df00eadc21881940308ccc4b4edebcb2a71bdd03ba3de5beb1cf42e2f058
 EBUILD wine-staging-2.0-r1.ebuild 19947 BLAKE2B 44adc4926d0a93bdcb8ef176d0c058eb2a7ec6896ebc00f253e417f541fdd14e7236e4c1123b8aa93e7b386e15a34b356103e573e2a06ca2be4449073180d2ad SHA512 0d1173b27696344bd491f53fe2e6b11e88ba9d5d1b55869c9907ab292c20e248e48fc05b776c573a6f4dd6a49b8cbc247535e59c39990d80633bcbc55ef7c31c
 EBUILD wine-staging-3.10.ebuild 19971 BLAKE2B 4d18c0f96ce8eb3f4c6fe8871875c323639af7dba6d120a67038b12bfe19d472d36ff1d994be21a6bc89d929561aa97cc1e6629d7b076a63773801e10135a485 SHA512 451f8dff34221638c15a2ad3693c688c2d49f55c2da6b6a45b4577d2c1adfe71a0c005530df377734ad996409bd63b34527c407a74e38f861312191566595ef5
 EBUILD wine-staging-3.11.ebuild 19882 BLAKE2B 7db7a015866bfdd71263b163c525bdb74307712ac6a32b8b499278cb948f41addf9e122cd2d01553f97eff7f06614679cd0be6ed80ce388b6dc7de942704a66f SHA512 cf53120963fd78fa5c5dcebce9632f5363317cc0761817cea9ace6d2197da8453736b54127026b392c4cb6a69af630ea83fc13d8a981e5a6690ab2b90698c8da
-EBUILD wine-staging-3.9.ebuild 19971 BLAKE2B 4d18c0f96ce8eb3f4c6fe8871875c323639af7dba6d120a67038b12bfe19d472d36ff1d994be21a6bc89d929561aa97cc1e6629d7b076a63773801e10135a485 SHA512 451f8dff34221638c15a2ad3693c688c2d49f55c2da6b6a45b4577d2c1adfe71a0c005530df377734ad996409bd63b34527c407a74e38f861312191566595ef5
+EBUILD wine-staging-3.12.ebuild 19882 BLAKE2B 7db7a015866bfdd71263b163c525bdb74307712ac6a32b8b499278cb948f41addf9e122cd2d01553f97eff7f06614679cd0be6ed80ce388b6dc7de942704a66f SHA512 cf53120963fd78fa5c5dcebce9632f5363317cc0761817cea9ace6d2197da8453736b54127026b392c4cb6a69af630ea83fc13d8a981e5a6690ab2b90698c8da
 EBUILD wine-staging-9999.ebuild 19882 BLAKE2B 7db7a015866bfdd71263b163c525bdb74307712ac6a32b8b499278cb948f41addf9e122cd2d01553f97eff7f06614679cd0be6ed80ce388b6dc7de942704a66f SHA512 cf53120963fd78fa5c5dcebce9632f5363317cc0761817cea9ace6d2197da8453736b54127026b392c4cb6a69af630ea83fc13d8a981e5a6690ab2b90698c8da
 MISC metadata.xml 3506 BLAKE2B 8b2c1e1624503b1ed459b1bab8cbaa488a9cd70734b71ced169eef9a4a70f0912a1849a1442365a9c1567cf1f9bbf431e6e0cf4c6688172f6e0700a5131286d4 SHA512 a79ed8f4c8cc3ac5fd7679a5b2e8db166a9a804d527d9da27455066d790f8cc064726829a27e8cce70c87eac1cc48097ab9391fe918dd39d32ba5e0f69f2b6ba
diff --git a/app-emulation/wine-staging/wine-staging-3.9.ebuild b/app-emulation/wine-staging/wine-staging-3.12.ebuild
index 4873ea014bd1..54b66bc499b1 100644
--- a/app-emulation/wine-staging/wine-staging-3.9.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.12.ebuild
@@ -44,13 +44,12 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
 	osmesa? ( opengl )
 	pipelight? ( staging )
-	s3tc? ( staging )
 	test? ( abi_x86_32 )
 	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
@@ -135,7 +134,6 @@ RDEPEND="${COMMON_DEPEND}
 	pulseaudio? (
 		realtime? ( sys-auth/rtkit )
 	)
-	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
 	samba? ( >=net-fs/samba-3.0.25[winbind] )
 	selinux? ( sec-policy/selinux-wine )
 	udisks? ( sys-fs/udisks:2 )"
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index a406b3316750..a15236f22a1a 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,23 +1,13 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST wine-2.0.1.tar.xz 18845444 BLAKE2B 82e692c9a216087ea3b51cba659b12a79b25b44aac2ab572b9cf6d12c29b8fa5cee3c4bb9f8e9dca526ded2c6ba1f77d2c948b783914427ec2b93409e64ccaec SHA512 b32d07443655898768383b7409c21093b60c028fef166a596dad5dfab5a329b9fce4552e612c6d182e4f67eb1f28ed497fe2ed6af55d0000d3e96a124547722d
-DIST wine-2.0.2.tar.xz 18854952 BLAKE2B ae55b6a31e4d36b367a84e0e5fa7bea8c39a61ecfe7def4082747df4c55d0ee5c72e132bc77b49935fee8d0faf7f4d2cddfda0c712b6042b440dda1946e682b6 SHA512 3f37080a951819304cd3475f6012f1d6b5a94879b137cdf816cac4c8fde68ddc777905e92277ec5dce96437d8c32c43d55d3750b582781a9f9774b118f1a5b90
-DIST wine-2.0.3.tar.xz 18864648 BLAKE2B 0503a11e7545d5af805bfc3c2f614b6e35e39b7b532ee45dd9947e1a9a53eb788a304e744c683e42bf84f0e67e2c046ea5f839b6bbad1cf73b9996eaae5c30c1 SHA512 e20dbcb3a48ecb3526eba075d4baebab2529dfc50b7a6d5e18294704470f61db386013f457118c270274b911f9643d203110f46558d23e84e6a6c2d78e237dbb
-DIST wine-2.0.4.tar.xz 18898148 BLAKE2B a21c920e1cf15e064bc6b37067a11a5568f8d1906783c200236456b73947bbd24212208ab1bcc2ca526ed40d8b2e80a2dc5d95db1a8d356a484213afb6897f59 SHA512 8fccb93e5ebe482ed81e948e3b7f87d4fe5b1f838a10f9cdcafa9561de4ef54b7d5acdc292bf28ad3aaf44be34c5ad8452ebbfc39f49f95fcbe9f9d0fcfc862c
-DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
 DIST wine-3.0.1.tar.xz 19722444 BLAKE2B e042d280c3f4c2df64c2d426cdebdb65e9c7263034961b1916bc9c6206bf9c107aefaf8cee166d9f1a2ea21dfa57db0d3641ca5e8025f70520f11aa24d20ca60 SHA512 3d59f08a87da1d2ee280954a4c91e861b6994048b36eff1ac8df67dbab08a792d391b23ced66ea99f8503a979b3ec26cd35558b71c4d29d68775a5d484bf7d00
 DIST wine-3.0.2.tar.xz 19726920 BLAKE2B e108f851b2d893b052a26ae4368f3337bebcc81bb9ea9abf93c5b7d6e01e613ce6e5db98696ab6ad8e266f6f0f0b9c5ddccb66ae7ba7183912a7911fac4b9633 SHA512 dbd0f242c5eace297ad16e314b8ad139e7d430de7eb8ca52b2006d0b80db4809e28a0e785d404a65ea1acdb56e7f06ebfc9a50071db1edaa6180c8835e7c4b13
 DIST wine-3.10.tar.xz 20485784 BLAKE2B 3a5e9ca948880a3bc979c33e797296d156425438c2502c3d2c50a6d5241e485bdc081ff195b0647cfa1db1cab247e941f02d0511f7b94dc0037fa24e2e61eb5c SHA512 bb1a1d8e8ad7f48d9fcf48ebbf0ebbb8e3b45ea211736bd7837144ea34b373f74955d3c0ccc4cdc44020eea23c8af8e67252e1c5cd6115e11419ad5f6ef24843
 DIST wine-3.11.tar.xz 20501100 BLAKE2B 793fe0a83ed13f4ca436c710198ffcbde5e0109d9890551a410b1d836d79adf4060f0cc7e20861eb806878db79f8003023821ac1b0d72a0710235412863c4576 SHA512 8f7226364648ec30eb77f1848ee6bf01be2445fd96f902309575ac1f6ece31bf54d415516fcda76ae438010a36a9d4846d22cc37365aac4a230701376f9589d7
-DIST wine-3.9.tar.xz 20508952 BLAKE2B 6fbf22673588963c483b7b31e82287c09e15b579b8f57267e2731768f95a1f986954bb473ee0dfa2428802fe9331b8599a01c782dd1152d36ce2002b6a4e6bde SHA512 4c4e5a741a61b9427c175e015177df5806638736f7dfd92098ed95239d41a373cbab876c054d3c948e1db6a7de359db3babd63bc194edc8c2c3be28b58f75e64
-EBUILD wine-vanilla-2.0-r1.ebuild 17165 BLAKE2B 355d7a3892b96a92d3f2336e6ae450407ebe8d1b73ad21910459855de6371fd8aca117c162601d0f303265e234c4d06f35339157bdcc0c1f03d5227f3a746777 SHA512 7d6d3d0659100bdd88a294c4728f95f985284e94d4c2e334d3e65ff26f231f33d6a7ab2f34a695683ac51a804a690621cc4d32bc3dec579003526f86ee9e9d69
-EBUILD wine-vanilla-2.0.1-r1.ebuild 17164 BLAKE2B 39c1a2facb2c155e5e5f511f6800af9c93c09cf4cd4ff428519448cdbdbc15afb87e58e12d051ddf0b672726841cce3aa7777aec1c72e19bc3e693c3cf53b4b2 SHA512 b6ff0335579045d560d4a30970b3b8150b07a5e2de086fe4b7377a151924fbb9abee62feddce77ab1c69133f70366640bdc43e0f58820fe7b7563c83bca225c1
-EBUILD wine-vanilla-2.0.2-r1.ebuild 17164 BLAKE2B 39c1a2facb2c155e5e5f511f6800af9c93c09cf4cd4ff428519448cdbdbc15afb87e58e12d051ddf0b672726841cce3aa7777aec1c72e19bc3e693c3cf53b4b2 SHA512 b6ff0335579045d560d4a30970b3b8150b07a5e2de086fe4b7377a151924fbb9abee62feddce77ab1c69133f70366640bdc43e0f58820fe7b7563c83bca225c1
-EBUILD wine-vanilla-2.0.3.ebuild 16974 BLAKE2B 61a9d93162ba22248f95f518026024c7c7844ea00278b0523d94e0e4306eb8fe4a1b22bfe82a08b4be87d97e174d2ef572cbd9d14bb0dc6a560395708a09bb63 SHA512 b3f1897e19623469dcafa4268cf6f57842c9945b15e395a8eeda77f92b63f2035d00d57fcbbb0d9fc5bf937e0b5e7a9b0a7b49a41588c548d4c91ba1f205b562
-EBUILD wine-vanilla-2.0.4.ebuild 16976 BLAKE2B a1b0391d257ffd77cf58bfe5c2614e85e421c5c4db3a1b3157b1a3176d47d6f02bf709c866df146b8cb6f17aa929752cbe9731119a32b83d66115860bc0755a6 SHA512 9b692447e013c31db521d4443b1b3f059279e8f5e0c9c17a629af38c5619a2481321a429f76e8543bac833a4483fcf33d085706672c3068f02b638fa12a93c6a
-EBUILD wine-vanilla-3.0.1.ebuild 17124 BLAKE2B 5c7489c5ea5547f4d42954f94157ea2b0b02b61cb77d6c01255e705cc13fc5f0b260ffdcaaaaab2d11457d9a7ed6d2401ec22165c6091a5a8b7d60a878334083 SHA512 cbfd158b87331125b21e28e61d64332c68f1de6ce32b022097d1eb144d346a73cedf4064773971cc053fdf8bff6254705c6ffa03e981edbd5af6414475209dda
+DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
+EBUILD wine-vanilla-3.0.1.ebuild 17123 BLAKE2B 5aef4adb2ece22b4abaee6fcff8fc28aa73dff048c09f7dfce3314563bffa17657c35e243b9fa689f8ffd94c4dc266b32884f2a85d8161da76ec9b6dedfb0413 SHA512 eacd129eb9d98f3d46993505d81fb70bcb1435a9cf371fb1ca9a512edab6d235ec5398241a5db3e5281e5c677454b43de8dfbd15ea63c7b927db5dd5d3885904
 EBUILD wine-vanilla-3.0.2.ebuild 17125 BLAKE2B 51d4eeb0ef880774cfd8ffce30c8482e9c0a847cbfbecb15159e95497c9a56f62a7ecb1c941bda4f31fe4d89bd11fb740d747f28df28275ead43503af994eaf5 SHA512 011941555712a3a02ff08bdab12b467da71a151efdeb0bce060b9c51c02f8ffec5368b70969a36424b9272ad981e2e8a4725f7de35a8d6064e9e8ad00ccb0f35
 EBUILD wine-vanilla-3.10.ebuild 17329 BLAKE2B 4e0f08f51a31405ea56bcd7fa6e27c6e2060bc34fcb23dc7c6342d33abac6d62b5b664da6727094e9cc5105ccef9e026d75bc24a9c3aaa266069fe5fcddd29e1 SHA512 44d9a8470cfd621237c1f7fc389040b11eb0439429804f6472b1488b6372a091b123159f6ea32f2b911df320f303983ea94449e87814cc6840cefbbfedd7887c
 EBUILD wine-vanilla-3.11.ebuild 17329 BLAKE2B 4e0f08f51a31405ea56bcd7fa6e27c6e2060bc34fcb23dc7c6342d33abac6d62b5b664da6727094e9cc5105ccef9e026d75bc24a9c3aaa266069fe5fcddd29e1 SHA512 44d9a8470cfd621237c1f7fc389040b11eb0439429804f6472b1488b6372a091b123159f6ea32f2b911df320f303983ea94449e87814cc6840cefbbfedd7887c
-EBUILD wine-vanilla-3.9.ebuild 17329 BLAKE2B 4e0f08f51a31405ea56bcd7fa6e27c6e2060bc34fcb23dc7c6342d33abac6d62b5b664da6727094e9cc5105ccef9e026d75bc24a9c3aaa266069fe5fcddd29e1 SHA512 44d9a8470cfd621237c1f7fc389040b11eb0439429804f6472b1488b6372a091b123159f6ea32f2b911df320f303983ea94449e87814cc6840cefbbfedd7887c
+EBUILD wine-vanilla-3.12.ebuild 17329 BLAKE2B 4e0f08f51a31405ea56bcd7fa6e27c6e2060bc34fcb23dc7c6342d33abac6d62b5b664da6727094e9cc5105ccef9e026d75bc24a9c3aaa266069fe5fcddd29e1 SHA512 44d9a8470cfd621237c1f7fc389040b11eb0439429804f6472b1488b6372a091b123159f6ea32f2b911df320f303983ea94449e87814cc6840cefbbfedd7887c
 EBUILD wine-vanilla-9999.ebuild 17329 BLAKE2B 4e0f08f51a31405ea56bcd7fa6e27c6e2060bc34fcb23dc7c6342d33abac6d62b5b664da6727094e9cc5105ccef9e026d75bc24a9c3aaa266069fe5fcddd29e1 SHA512 44d9a8470cfd621237c1f7fc389040b11eb0439429804f6472b1488b6372a091b123159f6ea32f2b911df320f303983ea94449e87814cc6840cefbbfedd7887c
 MISC metadata.xml 3082 BLAKE2B 5ddadb49dd2e5b9da259d3313e2406e37871271f8261e9501508a50220a8ea31a68185d5fcecce968bc4f4915de6901060d980476ce2ddd61d1866d2766b0cfe SHA512 fa40b440a418dd442bdebb7914c84f648f74a18286f91d59726cbfefa1bebec8afab1f9a7b6ed8c7ae2788253dcaea9dc13cb4eff09ca6da56370e280952be70
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
deleted file mode 100644
index 44f1a68f219e..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.bz2"
-	KEYWORDS="-* amd64 x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.6.4 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
-)
-PATCHES_BIN=(
-	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "WINE_COMMIT"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Requires wine-2.0-rearrange-manpages.patch
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
deleted file mode 100644
index 203ac31a11d8..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* amd64 x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.6.4 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
-)
-PATCHES_BIN=(
-	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "WINE_COMMIT"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Requires wine-2.0-rearrange-manpages.patch
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
deleted file mode 100644
index 203ac31a11d8..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* amd64 x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.6.4 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
-)
-PATCHES_BIN=(
-	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "WINE_COMMIT"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Requires wine-2.0-rearrange-manpages.patch
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
deleted file mode 100644
index 42ea191ef336..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
+++ /dev/null
@@ -1,521 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* amd64 x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.6.4 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "WINE_COMMIT"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Requires wine-2.0-rearrange-manpages.patch
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
deleted file mode 100644
index e012559463d5..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
+++ /dev/null
@@ -1,521 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.6.4 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "WINE_COMMIT"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-	# Requires wine-2.0-rearrange-manpages.patch
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.1.ebuild
index 5ca2d89a3c04..eb3d66d40ddb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(get_version_component_range 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 x86 ~x86-fbsd"
+	KEYWORDS="-* amd64 x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.9.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild
index cdb123c486e7..cdb123c486e7 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.9.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.12.ebuild
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index d2efe92256ca..a1eda696d4eb 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/chkrootkit/Manifest b/app-forensics/chkrootkit/Manifest
index 54a850c1b4ab..53e4619ea4ad 100644
--- a/app-forensics/chkrootkit/Manifest
+++ b/app-forensics/chkrootkit/Manifest
@@ -3,5 +3,5 @@ DIST chkrootkit-0.51-gentoo.diff.xz 4708 BLAKE2B 0dacba47222319d9e5bb5d39e0eb4b7
 DIST chkrootkit-0.51.tar 174080 BLAKE2B 36acd12801d2ac599b71d0c59165c1489309df0365442aa575bb4c505bbfea5d0daad837fa9b7b40c2aa3841fceda199f37fe5832f0685ad3a0a82ff5e653a3b SHA512 adef6823d069b32305605d0eaa3d3701c6a87900646d9509cebe0fd8a2fec0523595d0dcb4576b32245e7638388d3b43858dbc42be68de9971ac8461fcfdeb34
 DIST chkrootkit-0.52.tar 40031 BLAKE2B 8bd3518edc11a22dbc7e866de622454f55baa9fcd06a4034489596c0a24d867fec16d134dbc0aaf8b936640177d7dee8e061e39813a3ed261ae657d70f54a47d SHA512 45d66227c185c60166c9ea2a1f89f4594fa7c943c280fd6da5b59b5b355d5fe0d36806ef133fb29f9b2cac0bc05e9c10773ed4fae923a7115cc900818a596d42
 EBUILD chkrootkit-0.51.ebuild 1332 BLAKE2B 5d5bdb9a5edcb3bd08944f89592f24446f45f890859a80930adbe99831b26b5860e4f47804c1c27f101895c15a40b0c3d2c796c9dd687fd10bad3a3a25b1c971 SHA512 094c6e7003e1e5588d74e392ca2c6924f4172c42598601066b9858de5b01385abe444a1be9f5d81d55e0ef1125257914e68ba9bc5108c7fe018ee3cdd1a01232
-EBUILD chkrootkit-0.52.ebuild 1353 BLAKE2B a70803c73793221b5e3c27b12226ba387efde5f7c0efb6c3b0f33734659d96f8e7c1e98571c3118757fa7e392da82c8e611a17a7c0a7461d3f4723cda0d369be SHA512 101d3f6d06dc36995ec149616756a3b70b7a1626f98b9ddaa64934e6d3fba8f25b31b402b5c1556a0a59f3b5f601995a699f3ac0e4955861b1510dcdd8716733
+EBUILD chkrootkit-0.52.ebuild 1350 BLAKE2B 55270163c96b527542f576469743bfdab10af8b264c1084fb521dee56173b787a67273b676a64542a52e8e8d426e648a4556c61ac5982de210ed17baec0c2197 SHA512 4466b09949fb06257cedb02caf7d94b97f1771144fd9e08c135da61568080ffe8f49e1486c9045c41252d9199be4fbfac4f21f019958adc6f04cd58bf159d857
 MISC metadata.xml 254 BLAKE2B 82f42628c121ed27ad00d04687d2f6b52148571b49f1c8f4a81cf47ccf2e857b16c9d0c6a3da2f8bebd6a8803d433a874e8066f48bd18ff960923f53bd15da7b SHA512 f0b5ba232a76e933dd34a7e3e7fa04e627de0201610166f4758c5ccf888f509815b5cc39f5373b87a413496318f507bf28599ec0995d32bde98a7c65287d39bb
diff --git a/app-forensics/chkrootkit/chkrootkit-0.52.ebuild b/app-forensics/chkrootkit/chkrootkit-0.52.ebuild
index 7920cd74260a..2ca1931ac553 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.52.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.52.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
 IUSE="+cron"
 
 RDEPEND="cron? ( virtual/cron )"
diff --git a/app-forensics/libewf/Manifest b/app-forensics/libewf/Manifest
index 1bd8c6ecd5d8..2def4fa690a5 100644
--- a/app-forensics/libewf/Manifest
+++ b/app-forensics/libewf/Manifest
@@ -5,5 +5,5 @@ DIST libewf-20140608.tar.gz 2129518 BLAKE2B aaa8e95f243e887494c5a50c1706864b4613
 DIST libewf-experimental-20171104.tar.gz 2243405 BLAKE2B 86e69eba5313dadbfe2cc63639e96cf964b5d72e3c98299c0262547b2d900b7a8a4a5938435bdafac3890ee05ea0079ef68809086234ff486c985d557d2c4897 SHA512 610174971b8e09385f1f51c02e7be36e7a18d21f8b22ddeb7ba7d5c20e7df97591a70de3523b2d63bed8deb5a2a170a14e825f6a80aeb0937553ecae5925ee0b
 EBUILD libewf-20130416.ebuild 1390 BLAKE2B f86f0370dcabe7fa02fe745ee3864fb9fcb45d47832ab5112219a30c4c13e49fce18e8d7df3be1957bc7ae2c79447c9f8b7659eff35bfac2676c834c35e798fa SHA512 98b8718ec6f1b25f2b33b8a73973906197cff2f505583270d4bcf301223bbfe0aceafe55395e795c7d173c27dd00ed47b2570234d5bff1a07bbd2385151369a7
 EBUILD libewf-20140608-r1.ebuild 1601 BLAKE2B a31475c4f6f3195b90092f5baa0d80d691f8ad07a4ee410fd06070d56366c77ad2bfa947b99aa32e59e8e7c00cad172efadd52efe74a35369da0fa82eb616e7b SHA512 2bf8916b14c71a5685915954d4864ab8b375ee8d09944958b3f47699a78316f45c417d67ffebdf4066e8671f3693dc5563e9246ac9a46134fde85c6c37604d3d
-EBUILD libewf-20171104.ebuild 1360 BLAKE2B acebf82af94b5123abbc07bf3f8f728bf824debc344ba5de5378ceadf51e2f18dc709d7ef08d673332b08cd7c597fb112d5498dd7736ca999db24b3d5322ca50 SHA512 8aa99bb0a6cfb10ac5388f96d349d2b22cb1e9aed3ec2781e175a4c4159eda77cefe89110ae7fa1a853741710acfe7ff80ebe7f2567715715ecf37c975ca06b4
+EBUILD libewf-20171104.ebuild 1359 BLAKE2B ba9144c2f11f67290f92d9d6baa06cbd9bfba80a8331bb04cb3c876bc15f812b6b79c317fc4bfa11c6e25c7a9f24c6c49860a4e42b31868eadec8438dfb71aff SHA512 b93a30e4603c85ab59e28ae1003ed7bfb893290be4becb5d978b5a5a143d22e09c033436da70e13733143be1127027a8e8706840f66b8afb92e08189da11b476
 MISC metadata.xml 637 BLAKE2B c3d42f901c29baa52deae9745e42960cd5d3f8fc0dd01f530c9948806231ec2a8ef6f3fbd8f5fcaaee877167225db542af2ef0b84a6f1bb1a65db7ef617752c6 SHA512 ece6655919f7bd0dc6b2d8189e04f60114428f3ff2bc7ee6859abfa0e73527e5a37dc0816d85b368f2f0a0f139351924b9b800d680115b9a158bce9f665a9ec3
diff --git a/app-forensics/libewf/libewf-20171104.ebuild b/app-forensics/libewf/libewf-20171104.ebuild
index 126d6578e185..fd434d97dcdf 100644
--- a/app-forensics/libewf/libewf-20171104.ebuild
+++ b/app-forensics/libewf/libewf-20171104.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libyal/libewf/releases/download/${PV}/${PN}-experime
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~amd64 ~hppa ppc x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 # upstream bug #2597171, pyewf has implicit declarations
 #IUSE="debug python unicode"
 IUSE="bfio bzip2 debug +fuse nls +ssl static-libs +uuid unicode zlib"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index e3b69424a975..fbdac13f929d 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 13449d6416b9..75460e331c0a 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,5 +1,9 @@
+DIST boost.282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d.m4 55907 BLAKE2B 16ac81094457c80b418109104139c1604e38ec58d6065474cc512668601f12896c4d470fe15c9a366a5ec63d50135265df71f28f4202fa283231879fafb0efbc SHA512 382c7f8a94059ae9816783b12c2d27ee6ca69e23ef7085bf2ee5a31109e6ab0c3d0b0042a3dc290b89276b6315d767aedf073dca390fa688a9aae07e837f83c9
+DIST ibus-libpinyin-1.10.0.tar.gz 1693440 BLAKE2B 5e0d9debddfbb81fcb45ac86d1fe8fb1220a50c527222fb3c3431149231f41dcc59ae87da9ae9485e2585f0e3051ac4d1792407ba62d90e5e0323c482d52318f SHA512 c9fdc28562714bddc889805e1d439a7dd425f721a8236b8f8ec4727ce24e5053693b3e5bd9b06ced22ceb66bc7621715f7ee52e00af3b8b113503a5ce6963ca0
 DIST ibus-libpinyin-1.9.2.tar.gz 1693247 BLAKE2B a887be2a11406420e86cf1e7f76f8d8c06cbffa62a0ab42d450015965c24accab51164ed18cdc8e24f26edf03676603a691c907e00722efc24e947919345570f SHA512 008390049b0186b7163cfd8857806715dd78235fc1e35a89d4b58a38eb7f292b643d48f502c0c924512a9f5a96d2581f577d6a9ec3b660d05d9a4adcde970430
 DIST ibus-libpinyin-1.9.3.tar.gz 1692251 BLAKE2B 6f23a8838f90c082a43fc2922bcaf13ecf287fdfb898f1ba213739f8e2f65ff9a68bdc57cf8f82e73e2c5e1569f1209b8294b45c30c5c3b7e32287b73394ddc7 SHA512 cad3d8415e0c206cbd2eb606ea04b5861e10c3a5f614d90bbba29b751fcc978e2ce1a8a000ceb8cc98de1afcc145ea62b5ee8e9d34e4184bccc487225b34ab1a
+EBUILD ibus-libpinyin-1.10.0.ebuild 1511 BLAKE2B 87a7b8d544f724a07a1bd45d3fa9c20ccd6ac37ec3200981be1efc33fdba5885389ef71b0cbeabc36eb5dd3f626127ba7bf3cf63901b8615a0f3d899c6184e40 SHA512 f8217da8f687758bd412344689b0fcd5f0827fc07af0067dafca14554acfe32a4517910b58afbcbd59c29b6c170ea8c2e4a3f0600726c3bec3a619574a50cb97
 EBUILD ibus-libpinyin-1.9.2.ebuild 1175 BLAKE2B ae4cdcdf56038f16466c6487673c9cc3e445fe921965a67823b4b6f5766ec15952a116c2c01c75c42496262a5ad964b96f32f95258bb949115c2b17d1903c870 SHA512 d407d821b80e2fb2b114cc746ece7688c3e11643dd422523e2cc557ed1995f6fc11e4ce7381e5a93de678439e62d9bb0af5d9334d6b7480a874225f8c11ddbb3
+EBUILD ibus-libpinyin-1.9.3-r1.ebuild 1414 BLAKE2B 51bed33e4c13ade709bc8c31cefec8c7e85b6ae1d30f01021b228ad454bab98584116217fd807273bcd9ff9c0257d9268a3741100b71e5256427f7b5b550ffe8 SHA512 ae5d7b682dab09fed9cd7fc9a8c222237368c876df342f629828428ca16cdc220104ff48a6a9af0bba66ed75f59a2a090783c10c3eb279b8d338bb87b29fc793
 EBUILD ibus-libpinyin-1.9.3.ebuild 1072 BLAKE2B 154b20cc5d10220b8da08b7bf779591a41a0dcbc55e2187b402377949365acc7d183fd691440f4ca40f743be967e73ae14920f759cd1b55574e7c4ca13f1f8ad SHA512 070878cdf22d10fd5bd5fb0cfc5b973542c40f0456297f125f66935007f0f6c0dc0b54dca32e01d289681c80af25d3aff18f92c16e331dddecd68ee8d1daab3a
 MISC metadata.xml 807 BLAKE2B 864c61e2dac53fc0b95541bf79e8f27a183f879bab95574f7cf462bfe276c89c8a5d2b65c899f4734c487feff1113a20ee02debd48b4ff955a24ace70ed5006e SHA512 c92e0e2c47a1272285c3a36cfc18c739df2a69dc911a8849cdc9c517183309908fdae894e88ed7511645b1c90c3611670b046f1a2c7c48fd0ff7c79d2de0a5b0
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
new file mode 100644
index 000000000000..b7b9d91dd13f
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit autotools gnome2-utils python-single-r1
+
+BOOST_M4_GIT_VERSION=282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d
+
+DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	boost? ( https://github.com/tsuna/boost.m4/raw/${BOOST_M4_GIT_VERSION}/build-aux/boost.m4 -> boost.${BOOST_M4_GIT_VERSION}.m4 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc:= )"
+
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig"
+
+src_prepare() {
+	if use boost; then
+		cp "${DISTDIR}/boost.${BOOST_M4_GIT_VERSION}.m4" "m4/boost.m4" \
+			|| die "copying newer version of boost.m4 file failed"
+	fi
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..04c2251e7b30
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit autotools python-single-r1
+
+BOOST_M4_GIT_VERSION=282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d
+
+DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	boost? ( https://github.com/tsuna/boost.m4/raw/${BOOST_M4_GIT_VERSION}/build-aux/boost.m4 -> boost.${BOOST_M4_GIT_VERSION}.m4 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc:= )"
+
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig"
+
+src_prepare() {
+	if use boost; then
+		cp "${DISTDIR}/boost.${BOOST_M4_GIT_VERSION}.m4" "m4/boost.m4" \
+			|| die "copying newer version of boost.m4 file failed"
+	fi
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
diff --git a/app-i18n/scim-pinyin/Manifest b/app-i18n/scim-pinyin/Manifest
index 98d6b8f3dfd3..273a2f93c51d 100644
--- a/app-i18n/scim-pinyin/Manifest
+++ b/app-i18n/scim-pinyin/Manifest
@@ -1,7 +1,4 @@
 AUX scim-pinyin-0.5.91-fixconfigure.patch 1313 BLAKE2B 6ab4742b4c857064d07402411b81041e3a5f8cc998876df7421f1b7bab97905e572fe793fdecb91325a34c0f4e774d8d115dbc3ea23db63aa518e0d84240ebb7 SHA512 9d4dd0c259d8171c8a3b171e68eded4670aacd27902ee8373fe7aff36d088b3cec5570783b9588357ea475321b5267ff635b865a57e7fd3a9b1245e86710decb
-AUX scim-pinyin-0.5.91-gbk.patch 2501 BLAKE2B 5a352313b0a779049e5a74f94fab1ffe23336b2fa979d35961ff0db8e86214d51f4ef3e08a6b65261306fd049fad639dabf767ebc3c5e1d863b8249975b0c819 SHA512 77dc428913f0fdfa8c9c9ac056eaa84d9b60e3b285ce510aa9528be087f5757f3f8055ef0930c4ce1c3776e0ca0e3a3fd725ca5d790ade030a8893e5fc8bca17
-AUX scim-pinyin-0.5.91-gcc43.patch 1737 BLAKE2B 09c72b35e238cb0df6a9d3ca9dc08087257bfdd21dfef3d3a0a1de71984a5f840f8b18207183beae794d8284849adeaba9d3ce122dd65e8290aa4c810febe84b SHA512 3b9d10c2ee4ada9a3d8e6c2c292f745efbe034b8eda30932aeea24c1fbaf54a9ce5e6b9e1dad3c43b33b6b14b009406770a55c23821bbe4d9e421d674d1b34fd
-AUX scim-pinyin-qt335.patch 1122 BLAKE2B 693bfb38d5acf47da482603442c28f5fdd2bb1fb9a9f158fd033321f4d28f092fa049e554bb0281178c47013c8888abc44085b10042702d95a2aea349cf1d450 SHA512 d9cafc0f058f7da5fd2c7b70f7b2eeea249044a1aa886e414d5fad78ceaad168d8cd260e7077c03aad6fe622b637bba5312403b15b61b935157f6258020c1c55
 DIST scim-pinyin-0.5.92.tar.gz 4769203 BLAKE2B 413a196d175536a044bdf4922bf1f3de6051f7e3cb61131153cab6c15e2301e373bfdd037d3e70c2893f66c29f955696e94bb9c75d1e686ca549d26716de0c47 SHA512 6af20b925c45ca355e12eeb59285e3327c2195038078a0e1741870395dc5a8f7dae60b8c9cd77919fbad94c27e123b9e58439f7011277439f9914d1a543a805f
 EBUILD scim-pinyin-0.5.92.ebuild 845 BLAKE2B 8b9ea8806e578c7a66ef65001d192233d8c1150508f7de7d027b32082c4955d2945eb81174a361f48c835a8ead8d16fc47dd8b57f9956705fef409602efe16c8 SHA512 d5a80f917eb810b87e31894404170eec5f87788c831cd6c8c80d369e7558ee9b44d4f4b0095c1eb378bb4848fb0288c9b2b138a4949bcabc35b9446cc22c6762
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gbk.patch b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gbk.patch
deleted file mode 100644
index bc6a228fb0cc..000000000000
--- a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gbk.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nru scim-pinyin-0.5.91.orig/src/scim_pinyin_imengine.cpp scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp
---- scim-pinyin-0.5.91.orig/src/scim_pinyin_imengine.cpp	2005-08-06 23:31:08.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp	2009-02-18 00:06:34.000000000 +0800
-@@ -706,8 +706,12 @@
-         m_sys_phrase_lib = m_pinyin_global->get_sys_phrase_lib ();
-         m_user_phrase_lib = m_pinyin_global->get_user_phrase_lib ();
-     }
--
--    if (encoding == "GBK" || encoding == "GB2312") {
-+    
-+    if (encoding == "GBK") {
-+        m_simplified = true;
-+        m_traditional = true;
-+        m_chinese_iconv.set_encoding ("GBK");
-+    } else if (encoding == "GB2312") {
-         m_simplified = true;
-         m_traditional = false;
-         m_chinese_iconv.set_encoding ("GB2312");
-@@ -930,10 +934,39 @@
- 
-     m_iconv.set_encoding (encoding);
- 
--    if (encoding == "GBK" || encoding == "GB2312") {
--        m_simplified = true;
--        m_traditional = false;
--        m_chinese_iconv.set_encoding ("GB2312");
-+    if (encoding == "GBK") {
-+        if (m_simplified == false) {
-+            if(m_traditional == true){
-+                ; //Big5. Big5togbk is not implemented. Set to next available. 
-+                m_simplified = true;
-+                m_chinese_iconv.set_encoding ("GBK");
-+            }else{ // nochinese mode. Should not happen. 
-+                m_forward = true;
-+                m_chinese_iconv.set_encoding ("");
-+            }
-+        }else{
-+            if( m_traditional == false) //GB2312
-+                m_chinese_iconv.set_encoding("GB2312");
-+            else m_chinese_iconv.set_encoding ("GBK"); //ALL
-+        }
-+    } else if (encoding == "GB2312") {
-+        if ( m_simplified == false ) {
-+            if(m_traditional == true) {
-+                ; //partly map big5 to gb2312 is not done. Set to next.
-+                m_forward = true;
-+                m_chinese_iconv.set_encoding ("");
-+            }else{//Should not happen. 
-+                m_forward = true;
-+                m_chinese_iconv.set_encoding("");
-+            }
-+        }else{
-+            if (m_traditional == true) { //Should not happen. 
-+                m_forward = true;
-+                m_chinese_iconv.set_encoding ("");
-+            }else{
-+                m_chinese_iconv.set_encoding ("GB2312");
-+            }
-+        }
-     } else if (encoding == "BIG5" || encoding == "BIG5-HKSCS") {
-         m_simplified = false;
-         m_traditional = true;
diff --git a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gcc43.patch b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gcc43.patch
deleted file mode 100644
index 6f9bd3879eb0..000000000000
--- a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gcc43.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur scim-pinyin-0.5.91.orig/src/scim_phrase.cpp scim-pinyin-0.5.91/src/scim_phrase.cpp
---- scim-pinyin-0.5.91.orig/src/scim_phrase.cpp	2005-01-06 22:30:58.000000000 +0900
-+++ scim-pinyin-0.5.91/src/scim_phrase.cpp	2008-06-21 13:16:32.000000000 +0900
-@@ -27,6 +27,7 @@
- 
- #define SCIM_PHRASE_MAX_RELATION 1000
- 
-+#include <cstring>
- #include <scim.h>
- #include "scim_pinyin_private.h"
- #include "scim_phrase.h"
-diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin.cpp scim-pinyin-0.5.91/src/scim_pinyin.cpp
---- scim-pinyin-0.5.91.orig/src/scim_pinyin.cpp	2005-08-08 15:11:16.000000000 +0900
-+++ scim-pinyin-0.5.91/src/scim_pinyin.cpp	2008-06-21 13:16:30.000000000 +0900
-@@ -28,6 +28,7 @@
- #define Uses_SCIM_CONFIG_PATH
- #define Uses_SCIM_LOOKUP_TABLE
- 
-+#include <cstring>
- #include <scim.h>
- #include "scim_pinyin.h"
- 
-diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin_phrase.cpp scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp
---- scim-pinyin-0.5.91.orig/src/scim_pinyin_phrase.cpp	2005-08-06 21:06:49.000000000 +0900
-+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp	2008-06-21 13:21:13.000000000 +0900
-@@ -26,6 +26,7 @@
- #define Uses_SCIM_CONFIG_PATH
- #define Uses_SCIM_LOOKUP_TABLE
- 
-+#include <cstring>
- #include <scim.h>
- #include "scim_pinyin_private.h"
- #include "scim_phrase.h"
-diff -Naur scim-pinyin-0.5.91.orig/src/scim_special_table.cpp scim-pinyin-0.5.91/src/scim_special_table.cpp
---- scim-pinyin-0.5.91.orig/src/scim_special_table.cpp	2005-01-06 22:31:02.000000000 +0900
-+++ scim-pinyin-0.5.91/src/scim_special_table.cpp	2008-06-21 13:25:25.000000000 +0900
-@@ -20,6 +20,7 @@
- #define Uses_STL_IOMANIP
- #define Uscs_C_STRING
- 
-+#include <cstring>
- #include <time.h>
- #include <scim.h>
- #include "scim_pinyin_private.h"
diff --git a/app-i18n/scim-pinyin/files/scim-pinyin-qt335.patch b/app-i18n/scim-pinyin/files/scim-pinyin-qt335.patch
deleted file mode 100644
index c7c0c595c0d1..000000000000
--- a/app-i18n/scim-pinyin/files/scim-pinyin-qt335.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: scim-pinyin-0.5.91/skim/setupui/smartpinyinui.ui
-===================================================================
---- scim-pinyin-0.5.91.orig/skim/setupui/smartpinyinui.ui
-+++ scim-pinyin-0.5.91/skim/setupui/smartpinyinui.ui
-@@ -863,20 +863,4 @@
-     <tabstop>kcfg__IMEngine_Pinyin_DisablePhraseKey</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--</includehints>
- </UI>
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index dc7af5a0ed2c..488017e0ab8a 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -2,5 +2,5 @@ AUX xinput-scim 240 BLAKE2B 8c235304288f531db5bea179ff0100f6152b55348057a2604f37
 DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
 DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
 EBUILD scim-1.4.17.ebuild 2650 BLAKE2B 4a6c0f271a6e924844d1de7cba6309f8a0d6a71d0b880ab96226aedb1bc21cbe15c7d919b9d1176bb7f36aaeae3c6c75ff095f2faae00eadaa1ba9060451af1d SHA512 c551d6e3a75da6f16c6bc82d9bbb2ad2d1def41949daa7bff782afb9e8e697de79b7ee14d904398137b2495d51ad9d25af65e57c8bb366f6a06eecd1b04909a6
-EBUILD scim-1.4.18.ebuild 2665 BLAKE2B 7106d2a5967ab0af3f165547213c9cf3839bb90ac3fad96828b1dce724769e855a60a608af8c71e91876588cf36b2d68552b4803c7bbacfc4a417ea522570f12 SHA512 93da84924cab1fb0784bcd4199d9049c5875734e666eb1fa8864e535167b2a1019584440cc6abe63b10fdabe1bc0dc1eacb1117c387c30033d2ee4d689c52a21
+EBUILD scim-1.4.18.ebuild 2664 BLAKE2B e13c1ff0034b09803a7332f593c04330635dc22fe0cbc0619100f61523596b744ae877c8d204043cf27985a9424eed2150086fb5cb4f8593cc25fb795427e0af SHA512 d571c9ff88ca85f1d7d4f2729237e76f87694ab7f56c049e1bb004f9ee869f8f8122ba183e8e2513c258be0250bacb5a7afb78e44fda4224b80e0b5b4250c7da
 MISC metadata.xml 399 BLAKE2B 35834cd16ccba6bf71752ae33d56e8a70391517ba09f83526d402b3aec5fc5d9c13513e090bb014cad67658c905c1dbbe396cc0c9dfc6f1e7c32c4c09a81d777 SHA512 3bbbad26a22cc5222316cf769f638a0e181ea94d8cee39058bcbd1a08e61dd0096441721190323ddb285c504dc061027e4c4185f8bee1d4d0b4b197903f3be0e
diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
index f7e4af81ffe8..cf10edfec8e1 100644
--- a/app-i18n/scim/scim-1.4.18.ebuild
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="doc gtk3 qt4"
 
 RDEPEND="x11-libs/libX11
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 7881c9cc9a35..383357f067e1 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/pbbuttonsd/Manifest b/app-laptop/pbbuttonsd/Manifest
index 40c4e80e03e9..8dec472ebd03 100644
--- a/app-laptop/pbbuttonsd/Manifest
+++ b/app-laptop/pbbuttonsd/Manifest
@@ -4,7 +4,6 @@ AUX pbbuttonsd-0.8.1-g++.patch 431 BLAKE2B c63ff011777c4fc35c3c96985727f07967fbd
 AUX pbbuttonsd-0.8.1-laptopmode.sh.patch 827 BLAKE2B c5153225d8c8f0dfdc380ea8a7030fb994f9893a201ee83692ef712d3ab345f4f5eca4057a36e9b45394f49d89a4a400e91fc4dd7ddb425ddbfe8243e6d49b7f SHA512 3ab0e2ce5b3fa050d7cc27c7e9d90fb3e7fdca46ba2de8e34cfd0a6338b5ba27dcb07204827ccaa8b228f37ae5941e5829b3cfe1a9c4aa3cc50754c7fcedc307
 AUX pbbuttonsd-0.8.1-lm.patch 419 BLAKE2B 2f982fb58e97f8a26970dae583c0c90e6b7be03d9fda2081a64db0f4e41e31f44e425403ccb81e4e2e17a236ac6171a7189a77fa7579752bddeaab97abc56598 SHA512 1ce79d85f9119d0d94b789557f8dc41ddcd8ca030c8b03c2399035e21115e2ff3bfb7c4284750450733ac5ad305fa2513041e65feeecd7dca81db4a23ae53e34
 AUX pbbuttonsd-0.8.1-lz.patch 920 BLAKE2B ab9a5cdf4b9ac2b1dd55229ab7dcfcf65bf4ff3b526f52705c366ec364131fcea31222837a910b37f5507600de6ed4e278bcf0f52cc96bfc5aae8a747cf69359 SHA512 17546f9b7e8b488a2ace5cab29da3738ff59c708aeaae1ef58e6240dba0876254f83f5df358d76af271c636d64c512d7d9fa550e377d4e57d92851a720441dea
-AUX pbbuttonsd-0.8.1-pmcs.patch 692 BLAKE2B 79f3fb25cd7bc552afda0c0eeeaa94b89c10e066ab2ab9dabf151d26efac784a52da5deff5d70b3cbfd78f4274aa4d1a6c1c2f42effbe455d3ae72d43f1dfd8b SHA512 ae8e9c695d80fa775c07b64968f13b3092858e14b37b1ce725e10ea06b897304e9f5079339633163b02e565d9dbb96db321d628394fcfefe528c7a1d36c66b31
 AUX pbbuttonsd.rc6 355 BLAKE2B 41e646f547b684930949669760ffd7e09c6ef4591e6183b12d555dba45d100414cc5daa54ef26e2bba491841553961955cb0a29c9c5d6b37d4e13f9a3117a9fb SHA512 93165ce1d1c757e58b407656bf86084bb3fcfe0c55897fbb382f107ff9b3d69559255a11ac3017cf5741eb2923d753f5cc3f1b495e31e16b18b16757accfbdfb
 AUX wireless 235 BLAKE2B 1fdc5401c1bcc927cad521bb7e6d502fd072c6aae119e59d92c19431985cccaecad5ba55a27af888e63881d0305ee732dce9b1e777e4b2322a98efaad13de310 SHA512 58cbfb80ec32ba6868fea500bcf58bf649a0f468a017ec8c200fe0edd0fd7f1fe17efaafca3e67c20df9fc5a6c80b2941237a375f6e73349a83593dcfacf2816
 DIST pbbuttonsd-0.8.1a.tar.gz 589747 BLAKE2B a0410b7f165e8a0f5b6efa8fa86cc32a84e62da08141d285442d48f0e541d4d6d063e61a7e48aa7901135c4fc9640a7968be821619b3741ce30ba1497015aad4 SHA512 4aaf674872982925f7aa8e06a363f50830f13d9491f4a3b850c1852a8a6d4b2c72164f839c482eed059703dd25d900fe3bb774f78e7039ac2464ea7a1837bf99
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-pmcs.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-pmcs.patch
deleted file mode 100644
index 2ed3bf329e28..000000000000
--- a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-pmcs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/scripts/pmcs-config
-+++ b/scripts/pmcs-config
-@@ -11,15 +11,15 @@
- 
- # Section for power policy 'performance'
- performance_HDTimeOff=0		# hdsetup - timeout in seconds
--performance_HDOptions="-p"	# hdsetup
-+performance_HDOptions=""	# hdsetup
- performance_LaptopMode="stop"	# bdflush
- 
- # Section for power policy 'custom'
- custom_HDTimeOff=60		# hdsetup - timeout in seconds
--custom_HDOptions="-p"		# hdsetup
-+custom_HDOptions=""		# hdsetup
- custom_LaptopMode="start"	# bdflush
- 
- # Section for power policy 'powersave'
- powersave_HDTimeOff=60		# hdsetup - timeout in seconds
--powersave_HDOptions="-p"	# hdsetup
-+powersave_HDOptions=""		# hdsetup
- powersave_LaptopMode="start"	# bdflush
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index d0b4977b3fd0..a41676055af1 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/alertmanager/Manifest b/app-metrics/alertmanager/Manifest
index b12a37ab3a4b..53b489edef9c 100644
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@@ -2,8 +2,8 @@ AUX alertmanager.confd 135 BLAKE2B 7a3dd341e63a73e9782d44dc59c8a65ea1c855ae0589c
 AUX alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624be41ed632a6db389a7c226b3a37d43f22f1c8c098d34f652d9b6b9cb407523b375c884e75fe3740578f26e822df21c7 SHA512 34ae9348f5e054543bdbffd29e30d1fb6147d47e74cecb1755c29bf4327bd56ac4fae4cecddf2c515b6ddffbce4ad7151ae3a3e7f283db2d6b74619f5faa44ac
 DIST alertmanager-0.14.0.tar.gz 2786623 BLAKE2B e9c773af81153b3062d27464c6b8d1edcafe66575b8d5a6309b162c6546d3dedf7ae5b1afcf4dafb3dfdb6bcf826aeb9119b27cfe596da365a6272ee71b30441 SHA512 e352d51d86b853ff679892df3c494da2c7b4afb918d807e6d63b76e959b586f43a4c773de18bdd9e6a5067d4034748bb304ebdee2f08983b00890c1ae393d0b8
 DIST alertmanager-0.15.0.tar.gz 2755787 BLAKE2B 3c13f31c87605d7ff1e90ed8734c5415aa8ee3f9d5ba2713bd8ea8d6d56b013d70e60e3571714b4b423c82c139cb784eff146339a62e2e302c92e7e045d8b977 SHA512 df3b5146c333227ce463b7eed318c30e5c5192ed1728acd3e8664cab85be18b3c430d776063a4101611cdbb08be36f4a04cef9f9d8e053f4db443ea2dcab5853
-DIST alertmanager-0.15.0_rc3.tar.gz 2755833 BLAKE2B 60f17b61ad3ba518064b2999f2fab05d53fdf55c5b787314efbad0e427166442b76017951d3ca7bf2c886328d01713eeca7a36f975dad30d9fb19c0c176e1b5e SHA512 73370f18ba085e8b6701400d88983a849eb53734b14b187e56aacd89a57cf4e236332906add1f6ee8c3eaada0284b62d7a9b4174a888c694d48b8ecd120c186d
+DIST alertmanager-0.15.1.tar.gz 2756389 BLAKE2B 8da152f3edc856ea12025e08b108b47501d95a278e621198712831cc3b105085f4b6b0073c184314b2cc4b291c6d27d6fecf35d5c423476a92ed35f63fe66ede SHA512 b71c59fb1fb745e0d1aac39617cd208b778d215db9d4c72703f5d88a6f293451b63f941dab1c86a8a2257657aa1d9a243044711724e3bfcc66e64db36f473c6b
 EBUILD alertmanager-0.14.0-r1.ebuild 1311 BLAKE2B 347ffeaca216e1b1234b6005fe670696ec2d580738b8b0dc7236a28ba8821176d3eba3a37a0d7772f983be3632d7f709fa37f3d75603607c7bdf25a271955be2 SHA512 64a1ceb5cca20a51ad3ba9c5dee50d20c3774acabae01dcb3ace1a185b125eb44dfe1ba1ffc60876c09e5b14d59d421b9950f4e71d2f937c80bb398e65bf5a08
 EBUILD alertmanager-0.15.0.ebuild 1311 BLAKE2B 796affcc4eae677d9b0c82046415dfc22a740332686abf0da40969d6ed92825377a8e331f93b5f11af4175bf04ef629831522cb905134a2e80af732c1aa6dcbe SHA512 91352629f1dac90a54811392fbfe07070cc05abd544b6d2937bce9e8e654cd020c7feb7e0624ab8dc203055f7ec5c7c53744ca4a848912dc6e01428716dc5901
-EBUILD alertmanager-0.15.0_rc3.ebuild 1311 BLAKE2B 27d9754d5bf2fd21a9c6b0deeef73321ea194e103bbb77f24533f83776014e83fa35fed03fb89389b0ea6220b80fa32099a4ac8c0d967713bb62bd3d37063e6d SHA512 ae2631447334d9cd180490d6d0cb18fd2c251cb7e20e46ec8fee8843dbb200880d7d20bca88200ecd3ffe317662c3c45bdd7aa52f54056bdda8120c797480af1
+EBUILD alertmanager-0.15.1.ebuild 1311 BLAKE2B 7280246a9da3cd00c5c5545190629305aa7c117eb9ad28b5f110908a035cb56c6c5153eceb76761bd29e81195d15720acc81de660eff2603eb64be8dd72e95ac SHA512 4adf84dd9e3adef99e85badcde86356a5179c90cc7074516353a097708c8faf3561ae5c95edd859fab644de0cc578b7ddf84b029ad95273e8e43b34937a8df83
 MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
diff --git a/app-metrics/alertmanager/alertmanager-0.15.0_rc3.ebuild b/app-metrics/alertmanager/alertmanager-0.15.1.ebuild
index ce37eebba0db..0cdd5f83df8f 100644
--- a/app-metrics/alertmanager/alertmanager-0.15.0_rc3.ebuild
+++ b/app-metrics/alertmanager/alertmanager-0.15.1.ebuild
@@ -6,7 +6,7 @@ inherit user golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/prometheus/alertmanager"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="5e86f61"
+ALERTMANAGER_COMMIT="8397de1"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 193cf8c00823..0e6cbdb9246a 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,9 +1,9 @@
 AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6562a2d3c040a75c3665d9862829fc44134db2fbbbbf1d38b7dc4010c9c284f5af38f0dd2cf4be1f9d11 SHA512 7d3650ef5b632507ade4cfb00a167ec7c2d3d8e91551ef8f4550f9947038df0b22a3dd0a33e093296eeb0ca88f1d12ae40e73c7fec4df03e5dcc7630893ded59
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 DIST prometheus-2.2.1.tar.gz 5629500 BLAKE2B 7645267a2c5ed1c4138a5dd3929a48cb9dfa27789db38e98addbb06c37c6b482abfcf296ef1a5836bebd971d8224136c24a4ccd3093175882bb0beda1673deff SHA512 a94cf867de2b3be65b0a07307f89ebfa9c0a319820a72b3b6691edcd2e2b56b5268d27fb52bdaefea0e7084906d69b818e5292a39ccd5991e04e56d594f56ea7
-DIST prometheus-2.3.0.tar.gz 6171790 BLAKE2B bf08aaa124925a6fa1f610117919b5d4d15f4f4a71ff1bed1edca588b7cd4a14483a7ecbf3b3aaf5bfabe968290732b9fe3da522f726b673e0b910d2be3ead3e SHA512 2ab2bc2cc7c9bd9cafa16f54e24845b2e5c4b923bbc200ad9efae985b56587752892a364f08673e34278e6f8ad0b477482eec56632b281212af13a9110940aca
 DIST prometheus-2.3.1.tar.gz 6175030 BLAKE2B 395808ce10eee18469a34caa7a358325830717cce7199f4cd3e6da346326573e65695cd444ad1c37586f9744db51808ef78f4a50fac971fa0fbc7fd7a4089994 SHA512 f0930a8de3885f9d870d41b41b602cd19addaa362d0473c95723b6cff32fd28870f8d47c89b9d39e13f43e189ad991d7569baa1a6ecd1ca59ba85cbb3d3cd6b1
+DIST prometheus-2.3.2.tar.gz 6175804 BLAKE2B 98d7fe58043e5104b6eb181edd13a2aec3c347ae6d0325f08a267b02eef3bd8963603fb17c113244b47967a549ebe860f2a3f11e297ceca85b57495df7f19070 SHA512 35bd654f3326d36846654775e924821de9efc7b39c93d5ffc5e8f4db6feb456cf3b8833de3aa3df9d9f63481c487f2633b55b9610cef4e7a037f2a9b1ffbbd23
 EBUILD prometheus-2.2.1.ebuild 2022 BLAKE2B 35b2eb824625cac8505bcc933130dd2810fd19855f73d975ef1e665baf98a60b95d4f3afcac1edc4b9cb2d6a030e7aeecff9926a460fddd9ea4ad8fa9f34cd6b SHA512 e378cbd27a7e2d033bf2ab6203955207d27f879f8c040cc54e873db8e64b225bf7aa6e977238d0203e00fe688c6328fef611516aea6d8e4afc4a5ea4649df127
-EBUILD prometheus-2.3.0.ebuild 2022 BLAKE2B 894d843ed2df1d5c9f6aaf084d1d1f4f726d2e01d6eb6dad44b435f72f79ea8ddcc3d84e617cba5a9b1aeb2fc48428440251260b7d10a1160d0f6437ce3d6ea4 SHA512 d0cbb12ac9da43f2e27aabaf0a0b7b534b297aca132dfeafcd5e2cd4528a2ad048c324e561f7ccb6874126c370ff0f44c2bcfb65d0fc70b6da6320dd5609dd9f
 EBUILD prometheus-2.3.1.ebuild 2022 BLAKE2B f99591f9347de5c0ed88e05939bd81969f51e133ecaae1f8d275560a888e238bb1cae03085935639fcec6992ca67f16a70dfed8d923f1d2128a191921c597cf8 SHA512 6f458e28f7c6f35ad6f184a836220eeb559f966de760bdeb01f16ddeee6fa139838ed504fe07226cca4c5af6ce926fa52e96ea836a3e6f738146c51069320a4a
+EBUILD prometheus-2.3.2.ebuild 2022 BLAKE2B e35104c0f2c9d2ce49e6256287adf008344f6e75c61e7f97b46563e3e16be1c4d4759b65799fb612bff45619b9abcd4ca009e328a944733c81592329059219b1 SHA512 19b085b959bde4f81218938de7c010f585abb201eea28d3b06479635626ee955e84e094daeed41253a857d7e47db828628aa6742fa5eaa1e17aa126aa4e893a0
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/app-metrics/prometheus/prometheus-2.3.0.ebuild b/app-metrics/prometheus/prometheus-2.3.2.ebuild
index f437abf471ab..1bb29b3310b7 100644
--- a/app-metrics/prometheus/prometheus-2.3.0.ebuild
+++ b/app-metrics/prometheus/prometheus-2.3.2.ebuild
@@ -7,7 +7,7 @@ inherit user golang-build golang-vcs-snapshot
 EGO_PN="github.com/prometheus/prometheus"
 MY_PV=${PV/_rc/-rc.}
 EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="290d717"
+PROMETHEUS_COMMIT="71af5e2"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 54a724a70159..a97901a31479 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 5841408e7424..a03390cef4b7 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -3,12 +3,15 @@ AUX elasticsearch.conf.2 2070 BLAKE2B b620bc7bddfb57c0d1c409c8af919c85fd28df79fe
 AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd0209a58c15868531a108175ecdd21ddc18e1daf1e83c0bbd26da7c00b260698b3ef87c938b6d18928df733 SHA512 36a98d788cff404ccfe0fdff7bbe358750df8db9e5a5f419991b90e257e97331ec93c5f9a84bed57099dd239abb572ef450a191582e7145d8d7517c242707e49
 AUX elasticsearch.init.2 1830 BLAKE2B 57dea653c636c7ccb40fa6ab777f0713b245bf9d344b39de23aaaad753c229196cb81acd01c4ac1c9ae29c166b1dbfa38e829d60172106dbc384aeb6e21a544e SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a
 AUX elasticsearch.init.3 1873 BLAKE2B 58c1fa6be05b4fc28ee0b65bb5f95522b5dee4fed706f8a207a48279a5be135e841dc7228f851ed0f8318d1717b810eb4a6048de2590336f31d7de6f72193f57 SHA512 8b4738042882fdbab3979a48174aee2e389570e4fcf5c07b2d2ef990fe9f38097f29c424ff9a7a50bc2b9f2fb0612b0b5d160e31901d34f5b33e21d5fff99b0c
+AUX elasticsearch.init.4 2018 BLAKE2B 5cce066d530afb57e4bc55026d68f57ab41419c6967145efa621051159efdeb5f12e5cbf97d50048d7b7266cc3d2c41e2957c212623cc9139d4b8558dda42864 SHA512 648bb8cf6a5223920db6685be68e439a6854a3d7532ecf6f2fcfaabfc95a5cb768982e7168063926b40eabb0e3a8d4e0a3b4a30213b2a8cbe59eafbeae5cb7c6
 AUX elasticsearch.service 1718 BLAKE2B 1d3df50f9b521a897f6f57c411265ce3d5da849c23a6d5274959739531ec1f1373f59adb9d0ac94318eefbe90cf10218b67aa47530bdd162ed306354fb9cf2db SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470
 AUX elasticsearch.service.2 1544 BLAKE2B bb66a0e945df66f84937804461ed51216f8bc4585dbdfbd5e834aad0632cc7fbf1005322509183705b62fdfe0f0d105bcc238810056ec066102d8ea84dbb1020 SHA512 33dc3efc736501d6e04ab1aa1b13a4d5f5cb235f7d9ff9674715dd47afdf1e8da8db0a4b82ce46c8c6b71d8258917e8943613eff8a0371a82b5d2e490acefd77
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-5.6.9.tar.gz 33794793 BLAKE2B a056443b1f71b3af773b5195147927017456e1c9a6517c549cfe7e4ec70f0ff4ec9363c9ef6376b7b942e82f811cd5927d44eb9f9eb8022a56e54a85b4ba7c46 SHA512 4e61a4c5f79d0439a414f1e9361f855cdb2f79322cf592bad43132605922fb8ded6368b01e05ef6bcbee49911943c2a3b6be5fd6d0900abddfe03c736cca96d6
+DIST elasticsearch-5.6.10.tar.gz 33796721 BLAKE2B 4e9d1d910a70acf32ca63cec811b711f692f3cf32dcec084a07f92d281eed07c067740bb5c5447055a6d0b6126e55a635edcd08c105dc59985db72bcd031a8a5 SHA512 17bd5710cfc3efa455428a79c74e63aacc9b9481d59a0b0df07ad4e4c25ef32dd41b3dbbde464a2801363b6d428a23eb52cc935640ce86bbc4d8a01dca8a1585
 DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2dd889859b50f46b57b68ed43514568c4aa9629b5ca32edcc2328a6e7245256d64901c8acc8b2dd91337f8ca97b87c46e1 SHA512 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
-EBUILD elasticsearch-5.6.9.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
+DIST elasticsearch-oss-6.3.1.tar.gz 29417012 BLAKE2B 356665cde2f12ae5813d95302398f5fced07c53d25e6e1dc7ad41c8dc8ad42cd3d5bd4ffa6cab24af8088c29800f6ec59a483710272b756af2f76b5967d4b932 SHA512 3df0f7f35e150198f7ff660cf4d90fbd1c2ca587287c6340d427f968711b6390123bfafd09a744c9bdf328d57423bcb75f6e4701ce14a7257388611abea62545
+EBUILD elasticsearch-5.6.10.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
 EBUILD elasticsearch-6.2.4.ebuild 1747 BLAKE2B 2e8ad76bb75a927499cb73a89ede57629db4426ee267a0721e65e8893cdff2799830f7cd136b7e82185effdac60ab8f0d9314edc0179fe2261066514f3c60519 SHA512 e7be527f28b482278376316dd3d6bc969e4d70a8d95a067ac1932f5be0dcffaaaa47064e463bb043665725f73d9605cd150128660ed923de7094f3eeb8af5a3c
+EBUILD elasticsearch-6.3.1.ebuild 1758 BLAKE2B a4105ef73d07a7f8c5796b8457fdf417ad1dd30f8ff4444eaa064e8a36501c56379eaae07725be98b66776ad9777a66e0844ae625cc1f486d547d49ab13acfbd SHA512 c05e0e1fb1d05178001948a8be071326cac3e7b1e75afdfa22512e498d97603eb6ab6d4b1fcc791388e69170f93bcd493bc41eaf6d8108c50da50f85c371a38c
 MISC metadata.xml 493 BLAKE2B 8149c45c1eb86d156ec0a32f016e8eed79d8e8fb7b6f0294ad606eebe9c63208e3d450796cdfc123fb7b2b2bcd10ff0cf23f2b6d2a99c177cb1e795965984892 SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.9.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.10.ebuild
index 26cfa98675c0..26cfa98675c0 100644
--- a/app-misc/elasticsearch/elasticsearch-5.6.9.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.10.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-6.3.1.ebuild b/app-misc/elasticsearch/elasticsearch-6.3.1.ebuild
new file mode 100644
index 000000000000..f3e63754b4a0
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.3.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="virtual/jre:1.8"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+
+	rm -v bin/*.{bat,exe} LICENSE.txt || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -rv config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.4" ${PN}
+
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.2 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/elasticsearch into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.4 b/app-misc/elasticsearch/files/elasticsearch.init.4
new file mode 100644
index 000000000000..ac3027766103
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init.4
@@ -0,0 +1,67 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
+	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+	ES_BASE_PATH="/var/lib/elasticsearch/_default"
+	CONF_DIR="/etc/elasticsearch"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export JAVA_HOME
+export JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_JAVA_OPTS
+export ES_STARTUP_SLEEP_TIME
+export ES_PATH_CONF="${CONF_DIR}"
+
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
+
+command="/usr/share/elasticsearch/bin/elasticsearch"
+command_args="--daemonize --pidfile=${pidfile} -Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}"
+command_user="${ES_USER}:${ES_GROUP}"
+required_files="${CONF_DIR}/elasticsearch.yml"
+retry="TERM/30/KILL/30"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+	fi
+
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+
+	# fails to start without keystore
+	if [ ! -f "${CONF_DIR}/elasticsearch.keystore" ]; then
+		"${ES_HOME}/bin/elasticsearch-keystore" create
+	fi
+}
diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
new file mode 100644
index 000000000000..61eb71f5e033
--- /dev/null
+++ b/app-misc/fhem/Manifest
@@ -0,0 +1,5 @@
+AUX fhem.cfg 791 BLAKE2B ba55b71711199794c38720ad724fbc9d5f05d1713c1af0d02662765e8248e845bc3c07ae619b46e450d9b3a96a993a814e0c831a51edce6129d8efe07baee0db SHA512 9ce1c1cc2d7c55a29df2e344ad6600704e68536b734997a7cc1a73a225970c26f924c902c4d4e6f318e22a000b9b4ec2ceb52edd650fe3a8d12488b5293f7ad3
+AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5adc580af2cad57a0c13549b3c9f4b19b6fdad279ebbf8d0b64a36f29690911b342a06c865c7da SHA512 3be01778d970f4b93e551ff3769ed7b0825508dc5216a43ed0bb12f589103350bdb400561cbada9315050d32a99f723f5291e9bf1c6318642b16b8b9dc9e8c61
+DIST fhem-5.8.tar.gz 22139481 BLAKE2B 444b041b591d3c960036a262e6eb3fda026d4b229a21df16d7817c32a1fd57282a7fbe5559164b760bd9cfad314c2977e7d6f611320d35be090cdb9df66fb8fd SHA512 6cfaa14288ce553a2418db4cb47c719f2d5edbccbde9e76f221cd47cf8a175a67125031c4971f9f9972b218fc709a267757c2abefe6a33be47eb4bb45e23be57
+EBUILD fhem-5.8.ebuild 2226 BLAKE2B 1e938078cde599e3a2acde068ff4e9f4be16c3160ca95819d7c51f0ca8e3c32902577c3076cdef2972dc13ac5b0cf31eb5bff9afc476548a3b25b34872724836 SHA512 9e104f7626b17dd8b43bd2ef36d264a1d48219d36fff8345f1b0bde78c289b88c3c4f3ab87a0e60d3683134b486759d5c5d407357367380daeab005a2662e1c6
+MISC metadata.xml 767 BLAKE2B 16319027b755dc2d63c9176681196af9da38d9c5002ca75554f824bca03c67303cee0f1b15f9583d8264eb87c25373704569ac629258c81ed999882500f04014 SHA512 ba31d04179d2f12b1ba803a4cb589ca17b35b33013b78804fb89a716644bcad9fdb71795b36a6519e90b125164b7fe5d6744f0e1e519fc129a7197bd722c6ae4
diff --git a/app-misc/fhem/fhem-5.8.ebuild b/app-misc/fhem/fhem-5.8.ebuild
new file mode 100644
index 000000000000..70fd300295f7
--- /dev/null
+++ b/app-misc/fhem/fhem-5.8.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="A GPL'd perl server for house automation"
+HOMEPAGE="https://www.fhem.de/"
+SRC_URI="https://www.fhem.de/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="dev-perl/Crypt-CBC
+	dev-perl/Device-SerialPort
+	dev-perl/Digest-CRC
+	dev-perl/JSON"
+
+DEPEND="media-gfx/pngcrush"
+
+QA_PREBUILT="opt/fhem/contrib/lcd4linux/fritzbox_dpf/lcd4linux
+	opt/fhem/contrib/lcd4linux/rpi_dpf/lcd4linux"
+
+pkg_setup() {
+	enewgroup fhem
+	enewuser fhem -1 -1 /opt/fhem fhem
+}
+
+src_prepare() {
+	default
+
+	# Allow install path to be set by DESTDIR in Makefile
+	sed -i -e 's,^\(BINDIR=\),\1'\$\(DESTDIR\)',' Makefile || die
+
+	# Remove docs in Makefile, as they will be installed manually
+	sed -i -e 's/docs//g' Makefile || die
+	sed -i -e '/README_DEMO.txt/d' Makefile || die
+
+	# Remove manpage in Makefile, as it will be installed manually
+	sed -i -e '/fhem.pl.1/d' Makefile || die
+
+	# Remove log dir, as it will be replaced with a symlink
+	rm -r log || die
+
+	# Fix fhemicon_darksmall.png, as it reports "broken IDAT window length"
+	# Reported to Upstream: https://forum.fhem.de/index.php/topic,86238.0.html
+	pngcrush -fix -force -ow www/images/default/fhemicon_darksmall.png || die
+
+	cp "${FILESDIR}"/fhem.cfg fhem.cfg || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local DOCS=(
+		"CHANGED"
+		"HISTORY"
+		"README.SVN"
+		"README_DEMO.txt"
+		"docs"/*.txt
+		"docs"/*.patch
+		"docs"/*.pdf
+		"docs/changelog"
+		"docs/copyright"
+		"docs/dotconfig"
+		"docs/fhem.odg.readme"
+		"docs/LIESMICH.update-thirdparty"
+		"docs"/README*
+		"docs/X10"
+	)
+
+	if use doc; then
+		local DOCS+=( "docs/X10" )
+		local HTML_DOCS=( "docs/"*.eps "docs/"*.html "docs"/*.jpg "docs"/*.js "docs"/*.odg "docs/"*.png "docs/km271" )
+	fi
+
+	diropts -o fhem -g fhem
+	keepdir "/var/lib/fhem"
+	keepdir "/var/log/fhem"
+
+	dosym ../../var/lib/fhem /opt/fhem/data
+	dosym ../../var/log/fhem /opt/fhem/log
+
+	default
+
+	newinitd "${FILESDIR}"/fhem.initd fhem
+
+	newman docs/fhem.man fhem.pl.1
+
+	echo 'CONFIG_PROTECT="/opt/fhem /var/lib/fhem"' > "${T}"/99fhem || die
+	doenvd "${T}"/99fhem
+
+	fowners fhem:fhem /opt/fhem/fhem.cfg
+}
diff --git a/app-misc/fhem/files/fhem.cfg b/app-misc/fhem/files/fhem.cfg
new file mode 100644
index 000000000000..04f7ae9a4681
--- /dev/null
+++ b/app-misc/fhem/files/fhem.cfg
@@ -0,0 +1,27 @@
+attr global logfile ./log/fhem-%Y-%m.log
+attr global pidfilename /run/fhem/fhem.pid 
+attr global modpath .
+attr global statefile ./data/fhem.save
+attr global verbose 3
+attr global updateInBackground
+
+define telnetPort telnet 7072 global
+
+define WEB FHEMWEB 8083 global
+
+define WEBphone FHEMWEB 8084 global
+attr WEBphone stylesheetPrefix smallscreen
+
+define WEBtablet FHEMWEB 8085 global
+attr WEBtablet stylesheetPrefix touchpad
+
+# Fake FileLog entry, to access the fhem log from FHEMWEB 
+define Logfile FileLog ./log/fhem-%Y-%m.log fakelog
+
+define autocreate autocreate
+attr autocreate filelog ./data/%NAME-%Y.log
+
+define eventTypes eventTypes ./data/eventTypes.txt
+
+# Disable this to avoid looking for new USB devices on startup
+define initialUsbCheck notify global:INITIALIZED usb create 
diff --git a/app-misc/fhem/files/fhem.initd b/app-misc/fhem/files/fhem.initd
new file mode 100644
index 000000000000..424948719010
--- /dev/null
+++ b/app-misc/fhem/files/fhem.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+home="/opt/fhem"
+command="${home}/fhem.pl"
+command_args="${home}/fhem.cfg"
+command_group="fhem"
+command_user="fhem"
+name="FHEM"
+pidfile_path="/run/fhem"
+pidfile="${pidfile_path}/fhem.pid"
+start_stop_daemon_args="--chdir ${home}"
+
+start_pre() {
+	checkpath -d  -o "${command_user}:${command_group}" -q "${pidfile_path}"
+}
diff --git a/app-misc/fhem/metadata.xml b/app-misc/fhem/metadata.xml
new file mode 100644
index 000000000000..92b432980845
--- /dev/null
+++ b/app-misc/fhem/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		FHEM is a GPL'd perl server for house automation.
+		It is used to automate some common tasks in the household like
+		switching lamps, shutters, heating and to log events like
+		temperature, humidity, power consumption.
+		In order to use FHEM you'll need some attached hardware
+		like the CUL-, EnOcean- or Z-Wave-USB-Stick to access the actors and sensors.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-misc/grabcartoons/Manifest b/app-misc/grabcartoons/Manifest
index 643c1f54a6f9..4bb539fdec43 100644
--- a/app-misc/grabcartoons/Manifest
+++ b/app-misc/grabcartoons/Manifest
@@ -1,5 +1,5 @@
 AUX 2.8.4-fix-install-paths.patch 1189 BLAKE2B bb9e00721bcc4cbb766e6ddb432b49a0b0b2c9525a020a4a798ca8b80a4d2cbe3b8caa9383a6f8dba3804283df31f7eb17b8219d231dccb6c3ded1227cddf8c5 SHA512 3983cb0487cd1f770c985700297df01d5f33761d8dbacad413a3e50c315a999ae3a70a918b46149928124e6e4a299a8f4994bf60fec990aea6a87313bbc283ec
 DIST grabcartoons-2.8.4_p20141112.tar.gz 40998 BLAKE2B 616dde080c8e35548a527ede7c844fb23b733408bb21ce621065d698220111637b9cf8b044d56dabc6b0987123c656743a8c111b8e9c01cbeb589ed3bf35eb94 SHA512 6de81d151414ccbb7b00c2f472f0d811a7024c67a3c4bdc929babf2ff8990280ba1fde0851e4405dbc487c58e99f13a1dd07a0cd202099f6289dd0ed61296ee5
-EBUILD grabcartoons-2.8.4_p20141112.ebuild 774 BLAKE2B 5ca2cc7a6bce4b49fe6b15f063a32272d140c8211a1ab7f8a1e0691af2e4577a6e289eec369d05989328a3ad266d5df2a11fe00ecdc8f0b4fa02f4f43a4d487c SHA512 30d266736f460cd3d341c9d6e8aad6a753e16846bde48071fbc8f5c5685e4f3b8e4e16269ff5a89184de00150fada92b69cf7e225e781c62fe420003205c3c65
-EBUILD grabcartoons-9999.ebuild 774 BLAKE2B 5ca2cc7a6bce4b49fe6b15f063a32272d140c8211a1ab7f8a1e0691af2e4577a6e289eec369d05989328a3ad266d5df2a11fe00ecdc8f0b4fa02f4f43a4d487c SHA512 30d266736f460cd3d341c9d6e8aad6a753e16846bde48071fbc8f5c5685e4f3b8e4e16269ff5a89184de00150fada92b69cf7e225e781c62fe420003205c3c65
+EBUILD grabcartoons-2.8.4_p20141112.ebuild 781 BLAKE2B 96d4dfeca13963d7dad314f760d3acea76c32b363ff9f9c53efa30fe2dd4a2892c92a461792c2ed7dd2559eefd20fa102234767362604ab760808abd43a22ac8 SHA512 a0731492596232cbd02fb803cc2ce03895a712ef77096e75e3d4d57aee16daf9dda88ff6aee0a1540ef0b9a466b31955ba613880d3f0591aa9ec2d1cb9c69455
+EBUILD grabcartoons-9999.ebuild 781 BLAKE2B 96d4dfeca13963d7dad314f760d3acea76c32b363ff9f9c53efa30fe2dd4a2892c92a461792c2ed7dd2559eefd20fa102234767362604ab760808abd43a22ac8 SHA512 a0731492596232cbd02fb803cc2ce03895a712ef77096e75e3d4d57aee16daf9dda88ff6aee0a1540ef0b9a466b31955ba613880d3f0591aa9ec2d1cb9c69455
 MISC metadata.xml 253 BLAKE2B e1d15b2d2944cde7e6a52fba9fb0c75d3e73d2f1182572c7cd567f3658304d159f262476924df02b9c2924114283ec96cc24ef804fca9153a402a3b0208c1809 SHA512 8c92aefe6448e9d697177aaf5e6f5b08423d728ded122b1cec119079998e8e63c74558260b6b26bfddd6a0c7b50d13dbf4a825c5a126389885ffb75bf2ee478c
diff --git a/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild b/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
index 77fbcd8f86b9..6a318e06fa51 100644
--- a/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
+++ b/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ else
 fi
 
 DESCRIPTION="Comic-summarizing utility"
-HOMEPAGE="http://zzamboni.org/grabcartoons"
+HOMEPAGE="https://zzamboni.org/code/grabcartoons/"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-misc/grabcartoons/grabcartoons-9999.ebuild b/app-misc/grabcartoons/grabcartoons-9999.ebuild
index 77fbcd8f86b9..6a318e06fa51 100644
--- a/app-misc/grabcartoons/grabcartoons-9999.ebuild
+++ b/app-misc/grabcartoons/grabcartoons-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ else
 fi
 
 DESCRIPTION="Comic-summarizing utility"
-HOMEPAGE="http://zzamboni.org/grabcartoons"
+HOMEPAGE="https://zzamboni.org/code/grabcartoons/"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 425ffe45ed27..4352e7a9f525 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,4 +1,5 @@
 AUX graphlcd-base-0.1.5-nostrip.patch 3062 BLAKE2B ebcb8bf96457871e9cea6a5f8bff6e4458ff8c5f1868216645b1b5fca062904adbd3865784cf3fa260a7653e757f8e9cc534a411ed3b92cbe9f4e76ef7fccf84 SHA512 10af50a5c223cfde3248e448ec02f1160bef6b2b66e11e6fc24d3f2a5e6c40d82e9808b9c2ddf3865cd8a15223ebb7acbed4c1e4f247eaed977a18595cf9b3a0
+AUX graphlcd-base-0.1.9-freetype_pkgconfig.patch 906 BLAKE2B 5df340c5e11055ca45ee4f739d44eef28ec861040ca90b105cc8fa05ca1602d984c8ec9e08bcc8007825a3f87110f18371d530d65828b1a0d163fa9a98c2832a SHA512 7665e290b4e5e46fd62186ac1ab97b8245af8d96fa73e274e07c1660dc65c51c9b8048e4e5c0e316aa8c01233e758ef84c9202cf9142b1e92b9f172559081776
 DIST graphlcd-base-0.1.9.tgz 130390 BLAKE2B e25180c3679f9625efce94de77842ca296ef3155278727e3c74a657b36b45d0d3c70ceae5eb4b452c5b86ba4f0869a9c80a559fc89cd767423fe8041b2c47334 SHA512 3769cd31281f40c1cb343a70cba1fee4b27b5ab1454609dca430199b731744d63244ac39d6460c18b236dd1eaaae8284e236c63493b2df23c394ff628f3fb834
-EBUILD graphlcd-base-0.1.9.ebuild 969 BLAKE2B d4b3ffcd7fe2c719a1b50b538fe39f1640792795f3a38b032931b1c4f819a3dcfaa045881779416a343dede27d349c59f4d354730bc733b304282ec00d76aba5 SHA512 8e4ecbde261c813e64e1707992af8c59a22cfa2105ddb7c6265b496ea7ec61d11aaffa3bc2f31ce5a062a667a48dfbfb0ecfc3b8fb5dafd44967338a171a53cf
+EBUILD graphlcd-base-0.1.9.ebuild 1057 BLAKE2B 2d1925c6859ad5e99bb183ae9faaa0c3ed7b2d08ef5ae710b017b4af0912c7c5d2790f34b18cac36d00607c1eb0b81b2f72f4816b3dfc09c67dd68317b384872 SHA512 63d3ac21c5980b49fd5c86fcfad5fd26323ea483c560bc987af574fd09d2edaab6767591b5b9afea3896f90233fd54e94741e0596947ce04a5b4a4cc64dbe9a9
 MISC metadata.xml 464 BLAKE2B 2f69a92ffc1ac13154404024dade395001526ee2a787526034fa68857b01d41cf278ac4b13814e8f116ba16fa7f9e576d6dc09be8dafd8e4804199dc6194d3ca SHA512 a1c66dfad0b364ba3f03d42701c22f7e67c81fcbd03e8e5228f5072aa78d05ad0b09554173131456d789771cd53d3f77898c46ed853216407ace1786870fbcf9
diff --git a/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch b/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..cbdaf1ceb59a
--- /dev/null
+++ b/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch
@@ -0,0 +1,30 @@
+--- graphlcd-base-0.1.9/glcdgraphics/Makefile
++++ graphlcd-base-0.1.9/glcdgraphics/Makefile
+@@ -33,9 +33,9 @@
+ -include $(DEPFILE)
+ 
+ ifdef HAVE_FREETYPE2
+-	ifneq ($(shell which freetype-config),)
+-		INCLUDES += $(shell freetype-config --cflags)
+-		LIBS += $(shell freetype-config --libs)
++	ifneq ($(shell which pkg-config),)
++		INCLUDES += $(shell pkg-config --cflags freetype2)
++		LIBS += $(shell pkg-config --libs freetype2)
+ 	else
+ 		INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype
+ 		LIBS += -lfreetype
+--- graphlcd-base-0.1.9/tools/genfont/Makefile
++++ graphlcd-base-0.1.9/tools/genfont/Makefile
+@@ -9,10 +9,10 @@
+ OBJS = genfont.o
+ 
+ INCLUDES += -I../../
+-INCLUDES += `freetype-config --cflags`
++INCLUDES += `pkg-config --cflags freetype2`
+ 
+ LIBDIRS += -L../../glcdgraphics/
+-LIBS += `freetype-config --libs`
++LIBS += `pkg-config --libs freetype2`
+ 
+ all: $(PRGNAME)
+ .PHONY: all
diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
index 8a5684039573..7c3f216d9771 100644
--- a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,20 +16,26 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE="g15"
 
-DEPEND="media-libs/freetype"
-RDEPEND="g15? ( app-misc/g15daemon )
-		media-libs/freetype"
+CDEPEND="media-libs/freetype"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	g15? ( app-misc/g15daemon )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.1.5-nostrip.patch"
+	"${FILESDIR}/${PN}-0.1.9-freetype_pkgconfig.patch"
+)
 
 src_prepare() {
 	sed -i Make.config -e "s:usr\/local:usr:" -e "s:FLAGS *=:FLAGS ?=:"
-	eapply "${FILESDIR}/${PN}-0.1.5-nostrip.patch"
+
+	default
 
 	sed -i glcdskin/Makefile -e "s:-shared:\$(LDFLAGS) -shared:"
 
 	#gcc-6 fix
 	sed -i glcddrivers/futabaMDM166A.c -e "s:0xff7f0004:(int) 0xff7f0004:"
-
-	default
 }
 
 src_install() {
diff --git a/app-misc/ktoblzcheck/Manifest b/app-misc/ktoblzcheck/Manifest
index e2f64d071de3..280d2da3ae82 100644
--- a/app-misc/ktoblzcheck/Manifest
+++ b/app-misc/ktoblzcheck/Manifest
@@ -1,5 +1,3 @@
-DIST ktoblzcheck-1.48.tar.gz 561054 BLAKE2B 559f70712050a41c07bc440ce6ebfb8a8d51053b17556b1e04d831cafb2097d61965b44ee9bcc807378923c0863136ad3b84c3d8ae59b63a21d712541e28c907 SHA512 897a98b7f39cee43f46fb34009e5d51b06fc0734f4c6e50adf888e9663114c7f927ba5b34cfe8786cb4558621828a580076cd975512a253f247b1e4ce5cfb089
 DIST ktoblzcheck-1.49.tar.gz 561501 BLAKE2B 209d88fac131f58413c27a2df1bb2a380a7517ae20050c8151c368c1a2e7675ce4d563d20e481fa7d843991a95d5edecd393dfbf601446d2657c72302fb5d7ff SHA512 da2321112a78b11ccaa938ec295275cb27a4830de0de62e7b9335f2991b9ca335f0ad10e422d9dcbd32a16effc2fc59f3cdde0fd732a639d3e6a39e141081aaa
-EBUILD ktoblzcheck-1.48.ebuild 862 BLAKE2B 5b5b3bab6e9a5a3889557e8a5b779cb5c0f3a713fb3c21527fc0e65496960167647c3039190c8a3900e4aabf79c968fef93f0b4cf7748df96e55cbc771e56dac SHA512 376d251218ef70ed24e9d54d5057634cb46b296fe9c5705eee29ce29232705a37cc4d09d332d90890385285d72866b1fa3c53697f91a53f044c7febeab7f9691
 EBUILD ktoblzcheck-1.49.ebuild 862 BLAKE2B 98ed370e98ec1abc27d79aad8b2c7ffc9cf6487a14643ec19317ab8516a0fa310a0114c8954e8b70b36f63cd52427f4fb12df2518509f20b79ee83851b28c004 SHA512 e05af846b5a27a2b51e55708998898cafd5774ac8388f5cad02a67eb4194d568d2713b3051902e60c18ec94071afbf261f2d084f4fd07263612b17bab779f397
 MISC metadata.xml 297 BLAKE2B c7fe2728b531d1325f0335b85b9fdf9b0cb828780ccd279dd516af6036ec17f5c0416564b50e1cb972690a43e6a250f0c120dd90e1533f36d6077508214f4133 SHA512 c4c121f254990adfc30d96af3e0d58bbf937863f521422d759779dba224f3eb6a904c7e5a03bdd65e25afcc0fd67fb8ffd84566799771b1c73bf7f43d9c92c0a
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.48.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.48.ebuild
deleted file mode 100644
index a14ed1ae7f56..000000000000
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.48.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Library to check account numbers and bank codes of German banks"
-HOMEPAGE="http://ktoblzcheck.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
-IUSE="python"
-
-RDEPEND="app-text/recode
-	virtual/awk
-	sys-apps/grep
-	sys-apps/sed
-	|| ( net-misc/wget www-client/lynx )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.6b"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf $(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 6970f15f0535..5a166f2416a4 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -11,7 +11,6 @@ AUX lirc-0.9.0-kernel-2.6.39-fixes.patch 2175 BLAKE2B db4c75de0f7c2de3b99f50b173
 AUX lirc-0.9.0-kernel-3.3.0-fixes.patch 1545 BLAKE2B 400ef11e93b9cc58bbfa7f414df66208d1ad6fe14301b85dd05599b400aa1ecf6299b1e9692945f10f4b7ed085e8e087b0cdf218644bea0b7f785e00959d2be3 SHA512 75743844d7fe61a91174c1d7ee78a229e347659a35d1062a704c39e424d8a433efac4216a0b840282c38a4f2f22baa7a489c1c0402a40f734e7475992046a2ae
 AUX lirc-0.9.0-kernel-3.5-err-fix.patch 326 BLAKE2B ebfc117d5f1f1abe2a456ea6b5ed730ec22ebe03fee976eaf9005464afbfe5519f290cb5a107946286b8632a695d2f352ddb8581f63c429f75a7080d1916189b SHA512 c3a6e802b140595155a7ae8dc695bc13e4d6147323949a8dc9c86857bf7abcd442339eac64f99869925c308a100bfb1b7b0eb715f086afb8997252164ff079df
 AUX lirc-0.9.0-kernel-3.8-fixes.patch 2727 BLAKE2B 26601a6e34f0dadad36de1efa9b9a43127643a5c548372d9a64b2b919ddcef3d412ccd4bd59e8c18cd9d5fb9a41efe2d213a3f91397d9067a5851aa84b7832fe SHA512 0db9cbb3aba7d43dc497bc8009afb8335bfe013a06aa6936e1cd357e58c60f545575b06fb6941740d82b496dd4f2ac51b3a165435aee6b3c57107ae62bae7bdc
-AUX lirc-0.9.4-doc-path-fix.patch 892 BLAKE2B 12a7bf66bb91676152216be1806d7e577eaf0b4b0c82706d553ac9e1c5d4300f0c7c1433cd7448c849c937cbd7d561b1d0f0ae18df30228c6e092c9ef82607a6 SHA512 ba9e93b6f32d73bc46e55b0e58f099101f833ffc977b9307aa335fcd1f6cf537ce533854f739244393644ce8882379e9721ea29c80c2fa126554b3127911c8cd
 AUX lirc.service 216 BLAKE2B f1ee64926ab99eaeb5604f93d6394994eff97b9e5ae5b32a10d066e143e66278114722e15c3757815911ebc0485fde43c1f10e8abecf4a90550ccf4c08c5aa1b SHA512 c3e43d24f562ba5ac7e0f12d160026ebf5db00fe066d9e28e0cbb6767fb272474103ad271fba10b970a6613f6e4545150d61b7aa096c696fddca4f2db8019e49
 AUX lircd-0.8.6-r2 1204 BLAKE2B ae4082b6f063d3100865bb3e974d9ebec8f04e08dae8c296c30152f69700924b8850c85687a5cedb3895f52c1e7a576b0855a52e350462a0552da64cd3a7e6a4 SHA512 482fccd204671f6258822029b9eb9a1e22abf02e382b3814f924f171fd1168d46560f52a90727f3de60c27a78158173a4e0c3e848d45e489471c27851c907c05
 AUX lircd.conf.4 699 BLAKE2B 573b16d756f6df55c399fd77027ebb1e6bec1f28106d1a1d4cb028ab3694350a959486d33b82502a258492882e2fdfcb8f8e5220998ee4e1a503618ec247b30b SHA512 1fb1778f4cc72fc9c11b13a704b3abe80bcce5b3770b69b6b6bea8571e5293adad8c6968779b812e611b67734462c9a577cc71c6b16da3a5bfe31b8007300a62
@@ -19,18 +18,11 @@ AUX lircm.service 174 BLAKE2B 30db4e9dd3eed5ae896f60d2363d25f5bf11c83b946e668e7b
 AUX lircmd 364 BLAKE2B 71971476198f92bb2d26cbacc8fe330c4d73e0b36370180cfc6438047339487451b093455761b92660e3f3571c7884b97e6c79cbf7415bff6bcc6ad5198ddd43 SHA512 2f4aae24982a51c54fa59ddd8a48190c11f86ac67fc25bbb599f750be5b91e457c2f779e915943803bde2ec3e5e8988f3c0ffb9d1ea4a08c2e7f05cd3e8b75a5
 AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297aae75b17ed1bb858a57aa1f524d096ec2744f0d543b719f13e80a467869b7ac86e560cc396a24b0648 SHA512 6a69c7600024f00947dc35e3c6cebf7524fcf5f2a1e799fe70590fef2070c1049c4e6177711821f4e7b13972fd6f535591b48bb1006acd44fa650591b3265ace
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
-AUX lircmd.conf 65 BLAKE2B e63ba72d49e51a09ebe848a63c8ca3865fe7cab40663e58e0c03ec303c7700f27017d2d127d54555c94bcd4a7e996f2cc992ef26acd96f7e5ec39889ce655d6d SHA512 75cea93359a18f5d3f398795904dac4b49abac8bdaf19e06d17a713a3bfc2e5ee154b1f137c3d731fb659ecc245ad880053378a5b5958a28af3f884f5827e228
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
-DIST lirc-0.10.0-rc2.tar.bz2 2552982 BLAKE2B d68639198dd7041865f6b7ac79cb94b63d8a85ee70f97628e27887d14f62814388a51521dabe91730570c382c6bb7edb36c15eba0f8ea9f5d4490dfce2bd121a SHA512 ab3426477f017e3a1b9da690189beae5086bbb52f88d302e6c91d7633f74ef781e6747f6b697b3ed6df13497a3e666f11c846104d2f00b975746d24bfd2a6cd5
 DIST lirc-0.10.0.tar.bz2 2523528 BLAKE2B 5c133b40936060fbaa0a9463b1b07d9197d935388e3eb4e46791b1f844b82ea6b6d42ae0c6ce249ca306688fa5d15718f5a3a54b497fc9f168b8b736b06bdd1e SHA512 06ccc1c8c80bfd17a6d180ae39a17779cbba341086f90a03a2e552bfb71e3abcb13f991312fba0e57df79c1882c1e29a2f273dddcd46a9ff53160b556e1547ab
+DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
 DIST lirc-0.9.0.tar.bz2 857286 BLAKE2B 034c7b8492dd42301bb6d40da8c6c95f714b925ee50e7396290231684024dc3fe3bb64987db92d2a4e4d56203436007e68222bbf9a775bb9d29bbefcc4a7c1e4 SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431
-DIST lirc-0.9.4a.tar.bz2 2292119 BLAKE2B 6ca7562716fde3327aa3f8f9913da7d349969f1bcac095bf2e9b1e3025d1e39176e2fb386ca08bcf80d458262f9eb96dab363ef3aa2c1d56b914ac8a36fcbacf SHA512 16be0ac5dd9b07d717ceba63cdc38c0db4a2bdcfc373ca6346d7cd4ab2cd2973aa7585d10b045fcaea952a3aabf7617c564ccb8268db6c62b172683a4b2cc188
-DIST lirc-0.9.4c.tar.bz2 2311300 BLAKE2B f58f3b3a701e0ae787e34ec65c1d29b0faa75958b95aa43663a78dbe04c1c1d5456df5a6c5e41c673db9f589a7c2d41423b5f6a667fac890fb18f29fd797438b SHA512 0a0d0e025b87a55ec919c92824d8288bfaf35cfebae0ee97d86e344109f584baa72a2eff6d24fbc526900671d6092e0eebef8d1566559b0d153e122e3127c0cb
-DIST lirc-0.9.4d.tar.bz2 2489704 BLAKE2B 89cf8989aa84905d292fdf72632b7e5854aa2b225a6a6183839fa3e5fbc6624474e2723d3456cf5c5e6216abd134805fba495e89469808cd5ff139c31f86c032 SHA512 fb3892e12fbe5277e04c451694f1ea4ed45cc424d66ea57b11c4ac4760afa7df4b37897f380b4ade464a82523a0cee336f216d2009ea9431333fd7ca74a8336c
 EBUILD lirc-0.10.0.ebuild 3628 BLAKE2B 18880addbafab7abf3216e023ba27c568b1234f80a35bda0f45441d56f6e17c2ceb6623d5d25d9216b35d0aa4155eb060505d6c710913bf9052979654538e7d2 SHA512 375ada586cb5e60fc95d9c11962386d2cc2eb7e8ba8f3a40c12f766c9f256bd0812a5f9a564a1695eca60f05528e1f15d00b3fae359fb2a640525fac799a45b3
-EBUILD lirc-0.10.0_rc2.ebuild 3624 BLAKE2B 1729fd08c45514c24a7d48ecdac50b17d9a8d52b95ee06c23af5f5a87f89ccb6704b61d0c6344ce4e28396ec754dfb9ed4a33403179b72ff8060053712f1b115 SHA512 bf10dd1f1fe53d0ffed5e2ed0a0439c8f29d6f291b8487dcd5f74a01bec67b06838c4e35816ad475f0b21f113b65696277f63d13567fd711da719718cd322acc
+EBUILD lirc-0.10.1.ebuild 3628 BLAKE2B 18880addbafab7abf3216e023ba27c568b1234f80a35bda0f45441d56f6e17c2ceb6623d5d25d9216b35d0aa4155eb060505d6c710913bf9052979654538e7d2 SHA512 375ada586cb5e60fc95d9c11962386d2cc2eb7e8ba8f3a40c12f766c9f256bd0812a5f9a564a1695eca60f05528e1f15d00b3fae359fb2a640525fac799a45b3
 EBUILD lirc-0.9.0-r6.ebuild 13250 BLAKE2B 81ca3c71e46089a8f3a1b412d53e60096f14c0825f8f4c7daf9fee9387e3eced4dda10c8e5dc4550a9e0eb1347b1db40972a3a2397154dce2a8e1d2ed8b99977 SHA512 0d620d93bccf35721830420a7e367b45c1b6a71891843db12fe4c96b0d1228de6367969545eeb0f0416833f195ed933eafef69d5d38a0a46a1f0ddc32829240b
-EBUILD lirc-0.9.4a-r2.ebuild 3412 BLAKE2B fee771153fbbf941641b86836d860f9bba1ccb00c834a7433fd48d1fbd51c737fbef0308119db2b7ca61e92b7ff615b7c0b4f0bedc5f9e4908b43db18acf9fdb SHA512 a4fbfa1f58525ba5ff464023b717a5c927299dfc2a57586e19d150de7600e76577004e9398f21cc062ee7e83e90c45f1b3bc8ed9f391be2ac3cda940683e1a66
-EBUILD lirc-0.9.4c.ebuild 3620 BLAKE2B 863f48ca71a933f76c7c8d307ef2545f54c5d66c9616a6ea171e46faa346c9644a6c1fb881d451b6c430f7111279ed783fe516068464b5c16f0b0858227c4d0a SHA512 f971cbe128d7516d21890f6a99ac581d059f41d769222a736da0779b2b551ec2267a04930faae27faced05549bcf1d725bc260b49c11ee400a7045a412a7ffd0
-EBUILD lirc-0.9.4d.ebuild 3671 BLAKE2B a16deea9b8b715a085d908789d2c252c60b455aff352baf99ac20f7b708713bdac6c3069356072d2b2f996bd99347f4ee1f5552ca670c03a0f9d7e93b3bb5b16 SHA512 466f717db881bd0de70511960c878208efa989995fba7e24a7145c473e8fa81777d191daa2d67789694e2346cd26c7f24f1ff6a3e84300a0cebacd033f7981ef
-MISC metadata.xml 1311 BLAKE2B 4a944ee2bfec572a01ba493924490388f10609ac4c9f6d585e2a7169abbb96e395c181c2ccabe51faa81acb381f259c688bca9a3a217347c4256a29bbf1600cc SHA512 71aad60940c2cdd6e6059b749b6f7e2834dc4146429e78b8b66cc74be32a498f7b019766033baf089f217f95c48dc2576919730645e17d997a37acef058cd73c
+MISC metadata.xml 1175 BLAKE2B 1bcfd5d3fed6ee42c3e53168cc40fd930e6b92bf52bc787c43439f053e1fb97bf841d71ec58ce3fae56187c77cac767613107e74a90f8871dcfe3f33e4ff293f SHA512 c1d6ff9a423c0ea5d52410d5dfa2cd9dd94b61109494c629706dc74c228032e19e6504884c50694450624d6c05f437eaaebaee0ab626f7004fc7377331fa847c
diff --git a/app-misc/lirc/files/lirc-0.9.4-doc-path-fix.patch b/app-misc/lirc/files/lirc-0.9.4-doc-path-fix.patch
deleted file mode 100644
index 9a2d6c2e638e..000000000000
--- a/app-misc/lirc/files/lirc-0.9.4-doc-path-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://sourceforge.net/p/lirc/tickets/214/
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 53d0f21..f833b4b 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -33,7 +33,6 @@ nodist_man_MANS         += man/xmode2.1 man/irxevent.1
- manpage_html            += man-html/irxevent.html man-html/xmode2.html
- endif
- 
--docdir                  = @datadir@/doc/@PACKAGE@
- dist_doc_DATA           = irxevent.keys
- 
- if HAVE_DOXYGEN
-@@ -58,10 +57,10 @@ if HAVE_PYMOD_YAML
- nodist_website_html_DATA  += table.html
- endif
- 
--vardocsdir              = $(localstatedir)/lib/lirc/plugins
-+vardocsdir              = $(docdir)/plugins
- vardocs_DATA            = index.html html-source/lirc.css
- 
--varimagedir             = $(localstatedir)/lib/lirc/images
-+varimagedir             = $(docdir)/images
- varimage_DATA           = $(dist_image_DATA)
- 
- website_imagedir        = $(docdir)/lirc.org/images
diff --git a/app-misc/lirc/files/lircmd.conf b/app-misc/lirc/files/lircmd.conf
deleted file mode 100644
index 319362a321aa..000000000000
--- a/app-misc/lirc/files/lircmd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Options to pass to the lircmd process
-
-LIRCMD_OPTS="--uinput"
-
diff --git a/app-misc/lirc/lirc-0.10.0_rc2.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index 464217b7e0af..9b8d2c10c013 100644
--- a/app-misc/lirc/lirc-0.10.0_rc2.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 python3_5 )
+PYTHON_COMPAT=( python3_4 python3_{5,6} )
 
 inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
diff --git a/app-misc/lirc/lirc-0.9.4a-r2.ebuild b/app-misc/lirc/lirc-0.9.4a-r2.ebuild
deleted file mode 100644
index fa9852918a23..000000000000
--- a/app-misc/lirc/lirc-0.9.4a-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic systemd
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-LIRC_DRIVER_DEVICE="/dev/lirc0"
-
-MY_P=${PN}-${PV/_/}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
-	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc static-libs X audio irman ftdi inputlirc iguanair systemd usb"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	iguanair? ( irman )
-"
-DEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-	)
-	systemd? ( sys-apps/systemd )
-	audio? (
-		>media-libs/portaudio-18
-		media-libs/alsa-lib
-	)
-	irman? ( media-libs/libirman )
-	iguanair? ( app-misc/iguanaIR )
-	ftdi? ( dev-embedded/libftdi:0 )
-	inputlirc? ( app-misc/inputlircd )
-	usb? ( virtual/libusb:0 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/lirc-0.9.4-doc-path-fix.patch # https://bugs.gentoo.org/show_bug.cgi?id=589246 https://sourceforge.net/p/lirc/tickets/214/
-)
-
-src_configure() {
-	filter-flags -Wl,-O1
-	econf \
-		--localstatedir=/var \
-		$(use_enable static-libs static) \
-		$(use_with X x)
-}
-
-# Defined src_compile as a workaround for a parallel make issue
-# See https://bugs.gentoo.org/show_bug.cgi?id=588864
-# and https://sourceforge.net/p/lirc/tickets/210/
-src_compile() {
-	emake lib
-	emake
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
-	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
-	newconfd "${FILESDIR}"/lircd.conf.4 lircd
-	newconfd "${FILESDIR}"/lircmd.conf lircmd
-
-	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
-	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
-	newconfd "${FILESDIR}"/irexec-confd irexec
-
-	keepdir /etc/lirc
-	if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Avoid QA notice
-	rm -d "${D}"/var/run/lirc || die
-	rm -d "${D}"/var/run || die
-}
-
-pkg_preinst() {
-	local dir="${EROOT}/etc/modprobe.d"
-	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
-		elog "Renaming ${dir}/lirc to lirc.conf"
-		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
-	fi
-
-	# copy the first file that can be found
-	if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
-		cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die
-		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then
-		cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	fi
-
-	# stop portage from touching the config file
-	if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${D}"/etc/lirc/lircd.conf || die
-	fi
-}
-
-pkg_postinst() {
-	# copy config file to new location
-	# without portage knowing about it
-	# so it will not delete it on unmerge or ever touch it again
-	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die
-		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
-			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT}"/etc/lircd.conf || die
-		fi
-	fi
-
-	einfo "The new default location for lircd.conf is inside of"
-	einfo "/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/lirc-0.9.4c.ebuild b/app-misc/lirc/lirc-0.9.4c.ebuild
deleted file mode 100644
index 25ec10062e31..000000000000
--- a/app-misc/lirc/lirc-0.9.4c.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit eutils flag-o-matic python-single-r1 systemd xdg-utils
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-LIRC_DRIVER_DEVICE="/dev/lirc0"
-
-MY_P=${PN}-${PV/_/}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
-	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="audio doc ftdi gtk inputlirc static-libs systemd usb X"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	gtk? ( X )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	audio? (
-		>media-libs/portaudio-18
-		media-libs/alsa-lib
-	)
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	ftdi? ( dev-embedded/libftdi:0 )
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:0 )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	sys-apps/kmod
-	sys-kernel/linux-headers
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	gtk? (
-		x11-libs/vte[introspection]
-		dev-python/pygobject[${PYTHON_USEDEP}]
-	)
-	inputlirc? ( app-misc/inputlircd )
-"
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=589246 https://sourceforge.net/p/lirc/tickets/214/
-	"${FILESDIR}"/lirc-0.9.4-doc-path-fix.patch
-)
-
-src_configure() {
-	xdg_environment_reset
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable static-libs static) \
-		$(use_with X x)
-}
-
-src_install() {
-	default
-
-	if use !gtk ; then
-		# lirc-setup requires gtk
-		rm "${ED%/}"/usr/bin/lirc-setup || die
-	fi
-
-	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
-	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
-	newconfd "${FILESDIR}"/lircd.conf.4 lircd
-	newconfd "${FILESDIR}"/lircmd.conf lircmd
-
-	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
-	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
-	newconfd "${FILESDIR}"/irexec-confd irexec
-
-	keepdir /etc/lirc
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# Avoid QA notice
-	rm -d "${ED%/}"/var/run/lirc || die
-	rm -d "${ED%/}"/var/run || die
-}
-
-pkg_preinst() {
-	local dir="${EROOT%/}/etc/modprobe.d"
-	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
-		elog "Renaming ${dir}/lirc to lirc.conf"
-		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
-	fi
-
-	# copy the first file that can be found
-	if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
-		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	fi
-
-	# stop portage from touching the config file
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${ED%/}"/etc/lirc/lircd.conf || die
-	fi
-}
-
-pkg_postinst() {
-	# copy config file to new location
-	# without portage knowing about it
-	# so it will not delete it on unmerge or ever touch it again
-	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
-		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
-			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT%/}"/etc/lircd.conf || die
-		fi
-	fi
-
-	einfo "The new default location for lircd.conf is inside of"
-	einfo "${EROOT%/}/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/lirc-0.9.4d.ebuild b/app-misc/lirc/lirc-0.9.4d.ebuild
deleted file mode 100644
index 57072953cadc..000000000000
--- a/app-misc/lirc/lirc-0.9.4d.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit autotools eutils flag-o-matic python-single-r1 systemd xdg-utils
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-LIRC_DRIVER_DEVICE="/dev/lirc0"
-
-MY_P=${PN}-${PV/_/}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
-	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="audio doc ftdi gtk inputlirc static-libs systemd usb X"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	gtk? ( X )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	audio? (
-		>media-libs/portaudio-18
-		media-libs/alsa-lib
-	)
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	ftdi? ( dev-embedded/libftdi:0 )
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:0 )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	sys-apps/kmod
-	sys-kernel/linux-headers
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	gtk? (
-		x11-libs/vte[introspection]
-		dev-python/pygobject[${PYTHON_USEDEP}]
-	)
-	inputlirc? ( app-misc/inputlircd )
-"
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=589246 https://sourceforge.net/p/lirc/tickets/214/
-	"${FILESDIR}"/lirc-0.9.4-doc-path-fix.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable static-libs static) \
-		$(use_with X x)
-}
-
-src_install() {
-	default
-
-	if use !gtk ; then
-		# lirc-setup requires gtk
-		rm "${ED%/}"/usr/bin/lirc-setup || die
-	fi
-
-	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
-	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
-	newconfd "${FILESDIR}"/lircd.conf.4 lircd
-	newconfd "${FILESDIR}"/lircmd.conf lircmd
-
-	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
-	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
-	newconfd "${FILESDIR}"/irexec-confd irexec
-
-	keepdir /etc/lirc
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# Avoid QA notice
-	rm -d "${ED%/}"/var/run/lirc || die
-	rm -d "${ED%/}"/var/run || die
-}
-
-pkg_preinst() {
-	local dir="${EROOT%/}/etc/modprobe.d"
-	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
-		elog "Renaming ${dir}/lirc to lirc.conf"
-		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
-	fi
-
-	# copy the first file that can be found
-	if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
-		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	fi
-
-	# stop portage from touching the config file
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${ED%/}"/etc/lirc/lircd.conf || die
-	fi
-}
-
-pkg_postinst() {
-	# copy config file to new location
-	# without portage knowing about it
-	# so it will not delete it on unmerge or ever touch it again
-	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
-		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
-			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT%/}"/etc/lircd.conf || die
-		fi
-	fi
-
-	einfo "The new default location for lircd.conf is inside of"
-	einfo "${EROOT%/}/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml
index b1e7f0c27f85..3a8d3814118e 100644
--- a/app-misc/lirc/metadata.xml
+++ b/app-misc/lirc/metadata.xml
@@ -11,9 +11,7 @@
         <flag name="hardware-carrier">The transmitter device generates its clock signal in hardware</flag>
         <flag name="transmitter">Add transmitter support to some lirc-drivers (e.g. serial)</flag>
         <flag name="inputlirc">Add a dependency on app-misc/inputlircd</flag>
-        <flag name="irman">Add a dependency on media-libs/libirman</flag>
         <flag name="audio">Support using an audio device connected to an IR receiver</flag>
-        <flag name="iguanair">Support iguanaIR devices</flag>
         <flag name="ftdi">Support FTDI devices</flag>
         <flag name="gtk">Include GTK support which enables the use of lirc-setup</flag>
     </use>
diff --git a/app-misc/ondir/Manifest b/app-misc/ondir/Manifest
index 4044838face7..bfb9fd8c5606 100644
--- a/app-misc/ondir/Manifest
+++ b/app-misc/ondir/Manifest
@@ -1,3 +1,5 @@
 DIST ondir-0.2.2.tar.gz 20138 BLAKE2B 3724b8d356cec16e1f60ec49574e2f688d4f7456f48f1d909402e8436f588d9617c827eda9a74c1b930d2538fe8c9d1372a1d222124d8f7b863bf8e895cfaa25 SHA512 5c2c53532934b25d2a170c619d067c369b6acf2ef3e0a87607619613dcc0bbfc570937fb91cdc5df3f22ae0453b5a5d00edd57cd1b852f7a076c15b96c45d4dd
+DIST ondir-0.2.4.tar.gz 52860 BLAKE2B e9111f9a64d8d7393d9a8e48d5dc66d5814995ae1dbd2f577538a03021c1b1b92af43acbd0ab9cb24ab29ba16c50d5752a9442689effc62bd8c13b6fe11a4785 SHA512 f59a823807f86ce2992aaf5fb174ddea222b02ed18e1289ca450179bd090892f1467072dfcec97ce219e216c055781ea7a1a05bb9402276fb9404a57f42ddb52
 EBUILD ondir-0.2.2-r2.ebuild 983 BLAKE2B 1ad1bf96ffea8060f6a676183d5c200165e928cbf46e5a4ddc2dfdd342e150c53bc9375a8413fae34a2a0af147a34ab1cac6caa19b3858e0ae33e85bbeb4e8b6 SHA512 4da1bcf80437796ea0c427f3be610c406880ff76e2d59c651078ab86917c3a06ad3e1b5b017836d499a7cd3ad1095ea9a5308def391764c78dc042063b1af7fe
+EBUILD ondir-0.2.4.ebuild 936 BLAKE2B eaaf969c2efa62b1f186c2101ea597f22ec5d5a0731500615468238ea21a25ead29baf87e113d022380404c0082da32305eb77c5c36bef30c7e0871cc6eae8d7 SHA512 b76a67250437ff8cf6014502bec594bff0e3aeea9ea14b472e7c09bb02f2a8c2b595cd5e3a870cde4b63f15263a1c3a74b4620ce18402f96993a03cc8b30bc31
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/ondir/ondir-0.2.4.ebuild b/app-misc/ondir/ondir-0.2.4.ebuild
new file mode 100644
index 000000000000..2f51ec18dee6
--- /dev/null
+++ b/app-misc/ondir/ondir-0.2.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Automatically execute scripts as you traverse directories"
+HOMEPAGE="http://swapoff.org/OnDir"
+SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="sys-apps/sed"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog INSTALL scripts.tcsh scripts.sh )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:\(/man/.*$\):/share\1:g" \
+		-e "s:-g:${CFLAGS}:" Makefile || die "sed Makefile failed"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PREFIX="${EPREFIX}/usr" \
+		CONF="${EPREFIX}/etc/ondirrc" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	default
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		CONF="${EPREFIX}/etc/ondirrc" \
+		install
+	newdoc ondirrc.eg ondirrc.example
+}
diff --git a/app-misc/openastro-data/Manifest b/app-misc/openastro-data/Manifest
index de2a31f0dc81..8430cd1b04f4 100644
--- a/app-misc/openastro-data/Manifest
+++ b/app-misc/openastro-data/Manifest
@@ -4,4 +4,4 @@ DIST openastro.org-data_1.8.orig.tar.gz 16045562 BLAKE2B a2528faef9827249e01c92e
 EBUILD openastro-data-1.6.ebuild 536 BLAKE2B fcaac146a091782e7560d18c54eeb11af4c9bb5342061fb2a78e84b7ba0860a31341452b3d8281e3c76478e4d72fd1c30a9087af6dac1e014d547da57c6491cf SHA512 7c674f9ed47af5c4e92de0180d083c3c1ab6d2545a827dcc8665ac69306a6f1c3b6c23b69e325e0191a563bfc0372f15fe577e71a93440dfeba08a9ec030ab2a
 EBUILD openastro-data-1.7.ebuild 536 BLAKE2B 4e6529414ed28d9a3f3666c28ad3b159ada8c1bc19012a6f9277547e3805d34bbb51577d70ea17611b58bb5b7d51288d0a0bd0dd5787b040619490a7c747cb2d SHA512 573683c1b529dbf6032329c338a1c9be018f6a4f587d123233c316209d63868b376b673c2636c32198b9aa48f5472bf484c55ec36a33007b9618d5ab5e21c7a2
 EBUILD openastro-data-1.8.ebuild 557 BLAKE2B b5cadc16f1bd965ac09a81a5674cb1f9cdfd47bed73b3ae10529b70c3ad626a802bf2c90f71b10c77b6283289d000a532fad6d3ae38dfbc14d02544cef72595d SHA512 e6955a4f9486e4a56147ea74fd70f72d348ed03e964f84a1a2aca54b5012bb11b62fb19797302075d90f83c6539212f3146e4a0690dac3b2d1f4c1eade1bd088
-MISC metadata.xml 597 BLAKE2B c706d7b1ad6975e22bcab85e3cd58b765fc32d3b16e6cb415ea83eff1978317366cad7468fef55f72442a9ed94febe067a3571277e2b60dcbc826ae1dfc14ddc SHA512 01f7315f5fb9672ee5d93fab9f438ca2fe0acfe6ba08bc62e3e4c3d9e97725885e60268d23bb67074bcd5426fea334e4f17be64092a42a39dd63af3d2e1ea5c8
+MISC metadata.xml 391 BLAKE2B de44378c992fb6a7cc3fd16c2cec319b49dafc0da73f06e41ed08e48a57b97906f2e488bc2dc74d8850800762c3c70de3281af436dadf67d8a60b30226c795c3 SHA512 33213a04e12838729bdce8d1db7a395d337dbf65f9b00bdb3fac1f7a0764efd615a879942f03d9bec6476026d1fbc81e69a096bcd3831adada5b289bbbff483e
diff --git a/app-misc/openastro-data/metadata.xml b/app-misc/openastro-data/metadata.xml
index b433d43ad5ce..225f6c806bf0 100644
--- a/app-misc/openastro-data/metadata.xml
+++ b/app-misc/openastro-data/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>lluixhi@gmail.com</email>
-    <name>Aric Belsito</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <maintainer status="active">
       <email>devel@openastro.org</email>
diff --git a/app-misc/openastro/Manifest b/app-misc/openastro/Manifest
index f589c5b98511..60abbd6db30f 100644
--- a/app-misc/openastro/Manifest
+++ b/app-misc/openastro/Manifest
@@ -1,3 +1,3 @@
 DIST openastro.org_1.1.56.orig.tar.gz 212271 BLAKE2B d0252ae7f3c4c4f255ab1e402f3491b2b61e295f2d2064bd6a25ba07424526cbba01f2fe9f255eced0037b4d05edd1b0cde2e0fdae5c0fd7849652d5f8bfb1c7 SHA512 0446575bde71ca5bc88177bf1d5b8088cd1bb8e29ecfbd83ff15ebc4da4f07534c987f8a00b555a0af85c613e5d6bd2cec60898b586110c2230570446e4b7f2d
 EBUILD openastro-1.1.56.ebuild 919 BLAKE2B 21726da473e1e56e06512ba566d1457fd4a5f73efc8d073bbecbcdb25eeb7e505ccfe7da7d50dacbefa32d3d3b161029cccc8c41760788a4ea54be6b2edfcb84 SHA512 684758d970d7515c5f82a8f137fa805376103221167f067584efacc42f57c157c996d255e3759a2910e1244d71b3d8bcfd0385f9888d7a1d7d04dbe4328c4ad4
-MISC metadata.xml 760 BLAKE2B e9b074215b46c50472e3eed1ec3c37eec0278596de1865b5ac230957be46dd197750dff099c62bd4f51be639ad47506b5f1e2c896fd87dee8ea275f53d247380 SHA512 300f1ab4db7cfe1acce6a62282ddc506c4af8f41c548702afa73a46ecce2882bf604074f3d4aae1d07e856f0459e9df96bd9d940c1635fb850ecac71013dbf39
+MISC metadata.xml 554 BLAKE2B b7e8a99695365047f82469d977834081f033f7742a56a376897455e1b87acbf305454088dc9102265747b67f327733a74386e2d0e04c2f8c6d521ad44bd40bee SHA512 4c226c8e6dc6effd387a8fd9af0c1f52b471e90c4fdca04d37b291fae787eaa7d390bca12c0a5095bc2a242ba32daf80005ac69ea48e3764a0685b1974c88301
diff --git a/app-misc/openastro/metadata.xml b/app-misc/openastro/metadata.xml
index 51e2b2a8f736..8ee7525f685c 100644
--- a/app-misc/openastro/metadata.xml
+++ b/app-misc/openastro/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lluixhi@gmail.com</email>
-    <name>Aric Belsito</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <maintainer status="active">
       <email>devel@openastro.org</email>
diff --git a/app-misc/prog-express/Manifest b/app-misc/prog-express/Manifest
new file mode 100644
index 000000000000..9916cdec6501
--- /dev/null
+++ b/app-misc/prog-express/Manifest
@@ -0,0 +1,5 @@
+AUX pe.exe.config 102 BLAKE2B 8cbb33802ee55ed8a814b55372ecfed87b12e58ed4400554cb41e28204f42ecc3cb83f5d7bc23a4806a72b889deda6f451ab5538bcb882915811201c2907ce76 SHA512 282c302d4613f360e8d28cc0ab711ac4125768557d087d6ee46df75c1c7948503a26d46e1d0605b514335bd6626e7840d4886b2ce0ebab148284af166bc55a22
+DIST prog-express-3.7.8-1.amd64.deb 36468792 BLAKE2B 7edc5b4c9b7c145877298ac33db743960850d2fbd4cc33943612573277a32935dba15a531f13ad7d75309291cf74ca8f0b80b084dafd840f7831362315c6b8c5 SHA512 647549edd846330044bf34eb40436cc622c4e0871726a31049a93b032e5e1c4428231bee97a21cf75baeeade4e651f7d593ed0cdeb0698679582ff6a7f4293e2
+DIST prog-express-3.7.8-1.i386.deb 36468530 BLAKE2B 9e6e81546889a5892bce33168e26b067abe91ceecd9a77f8a0f4af788cbb9da3930e3c1fcf682d6b5aceda04bc84d7ddcf7f45ee4936be8833be4b5244f12541 SHA512 149ae0150d5f8cb99aec92485e4309973f425a87d5c46971b850c69263ea2cbf39df73025709327f80e8b01219114ef9b7219bad7647d947de3625e1bec4904b
+EBUILD prog-express-3.7.8.ebuild 1573 BLAKE2B 7ea62d5ac6bdd72135934d7e19c851f0e73e87f7da8a229a6dce05bf965f4be129d3a11ef3e12c7ca44b456430e94b01cbdf4b5275d7ff009bad221db3aea440 SHA512 218576988462e71fb6aa0fb8aedd6894798323b00baf41bf91d21783d3a7a4bf29ceacdf75d7c6bb5adaf547bcbfe48dc28f05f7aec1a6e17df63126c8e5438c
+MISC metadata.xml 523 BLAKE2B ea6df68f08186fa4b039a199b83452e561480ca24836dea6d96723058c74d8657f0c8dac3404492a4aad660d9d3d10a30702dc0cd90e6712c4a74e6803ee85a9 SHA512 d7e5c947e7f15307c97c5b4940765245a0b4198a32ba896b8c4587f2d6ece0e3631b654c50b3d918716e598c213ad33d7ae636b4bf119149c90d2ba5f70b5aa2
diff --git a/app-misc/prog-express/files/pe.exe.config b/app-misc/prog-express/files/pe.exe.config
new file mode 100644
index 000000000000..56cb1a6e5193
--- /dev/null
+++ b/app-misc/prog-express/files/pe.exe.config
@@ -0,0 +1,3 @@
+<configuration>
+	<dllmap os="linux" dll="libusb-1.0.dll" target="libusb-1.0.so.0" />
+</configuration>
diff --git a/app-misc/prog-express/metadata.xml b/app-misc/prog-express/metadata.xml
new file mode 100644
index 000000000000..0a374610972e
--- /dev/null
+++ b/app-misc/prog-express/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Prog-Express is the programming device control software,
+		suitable for all USB programming devices of Batronix.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-misc/prog-express/prog-express-3.7.8.ebuild b/app-misc/prog-express/prog-express-3.7.8.ebuild
new file mode 100644
index 000000000000..3cc76c3e2683
--- /dev/null
+++ b/app-misc/prog-express/prog-express-3.7.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop udev unpacker
+
+DESCRIPTION="A modern and intuitive control software for the Batronix USB programming devices"
+HOMEPAGE="https://www.batronix.com"
+SRC_URI="amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.amd64.deb )
+	x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.i386.deb )"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="prog-express"
+SLOT="0"
+
+RDEPEND="dev-db/sqlite:3
+	dev-dotnet/gtk-sharp:2
+	dev-dotnet/libgdiplus
+	dev-lang/mono
+	dev-lang/mono-basic
+	virtual/libusb:1
+	virtual/udev"
+
+S="${WORKDIR}"
+
+DOCS=( "usr/share/doc/prog-express/changelog" "usr/share/doc/prog-express/manuals" )
+
+QA_PREBUILT="usr/bin/bxusb
+	usr/bin/bxusb-gui
+	usr/bin/prog-express
+	usr/sbin/bxfxload"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	gunzip usr/share/doc/prog-express/changelog.gz usr/share/man/man1/*.gz || die
+
+	default
+}
+
+src_install() {
+	dobin usr/bin/bxusb usr/bin/bxusb-gui usr/bin/prog-express
+
+	dosbin usr/sbin/bxfxload
+
+	insinto /usr/lib
+	doins -r usr/lib/bxusb usr/lib/prog-express
+
+	insinto /usr/lib/prog-express
+	doins "${FILESDIR}"/pe.exe.config
+
+	udev_dorules lib/udev/rules.d/85-batronix-devices.rules
+
+	domenu usr/share/applications/prog-express.desktop
+
+	doicon usr/share/pixmaps/prog-express.png
+
+	doman usr/share/man/man1/bxfxload.1 usr/share/man/man1/bxusb.1 usr/share/man/man1/bxusb-gui.1 usr/share/man/man1/prog-express.1
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-misc/selecta/Manifest b/app-misc/selecta/Manifest
new file mode 100644
index 000000000000..3c5193912a15
--- /dev/null
+++ b/app-misc/selecta/Manifest
@@ -0,0 +1,4 @@
+DIST selecta-0.0.7.tar.gz 116987 BLAKE2B dda7f21ad939780a1d631086eb669f4824277c9b9bc4a762fa56e201fca3202ee8fab63ea1328dfabf868f4c430456969be99ec1520afcb8c509518f589a3a6a SHA512 7db8fefa51411c6b9996bd1e19889902e807471bb76309bbcace16dcfae70cdb71bdd7abd2c1a96b99d2fe1f9ecbdb1972e95485a2d06b3e3258303a0fef2018
+EBUILD selecta-0.0.7.ebuild 612 BLAKE2B f5392d93eb8e00563aa659649071c8d4f75caa73276dc177e975e01a49530a5542c03f7dcefa168e12b831a7244e0b96d72bb22f6131eb44177c3287cbb876bc SHA512 882a115d5702e7def5b7139688caea83ce853d044bcd59e4814501e32cf323c3b8259a61a646f6ebf73cd047666493ef9826e7a2204ffc7a3cdc7f5a70390296
+EBUILD selecta-9999.ebuild 612 BLAKE2B f5392d93eb8e00563aa659649071c8d4f75caa73276dc177e975e01a49530a5542c03f7dcefa168e12b831a7244e0b96d72bb22f6131eb44177c3287cbb876bc SHA512 882a115d5702e7def5b7139688caea83ce853d044bcd59e4814501e32cf323c3b8259a61a646f6ebf73cd047666493ef9826e7a2204ffc7a3cdc7f5a70390296
+MISC metadata.xml 364 BLAKE2B dd954ec6767c68a6ae792b545fe4a11b15630bb77445e146aef6577f71a05d01cf52a8b6afac6dd304ed0d9429453edb16b3f47008b411f331e786bd33c01efd SHA512 542d4cde25dd2756b2927d22dab88cfd2b086b01fcfeafe93aa9bddcbc7b2878e2e048d379572bd06a59440c2b5b255d43dfb7dc8e1e4ce59a07ae7622948845
diff --git a/app-misc/selecta/metadata.xml b/app-misc/selecta/metadata.xml
new file mode 100644
index 000000000000..6bf484adc0d0
--- /dev/null
+++ b/app-misc/selecta/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lucianposton@pm.me</email>
+		<name>Lucian Poston</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-misc/selecta/selecta-0.0.7.ebuild b/app-misc/selecta/selecta-0.0.7.ebuild
new file mode 100644
index 000000000000..102d07f58dd5
--- /dev/null
+++ b/app-misc/selecta/selecta-0.0.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/garybernhardt/selecta"
+else
+	SRC_URI="https://github.com/garybernhardt/selecta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A fuzzy text selector for files and anything else you need to select"
+HOMEPAGE="https://github.com/garybernhardt/selecta"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-lang/ruby-1.9.3"
+
+src_install() {
+	dobin selecta
+	einstalldocs
+}
diff --git a/app-misc/selecta/selecta-9999.ebuild b/app-misc/selecta/selecta-9999.ebuild
new file mode 100644
index 000000000000..102d07f58dd5
--- /dev/null
+++ b/app-misc/selecta/selecta-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/garybernhardt/selecta"
+else
+	SRC_URI="https://github.com/garybernhardt/selecta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A fuzzy text selector for files and anything else you need to select"
+HOMEPAGE="https://github.com/garybernhardt/selecta"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-lang/ruby-1.9.3"
+
+src_install() {
+	dobin selecta
+	einstalldocs
+}
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 651fd09ada7d..0f5ad479ade3 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/heimdall/Manifest b/app-mobilephone/heimdall/Manifest
index 303052e113a0..b830c5d5cece 100644
--- a/app-mobilephone/heimdall/Manifest
+++ b/app-mobilephone/heimdall/Manifest
@@ -1,4 +1,4 @@
-DIST heimdall-1.4.2.tar.gz 5486693 BLAKE2B 213bfa5bb7ede8d418847916a5ec16c17e4dec7fcb07de296d96e16c929634167afb57e13cee0e8a6e42fbbddcd2f2e0f5069cfbc3e8c3b5721d2d303ef48407 SHA512 c554662f9ccb763a8e9867a0c563618879d2533af985d44db3c237d3ee51add44c1681d13b1a83b72b30ba6e5b32d7c2f9c02b31114c67c5fbe01cbb010acfe7
-EBUILD heimdall-1.4.2.ebuild 1087 BLAKE2B 479ca5811cd315a1a7b77709671f3c70956e2597558a20e622a8eb7820d6880654446a281501da14a82210768e52761a04890b93337661707b6d33a116c8d27f SHA512 410af64dd8b82467fc1eaf4f81450670a9199a57267b8da62f00712cbf48300dba23f780f166b77bcb9f90334fa02e400dac5abd5ed3f4f49812300d9bd6a9c3
-EBUILD heimdall-9999.ebuild 1087 BLAKE2B 479ca5811cd315a1a7b77709671f3c70956e2597558a20e622a8eb7820d6880654446a281501da14a82210768e52761a04890b93337661707b6d33a116c8d27f SHA512 410af64dd8b82467fc1eaf4f81450670a9199a57267b8da62f00712cbf48300dba23f780f166b77bcb9f90334fa02e400dac5abd5ed3f4f49812300d9bd6a9c3
-MISC metadata.xml 350 BLAKE2B bf0c1a7237f44596f61802c67ed46fb2e8b85d4ddf38fc235d625ffb2dce123f245f65497293f9d76daf59f8a327a2e8fc7247d3062001d44d4c8242c08131cf SHA512 bef074ae5251d966c48420c9ed1c61e1cbf36636823e8b237914087b31e300c2436e3c7479da9762d396412e6767ebe3c9453fd85e958e603a0639268c539f77
+DIST heimdall-1.4.2.tar.gz 5486708 BLAKE2B 3846176440f235bc5bb65ac77a2d86b29381dcdf8e999edd38529f02a9f3bd21070bf922ad48fbd8c73c58e1f4834345da4c849549d136dde82df8a68cc4155f SHA512 ed9c5cc7e9377647474ba1af8b7a06d7bbc2371d379d83c2e5cd8463637c52c08c269ab18b6a0a0bec91be8101978748b2d10dd78629ba567bd2c2e452633f63
+EBUILD heimdall-1.4.2.ebuild 1104 BLAKE2B 5c1d639ac2a73ac032a737d3bfdbbf174f07365d090f2ea2d89e8d65e1dbd4403758e68b6220dc50cf6124b1e4c23bdd07e7aac8ea6822c85af2477ebefd7491 SHA512 64f66eb007602f700fe57d78b7eb4fc4af3e23b013708fa2f8232294bedf9bcb91c549126118847bde6dd051e401a15b94e784ad93ab88935b92eedb69f763ea
+EBUILD heimdall-9999.ebuild 1104 BLAKE2B 5c1d639ac2a73ac032a737d3bfdbbf174f07365d090f2ea2d89e8d65e1dbd4403758e68b6220dc50cf6124b1e4c23bdd07e7aac8ea6822c85af2477ebefd7491 SHA512 64f66eb007602f700fe57d78b7eb4fc4af3e23b013708fa2f8232294bedf9bcb91c549126118847bde6dd051e401a15b94e784ad93ab88935b92eedb69f763ea
+MISC metadata.xml 349 BLAKE2B ed767cd626d807128c617828a7b7c8d789644a86d0b88dd6b53806682878714e795461e1abd550e81591ac9c677dd0a906ecffd1de97ccb9e6378bb81590b083 SHA512 c835df6fd37ac66d692a02fbd0b7b2e5b2eed80837be0f15b4b403d25b1588a4343c38021e96733918576f8cce0392abd87d65624264fbd713b4dd9fc2c84b57
diff --git a/app-mobilephone/heimdall/heimdall-1.4.2.ebuild b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
index 02bca30a9f23..3bb74e9129de 100644
--- a/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
+++ b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
@@ -6,12 +6,12 @@ EAPI=6
 inherit cmake-utils udev
 
 if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/Benjamin-Dobell/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v${PV}/Heimdall-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/Heimdall-${PV}"
+	S="${WORKDIR}/Heimdall-v${PV}"
 else
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Benjamin-Dobell/Heimdall.git"
+	EGIT_REPO_URI="https://gitlab.com/BenjaminDobell/Heimdall.git"
 fi
 
 DESCRIPTION="Tool suite used to flash firmware onto Samsung Galaxy S devices"
diff --git a/app-mobilephone/heimdall/heimdall-9999.ebuild b/app-mobilephone/heimdall/heimdall-9999.ebuild
index 02bca30a9f23..3bb74e9129de 100644
--- a/app-mobilephone/heimdall/heimdall-9999.ebuild
+++ b/app-mobilephone/heimdall/heimdall-9999.ebuild
@@ -6,12 +6,12 @@ EAPI=6
 inherit cmake-utils udev
 
 if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/Benjamin-Dobell/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v${PV}/Heimdall-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/Heimdall-${PV}"
+	S="${WORKDIR}/Heimdall-v${PV}"
 else
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Benjamin-Dobell/Heimdall.git"
+	EGIT_REPO_URI="https://gitlab.com/BenjaminDobell/Heimdall.git"
 fi
 
 DESCRIPTION="Tool suite used to flash firmware onto Samsung Galaxy S devices"
diff --git a/app-mobilephone/heimdall/metadata.xml b/app-mobilephone/heimdall/metadata.xml
index a32d39ae12f7..f4846dae2896 100644
--- a/app-mobilephone/heimdall/metadata.xml
+++ b/app-mobilephone/heimdall/metadata.xml
@@ -6,6 +6,6 @@
     <name>Lars Wendler</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">Benjamin-Dobell/Heimdall</remote-id>
+    <remote-id type="gitlab">BenjaminDobell/Heimdall</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index fe8d58960f04..7a0bd694bcba 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index 9c04eb45819a..70b0a1c5579b 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1,3 +1,5 @@
 DIST grisbi-1.0.2.tar.bz2 6956892 BLAKE2B dde75fbae341fc03226083567ff4731457abc7079ace92956c9e8b35ba4140dba32dc67ebe3b2a4826750229dbcd09da0f2eaf1f18c8783238d3fee274c46be9 SHA512 5988d362db8e94f135af34de1acfd7222ceeca11d229ffca533ca75c75c8054dda121bc45979106ee8f4ed2ac0660ba7836dfd053478fdbe4a2984cb94be3cf8
+DIST grisbi-1.0.4.tar.bz2 6965398 BLAKE2B f53b5cd7f2e4b0cdcf14732ba7e03315ec7d419c7f6ab3a290fd30a9dc9f7c0dde69b473dca3873aeb90b793cd90287c516f2fe4b7a50d71368abc3e12ce16f6 SHA512 9761ed94db563c39cab793ee076b6a729470231e3111d7ce57d188a6f1681cbb715174f67c15741320f295d4efdf0784f6e3d4d4d58267759efbad56561c7064
 EBUILD grisbi-1.0.2.ebuild 851 BLAKE2B ed663f8a87f1f917b1854bd0d077562d82559df468efe624972619379038a7fbb53a8eb8dffc69b002599ffbf5d04092f95ec0cb4d286c2232f7f9018ec6474c SHA512 b424233da058418dfc40a4fadef7beba94e4e3caf58441b1ba18215a5f7203ded75bf31f1e4a056350cc2a22fab88ddb111379a59d0b4380ccecaa73cd52e012
+EBUILD grisbi-1.0.4.ebuild 853 BLAKE2B d311fc979e49e45d4d9460abfeda1c11b12646db3d918b6c648cec31a756b89a3f2edfbf1b319669bbdaa857d599e8b2f14d4f9c10ea0c8d73de8aa3785c37e0 SHA512 1346634be750f248aadf7347b9a83546b1aff2452babd389e75291ac42508c79a838942dd5e04dfb659557242f38d71aa434d58516c116256bb1d0dea81996bb
 MISC metadata.xml 635 BLAKE2B df6fdefe6d4474ec7b1a5c1a68572dcd5879ccaa2fd09c217ac28790156f964a0a62e5460e54113389c664437d8f8b3917d1334fec2a78317b9105f31b9fb205 SHA512 c1c5f6e2bbe4a11958cc78c3f61d8045dc89bddd640c15ef93c52de9acdd7cc00f483ad1c06f3dbd36fdda998a45ca0c31d6e188ba17ed4bae72f8a3b2c21766
diff --git a/app-office/grisbi/grisbi-1.0.4.ebuild b/app-office/grisbi/grisbi-1.0.4.ebuild
new file mode 100644
index 000000000000..392f5fbf64ad
--- /dev/null
+++ b/app-office/grisbi/grisbi-1.0.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Grisbi is a personal accounting application for Linux"
+HOMEPAGE="http://www.grisbi.org"
+SRC_URI="mirror://sourceforge/grisbi/grisbi%20stable/1.0.x/${P}.tar.bz2"
+IUSE="libressl nls ofx ssl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	>=dev-libs/glib-2.18.0:2
+	>=x11-libs/gtk+-2.12.0:2
+	x11-misc/xdg-utils
+	ssl? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( >=dev-libs/openssl-0.9.5:0= ) )
+	ofx? ( >=dev-libs/libofx-0.7.0 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--with-libxml2 \
+		--without-cunit \
+		--disable-static \
+		$(use_with ssl openssl) \
+		$(use_with ofx) \
+		$(use_enable nls)
+}
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 59c26430102d..0297c62c640a 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -1,172 +1,4 @@
 AUX lo_gen_langs.sh 1469 BLAKE2B ff7a1744a71711025812d5fb40e803f5d111069099ca9d94ab408c0307df6c8fd0bc0b645d67127bb0d1666787ea3e0c546349b26373e5067446f929d5985003 SHA512 d683506baad2ddab1375a006f237661736e78e2f81a93cbe2c168f6bc4f67125ca1fef152fa4f8adbd59fdaf2b00eb13c8697863b0ae601eacc97f7395ab2eb2
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_am.tar.gz 7942171 BLAKE2B 55fe01c6bde8688fb58dcf34bba5094c37abc8d7c5556db49d541fbab3ef45c680c5c8e15282605a0d5a24b3e6097bbc1e049d87aeb161567da15df47f944eb8 SHA512 0bca472a857562c22fa8d8bc9b26e3b1ed0677c7f94484891fa9a87ba488ca223a0009fc4f47fdc2af2046b79f8ae51c8701b88e151584b7ae62e29cb09dd5c7
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ast.tar.gz 7872153 BLAKE2B 3a5c45223be61f178aa2e032be288006d3e55a535bf8ce3693ed1b15f83ac4cf4209465d00066652afbe1739c2e86a828921bf14eb3ab60ec099bd027fd2adb6 SHA512 e1a962cc358903b5c7653d076bfbbb170132e2684544cc8ecd43fc80755efb73a21cfc9861f18e651fec4585ad20afaa7a1cf5891444946b47d1c2e69c7a1e3c
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bg.tar.gz 8413835 BLAKE2B 48c671460b8d97a881211d223d50fb0c486f95a5407ae81b2e97c527e14ebce854d67e8334f8655f52fad3c15c17c09d804c8f2ff7704e581ad0d054b6417bb5 SHA512 63fc31cd4f3f7f59c375e77f905af00a83e5e124466629a962c1d45d8e089516f8d7febb8be0084de7a134c87964fbc9298763a5660b0636e37dbd312717a777
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 9126777 BLAKE2B 9a1098e0efdb35129a4dce8e022fe677288b3d4079291f2334ee9ad0b3d173a0f634b526d31031bc9afb96b605aff4cb046d8b7937810f7c525009701e159277 SHA512 12a191b39080c8167268e3d67499e983d010b3f37d31465bb05f9959f7bd3ed419d6b0f41981ca9eb7e6eaee61695a172a753bdca65813bb8df0de3f990a3edc
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bn.tar.gz 9126599 BLAKE2B 1d254a5db89dd8b31d07112c70c42aec33f996d8975c703e1d59fbe637db55539395d524d8cf2b9b2d3b84e601980975e7efb6f670e83126b438d48f520fbe0a SHA512 c40c6b51d4313fb3a37963ec60768f72df982a5d8372ad23f27dc98c88b69e50322311242c51c16d8c8da8c6088cb26224ae7eb5ef774274310cbb6931c9441d
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bo.tar.gz 8872871 BLAKE2B 36d0707b0afd222df978590b16d7187d15608ac7d18e82291f066b5c5307d384195f71bbfce0896269e0fec4244306583149eb9e8311c1043c6dc88e3cf92a7f SHA512 1417a9168dd107ea3f3c7bbe0d783a917671b0cf2b1f03c0ca12f16655daf11b2f85e5edb401f6367c4bdcc7346a473ad08ca75f7746889bf3e8e2f9b801926c
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bs.tar.gz 7174890 BLAKE2B b391dfbc2aee13dd82f9c818d5c68b83aa6ddb9360c03d1185f05e7477671c46499770b083ca6505bed91da35183f14c2923162ab6d3e6fd51ce8bbecc131e72 SHA512 12d5e265a11583c7354e3f6bff3aa757ec34eb43bc96f486a0bc2874e17ac28e115d16844059ef15bcbecc877960c74ed1f02f909b2ed63ae09296a7ab33fa2b
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 8010326 BLAKE2B 284278d7ea6c7bb5b8facab5e7dcaeaad380b8ca88c7c796720b5500400335a17628e18661fc2bb48105be85f2f5ada2947d8d7de4b7d1497aa4c4cff6bf7f2b SHA512 72bbd27eaafa3aaa5647ed38c8db85d9a7e948140c42b5a358bcd640a05537213a3f239bb6938c2f76eb880978ae8cbd3cc3a2176a56180b171c78b5c88d29c5
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ca.tar.gz 8047029 BLAKE2B d688b7d1691ecfef3bde171ffa741e38b818f6f0b86c6158b282254f4c2a6c82bae54027f8e802591e193275e17b0b07a68ff480eaed1599c24c3adbc0aa8f94 SHA512 fbbe88eded816d3a7b596303f20140ea7be51008368790fbb08bfae0c7fbda9869794d2b8bfdb4f971a25691a73bd6f2cf6895f98aa46cf8d21c23d772b7b335
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_cs.tar.gz 7734583 BLAKE2B d119d20a41efea3a36fa27b34967ad0d5dcfb20dee6214ee83489c38891e01d8d03d538dd3653cd3130b65d28a4c74a6801c3230298cfc56d0e54eb00d6551ff SHA512 0dafa2246057c542640b25ce520e521123d905998f3524a60e3073bfaa53b800486f218ecf933748caaddb2e0e474d61b04d600120fdd9a0dc7fd313ac00789e
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_da.tar.gz 7679027 BLAKE2B 60ce8ccc4da6a022cb0b3fc6a424081ab98db3f76c46e7b5387b5f573c802d7495116906602aa17d3de5e087bd5c81d620821cd53d33bf7cf8310d59e37dfd01 SHA512 818f78a5bf9c2a413f2ca2fa704f7c751cf9f3c0b27dfe592aae3d06b9090f026be3991891709196d2affded406a592805fb64bb0cbb153c5c2e770a6ae65b01
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_de.tar.gz 8188681 BLAKE2B 99ba1552f09d9ab5ceca476299b8d6c1eb23996f105746333f3804a46bed755a90f1f75c336adf1ec3be61ebeb6eff0383fcb392dc4dc6f8512fc2f1716542a5 SHA512 5e81c5afc4058a8fe7118393c180b843ea961f3758ad3aa2f1b425e2635cfc999ef34616c5f157bbfc06d55267c87312d9952bba5894d6395430902d419d62ad
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_dz.tar.gz 10258409 BLAKE2B 7210fee6fd84259946cc61bf10c3ea5dfa6c9725f6916dadf47b3628cd700c32959381d15e2e1fe7adf75fc53417991a91d6d1172bc8b40383fbe6cd3c28ac3f SHA512 033546668c4bcaae81dddc7926f2ab74e674371d33c167d3a7aa4c2df915fc2e4f0f8bcdeeb900f350b7d5c482343d0fa6d7c7d62fc01198f1a69fee150411cf
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_el.tar.gz 9061896 BLAKE2B 82897d1ec0336a45d05608c825e50bd4fc131f327705e1746063659c4ab6d3d279fd83e293df186209d9991bf0c0e910b365b9df8e8e1ccde9a25367662ae34c SHA512 85db76e28a03305bf3d630c936d7c000781e05711c623d4cd501b4d0c556eed01333a7459fc8a1ba5aa439b0c67aab90f903c0a1dad08f593345c830dca66efe
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_en-GB.tar.gz 6513058 BLAKE2B 80f114858d08310d9f397ade53ee0d2f091cd9daf0f469e9c18006734301968c2afd8d3181321f1e018c352f19fa46377b0750750441ac07cbc05379c8863957 SHA512 121911a796359a7bf74d285a308e505f2a31f71c5410bd66c63eac3465ad0eaa269614eb8df52c0a88435bcbf6ae129edb7fe2964997de124997c084c65090b3
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_en-US.tar.gz 6549858 BLAKE2B 110bab53270f759a4d617220135fc64484bfdb4c78e0578b756db6d2e9372a7227bbeb348228299fab7c2d5a5dd9ef61c9a7faf7bc011e77772b64c708d978ae SHA512 38ffb39e1c06c79fa855aefdbbd464482452520d6b8e7e2a98026afc0e3fd6296e3bbdad8f5c1df9543f6bbf08570b5276f07afe372d66e2a18bcec6c55ad215
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 6494985 BLAKE2B cd3d60a3f8605f433a1ee8dd9b9f072ab161d46f958fe9fd888a27dae843bcf5b7b9ded0adbcc1c3b9913210448f17ad53a8443cc084e09c83e7e8ae62f00a68 SHA512 d2b23951f8ad8a8969c79ce8c80acc3c63a15099f4e60ce6d099e7ed365ab38f94f829ce5694ca2a498d98ee16a8c4ead84367e4084040e310af24cbf67ba787
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_eo.tar.gz 7076836 BLAKE2B 20ae10872e6b1003c710ccd2ad9962e8325423effc2c4823cdf6d9df5a3d2a51d04680cbe43c7decc07c9af9a7c97231f9829cc700b1a82f46cd3a312514aff8 SHA512 cbb4429d4eff3aacc8747cba725780d70427700f2e1b9b78698ebc0af6e0555dbcd7ef6f2dfeb3276ed0329013f4903cb0b553b4c255c1df3d4a3972ccc75678
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_es.tar.gz 8092213 BLAKE2B 6ac267b4f5b4530386d7d8394147b823146d50d085a369158b8112c2955610a9c79df02e316aefafb5d527e6f6179ba0c52805140c99572c6228d397bb4e05ad SHA512 c182206919943ed55a74c40347f6ae75b158798806c1ba4915cbf19a952552e43e365d6144eb530b404acb6392f3ca29f7ed33ddd3896544c7668783b8454ccc
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_et.tar.gz 7604604 BLAKE2B 695a1b0ffd30ad870c05d40d8c77cc3010074b904c49c40c5a574b879e8022bc90fabc8737c99717928e61c9cbdb83ff77ab4bccc0afb2f4eb3619ce710abbf5 SHA512 015d6a1432d51a76bb98913b5552e63beaa1a1c431cc86b181c8ab9f8d8afa97d36c34bdab3b56c51f5b0f92b29d33e8c1b85e28a808b55c12d1298d6ecf398c
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_eu.tar.gz 7673005 BLAKE2B 9d67da90a698b135e72fcd6b8fd60fed4f36417683062155ea61f556aa4335c54684d34ec667653bdb839ca9a7bd44ad9af5f24b2bd5017a3ec3fc6b3ef85be3 SHA512 2da0e72a8368725c8989ff26b0386dc50c1dcf319a95b3e1d7b76e7e2b4c51ca67a41af91d745d0ec79bb4a9bdbc0dfc5df036ba31d7daed6b57ab0c364a9218
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_fi.tar.gz 7839404 BLAKE2B 19508767400041ab5893702261b05930603190b5ca9f70c467c77e3e44a342e6cea4452d4137f3732e9d1099c3aca858c339e4afbfaf00fe94edf0de81a560f9 SHA512 3a594cbe94d183c50c76ed46e41ebb135ac6b8ac7cd39b483a7f9a5e7eeedef02dea52f2bf128b9e489ab44ab2896be3238110d5412278892e2d2b54cfcbde7e
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_fr.tar.gz 8274265 BLAKE2B b7bba3e31e3cf7909b761a08a6c82b8f332b4ca0811a394c6fc6979de09ef38244bf91e7d7ff036a50c3280f05f2c360c71d39f6d0ba7d5c52a871c7f1618c68 SHA512 500120b14b6cd408d89b4cfc5b9a4f4d23c798d460688a8573109a73b7ea35068258ecdcde30a2290233900e499803ab61ca40d0f45a75027dfa63ffe68ec612
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_gl.tar.gz 7763056 BLAKE2B 19b9d21f8360043c67d1a39da356127fab82972e62455b9a7b97c8faadfa07e51607b2c2a6d354e49880867633fbab035c8b20414132f544bf5f28900a7f4a6f SHA512 4f99c1904d73c74f412ff93aa727f3f54f3425c200e2b9984c820a65fdf582d12ec79f3191c1afb800a7fc5472c3dea433aaa1015822138e6203e542170f003e
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_gu.tar.gz 6709179 BLAKE2B 563d6ae2daade46bb8d879fd864ddce744074a7243de6aa8e3b8a57224df16c80f99b57ad14caa46fa689e2e09686fd7ea19a46a76400c8e5090e9675b1afc73 SHA512 fc3ddd8e7a2c7a9bbb4a1c5cbca847e673794f17bee4a2553f4fd94f156c82cb681cfd1ad95b4fd321482c4bed07c742cf6aa8cb79fac234db359fb390ac123e
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_he.tar.gz 6321138 BLAKE2B f5032687d4040c60abaa8b88605d8c2524a1f9b82fcc878e747234cd129b8eaf4c6e5cef38aec2d86a95ba9d67df05420271f02a19dda47d8a26487972ece7cb SHA512 bbea25d7f2064dbeb49a9a065d6c9fecaffef8b437f45b71062e737fa32eba40a7c1fbbabe7aa997e66ce77e3fd6d7208963ca11f47ab2af634d581eb6b6cbb4
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_hi.tar.gz 7359956 BLAKE2B dc959da46a831217cf1144f15e7d7bd552fce0d356fd37520830b254aa417625bee71cce5278625580006ddd4851dc0e57ab2a0de8f9646620223731cbdefa56 SHA512 ed88cb1f13e7fcf4d5de53ec21b079e7eb3d88e3cd4f99774e337651048daed61f443aee7124fb1938ae3570992c9ee8c6c72c57ea3e068baa2027571518893b
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_hr.tar.gz 6863750 BLAKE2B bd911139054596fd514b79c8f3f7602247cd96f34144bab7e26f493d187e776ba665a6ecaab501d5c308ce6712e38d7779416bfff24140bb1d0b813ca7637b1a SHA512 52757b991484e184a0702fb4ef4e6c84c6e7f17d877a5370d548cde4445529e6f48101e85ecb942c85051e275b10f9edca33ba145d6a2d422ba90f10d2684783
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_hu.tar.gz 8152740 BLAKE2B a51c4ff95f1073fdac4f42fa9c73c34ed3369e66e24abc1492637fcfe4573b44edb6ed57b429f9342467fbccfda0457b899bf7300955b456e257efa9bdbe80a0 SHA512 233b42883aceee26a9f13c348d96812f438ba6107402a1ef87ec10b5fe1f589b87d20d0368c92b9ca354bfd605159f0d23356a7b56f70e37af1cc07246da9276
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_id.tar.gz 6916811 BLAKE2B 67198f3f7d4feb1cad7f60cd99aacd55542a0491c8ce878b76981d6f96c0e2a3d0d017f569044b2b3432b2aee652393b0c106a47543f08fdd1fb54337a92a732 SHA512 eaa9594ba8553ceb0ffc330f52f2955e317cd49ed4459ca29379c4dfdd606925d3ef34ae7868b34aa6d5fe863dffccb048f8213690aa05169a83c3e246bca37b
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_is.tar.gz 6994967 BLAKE2B 96823e4b4252169ae49ebdca5796cc3323beb7ff33c6691f2ce1eb54c87f5c6adabe533c4c152e95087135442fe8cf717246704b9f368cec700f2d1d78d643bc SHA512 bcb702c164e64f3c9e1c7b07c3ad35a4ad6748c1b9481aecb5f30344e1284723f3960dde620d190c900d20d8146780607f25d6572799a31ed7f3d85ac02bb67b
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_it.tar.gz 8031615 BLAKE2B aef293805da1478e429e59e579c2c1ceca479ad38231fac63381cca48059fe2f9f3b29c1ce67ee6c6458b4d84f29a05e5067fd880bf5f41cda9d25936390a5fe SHA512 4baf01a7026965f374329cd32b59d7466c110354e35e98ed874b7ca72e9f2181c9838d8c78032a03e5047084f71e767d3c6b923ac5c2e6d2d224ef63fa2560ac
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ja.tar.gz 13187624 BLAKE2B 031a73ce000821992c67c7622c85746ec9ed650aaabb1990d864ca6b152108821a119d0c45e6dcc352758dc1941847e4d4a603c48b8d50d1ba4283f0746ac84e SHA512 ace3ccf6f5c460658c8e60f8651a5e75ce2e5b0c07f051781e8ed7eedb851ddea564a365a2fc54914d033baf0742e0f799a1aab8af4ddaa5139f9791859d07ce
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ka.tar.gz 7158832 BLAKE2B 70928355fe0f2014aaf7567cdc58cb76fbbb12568036a9c3f707363ee36752922cc3506522ea05c90d9cf28865cae7f1ca9d8af765e3aea64d30d3a1adc0e07f SHA512 779db2ab5d6cb4b097f6f38383c11f65ee05743216621f209d83816f44d84fff039da631832f6cf6b637ea780ed49c60b24740cc7a8f3e7da29eb41e481fa6f3
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_km.tar.gz 10321040 BLAKE2B 097f0c3b5e1107455f621ea40cf61653192ed28ea882013945f3f67cf392b2f3ec499f922d169322784e59fad247e14434d0d6a54360f976097b3b0fc1a60cbf SHA512 aa66228bbe72744001199654f4b06fa8e6f05b6598324bc7c05328bd2f82e241257d8b5be45690d39bc80e88b9c9f1de81d93e781fdab5c4744305d986882cbb
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ko.tar.gz 9396708 BLAKE2B f91cfb43a33cb7017534938aebd098f930126d63dd4e36f26b96c84c23b0461a47cf8899ada2b80a52d3bdf9a14dde8e53363312e5e4ed90acc64f5c6ab5f9f7 SHA512 53a14eeca01ca72c9976b1950b10cb9211b7c4dcc00cdafe98b430666ef45279bb23c6251a6f3189ca92d62113a23e5f1ad1926ea2683be68244c459e1d427cd
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_mk.tar.gz 7374004 BLAKE2B 1f752c5c3092267b9c1ab5554c0d841fb38d4cb547041652445cec794ea39eae867ca891e374077c56c6e8a9289d296e53956f1b3eafdac172b1efb6e6ca125d SHA512 751c8fd95b1657f501a3e864f93bf8ed9c9c8e6bf5dd434c0a7a7eabd74175211710e86ec6796d065539b7676d777fbed5a1540d9cb890dcf4bd6170c892d16a
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_nb.tar.gz 7728385 BLAKE2B 4961dc51f8b304b87b35307216c0b4d7459d17e580c905297df096c7c75acf753f6fa5d08528137ca18a5250f98fed61ae41279f412377dc3e565124edb0ea42 SHA512 5f7bb73a418f3e1919ed487efef8757e74545270121268c8369f0cc8ebcc4aa363b44fd8acd160ebdf8fc32f95b60d74523ee4615d81554e6635ed8305bb2a54
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ne.tar.gz 9776739 BLAKE2B 7da96637ac99ab90b9b34ccde04ff2bfe4c7a7509f380bc1220dd2ac10367c0a771c14b2e7bfc85c277b271ea9f9909e681840a339f03609a3868b9a452485ea SHA512 bac3a94de28accccebbd1e57088a72cf2eb0b6a5dcb2de926b8fd92084696bb0a0c76d3a030b6224b14d83c270e3c06a1019d487d5a9f22b7c263cc8b1d7fb56
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_nl.tar.gz 7834191 BLAKE2B 3629df1bca227ece3f3acc402e4b436b9491dad5671d75bf88f0134dc6d7d83f45f98cf1c355e7e758e0350f2b0f38f15f101e1b63c2954a1f98d96a66c66f3e SHA512 40662d2ad96f3702883a545cc40cd4089a20b641b6eb5a9cf0db230123bf018ed888709560fae3bb613629763e13e4be81c037c4b058e11450cdf7d28b4e5993
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_nn.tar.gz 7708310 BLAKE2B 1bcab14d7782ddd9d2dc314932f16d8aaf74332acc817a9410513ab362cfff76c257f0aa92d078d61b7c8d7e7a5737058c949db2fdecfeaa00368f7659996b77 SHA512 4448cd3f98689af00a9c9afa43b65e9a23b841c072a3d8201923b2060e92138891c960334fa6cf42890ad46a65a7664331c3fa26fd1853dea055a3e03f0e9f5c
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_om.tar.gz 8028424 BLAKE2B 76fab64ada5520bf2305dba9b0475582008d4a76d74d56ead6195dc37a42e4b96e16a74ac6ddbf56647dc1f4893edd9f1fa814fe73db0ae4c444522e033245c3 SHA512 cb97a506eb23033777cfee1bfbbae8c1464736778374cd2340f17ffe90b90f47f1a2fc17413954abe34d72f18a01f6d826ac2edcad88441b40ad5a9e0cdff62c
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_pl.tar.gz 8169260 BLAKE2B ac3557d3e7219ef54fe8c58c08327472dfbbc7b330b47cb58ff589883de638545e7bd19687d469328202b6315a0c9e759e33d8d98114dfa1ba013bf00435668e SHA512 b4d653e1831b32c5dbb233ad00202a4ae00e709506496db50da1c73c3d2d191c7cde9c73b0b548d8c0019cca8463bcdb99d21bcf79813d7744b1b40cc09dc612
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 7842164 BLAKE2B 4f5a23b9cc8bf4099affe64ac48197b172ffdb20ed402fd509b015f924e700f1be1ed9eefa5c787d30ce21c34e931562fa6ae2e657ab15f097a27f57dd8bbc40 SHA512 aad7f712ded63c13ee6f4dca678d3ce5991b38b38d4afe0651f4ed6fdc829a91c6e416da7567d002038947e0c275aa90a90516e4d86c340b307bec94a0ec306c
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_pt.tar.gz 7811732 BLAKE2B 38ccdbaead53c6091d99976f8a66557d09519a5a2d30e01d0650cfc22aeb1acdd3feece1d6df1393a2cb11a77c2e6f86756c1c76dcf8e9dad2114f0cdbac780f SHA512 5e3042dd3c036d369ad550b96f92a021f9818e53c51a7e05d894ffbe2173e5c8a092d339cb20cb730fe000aef11cf4c5838439a0ba5ba1743f824325b299cd34
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ru.tar.gz 8460954 BLAKE2B 9673409f5b6e52120b33acacaedc149b8abd6c14f9934d12ffd255ee4cb21c90d3f0423df3071e1c199555ff4c168397fe714001ea9de91143a83aec5f68e926 SHA512 a72aa05fcdea05c38878849a41fbdfc12d2ab6496a18a36e8d517e11e43d92f7a9f6105f9074f79edd9180f87a9f6f6bd56d20d9457f1bd6b9221b3db408937e
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_si.tar.gz 7249053 BLAKE2B 55af32c05fce0d6bf8a341031ecd8dfc9775a1e92d3d66769c4c3484b8665eb56df226421ca45e993a3335b32a231e6c638c9215d1bce63fc9b27ef1a173b664 SHA512 e56aaec88eee38a6002b620381f30200d1c463ae1d104f80a57b9a31119c5a79a7af70c467ee8261d0e20402f25afcc101a27458ecb261db3b53b4f93f889465
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sk.tar.gz 7551148 BLAKE2B eac1e99a8ced838bf28e3b05fc9ceb14ac6c1457b233ede1cd45e16ddca901edbcae59e4380a63e6bf0242dab3b9364f24bd9e7912975aec824381d4a460fd85 SHA512 e09a7e3e293562d92b78ed69a7941bf029da483dbeee0262073bdb8099f9291b172e08d509618bd8d5c0a9fc358db424e0932c44816b84e0bbfb2d5f322b174a
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sl.tar.gz 7852306 BLAKE2B dd12674a20c0fc9fbb17d3f5765289604d1ac47eb916af76200a8654115887901a053d6eea27b4b8a43fb7d93ccb9bf3e0c99d4edf1d52a4ed280e8f68a4722f SHA512 bf1a33804f683b5fc4150cf54f2a0249180099fef38000edc95082c8e65cd66a5e14ef73c6d8cf5968cd51b90ea771235483adf2a56fd95b3973302ac43eda5c
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sq.tar.gz 6905293 BLAKE2B 0f98530fd6a85d5f5780497f3a3f1232fa267c3b647f0213026f239726e8f877247caf389bda5210bdc745da5e64f0f9b21cf334810ad48db210ef0e95c8fe63 SHA512 99a2531aaf15f9844f3d3cad4bfc10a00a28f85cc26d70b53101eef04092656fc6c351869610da3a7019991eecd3ea9d39861b2fe99ebbb4f37e61f19e2980b5
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sv.tar.gz 7774183 BLAKE2B 6e4e676664dc74e05c3d7a50d3d50515d3598998ef2f43e3541a9b4f709762f867cba860b567a123e9fa1fe7c7652cced5de6c04ca5e7a3193435ad8182b6b8b SHA512 2877fa0a6f88a9fd1b04c1ddde50c622681c3e7dd52db941071a902750709ecb826d57548b75286e7730234c74596f6b08923d47d63f07260519670b8f9013bf
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_tg.tar.gz 7209842 BLAKE2B 2ec41cef8b0b689a36bbd98e9225b803e5227f14fa1322e53e2cde054640d7bff7afae623236dd8f3838c486de9002be52e4b87c6d2a5949339f75442ac96f0d SHA512 b60300c580f41855711b310b03a82b0a947f77e7ff9efaf8b730164263f422dfb5062f2442d7d49eff6891ac82147925d1ac32e2bea8e6cf6880ecb8233b8b8c
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_tr.tar.gz 7991417 BLAKE2B 7fc5cfef7f24b30515102159dad74380e5ed133f4dcdd638440cbe2d3c6bd4937f900c41e370b8dad588d5490bebb4641dbe6aa1c630ee0fd6acd3b6e48857b1 SHA512 509de586046d0b01a980396f75efa85b872f5df9d1f2522a78bb23e234763629e9493844c7a21898e1bda610e3354cfe2696c2f8125e2ddebbf026bab1d74f35
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ug.tar.gz 6901135 BLAKE2B a764660786d81d7edd10fde46f8d306f6163a640f8a7667e980c6b71a9719045b55615d7385d8a2391b53457566ca683cbd39c504073d0d40b6424a2f1094c6a SHA512 f4f6bfce70d1df3edf3005243bd699d89c25676b2758592f81dad16b26435668b5dc2eee47e892f6dfecfe89eb8573f492ec00f757ed325a755d67d3d8e77ddb
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_uk.tar.gz 7914459 BLAKE2B c4b918037f7f9b84223a7de901ba3d2bbf531358b4b2b4bb45b7c8fc03025a3f95c867a52a0f9409ef55c16c80b73d490410ce1950f2ae97658b9706ae05e9e6 SHA512 a24108e20866a286717256221013477e8a34b79c646aab81e4418e672c2c5f43093a9c9881d2c3642e91b18e5fa084475ef7b2c5969eb1a48a125d0fc1524859
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_vi.tar.gz 8157447 BLAKE2B c7222dfe9f7692b795137f5b6a5021ab6a6559c2cf4d9b92d3e7e26123ce64b77d880847664776ec25a9bd3d2d0a29ffa6bc7c5e9b122195821e07d68e0e57d1 SHA512 a117216e5155fb500cd2d62549119258477aca553431d6c6a856b08b03f124ce8b02f9022d420179f5a872dc359a96954a99356d4190be07701002aa2c522166
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 10730455 BLAKE2B 97187b08f3c1e1bc6bc40844101ff33afd71d411db15b497b63a819988fc62766135ef9955e415ae7a98dc981f03a8763732bc6a2c70623de37932293b0876eb SHA512 17c97ecaa6515f3dd3a94542c80e4478ad8dde4c13da4752949527dd95a91f044f2b8ea1fc76bd97347a4225b00d4800e00c8b023c1a0a3b782858f07b590c47
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 10694968 BLAKE2B 934647764f2ec523a72f94afcb5109a5c0b2de2a56416c64b7f7d81e16e182d718967f1171447798d67922d0eff9d477f97dd22f814d21a174e223a6f1cade3d SHA512 45ee2eb80ccfc340d6a5ffd2a63dae390bd47945135e2240f7da690fe5f368264a528dc12a5d0876209b9689422f3b4d92fae3f43445e7074c90aac6c718f147
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_af.tar.gz 1055325 BLAKE2B 9e60b6d957fdd1d5d50ab288b73c5430d53bc833bca28f7c4f3de8c0bf318873c1cef647e2402704e05a03814e23f9fb2afc3e0582b1ad869908f64a577da08e SHA512 10aaa5a56efcea85a261c71f95150195e863ad3c018c23680fcb604d5601728805720617b0206d77e8a7419dc8d91aeeb971cc606d087f0873ffb3eb40b53003
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_am.tar.gz 465902 BLAKE2B 23b1cd7ac56eb513cae2e27996de8c1e007e46592c807eba6c8fb573c36490c8ec6f87bdb7750cb2e4111a9dd8ad8db857de74ecac5d6b7ef361a271074b2e7c SHA512 0d10eba06c9e4763e10f3da423e755f4b0372b5ed19c16ba0b10ab6e4e9b305e9a82fcc23700dfbb2f9428880145b71cdc6cebcce9c224009e6f259e61f48b44
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ar.tar.gz 2205206 BLAKE2B a41084d73157c6fdf9a77226b414a3aaeb575377bc57df6144ce02df002d6f5a08b700831e8e0d699d6c0a86fba12f42d061a57a3355ebb183b60b18975d5dbc SHA512 54876b038b46bc931d99d7c02a038be771775b6bccc626c55164c7d767563ace86d74aa3b29e67540be734a8b8a3fd3304b027c74938dd1c861725b9c15836c6
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_as.tar.gz 482491 BLAKE2B d5407742a76df23183e8fded8e77baf36ae1814897b59863e40c109fa75df83375379838b2f16812c0adf4354d8d8acb791f93fedc4d1a110b99990e6f3cee81 SHA512 9c0d80a5b239f4ff25107f0f826c05a5055e36255553eb2907dfa1c6b88b425a62aa028ed383255f76c0be3268c7ad553576ae8cc999b2896e6d8e634f423e88
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ast.tar.gz 443393 BLAKE2B 3ae69a3ba409b58f679045eae2b0e4c70d773d016192ee98b4afe49329cd2c6a3f2e5357c86f3786f46e58937f80ab72692627c1cfd73aa1752c6140278d8a97 SHA512 bcd5e2dd014cb5c57ad61ab106bdd254658998db6ecefdb80e6edb65aab12fc9f0c2a4db515f6f3c6a5e9cd88ff3f58fbc07ac87a076c3f758f7f74852872a2d
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_be.tar.gz 840387 BLAKE2B f1c3aeec6f72bdc75083bb90cd4ad116d24e864522824980a6b42a6c3df1635b8aadbcebc563a09fd6a827a02deb7bcd8ed00ebb7c9935254de461bae0b7ee7d SHA512 6e2ef2a334d4d2cbf0da2e1ab47e9debf86067f34ae01d4749f255cab3c86c68637b97e11955c24212ced6cc6cc4a4e3407ade843b2fedf34598763452be7a64
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bg.tar.gz 1902874 BLAKE2B 4cc7cd410ea6b30674d29ad511e6ec6f9d2b10899dd538e21ce399b602e80973c84ef088d632490383a9f1813993e9cc0843c473b775c9a409e43eae89c7bc0b SHA512 1bf068711b13d8bd85a66a5dc0a619efb5b31da1fb8772c6497f265ec66bf53580222ac56535f8485c965099c432f9c991dd799d06d772dd936b527083834921
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 489957 BLAKE2B d3e53aa270bf90e7a2b12ebf48c77ddd3e29b98061da129ca9f622bf6c40b5a6f74cb994dceff2af2ead1087c5d216c098e0e70aaaee647a37a407be9f18787d SHA512 7d26d798ce4374504f8cf5d28102983c3af4154f5d0e72cec95a50c1102c54146a95d1f2ee50e9bed3d5acdd68879dbb03828e72c76349aee6dc9540f58d991d
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bn.tar.gz 836131 BLAKE2B 63af377470a070adb9923390a6956e12ba760741700997b22e2b34eb47ce03237c4e615b610cdb037f4f61e6c5fbc6fc37b67a571b00507b165178c3629a38b7 SHA512 4c00593d2622d82ca2f770ad7f08b9635375d6a2e4fcb64afc6b41f88bffbbb9c3bbe25a56a685db67ba998e8f71cc2c7fa430c4eabad789fc4081d591a42813
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bo.tar.gz 473387 BLAKE2B 4528adbefa8867904f96daae9e259dd64b89774b3ee1e8afcab75ce4852fdee2a3a4abe9baff43555d430477b1ef77f84e0766ec09e27a882b78077ba5bd5836 SHA512 1caca070cd0967394fae8a0e42c7d587f88c2516d08239df4979c03598bcdd61541ea2c53eb215bc5a329ae1ade0a31e189f5b7df494cc29eab3a1729f92cf18
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_br.tar.gz 1662837 BLAKE2B 87da7912c0113eed4d64371c8367a6cb3b6798a10d75a55aa27f05adb87b6b7b88415a082cc00989d80e39e9d1b826de5cc56998977644fc2cdbe58c82bcb582 SHA512 46f2d9cb4df853952bbdef24e662b8563eae133ae4fbfa102af097fd2433f5c0e5c5c885088deb273583446a802fb352fa8341edbf86f71170a0146ac85102f5
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_brx.tar.gz 450087 BLAKE2B 423d685f109002e2f8207fc93b0e9fe491c8318f4d626fbb8c32770f9f11b5843c9ee3d0a95cb42aa58e9688c6816ee83b9f737b2b93cd00f3d2245db18eb999 SHA512 0b3ee7c53567e3bfc53d8c67015f163d5a0a71347a7c164bd2546c4d4436ca92413c51df9015b910a1c30ae6370f2029cecdd9951eff8eddbaccf6983651a9a2
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bs.tar.gz 557580 BLAKE2B 167840a27caaaba9c9bde12518751aa626d5aff3103108e9f11c192f0b49294ff96b05cb229efac4fd548f973160f8527eba82ab41f68c648482cb10478c3104 SHA512 82639ccfc3b67a8413a12945a2400055e51e1ab9cd4af4109ab5a53e1db1f6b6ad2eaa6c11d07880a0bef9af636a9c39aa9aa01f53f266d7d5a9c40f12bceff5
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1715025 BLAKE2B dc162ab503eca681881ad050984bb0dd53e16269d27f8ef662961a8df13e7207c4e54fe25f8f2ab8fda53e76ca980902c1dbf8aa4a35887ca35f3925c2ea90bc SHA512 4084efbb8a281bc8bc8225b3a48bb6e1a90430944eb642ac97d6faea11549a8ea993ea6fa9cfd407165762fbb8cd96568e4c4d47035d031f0554ab864bf04aba
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ca.tar.gz 1715715 BLAKE2B 322b15147e1c7fff47da36ddf7e0b09fe3704210abad2feb41c21d4fba5633731adf1ef395f1872a859d1b715350d08baef66d131f4fbabde05454080cf5371f SHA512 28d7f6cbc43503ddcc612497bceae192b3d1be5e922f5bcb3cfd32748316e4e745ff60ae5e3c01b02f5ca0912676a756d312e203cdf66a59b5ab183045eeb8fe
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_cs.tar.gz 2884090 BLAKE2B bfa9034b62c2ac19410837da8e30d42f700c63ec7a51e22f0dcd9d872ec210cca56523f7caeb56e0295a9ad9d4e9729e0215cde4c63af7df539dc05085f1210f SHA512 f4389858d0145de4b5fbb83c84e6206a1e2a931221712e138272559d1f8472788943ddd54e1acb0e514269ed208eae39dd57fadd11f3927ec121a3baa0abaef1
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_cy.tar.gz 425522 BLAKE2B 4d97949fd90fac7a664404898b05aa8d85e8ae43bc5d8d8a682dbeb565d6a19caf7f3ee72f67b73eb2a32ee51af1bf936e3365fb488c12cfda305002e27e69c6 SHA512 678a589c6c1336a792a184149b21560339b1c4901a33aedb64e802e11c0fc4fb852bf8cf48adcc0e676ba6888e16f9bb9671455a66db49bfc28487a90a52fb8e
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_da.tar.gz 2329348 BLAKE2B 48945713528647d4745ef9fd71ee9ae9115ab61912266b7f6cd4cc119a73cae601b70b842c051e68d71bad37da4b9452eac840f559f5cfd7ac41e574dae64bb0 SHA512 52ef0b08167923ccb5c6b11a300435d1c7f5ab2abb2e80bc0e3b1c4ae6ffaac974ade9978c1e75f02c31e1335daa80cf96e5c5713f76ec18ddc917ce3056077a
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_de.tar.gz 21456797 BLAKE2B 21da48b4a8cd76293ac857203b9578fcd77296526a2f19e02dd154f953af05fe159b6bb048d16de42edb2bd40708fe95fe3fe5b34c4f98e113a04bebabae3ace SHA512 069ac724bf7f09a62cff8b582b54db81db45a0a2d9508ca7e7476ed6aa3601fda4928b0f00494979a25f97fc7a05bebfadc5f68845b0b5489bdaad3c9d3a644a
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_dgo.tar.gz 479123 BLAKE2B 0d1de2beffd06e16e451960bde852db3b684785f3c1607c1e28d0c6a38c3b5c961478a0a0990a3119783c7273a34b8551bded0971b95aac8064621ae3be293be SHA512 a81fd5ed57a1c0126db389a4a7ba7d007ffb3715ef668290290119537cdfe0ea6bc99fe76e1512f13c6cfa6bc054ee8e6542454ed8299c6591ffc75126f88681
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_dz.tar.gz 472197 BLAKE2B 96632dde498cd94aafe1982b3e7e24daa4738c8d29145080865f69e60edfc4cede94864b0430905d1bce1eeb1f2e66a1c310e18aeeda51422aab3bd7e59fce73 SHA512 480146c0c1836247133d9f864627bcdaea22c6d902cd2e4e18c29011d186c8d4eae4d58b66c4d28a89730b9eb4efe04e3a1af9c5fdbf3cfb2749283289c86d58
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_el.tar.gz 2520454 BLAKE2B f8c00a558f27f76ce16a71b48fd321b0ff5842cb2d513eb1ff23369c4ca15d0ce478f872bb25572a997a1934a91dc9aeb89fad143e805ee204362b9ef4454357 SHA512 aee7c17a76f0368c7f9375b7195ac052a11e3090b37aedf0751c99bc4bd31dd1aef6d72d0caa89242f8feb52d97e66641a2921c7937bb1f09e5cbc6c639648eb
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_en-GB.tar.gz 6962024 BLAKE2B c60f4ef2c4fe570b8750663d065831326bcb3bdebf8ad49fd7afd4938aea89b02e548cfd1c63e11c30d9e7ff09436be66734552cf701caca75c2118833a26dcc SHA512 9f2fb63ec00f443ff20b1f6052e4c2ea483d2fa5459098b4c544a30224a2e1aa99d225dcdd958fcf13b0363afb37ddaac0f8463198747dff5a67e6664b673a1d
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 6877526 BLAKE2B 29191a8e66aa9e5bd6a7ef446c92e21339d270d9480325d39cc12250f3cae865522e79933643b11ad42b2cb93478ebe1f0380de1340d8850b14e8568364e8d6e SHA512 c9d764c9b55c1b803f230f0f2f92d0406ee2d2dd42deaabebd0886745126aa99bfd82ef5d2421ac00e516033fd4ba6890451515fa4ff0134577b76e5f6e31bad
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_eo.tar.gz 421754 BLAKE2B f0f7c9af3a804b652050368a2fe39a028bcbfc0c360e01a1cb06729bfe1d1e5181f92ddf51adc378a2b32caca17628e482690e891e688b186267c7baf127ddc1 SHA512 15df80c6e06eaf6fa50d29277805b13084c001fec8f070aa48c4f65eb9f72f46da131adc61e59bf6f8bdee7eb0088ab668708c5d98cd6541391e2cf9e89d7e08
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_es.tar.gz 1922398 BLAKE2B 4f4373c167b535f21ceaa6f1372a595d26766315bae2c51ab5c33e03abf2984e113fd33f81725fbbeb4ecf182b489b10237c70e80f32595536de006e95eb8a6c SHA512 30d5916050f7897146401fc9170d91ec414cb29249568f770e228e8fd05873a660efbfa31c0cdca3b44e3ea73eb3f45ede8588cc309e1cde84f98c0052560020
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_et.tar.gz 1333137 BLAKE2B ff408c70e0e8fe0b6c9c74009f1e50a2c4f721ab0b943f9402d4b90e519e1843c53366f9110fff1f575b4dbb55ff18bba8571d8d142be1ccbc232cf5fcbe1e0f SHA512 02702f33d0fe4006a771df1f7a3479c72b44f3a604d3f043a22c9ce2d263ace5acc386283d62a0cb59f371bbe071684332de8e9e2cc451f7cd2afe3a72f186a0
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_eu.tar.gz 429511 BLAKE2B 22d28d8756e43cdf8f11c4866b482cf5c93d0e4f86783efa763258f9093a0b95cf0d422a122cf8d03865cdae42cbc78488cce0d3b287a0d45cc5163d83128381 SHA512 4d58abced7b8849cac117cc6fe924d1d9c0d355d00fa863c2782c9928cceec9f6926b471d6ef8f1c4dc3218cecd989c270a8912b877cc2d4bf6362b6bfa857a4
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_fa.tar.gz 448875 BLAKE2B 25ad6cba1b7da7d32d4ce40e382aac5d7d4b64e5ea8aef894bab3197891e6857b977e209e5c501cf79d1e4b31bc57140c64bedb54127a10bcd484c77d5cf2dcd SHA512 853eb97c7bc253ee09a121da35afe30fc2ffaba155719bc868d854cda3b65944ef414934413f44b92298e6217f6b7d2d100603fd12c434d6ae5f3f9eb59de5b3
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_fi.tar.gz 436253 BLAKE2B aa6e1376acba9239841211e6c596b82661714413274f6642a5c3759a39d6cd8f830b0b5f233a94ebad88027100ca1b804c5ac29cad500e8187571851666abb3d SHA512 128e01481b65b54e6331acc22b3a303175b282cc7f622863ba3bdd75ac299c179293ced23741607ccba78648ef6aef325681d3d6e5c5155f961343276d262a50
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_fr.tar.gz 2732239 BLAKE2B d15d987682bf0a183b96869723780d5158b057bbfe713340adf36c9586b608955c48dd744be65d77fab326a328211129d40cc9eee74a99db1784d30bc883abe2 SHA512 76a17ec7cc9dd8d7522f6fba36212cd37124c1af6370264a0785232c0f97b69315d0a0e38eeec1395346f12b06c3889903115ab05c805ca2260736f29e7e20e3
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ga.tar.gz 448372 BLAKE2B baf705e1cbbe7ad43dc6e34737003a1a0c0413e39b35fc77a90b5a6aec7abd3a0ff36e3a46a4fed984c02882dda0d30f6e8fbb782e206118fd85f92f32f0fcbb SHA512 9bcf6dd8c34ff705f666bbb408129c357d8254cf02b826d2685c886c5dba02655cb362b4590d4cafdec7ec3e2266c2ae765cd07323518b01a05bb1598c1a773b
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gd.tar.gz 1479823 BLAKE2B a5b00a62c3b8b807dae254944b37e3c55e028e6a9401c6f7c3bf116888c5ef3d50ff4746bce77561f4777a36bc57597e386655fe9f0169f528f7e15af7886260 SHA512 72fb8d0cadc53477a8eaa1b9ec10149908455b428d3ee0ab371379af804e0d4d12a448e9fb99280a2c1e78bef132ca2bf4433735a52a3f134095f1640176d61d
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gl.tar.gz 994747 BLAKE2B 15d7b52d292fb07e3319daf0164c3e119a840d72a8ce7e01f815fc5296f3bb9747eaecadbb93a6fcfe202fc70ed54240c154edfa760d47fdf6207a77a6139942 SHA512 0e3c8b7f980c436b19461a15394e37dde704e05a46b862a2d16f2e4b01b1d78fd4a3a10adc8c017c048b8fa40c05c24a34162c4749ce03f530c5a7bbc7631015
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gu.tar.gz 1127892 BLAKE2B e5db0f7a1595f250f199f52e0ed0e8abfab774811055eb3dbdee1f149002a84e81ceea8224cb7fb2e75c8c9555e3861c9d81de24a32507bf2aa01857f5fdd8be SHA512 3f7747c39cb0cdde169222ce5cc5da458ae441891a763b6d65aec951e1f27c5799cba6c83c8c2d9924148446f180a62769731bfe978fafae640767e5185f55f2
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gug.tar.gz 445557 BLAKE2B fd3caae493dbaebff5f27827282931b2afbad94c9cf22bdad4b33aaa7881bdb6303447635411fe749df35823b55d198d36e7ccb31ff2f909f39c257954e6c486 SHA512 4c5f99976e9d63f46fe1c6b2dd53684b2e7995d6d95cd8cc3380444180ac32f4acdcef41393c8341cad5317c1a3848badcb20f14310aca6ffea587ea569ce111
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_he.tar.gz 1536464 BLAKE2B 8310e7aa58933191fde2de7da9327f2e6f933f4dc7cc701e8c8492735f312452d2bedf0cf1ff8cc13c892a0aa4de8f83502b23e404989e6e4eb988fa5592adb1 SHA512 1c9935b8a8028a2b4ad1a1fbf359bd00a106d0bab263f265d7d2b86a36be9b5843e70256ad15b85fd4626ec45b0ad3601f924ca68006a37a54cfebcbe99b5446
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_hi.tar.gz 547790 BLAKE2B 0ba30007932ce90b54bc90caa6d36dfb151f9c93a2b621e676fe1191c6c83bcd3415ac2224e9ba2a69b8fe8fdd81e3a75f345f57b930767c7d631883361c4400 SHA512 13977200b67aec0a80d4394753f7879d77fdfaf3e43b6cab03625954ff1caba116cee7312962cda1b0f4492b1ed200bffa103720bdd3e2beba349c2c9e9caac6
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_hr.tar.gz 677841 BLAKE2B a08c17152540255d64cf659fbea0692f309ce18dcfb390becb3399248d7ff918cd3fba23d13dd1c0e708b4494705be37843adf44061cdd17747691783737fe00 SHA512 d5f54d4339a63ef42126249c0f8aa50ba5544f24942891b34b3e039ef09141220eececb844752f7acecab281a7f607b476dee2b3056988751386cb4aac99e968
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_hu.tar.gz 2659273 BLAKE2B f7dc8fb3910cb57d76b79340302ef4179d3ff7b4ba31e119cc6cf0eb11b482c5df95ad92d6535dda7f56768f0e4ec70f2816bb688302fd23e4ad1dc5f91bce6f SHA512 8e6059223644a27f851fbf17de5178e4a3a0220206842468b364c59772107901e226fc80225d68e7ecaf955bfa0ee1630f021d1aaf4542bff4d7b8f638284176
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_id.tar.gz 422156 BLAKE2B eea778d8915cd625fa3c9cbdea156e91489045a66e2adba87ae60a7e49d1f4b9bf89eb66e1fbce985693951c641d2de1505c95c6f23a6a21e1b97990bcf9febd SHA512 493a11539082c4d4a8cbfe00950f04303aa323839c69c029314585389079fcb38b23e328b203cd3094a0ef292712275fc881fa3b883c8b194c3db0ae49e487d0
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_is.tar.gz 1232346 BLAKE2B 8a50b69744a7f1e9c3036184d22eaf9ccdb43e0729fc9a2cc39c9a76898f30eedb608952787e1be17a09fde1a36779cca98eb0fdf0b8511bc18dd44b2c93a57c SHA512 488eb9361e1b4a89679d53a0b2187c4427bad66d8f738edcb69bae611b1dc67b850b764ebe37d6d91df1fc6d6641e4c729e14a83b52c23ef768b746b4f88585a
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_it.tar.gz 1768229 BLAKE2B c57f1d2331b25844a8b1896875ac99fcef00994af0219d04de3b27cb609fc9ecb54b50a822e8f33e10045ec35397e7985a74740e0f934d9b524c3a9058e2a43d SHA512 2f61642ba53f6dcaad28b9c69731779c74daa1f169b938b3a8061a6553da8dc6c62900df4f5d4590d6e3e1b44ed5ea9bf6d70ca7c72e727e68fc9917f215963d
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ja.tar.gz 531344 BLAKE2B 11df4f9c1f900d5fff7d1a73bf8a4263f4e03130c9d775015a0b26d604bbaa75bbbc8f160174caaacf929661b10f5ff5cd2c3667c6d6b08a0e42a6b7c5ee1265 SHA512 ce906d66516741d4d4b34b38cf716063b8bbd1282256c037fc66650e50ef9e07c138f2b6eaaf3eedf1591afb680598eb69936a0590426aba7a1b417a4f3fe767
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ka.tar.gz 457543 BLAKE2B 4955c18697322692a7e2da24292a1090c266eb7cdca50ddb4cd5d1fd95d9f76a5e987abecc0d25cd742bf4c2e56b40a254b566a9e6f4c6c5c6bc99bcff685729 SHA512 f0154ec915cccb2cd08f6cdfefc57a80c38ccccd8ff8ee1e919e3577b4e5df6d5048211af6a26e9ef96b443ab3eea4dc126884669b5730e0ef75da00553cab85
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kk.tar.gz 478338 BLAKE2B 3fb4fe1d2b34a59120330bb93408e1d08834eebf3360b341d1b0f82f4d98ea346f634b307d966f31b01e5ecb75a433113b39eb130df7f0ca3db7afc557915ebc SHA512 e879c3e50348105af15459f0855ea097ffaf5421e3aefafd4ccd782a77ebdfe79b47c38350a9e314fab8d7f1da16b56fa635bd70e5b61d77731d5ebc83b8de50
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_km.tar.gz 578518 BLAKE2B ee20e487fd84e0eaa6120b4c93f92b7faf68062986c4cd42c96024f17de8d0c9f5d0a21cec5612a553f0aa4c46a8eac59324ec3712f8192205e854fb78756fae SHA512 9354311f0fa483d20fee3005655c56dc34f5366a6b1ff8e9299818f244697bd05954f5b50df935885e04cb205b118fb4b181ad71632db179a092fcee3c98e946
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 433779 BLAKE2B 2b5da58affd4901ab5c115994e2d98ae1f629810dae5d53978fb615dffe79d66673bd033632805e228b3aeb8a96c7529f424f9f1e3b6c2e37003c340ad00dad3 SHA512 abc84dfdc51900549fa608bdf9524109c382ccceb317f2b15613659fba19036bd19d9aa7f291360196c6d2eab05a18d3045e64ea827558415fc4d9ec49c3be5d
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kn.tar.gz 494314 BLAKE2B 472525bbfbab33711d8b79c45818c5bb5cba2995a32aa56f3e24ec94a631e187d5b7d43f319d52d933d713b64601137de335cbe58ca8aeca39d251ac9fe16557 SHA512 ea18d417ac0ad522965f31af1be63501109012485056702087d837fc27c564eb8a5e89dad42ae158d90b604fd38d0bd50292024269c314f592f1993eae0dc9e6
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ko.tar.gz 528693 BLAKE2B 08922f8b85aae42b20bf6580d394f68aa7f69453fab8ef073ba829384db4f84bb5518da541807790c418a2786417f8dbbd6ed2336c060dfd2cb6bc73c7163d35 SHA512 4a8a700d6b35c474f07c6f5ae67b92f2dce96ef028a58696dea0111d7960a683dde500255ada3394bd2e61573d55bc81f9e433afcb95d25dbee9c9c6b16e3650
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kok.tar.gz 472684 BLAKE2B 452c880e727bbc483bea04d8b530a76868f9c9a63c01d545a75bb29be0ed4a08c6903bfd21b8270cbe480e2e804c0e9daa7ec0a522f5181dda5e760495f248f6 SHA512 cd35a1014239b145ca6b0a71566601471546d5380620975930f00e4ff617bf411b250880dbb55a43d963fc74e5d97236f06813929ba208ad9f05eb56e23bd4fa
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ks.tar.gz 450987 BLAKE2B 7b339754c6ce10a619ea31505d8e59699c789b69fc125b74239cd2f61114e191a1eeab4d23c35dc05084d8469f3d58dd456f9d906fe43a677626f4e8df83310b SHA512 411048630141e8ccfd5abdba6853e744c01c4756a2372b0d501bc7aea416ec2987ec32e4ac428b46c29b8caf295a9e7a13a4d07a4a3b3347c1e34ce86a8aef56
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lb.tar.gz 412293 BLAKE2B e6daa6a269dbafa4323dbc66de8e44d2ca0abb22e12730e7e0e2de4c5dc176225f13b7f25302dd9a865dc37d73943eba352521afb1297f25c929c84da873f7d4 SHA512 93db13775d53d0627a56dfabbf731ed6fd649b9ad584dfcf55fd0d92174bcb1e6790c1685fdd6c896f2ef7638911dce048265a9599d65d75eccead0acbdd1413
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lo.tar.gz 496084 BLAKE2B c380de8ecfc4a58f35cbd33b10f106a0f3f1cf648acae0ed42a131b63d14b15c0f6af43949d6763a608db795cfac7bfa2cdaf45511a99f6c0dfe3f8feb0dacf8 SHA512 2c2a403fa1e1da02d9255d326e6e9128badc4bb573440a494f666d44d5d04e47fbc8571e635b1a75acafb8683ce6f7a071d59d6232aa1d8d354690f01acf516f
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lt.tar.gz 777549 BLAKE2B 8aab43a8f3b58cd77be0acd4f55f8d98d6320344885e631ca4411fb16fa7c67e423259fb269e732efb9c41ae15d6dd5295a0b8f8e6d0919ba0968ca96c22a178 SHA512 57f123d312a43122fb405266c53b9553295d31527d0ae5c44b03b4d9752b1d6c9c6d19824bc702b4e31cd40f2d4d64a8de4f872fcc3a05d4b0ccd1e0c0fc0d95
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lv.tar.gz 1193749 BLAKE2B 623474111996d963e9d30ff58267762ecd7946cc914ddf968e2025b4b9713e86cb40b5ec54294f599a62d10410662e81171048965e02b21dbcc3258f272709ea SHA512 2d7ed79afabe67e8422194cf3aa4ed63a6cb0a94b164e835fe557db9b767db73df590e161584e2c07250590f476026d182eda443cd364e062fe17440cc17e20d
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mai.tar.gz 452691 BLAKE2B e5a6d376dbe3dc071417a38fa86ac530778618c7aaffe0f92d1f595a09b535e9592864303389ec00aad888c43fc3b95a45826f5e218e0a866d8686a32b8be4f7 SHA512 0790412a73dc88f6a5a4143e99b0d2fe38390ed14e516a116ea5b41e762e2b57447b5974f2dca23704aaa8ef312e5c7b733ec47d6c07a6ff67332c3c95aebf26
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mk.tar.gz 454817 BLAKE2B a0be2708b3da8f2ac4d3b1b6b530b294192d050eb71fc1312a6909bb00c2078c6310f4d4dc285b42f108c5a357336e9410ba5396f06c27c45642a9a2eea404b3 SHA512 f8fc6bb148262153d156a7e52c0d0540389158ebe19f864bc5755cc01eb10e70ae247467c8cecb94bf74e3305b0709e8f0f52b6f0111e604a2383ea33ad3192a
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ml.tar.gz 494543 BLAKE2B 46d4fea5c315ed6986b30665b92d66482a9a10017d9d5070d7f5d3eb56d21aafe2302267b7d9c10c6173106a8200e049141e190975992a317fc5516b96265a06 SHA512 63f97cf14f15b5fc835f1a72d979143a441d1500fb62e3260101cbe3872ae1c8e06c03b9a177b4ab400668db2627d244bebe7060c79205e6f9d3f9e9f823646f
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mn.tar.gz 545630 BLAKE2B 4079d767d7f897b1b4c45e0b2616a518f42c56f67f2c9766b29cbfe2fbfc1417c9c12da3842d637b9658c266034f71a2dcaede8b2e7b6a4978dc741be1065645 SHA512 96da08eca63e84dd8100fce313ae7c40826a1d9763e8198d6a98417017f21df3f2f80a564941cede1788a21b965da16c325b7a57980908fc0c619ce8f64e380b
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mni.tar.gz 466877 BLAKE2B 3a27ab58d809c1b61b41932819e0a96173df66f681ceefae73dbeb7659feffedc4e2e4da9c1bf0a4c20c89634002ab71d22d859f12658f14f38823f260da28e3 SHA512 c715539c0a3f6004e9b9a8933ca691c50f06909d62e43f9fec4e1a15a5a147ec0222c266761115cb2b617fd475ab0d7c19891b003b548c16bb87f9d0d48fad2f
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mr.tar.gz 489723 BLAKE2B 1e752f32936b92b6c45b8f7124e2299319377699142b2de150e85626ad7328d30a881ac76ddf9bafa626e47a32aa034f1df905aae34c015a83e15c7d5f6ec9a6 SHA512 7537f7e7598cf1626e5cef8f995e7333cd7d8d5c84a6e51b999fe57409d36f5d2419eb0acd642b66125d0fd608a9316628ea5483f6ec21f637fd5301ad983ec3
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_my.tar.gz 484869 BLAKE2B dac377788ce531061377c7aa3fc9397e6652f2afb92daddce7f8cd0c3a5a6873907778d0d8be64c5ca7118992acb831689d35eb67b6d09edfc96ccc10aa24886 SHA512 5b8d5d7928cf61c467a51ebd8cb15ba6f3aadc9f819c2a0f2f485cb0c499bf33cbd423d3d9e36e01dd4c3a49358bb5cd713cfd3c9f8289ffdb4f0cc8bd0d5135
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nb.tar.gz 3426436 BLAKE2B f03ad0def0b5b1770f1edef75f2f4564836a289ab22716ca129c2901d16da26c7450dfb5e23b0cdbe93a6f8014d9821dcafd4e84368765ecf8f2ac126290fa49 SHA512 5e074626f1d57f94eda6ec5267db3ae53596a3ded344dfa59cdb72008b7ba7a1e77b52ac7cfbfcd17e9d49eb3b93c48de94e2b23005db69ffc22c31ca4b519a2
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ne.tar.gz 857431 BLAKE2B 02ca7da293f7b9489df087110d76713ab4b416e9512a55f060089a10dc2d11e5be37e22a51e7a0c8c6aa3237b971d15f560ee0c17801ed4bbef4a8aeeba3bfaa SHA512 0be281c001dcbab23e7badac48aa075c096db58cc2c0fc89387143597efefb3b628aff4f6d5cdd8d86d398f8c0b127ac43d3ef682f2df5c5589c7d2830c6a3fb
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nl.tar.gz 1225746 BLAKE2B eb0208bb2122aec1f613bd3e6a388d408a1aae5e6eaecce84befafa8aedba5e9833f042fb2ffb09a3ebface89f106e2c2f10d2d359c3ffa12d2f7dc1f6482659 SHA512 e3833194ecb2911992f1e595afbf07b4c07f2e89457e2d616084b476138b3c8b382a3cf474e80ec2242315d98f5a80e447e6a22a20b3be35b250ea7ee060f147
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nn.tar.gz 3425784 BLAKE2B c8c6e6d854e8b86c792ef4b4b8884ed3d78ee5276473e746a89bc75030beb7c175481827fd9f7fd23ace97f47ee710d0c7ead7528213a9cff518db578a22a065 SHA512 f381d8c7c14dfae04f8a72c92835c1650f3c25741d67d1d708e2d4219c498e521686f6b2f26b55fd7ef17f78ec269fb04e722f9b617a0e92a498b49c42d4cf45
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nr.tar.gz 432256 BLAKE2B c6d40b582008d7720d14325c072518220f4cb36cb7d2c4830cdb39dfbd2405b671c2785c3ed0ad6eece66afe6ce1713566fbc6af67bac362e49b3404e06893ca SHA512 81eed348826c6e961c4c9317d03ae2e03021e7d632c0aecfc293ee922a1b96934997dd57e4aaeb3ba09d0a529bbf57c0161a3d254a0a1c543994277094f550d1
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nso.tar.gz 431425 BLAKE2B af13240b1a58b1f5d5bcc8933318f78e186ae5cd10c4008f576a35d5b57c9645f438a6d38f5daa469e810bdaf6314a8db4eda74e2641e7fa977da9bdb996fa34 SHA512 1347aed0cea5754322f6b4dfb5860202eff16763612269d8fec18dbdc8fe93b180d08df2f145ec73bcfc1c4ba9574d466f3d998c4fd202abd061c1e440a25bbd
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_oc.tar.gz 637879 BLAKE2B 2987dcb45f655bcbd1faf51704cbe9529cde9de7842078c323a40bcbf4a2ea4796b208841d4d471dff40644f9e8d0c62660e8eba8f4dd8a1f7102f877d70724e SHA512 4d80ede3e22b02107774a23ac50c11f9d73787767ee1f1770420730dd3000928745158bbc85fe4ebc206ca55ec9c8e4c9839e0c7380903658c78f6f81c89011b
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_om.tar.gz 425926 BLAKE2B bcc638bcffbb55d7644991c16c1a7f54cbdcae494e75a2253bfaa7fdc7456504a73da26bf4bae5340474a80205291f7408d448ad19b8f39e83b961bacdc0d3b4 SHA512 babaec26b2b238b0841482e3092dd98491323d7007450b4614dfadb1ff938e6db91e09c0d34e1bccd16dc8eb4956f790f4c78f22c616b70f26aac76f1da5174e
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_or.tar.gz 490717 BLAKE2B 9e7c9250092113e15df6a394ad1ef6a8d94e9906f81eb0aa7ca13017a8f37e436cd68d5a9ce1b2ce0a851d9840800abc61c9668feed78dc7a3c64607f7b014f1 SHA512 78d251452d5a4af0b9f2de04452ffe8737aeded771ee18917a20bd08b62a571f2db6dc3b314f922ade886e573f5972e2b428dc6a1f53092b573180bc7e70a016
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 462198 BLAKE2B afcc210c0ed0696e6cc1c889ff724a24c6cf855461fee6bb4e8d03345ca231b32cdc7636560dec3e71de1901b4060fac2bc55a967cf701b7b010224ffaf148c8 SHA512 25bff6372073637eb8b92c002a605cec48cdd1010aa9b00474b7d764985442575723acbd674c7e94e392738c8ed34d5304350abbc800968e25ea66247fa16c1e
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pl.tar.gz 2794814 BLAKE2B cdb354ad91d17773ee837e58f96f13275aef0f22c67176cf97a6b408311906023f71166d37ac71e90f1682ebb07291eb830e75d3eaab5f0dadafb81ec5be85f4 SHA512 7a55d9d86db5e5dd2ae2319586f7c4b3c56d8e2433b2ad60f4c879c688ff26e8ef8abe359f6f5debcc54af01b663e35a8b622e2352b66e04922b884337cb37a6
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2517807 BLAKE2B 62e09ce06cce37769855c90bf1bd9c175c83c2e07a8e1467d526e433b1de2b57b6fc61c7eaae346748a09542d9189345a780e6fdd7779bf7b4dcf3d9d46c5585 SHA512 e939a213079e39163c4182245fe5ca9f69802fc0785d6c9323b2a5b81415ed0a57d4478f603f089464b029a13bebd0781fa51a67fb7abfd93fe594e322068016
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pt.tar.gz 2071056 BLAKE2B 0894c8a3da4c2a3b22f2215547c1e8f9727ba197fce3eb2db48488ce6722cefe2142452ee86c8935f8d59a2c9613f0a2e0b03c68ae3c6e08fc8e327dbaf6953a SHA512 78947f5f3c01f4b11fe3d29e4c08203ce6d5554435c07e85bf626fbc94a7f9833573a7387a2f25d46111d4c3e8d45fd60ed9259c2a7e98d3a6394efd56e3bc5e
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ro.tar.gz 2304220 BLAKE2B a00438b2dc4e2a0cc659858461242470e6d8bace9ba6b40101cda165947faf9ede63434222aaed497936b52fd0853d1f3ce779eaa49953cdb9ffaf55fc9de158 SHA512 785c5b48ab541af9464f8a71827aaa0979055e510a7bf5453f961b8e8ac6fe6329c7e1a86416aff8e21acc64a2815f6ddf5e5f9576a7941a46bf8a4439d04dff
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ru.tar.gz 1594260 BLAKE2B e56475635f1ed6880ee945f1cb69884eda726bc059bd24433501fb0f49425289bfe2d3b110201886999cf08e6c078ba3697e2250b97e9a617f502127f15c6ef1 SHA512 8c4aa79f31f515073cd602f43488391fc0b6b15857ca6507260111e5607f941cc2b5ab54563db0e3776f1abf9c188247abf1b646c572bf275b592a4e654e5373
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_rw.tar.gz 429127 BLAKE2B 089868603bc3e3ff3f9ad6407a88a84990a6f57d1046aa58d5173a5e099f328c80cedf77c64f92fa0cdeb35cf03dd71705bd735b396100e6f78333cc1e7de6e3 SHA512 3e24772ca2e9802c115711cbe2f564803f4fb07b20835310cb96a2d0762bab6b8d3bbc9147321b79eebbea86492a53b74e20c13a15a642be6b49e582cbbd9338
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 475335 BLAKE2B 6d504c47d116d4ca1a21d29aca8fbafb464568209c61803a232a1137d36b898c6a8fee698303cb6a57c4c2de25e5285d49f48851ae55f3d9aff5cb813bce9bb5 SHA512 35ff51803bc8f2d78a6dc45f74f744bd87a239e0a9dcdeecc79e9b2deff2493eb7467b5fce1690802c7ded53470d07b7e2b8a015035956ec3a55b7ed6d7a507e
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sat.tar.gz 503989 BLAKE2B e66a430d2ff8a5b7ec94e76b33d1d3ffe58766c4750eff11438e347c186f16fb318fcfaf518c019acaaae02fc4133309cb8f886884bbdd97c644413b633db192 SHA512 64edda78e972efa9e16e03b064dc94abfd7f5376eb1ab4067d43ca5f02b69ab756634dca9ac581631c04bfab7c0dc3b49472393225aa8065c400c187d92d2a7e
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sd.tar.gz 468748 BLAKE2B 0c78389d732da16ac0c3be3aebde80782ad984dbe2d6985d8df42fed46825b66348355a73f0834209b3f77278f3febd2e5b42cab83e37950ff9d757fd36d9954 SHA512 a65f397eeab1616f57a21becd6a5f24e40315964b269c34a70506654523736181bb439d1d7761bfd8f6a67d0f23e2da6be1ecd28f83dacf278f0317942524866
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_si.tar.gz 758751 BLAKE2B 6b7e8ee7a238fad824ace32af15f6738466e1684b4aa52c5619d2c0448e695fe0f3dadf215e3058e187b7c34fa25d2e585238d0f7a3ec4fd4367c195a3bb1c00 SHA512 b7278ad128e822c21ac1ae1408a90e576ac1e3c72cc85c14bb7c2873ca8f799416607114b26767f9b4c41a4e1ccd7fc08eb937957f93b5416bd512b29fcd8b70
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sid.tar.gz 433732 BLAKE2B 13ddc195d216731b77d7b5edf6e7fb55564ae8284e827d6c84a9a85a3b1ac209fd4befe0ff6a193ea12e659672ad4a95ab92c5ded628a30791023a67a26f232b SHA512 4c8f2f8eb45677964a6742b96459fb30aadd67b14c41284657bc3f789aa460440d787729e86050bcef32019878861758280bfd0211827e6fdcc4cda3b2b9d6de
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sk.tar.gz 1725227 BLAKE2B 9f6c02683519432c8f12791c34ddc11a908dce83fafbcbc94df00dcba1362d92b1238e5172dbc5e42a0410af39d35d3ee7dbed4e677f339042de62a85ed56f02 SHA512 366eded6170e2d9bba9d470989330e9b1c919091c5a6ca9699eac146f58781055ef99e32524783f5bd30bdd6b0d73bc6356fa2edd728706cfb74cc1771d0420b
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sl.tar.gz 2104305 BLAKE2B 364a0a9deb4cc3e5e1c1232062fe9e31c8948eea15f9e49157a9e5d67590c1af6ec7eee6a7698b04e35b21db593d15ef1e4c36ae2266089ddec398d8c77fb938 SHA512 8ec1469c8988b2e533d8a92699a9add361479fcbe85cfdc7dbae300e93418611367c397ad5c750b16f60314fd501522f749062655b520e3fe1faa8fa672eccba
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sq.tar.gz 446472 BLAKE2B 36233464e1870ea7de3ad70f337bf4273284ee63edbc5c0f8b5f475ba0a1c4a40b14acc31f1245da388ce9af3ac179a34c7cf066286a3f09a227e5de82508fc7 SHA512 bc582e9ba857d74a5f185306a74c868a81ecc20e6f87fc938909789fd605a6ce8f7c152dd804e81a7d27054f942da81e31a141cdb562547c3003f52e8586b505
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1597165 BLAKE2B 78e266f2d1322e2dbcf423e2e84f82f510809fa17a2dcc8ec28091f34636abacfe0fa88b678c6df7ed08dbce61cf6308ad877db39e76879c2d62c23c221d8151 SHA512 1184b6634ecc7953a7d1204657552056fd6c131a13a0616163178ae519e8c6fac602743f8dee88e78391194965302b5fd3f4e3acf26a60e353aee0116d389b2c
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sr.tar.gz 1617063 BLAKE2B a553d99f7f57cae7f9c5a1093d3dbed293f974fe262a88872bc3498c6e5fbbe798ecc12f6a8672d07336f7c9a999a49640f50fdfd551bd38ec5e9ab797338fac SHA512 8cfc140f1a89f64f05da5d951aabcab531767c7d4d7c8df3e049fe0f5c92c7172ee3a380ffe61571296d904d4324b46b8bf884650c4d95886a8dcf2dbd16f447
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ss.tar.gz 431152 BLAKE2B eb78d979ce08bb8f58a0726195ba0ad59e67fd5a897a3fc1c9e736f61cf9935da8e8f6646bc0202045932a93a27b7457bfc11f732f656b09570e8a0a15cbb2f4 SHA512 c3156fc3b6e94b961a8f61a5a1d88e306c9a2310e7818c6f9da14a108ed832a92ac3b490000de385345e0fed3e517801ce06f9746618b4ced46ddcae7b2daf4f
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_st.tar.gz 429252 BLAKE2B b21a2efa22f96704e2a21c49fb4663bcaf348c96e9437d892252b2331f4e7c962201d3804d0051b425b61506f9d4615bde172d4e2c616eaace7072e83c2de001 SHA512 51a8c3f9408a140be9d595130f2b4d4a576a08271a8cbc60e8d6637c1b1b6a971d87b1725fa77c2b4b025d9cf8fbb6e970fbac62ee9ed454eda1a99a15bd96bb
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sv.tar.gz 2314029 BLAKE2B 9c7436d16c51523054892a6e08085a7acca1391bab68050c30e540ff3fa1a935d0c54b4a199c6aad05abefd1f27c4fb6075f91b7676b79e854a7c789df12a7dc SHA512 91336ce47ab7813a5b509df195a118af564f8a29d33feea5845311b612106d9a761f4e7a1719b0aaab0ba1b665c31905cb48e3d8be078f4f7cced0df1a1ab3ba
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 420152 BLAKE2B d1a4ea3cc430308e6f939ebe228cca2db309ceca7ccbd198764927a9f68949fa428b2d66c48e4e1aa27c56065867d3bae7b322b62be1c282877b0513833dd8fe SHA512 ebbd864ff4a5049fdeeef8b6174ba19c41ef50d90f8cf97bde39f5d4416d25cb4316c80515c93ccf083e1d7edd15931550967ed1f523aa40ff0e4e133f6dcfe7
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ta.tar.gz 489673 BLAKE2B e445e8cddd502844b2c81c4d3d89221671a9be987c6d3a5f9c3a6bda8de1c7ea8571ecc7f94a261fb7a4875a5ba7b3cd7dd4448676620944072458747b88626c SHA512 780b97d705a6e267012ae5e09649db330b865fe69bbcdc8af8a766dfc7ec6f907dc2aa1dc13b119c03a96526395dd759ac43306700dd3e58073907bc38b79a1a
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_te.tar.gz 1040132 BLAKE2B 0db2dace3562f33f57752239e0febb70d806eecb040580653feb8c78bb26ca95122f9e7f4270b37f6cb1ae8c3b1afd4c8bc285f762070902db888d149411ad8e SHA512 ec5ac3a4ad60382281dfd843133bd52465725df0670f153cdd92765e7e7f3c1c21e8aee84be2efe0580327cc48ba8bc6683327e26877e3ba0d629c16f60588c0
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tg.tar.gz 446663 BLAKE2B 41526ab4aa392d61d66521c71c5bdef80c33308d7794097c66ada16c981cfd7c58cb48afe7a5c2b6c96941b099825e0299133339d9d947b1859c9a6ca39650b4 SHA512 b5bb67ac8e79f2b95172baf4f8a878971d78900572ab1d35e3d103d25efeb9f5ecf3f3bb2c91e1382de2e56d9512fff57e588b5da7a672b1b0ac4e15f1120cb8
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_th.tar.gz 625854 BLAKE2B 1e43fb90170085b3c86ddbacf6641d78265f18f0be1884f2e40e501300aef7e38530a850acae6a62e6be2ae290ad76c06c589d58a6b1fc141ca72cdae33a9eb0 SHA512 282da0fea9d8c75e22aecd862e1fc8daeb67900740994313e2763621b89dc744898cb7ce1c0791803aa4a8dc5e7a7ad496e786c68bb4839fa1cb19166f7620ac
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tn.tar.gz 421903 BLAKE2B a4d982599e198762c53a099dfec7e24dc9c9357c1704b0d7001637ccd91bcc651f49f10b1e2b81f69fbd7c48ec9e7b63267b1112a485c4eee2846c455e60cd84 SHA512 f7f662e80297fd0cd2e477005ec6b637e592d55d08916c304742c23737cc079174ba058a3bd5c4904962ecef0c6ddf204bd760bb759f464b47f0f9733b75af73
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tr.tar.gz 475397 BLAKE2B c87dfb19b35b00da05295768ac508800c873cfe62834a2fc0d4a68fd44a92be043cb373ce09c07f46d68b73af24cbb45a7315fb9ebe885a2523c7033defa36d1 SHA512 1688b06d8d4f060f68208a6731d7cf9319213e49eff88ef3293eb14b21063689abef3ca1e5071a592b5606bea6cd142c26ea47f9cd778f92243e0b2c69d9b81c
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ts.tar.gz 430957 BLAKE2B e9d90524799d4092a3bd41ab43bc76808a5b15cdda8babff69efb47660b2e1e20a55849b5cdeb0e26f9d467f692910c0ea2e13b2e604d2e8acfae601094ecd29 SHA512 fea6c4fc86b17239451f86ca2899f26d9c622ae3ff473d1e77b63d98713a564930a84f4a40510b56995db3352eb5121f5936975da3337a4d0e25a6fe196e5a52
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tt.tar.gz 428423 BLAKE2B 2b770b3a0f4c52e36195def5ffc0395ecc6cddb195981cf30490ae1c81c535607dd4d88681a20256c59837db26be34c1ced8c72ec249c16d5aecd0be6343d39b SHA512 7784a9342e8c9f1af2cee676d3717e1835afd7c1b04b2daab9985fc8d8165011f6c066f4873172c58062844853828d61a9fc6799d64d8e206c1e7102dc57b252
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ug.tar.gz 464634 BLAKE2B 20e00f78a0f27192d5666cd91891a1ebcc4599f189c856f8ca27be251aeed618610f630e53560f6df6cd51821832b5b9092d0e8dff30a1ef994d93fd4f1e49fd SHA512 ab7d7e20c32ad3b4d8daef7cb337a9f041e24bbaadcf18f20e8f93e218aa84cc99413138f2ca933ca58cd7899f8133910358bc1970d03548b4b2defe3dfb6778
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_uk.tar.gz 1315320 BLAKE2B f548d837ec8d072edd243e3ed899772124e5f62da18c6fc878fb7a20fda604f72c093e69410563fa113fc3b651e7d9f18298027c82d1ea25dc99020fcc9cfbbc SHA512 50c1e1e2d1706b9b083bb08710e5af483188cdb1abfeb14021d23e6a71ba389563b8f3db0580d18f887bd9c917d1ff36673a4c6874fbfd0860e058e21ae6600c
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_uz.tar.gz 425410 BLAKE2B d7a748981bd18b13e3495110ab299178539c4beeb4d1226e72ad724d245d4214d5d7f8c3a40f54a2c82f783a2a7508876dd2e5fa19793b01ef25b4fa2037ca9e SHA512 b009e91852d1b1c2ad12f79c4026db3b0b2a107d3ba452365940e7139d0bad27fa394f7de91d91eff22e4b60bafd21cc263f2a8f7705bcd0b509e78df6f32794
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ve.tar.gz 432762 BLAKE2B fa204cd64301411ae80d84d46704d8de6ca5001db1de69027579a8311adb31520ea548a20e63f572575753766f23c2e18a0f801d2f7e08a8e3ef1ab0ef9e2061 SHA512 0e8a38e266f7384fe31d9381d7e100a644d15e13fc8fa00e15f6ea7f065883aeb9f84ca5906828e029e52cf9d14469513ee5c377a78e117afe190622dc73b35e
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_vi.tar.gz 465383 BLAKE2B d44c99eb75e749919fdc6da9b665325e2eaf0743506ff35b39448bf9686a6334db5b399b35c2eff7ffb88763c3f3b027e8e9a9834eec8a7bb3d7e623d82a13ef SHA512 8c8ecc8d658a01df4aa3fd89c828037793a1b74dcc8449fd456e2e60ae7630a85ad83e5c7a1d22be96e9bbc4d0aa35d12c7c8b8cee3b4ea546789f5534e506a1
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_xh.tar.gz 437386 BLAKE2B e37dd965b94cb3e12bad97f703a5dfcbf74df401cd1e5c8a47e823cb69c608acb6ce7509ef8aeffb28c30c71d0e41cd8e03471f8ddff661902d2fb4b46f15979 SHA512 e60c68a1c613557aeeb3209e460c1c4ce1f7d4ea4163cd255d441eb664e90229688932189a99cba732d94fa54ba8be4f8f3cbc7a74186ffab836dd245e9a196b
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 515889 BLAKE2B ae945c3e8762c7115209da5c30f6fe64b374e692799afff5eea8e42a09a257883f1e89372964f6935655f6296620c25b17ba5a8ed91c7af2a5e004aeefeecb71 SHA512 f41d6cb173a9a01393cf09b5e1610d6dff308d22b750a0c283540e63d37e7b675edcb1df0507461dee7f63fa655a88344c5bb489efce0d3d8ba3e8b477f11d8b
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 513873 BLAKE2B 63b29287baec9e6e2403fa413995e39e950e900fdc3189d91d312763561951ee48c5c5ad60dc35ef8be58ccef5baa34e4b5c4a8289c1704d8ffae40b4c3734db SHA512 1ea3524029b2d4e83fff4dc7edfe07f5a131498c708f855660869a927027f1070f3be4980995beb5818d52675ffd5d593a5479bf227788bf08f394157752a379
-DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_zu.tar.gz 440340 BLAKE2B 0db2f89f5157ac1a368bbf130a6758cebfeacf97ba8baaf0b615d6d90932e4def6bb09c1411cb423400be86bf98dcf64e90021ba52c004e9b3c8a9fe0f3c39c1 SHA512 5af177674df21e50b7db3885ad388eaab5956792e5c2cad392a1a575065d50a766aa878e00237f5dc38472481f86b36376dfad319072b5cf65040bdd5d1e4da6
 DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_am.tar.gz 7989311 BLAKE2B 7ff6325d64d79df5c4a4785895a8124b694dbed8cf531ed0fc430a5eaeea5150d907649108523cb7307e76b8bba6667a1b387c69319a4f97fc89d0d0e1a04e01 SHA512 ed74a073453986b5b1ce9a10c661019f224e5e759a221b1a82dccafee346c686aaabecc76a10ee40f57c06840a5292099671cad6d76cc85ba7e579a13f0b2b1a
 DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ast.tar.gz 7905060 BLAKE2B 2276f2fbffb28de02fbbd6aaadca9f7e9e91f6469cabdcaba2774c47b71b4558c0b832d1dae196223b23781e67fb068dd3be37b4bcd4fb1e6cb2d9c35c456e54 SHA512 80d01b4fe97857de7a44cc2df14f2ec835a80ec1ba2b29f75f69590288aa496158654989b32bc678b528366171af4278125bdf0a48aa96539443124bfe443283
 DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bg.tar.gz 8465944 BLAKE2B 4c8b6f310b2cf804562df7718f9d9020f0fa06549136688e82aff2313a86f0bde314895417f04757b5da84e0f75e613f93c0344a62f0d5e7d44f8d6dd73f4c7c SHA512 308eb6d78746696456a91b80e95cbc10642d6594d47c180f85924457368755347bc9d949d5e8395175dc5acdfedd88b350211d18fbd61fcd99ed04d493fbdd93
@@ -503,7 +335,6 @@ DIST LibreOffice_6.0.5.2_Linux_x86_rpm_langpack_xh.tar.gz 295504 BLAKE2B 29d713a
 DIST LibreOffice_6.0.5.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 798866 BLAKE2B c6c6fee66de231610467f5c8ffed55068b2f497f78719b9500842e05d568afee0d55707921e05cc8eeb1040209b4cb87f47748ff3ceabf218d09c690243f70ba SHA512 f93d16b46a826d7ed258bc5b65765f48014bc80eae466cf498369562c3d73700adb20fccbc1d9113093b1a40e8ecd2442dddb2e92b727c87fa211265b677a9b1
 DIST LibreOffice_6.0.5.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 796771 BLAKE2B 5318c33faba8191ba52493283858902f02f1addbe62322840bc2fd3fa15bce9068ab31cdab077edeba840ae1e9b641ce00c5fc8f54d02fe74cb2b1ac0d94a2e9 SHA512 6d6492fb9a7edd3fbd669d57f9b1b407958a38e9b482a394b619761c34db4ff8f8acee608c0d8bddeec0b2545e3fc7801cfe732c04e0d6e283565e03b1a55325
 DIST LibreOffice_6.0.5.2_Linux_x86_rpm_langpack_zu.tar.gz 326194 BLAKE2B 00fa9c5e1af6851a58a47af3f1b85c1b6e47b19e673a1e556d2574bc22354b05a120e0e0a5e2174368397930bf9e4f21dde44723052974625f6e837ea0296630 SHA512 6ec3ab78016ccd9910c25d57c19e2dcf2801eb04b66c3bf988037fba000a87733f38aecb7ccd1aa2dece33735cddfb94e2c23fd216845aae4bb18e25dddf3f0d
-EBUILD libreoffice-l10n-5.4.7.2.ebuild 3325 BLAKE2B 9300825c46c619c23d03948033f247792337133829a2c335b62bae0e804e9e9c849b9906a3bacb9f0aa1a448615e8c105bda398d41791f343df8982864416992 SHA512 feed2226ac09e367fd5a97353ae70b4ff0fc0b1d318f9d2cd462ccd90ceb03d29025c5f746381c9c2cf68dd23cd28ea244eee82a497bdc5de71bf048bf06f6aa
 EBUILD libreoffice-l10n-6.0.3.2.ebuild 3365 BLAKE2B ac42e9f05e88133d0adb56e0c8e7288ea1d79c19a2359c8afa51620615f49d0921337242903ca134a8760030ed5a3c7a2171561dbcd6e7b3f04e58951825c165 SHA512 e7c0f037d6e9ffaa42d286fbebefdffe0f21d3f6937bb7d2b55cef9ef7e4c2557dc4b6f30bf9411740f3fabf4063b7b1dd5714148c5f2698419247448f2d95ea
 EBUILD libreoffice-l10n-6.0.5.2.ebuild 3325 BLAKE2B 9300825c46c619c23d03948033f247792337133829a2c335b62bae0e804e9e9c849b9906a3bacb9f0aa1a448615e8c105bda398d41791f343df8982864416992 SHA512 feed2226ac09e367fd5a97353ae70b4ff0fc0b1d318f9d2cd462ccd90ceb03d29025c5f746381c9c2cf68dd23cd28ea244eee82a497bdc5de71bf048bf06f6aa
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.4.7.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.4.7.2.ebuild
deleted file mode 100644
index 0a893cd1d293..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.4.7.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm eapi7-ver
-
-MY_PV=$(ver_cut 1-3)
-
-DESCRIPTION="Translations for the Libreoffice suite"
-HOMEPAGE="https://www.libreoffice.org"
-BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
-BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp"
-
-#
-# when changing the language lists, please be careful to preserve the spaces (bug 491728)
-#
-# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
-LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
-
-for lang in ${LANGUAGES_HELP}; do
-	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
-	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
-done
-for lang in ${LANGUAGES}; do
-	if [[ ${lang%:*} != en ]]; then
-		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
-		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
-	fi
-	IUSE+=" l10n_${lang%:*}"
-done
-unset lang helppack langpack
-
-RDEPEND+="app-text/hunspell"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	local lang dir rpmdir
-
-	# First remove dictionaries, we want to use system ones.
-	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
-
-	for lang in ${LANGUAGES}; do
-		# break away if not enabled
-		use l10n_${lang%:*} || continue
-
-		dir=${lang#*:}
-
-		# for english we provide just helppack, as translation is always there
-		if [[ ${lang%:*} != en ]]; then
-			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
-			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-	done
-}
-
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
-	# Condition required for people that do not install anything eg no l10n
-	# or just english with no offlinehelp.
-	if [[ -d "${dir}" ]] ; then
-		insinto /usr/$(get_libdir)/${PN/-l10n/}/
-		doins -r "${dir}"/*
-	fi
-	# remove extensions that are in the l10n for some weird reason
-	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
-		die "Failed to remove extensions"
-}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 4f9c723c4b81..dcc11b847bdb 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,32 +1,28 @@
 AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 BLAKE2B d95ded4f051c77aed22ce99f6273b73ec0893190622f55a3d6d3c3e3e53c59a2f3ce3f645b011c1afa02b727ee803898c65f8feff723955a2fe1a69de6d24480 SHA512 b5ff4c6d3771bcdde21613ad15459120ac1d759b1b3b422b5cba3ee23f7ddf88fde274956f2c91f0a6a37cb36a8d90d8f90bd865e6c2d3ff7c2100e2b469dbd8
 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
 AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418
-AUX libreoffice-5.4.4.2-gtk3-no-gtk-build.patch 436 BLAKE2B 609d8867eee6830e79cbbbce96b260a9401b8b26385bb0af3a4627a8350f046282c9d8084787be03195bc36ed7cd91465b5017ca0801abaca8a0048cc8994bfb SHA512 d2d3e03c2962f4996839808a0c766d60ec897d764b3b1c8c588ba17da7d2d320083f88b8ade5709bbc359e3529ab5c4510806d7ec2a5aa79899b05da6f802851
-AUX libreoffice-5.4.4.2-poppler-0.62.patch 1556 BLAKE2B 73c6218c1b12308b80db6cf93c1cd3d5fa317b5a65832df942c521f931e9bc1b624b1a50b3f7a34e168dad2c4e8ea9db7169b3f3ee27787f3aa1815f771368bc SHA512 759fb125ac09309c4b7dee4ee2d57c4e275b95dd31dbf5df7ff25dec687fd473815ad307dc4dc500ace11823c9f2b2e7bddf5c986fdfa2eddd3051eee7240cae
-AUX libreoffice-5.4.7.2-glm-0.9.9.patch 2905 BLAKE2B 6e7aed3698ddafbdd569e8bd0ba16641062c5e33e8672386da1079b8656b392270aeb4248f7e067a156629b3442c2192e009ecf363f7b26f55a310de3c17ab91 SHA512 722b1d4e8f323da2f78f3139156766d98c5ac4b66e5d02ea71b5f9ca19e19c6495293d5d1d2d4556fcd3776e47e3534719e4249dce78c22aa61544bc6ac9b5ca
 AUX libreoffice-6.0.3.2-disable-flaky-tests-1.patch 8928 BLAKE2B e5399e0e520dfe4ac5d0a02c3bf3372ccdc7725f073aabb74c36600a7cd09eb45a9e5d5486bf700ae374723206e3a421069b298137d14a9b05e17e70f2d9d3b4 SHA512 ca100dc389ed93a5eeed35f001d9e0f6f886782bfaa3dead3105b9bce91ca9e721354b55cd67fdb40c7d2d64966c530ebc6ba6a4e3c62b0e006759c7b64f1b29
 AUX libreoffice-6.0.3.2-disable-flaky-tests-2.patch 1330 BLAKE2B bf038456e3012592e69e6448399160d146ab42a6ce641f9728a13ae9275342d2deb60bfa14b12919c712f0e8f67e2d061a789fad80711c758e80e4adcb6271fb SHA512 30ede2094102b2d6d95e5cd7d76d59a3c4c40e9bd7300681613aea78a23406e32b0bd23aae779d5f8d21102baaaab999a0915e9ef3d16b32463b55caf6867456
 AUX libreoffice-6.0.3.2-poppler-0.64.patch 2617 BLAKE2B c7e9848012b40ace6cd42e7ba114bb03f137c88b25d895be4da3c962ffd2279e524b3b32ed9b24c605ede55920b664759cf321d241e5fd974651242f5c4f19e3 SHA512 ed6941b73fa49a1b520014fb92269a01f947a93bc80b7f6c8cb1c07572ae636154a1ab38a6d6de2d3129f16fad4c224b21aa9cf52e3f95343c882013b24f8b49
 AUX libreoffice-6.0.3.2-testTdf108947.patch 638 BLAKE2B 38da9bf34a921d22002d45e650c738687706c77a67ac2748ee14efb48f47a328b1339712687b525a4f66a1ad0b36fc69c0613ef441067a206ea4df81754f4727 SHA512 a712fb653d86a74a96d568805ca48d183a7ec71f32ef34cfb98a4999cb7fead3f5cd11f5d8f8944041583d5221b0dbaeb3cdfc625a1958118e867569d0c56479
 AUX libreoffice-6.0.4.2-glm-0.9.9.patch 1017 BLAKE2B 7a85f652d6a9c01157da37a9bcc72261849f8f5b64816a8b55b149a44c50e684102a63f0d758b69ed2199259a3a934fa4c47f56ca65b66a82558a72dca991084 SHA512 aca8b606c5ef7c7333938d489faa24f86f454f22797d40ff735653ef57b70874cb4b9d22f32099a8cbc45b23c6943dc1d9dbdda9b6a08052c63ef2ac99a3f1a1
+AUX libreoffice-6.0.5.2-enable-gio-w-gtk3.patch 2011 BLAKE2B ecbde1fcb3bbd6ee3d3be9a6b105684bf9b9e18b3c034cfcae216f0b41d8ad47a58838e75b9f20ec620ce2f6a60468d3d436871e71288e3df3dd8e7fd53ebd15 SHA512 ee543bb2825730e2fe5efa32f435e2895e7fc7b546e9844bb1f34b98a734abaa5b8751223fc14f9913a8ccb964666b20347832687157089345a5513159ee7f21
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-5.4.7.2.tar.xz 194486484 BLAKE2B 82c28025f20842dc6a1cf410e84953208ec36462e2018cc07edfcd9d1086c8e83ac93dcf75148df6b670c4b20cd8c1c7904851e3c7eb46c62c521781e013926e SHA512 712c66de9216b5b7fd48310610801b4f1f17465f8ff282cb7e070a50104ccdb4a5a71f6a58eedb828a7a58f7521b5c725745d5e0f6ece62596b7485161cf01f8
 DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
 DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
 DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
+DIST libreoffice-6.0.5.2-patchset-02.tar.xz 43072 BLAKE2B bcd6406b06bef83ac26e227bc77fed76b67e11f0150a23015e8c83c7092b8efd6f35ec8bbac12bbfda6c597ebaa1782391a624b10a7af0bface6b480b6603802 SHA512 fe764e02cff85a064f8b25e34b3f3558a9fc65051da154e94654c2322e8f50487a97b699a6ab886ec9db00d31a8ca544aaf0b93794e03d17fbbe90b83b44124d
 DIST libreoffice-6.0.5.2.tar.xz 204795724 BLAKE2B d027e83dc5f3908af25975354f8d0ef9a4a9a4fb601dada54d04cdc5bc6d0a0dbedda89ac0cf5bbe88da29382431bddfd331e56b63b88e9f5a23b9299c65b61a SHA512 796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6 SHA512 8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2
 DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
 DIST libreoffice-help-6.0.5.2.tar.xz 2972956 BLAKE2B cfe585fb690bc0a348b67aae1330daa61a0a08acc580fad147853d84c9496d0ad4c4b14598492d4aba9af4afe7fa65bff0161a77b1c0cae9089d50e2a542e0c1 SHA512 975c547e59280e08e554bc658642660fc17e5785b45254b40f969f4b42088d5a350dec72ae6b6f1aa60d7bc95bd9d2c2134f6b395ee86e6f9f5af09f52cc50e1
-EBUILD libreoffice-5.4.7.2.ebuild 16343 BLAKE2B dbcce05f885b808cf4417c888592e8373f71c821decf3dba25c312c23f21a237d050cadf8f235f844ee85bf58143fd450bf4686f9d9188421db6f3acad65d549 SHA512 43cf57add0881d82b0e542b6f33f325b308d7a6849cbbe87056e236428de653670df69c7525783cdc26e428065f139f5183f71ec2e9064ca19c11d3862f89c4e
 EBUILD libreoffice-6.0.3.2.ebuild 16953 BLAKE2B 9b17913bb18d607ac0141226e54199b1d48c5f88a66d9ba8a6bb40459e35c1301a57c0b111a23f12e03daba9e9e6b850e874d64e4d2a37bba809dbff24201eb8 SHA512 acd68e679413031897fe17a27b1da7c688522ca4e773174be5ab1595c588b62e0969f72fa758f1548d9adce54cca151ecd5edfee1193dcf568ec5fc4b8265a22
-EBUILD libreoffice-6.0.5.2.ebuild 16815 BLAKE2B dd47a31a2fc4565a7f2ba8918f278f456758a1a59753266d6248030d2e3e34dacb0f6b43635af07aeaf7e7b5903e86b64ecc96bd49e063b768b3b25ebfb733eb SHA512 8aa16c23bff368e704b215ccef8abf733fcc3e296f4e45976e644b084f795be562cb2e26081e3ed4c03368cfece9fe50d9a5da76742678d262e6bbee54e7c2e9
-EBUILD libreoffice-6.0.9999.ebuild 16824 BLAKE2B 08352bd94687e18fa60a2c5e23decb9fb028fa360cd5799f0d99232b58ea42b19a40923a645d37b6c60fcd44eeca7af427ecca448e6fccdf6a62cfdd51ca2182 SHA512 c1e873d754c8e34f42322ccb190e56a82f89dbaacd889a920b19ac06eb80dd170745880ca03ef9d153d10842143c156d39ef7d34f6d34f53ae7d66ba8141499b
-EBUILD libreoffice-6.1.9999.ebuild 16605 BLAKE2B 61df63788a3b0e5d8010b8589a365b3be0fb7a78e6bbac25438c39f022f8a391e27249cf6d39aaddd2e5918f251796887cc64f6c939161374b615fb77ebf65e0 SHA512 38489e5873c89a39cf3c3c09e888eccbeaf3bfbe7d90dde996415647c20609a374775aea9efd21591ec0d963888095c50b11fb4b82c958805462e492c5e34d69
-EBUILD libreoffice-9999.ebuild 16600 BLAKE2B e497c832f22797d839d084195dc70d37dc3091b3d9d88f4688a7e1ab53e624e073f7f72baa7800fa0dc09da913242ce8f4c565df694911cd2fc0d2df363195c5 SHA512 c062f2a1b2b35285266b56039579d37b347edcd7b274ee825a28b008bf2cd3ac1be2bf7a73ed4d499803ac7901d1284f776de12b666c20630791e6f1e9711e88
-MISC metadata.xml 1153 BLAKE2B 831243a115825974190637c2c9615e41e44d50227ba6b8e4c7f9683d8d510e422b573ee18f886673df2a3bf30feb5fcdfc7f1e90ec215d39bcccd9a11098d57a SHA512 50b686f39b0113d96b8a2b14f36581be68c2384d13a963ea3c20973b3af874bb9d50c4b7d5d2f11b2e0ffaf9deb351b5314fe30f954f17351ba0c8c850680c1d
+EBUILD libreoffice-6.0.5.2-r1.ebuild 16814 BLAKE2B 3f06b68e3d8dd43a549ca4358ce012f426f8ca5081df83035c187ccc29b14a6b6151e12ccc2a739dc5cb08583397bbc1dcfbd04c1366fe6ce5c6dc8a4bdfe4c9 SHA512 b95abbb02660b8d341fcecbc8e40beedf741b8d95e8817b8016e8bc94230e34c0d7e928d8df50dc45e4c164d28b03baa5954ac7275e816c3fa9ba906da61fc00
+EBUILD libreoffice-6.0.9999.ebuild 16752 BLAKE2B 85f7fea29bc3777cde350956ad73d064f3ef924996d9d1aaad608827d9b034fb5e0295e34d2e00d3004f78e1d70ea0161e77c347a2097f829dc063c933bbbf04 SHA512 43d1d010b55d33eb73897a8ace7f11ee062770f18c7c8961a9aa3e73b5d40bf5f5087115f47a70b3bc4a69f215603a4bcc58ff6d175edaa040d6089ed827e27d
+EBUILD libreoffice-6.1.9999.ebuild 16533 BLAKE2B ac11c68340706f89e7e25dee5fb2e6ad2f1301c20ebc7883892fa78ba997225c48121ba4882eb2dc12399281dea013c024e6fd713ef84ee04da82069ee2aab4d SHA512 a370fafd44229c2df400754b53f261f3fc3388adf96bf8b2c1d6e408e7fe8a695487921e78621311f87506732841569c0e63161ae4f4d8ed8af4b95f941f5be7
+EBUILD libreoffice-9999.ebuild 16533 BLAKE2B ac11c68340706f89e7e25dee5fb2e6ad2f1301c20ebc7883892fa78ba997225c48121ba4882eb2dc12399281dea013c024e6fd713ef84ee04da82069ee2aab4d SHA512 a370fafd44229c2df400754b53f261f3fc3388adf96bf8b2c1d6e408e7fe8a695487921e78621311f87506732841569c0e63161ae4f4d8ed8af4b95f941f5be7
+MISC metadata.xml 1090 BLAKE2B b30fc707317ea0601859f327540712eae38a9fc7365675501fca648e17e2ee3b35c2391e76dc7878b53e5216ca4eb2618595fbac2e07d8680f8daeaa67aaeeeb SHA512 4ffa1f2d605bc5666e25ce126d3264f9ed272ae1b12b9dd17ae366462d58de4a64767ee63928b233c21a15a77b549eb5c574064e73164cb20b0adb6ce12a9ec2
diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch
deleted file mode 100644
index f0e2c55c9369..000000000000
--- a/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix build with USE="gtk3 -gtk"
-https://bugs.gentoo.org/641812
-
---- a/vcl/unx/gtk3/gtk3gtkframe.cxx	2017-12-12 18:45:07.000000000 +0100
-+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx	2017-12-21 13:20:31.935843032 +0100
-@@ -21,6 +21,7 @@
- #include <unx/gtk/gtkdata.hxx>
- #include <unx/gtk/gtkinst.hxx>
- #include <unx/gtk/gtkgdi.hxx>
-+#include <unx/gtk/gtksalmenu.hxx>
- #include <vcl/help.hxx>
- #include <vcl/keycodes.hxx>
- #include <vcl/layout.hxx>
diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch
deleted file mode 100644
index e6d7dff898df..000000000000
--- a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version.
-
---- a/configure.ac	2017-12-12 18:45:07.000000000 +0100
-+++ b/configure.ac	2018-01-04 23:57:16.410999542 +0100
-@@ -10403,7 +10403,7 @@
-     if test "$with_system_poppler" = "yes"; then
-         AC_MSG_RESULT([external])
-         SYSTEM_POPPLER=TRUE
--        PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 )
-+        PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 )
-         AC_LANG_PUSH([C++])
-         save_CXXFLAGS=$CXXFLAGS
-         save_CPPFLAGS=$CPPFLAGS
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2017-12-12 18:45:07.000000000 +0100
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2018-01-05 00:29:16.541246738 +0100
-@@ -32,13 +32,11 @@
- #pragma warning(push, 1)
- #endif
- 
--// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
- // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
- //        because the internal poppler does not provide poppler-version.h and the macro always returns 0
--#if POPPLER_CHECK_VERSION(0, 21, 1)
--#include "UTF8.h"
--#elif POPPLER_CHECK_VERSION(0, 21, 0)
--#include "UTF.h"
-+// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0
-+#if POPPLER_CHECK_VERSION(0, 62, 0)
-+#include "UnicodeMapFuncs.h"
- #else
- #include "UTF8.h"
- #endif
-@@ -918,7 +916,11 @@
-             );
- 
-     // silence spurious warning
-+#if POPPLER_CHECK_VERSION(0, 62, 0)
-+    (void)&mapUTF16;
-+#else
-     (void)&mapUCS2;
-+#endif
- 
-     char buf[9];
-     for( int i=0; i<uLen; ++i )
diff --git a/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch b/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch
deleted file mode 100644
index 28982d90c369..000000000000
--- a/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7984347b9a2fce74cdce0c1c5b27f6e2b55a2f49 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Sun, 28 Jan 2018 19:48:25 +0100
-Subject: fix build with glm 0.9.9
-
-In file included from /usr/include/glm/gtx/norm.hpp:18:0,
-                 from /data/rene/git/LibreOffice/master/vcl/inc/opengl/VertexUti
-ls.hxx:16,
-                 from /data/rene/git/LibreOffice/master/vcl/inc/opengl/LineRende
-rUtils.hxx:14,
-                 from /data/rene/git/LibreOffice/master/vcl/opengl/LineRenderUti
-ls.cxx:11:
-/usr/include/glm/gtx/quaternion.hpp:23:3: error: #error "GLM: GLM_GTX_quaternion
- is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
-   ^~~~~
-
-so just define it.
-
-Change-Id: I981bfb5fd944f32a3774b3f9b183989773bf235f
-Reviewed-on: https://gerrit.libreoffice.org/48799
-Tested-by: Jenkins <ci@libreoffice.org>
-Tested-by: Rene Engelhard <rene@debian.org>
-Reviewed-by: Rene Engelhard <rene@debian.org>
----
- chart2/Library_chartcore.mk   | 6 ++++++
- chart2/Library_chartopengl.mk | 6 ++++++
- vcl/Library_vcl.mk            | 6 ++++++
- 3 files changed, 18 insertions(+)
-
-diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
-index f785d09..08455f9 100644
---- a/chart2/Library_chartcore.mk
-+++ b/chart2/Library_chartcore.mk
-@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\
-     -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
- ))
- 
-+ifeq ($(SYSTEM_GLM),TRUE)
-+$(eval $(call gb_Library_add_defs,chartcore,\
-+        -DGLM_ENABLE_EXPERIMENTAL \
-+))
-+endif
-+
- $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore))
- 
- $(eval $(call gb_Library_use_externals,chartcore,\
-diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
-index f999f94..8b5a22c 100644
---- a/chart2/Library_chartopengl.mk
-+++ b/chart2/Library_chartopengl.mk
-@@ -54,5 +54,11 @@ $(eval $(call gb_Library_add_exception_objects,chartopengl,\
-     chart2/source/view/main/DummyXShape \
-     chart2/source/view/main/OpenGLRender \
- ))
-+
-+ifeq ($(SYSTEM_GLM),TRUE)
-+$(eval $(call gb_Library_add_defs,chartopengl,\
-+        -DGLM_ENABLE_EXPERIMENTAL \
-+))
-+endif
-  
- # vim: set noet sw=4 ts=4:
-diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
-index 699d6ab..a2caa8e 100644
---- a/vcl/Library_vcl.mk
-+++ b/vcl/Library_vcl.mk
-@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
- 	-DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
- ))
- 
-+ifeq ($(SYSTEM_GLM),TRUE)
-+$(eval $(call gb_Library_add_defs,vcl,\
-+        -DGLM_ENABLE_EXPERIMENTAL \
-+))
-+endif
-+
- $(eval $(call gb_Library_use_sdk_api,vcl))
- 
- $(eval $(call gb_Library_use_custom_headers,vcl,\
--- 
-cgit v1.1
diff --git a/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch b/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch
new file mode 100644
index 000000000000..4a018711ca2c
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch
@@ -0,0 +1,46 @@
+From a560bcbea943cb317e96c15c608c5e2f66e5698f Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Thu, 31 May 2018 14:14:48 +0200
+Subject: --enable-gio also for --disable-gtk --enable-gtk3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+...as is used by the Flatpak build.  Other settings only checked in that block
+controlled by ENABLE_GTK, and thus potentially erronously left empty for
+--disable-gtk --enable-gtk3 builds, are GTHREAD- and GTK_PRINT-related settings.
+GTHREAD_LIBS is explicitly used in vcl/Library_vclplug_gtk3.mk even, but it
+being empty apparently has no negative effects, so leave it at that for now.
+On the GTK_PRINT-related settings, Caolan commented on IRC:  "ENABLE_GTK_PRINT
+is probably best removed entirely I guess, it didn't work out and they're
+redoing the dialog in upstream gtk again I'm told."
+
+Change-Id: I7e026c0ac9b23e7ace2c2e92390bdcc3be7d39a3
+Reviewed-on: https://gerrit.libreoffice.org/55127
+Tested-by: Jenkins <ci@libreoffice.org>
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+(cherry picked from commit b5dd045bf533a2ba4d1c98debe5a2acba4c8b486)
+Reviewed-on: https://gerrit.libreoffice.org/55164
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+Tested-by: Caolán McNamara <caolanm@redhat.com>
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index e35db48..9da61d9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9875,7 +9875,9 @@ if test  "$test_gtk" = "yes"; then
+         GTK_PRINT_CFLAGS=$(printf '%s' "$GTK_PRINT_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+         FilterLibs "${GTK_PRINT_LIBS}"
+         GTK_PRINT_LIBS="${filteredlibs}"
++    fi
+ 
++    if test "$ENABLE_GTK" = "TRUE" || test "$ENABLE_GTK3" = "TRUE"; then
+         AC_MSG_CHECKING([whether to enable GIO support])
+         if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
+             dnl Need at least 2.26 for the dbus support.
+-- 
+cgit v1.1
+
diff --git a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
deleted file mode 100644
index a2e8ed475fac..000000000000
--- a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
+++ /dev/null
@@ -1,550 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${P}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 jemalloc libressl mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libodfgen-0.1.0
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	=dev-libs/liborcus-0.12*
-	dev-libs/librevenge
-	dev-libs/nspr
-	dev-libs/nss
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( dev-libs/dbus-glib )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		x11-libs/gtk+:3
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/libertine
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-	!<sys-devel/make-3.82
-	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3
-	dev-util/intltool
-	>=dev-util/mdds-1.2.2:1=
-	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/ucpp
-	sys-libs/zlib
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? (
-		dev-util/cppunit
-		media-fonts/dejavu
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	# 6.0 branch
-	"${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
-	"${FILESDIR}/${PN}-6.0.3.2-poppler-0.64.patch" # bug 653478
-	"${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178
-	# 6.1 branch
-	"${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
-
-	# TODO: upstream
-	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-	"${FILESDIR}/${PN}-5.4.4.2-gtk3-no-gtk-build.patch" # bug 641812
-)
-
-pkg_pretend() {
-	use java || \
-		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
-	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
-		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
-		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
-		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
-	fi
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${PV/.9999}
-		[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	default
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-ccache
-		--disable-collada
-		--disable-dependency-tracking
-		--disable-epm
-		--disable-fetch-external
-		--disable-gltf
-		--disable-gstreamer-0-10
-		--disable-kde4
-		--disable-online-update
-		--disable-pdfium
-		--disable-report-builder
-		--disable-systray
-		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
-		--with-build-version="Gentoo official package"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-ucpp
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--without-help
-		--with-helppack-integration
-		--with-system-gpgmepp
-		--without-system-sane
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk)
-		$(use_enable gtk3)
-		$(use_enable mysql ext-mariadb-connector)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vlc)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with mysql system-mysql-cppconn)
-		$(use_with odk doxygen)
-	)
-
-	if use eds || use gtk3; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		)
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
-	fi
-
-	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=helpcontent2/source/media/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || \
-			ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# bug 593514
-	if use gtk3; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	# Remove desktop files to support old installs that can't parse mime
-	rm -r "${ED}"usr/share/mimelnk/ || die
-
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
index f8ee3a7fc14e..df31a0f84f82 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
 ADDONS_URI="https://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-02.tar.xz"
 
 [[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
 inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
@@ -64,7 +64,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@@ -113,10 +113,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	>=dev-libs/liborcus-0.13.3
 	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
 	dev-libs/nspr
 	dev-libs/nss
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
 	>=dev-libs/redland-1.0.16
 	>=dev-libs/xmlsec-1.2.24[nss]
 	media-gfx/graphite2
@@ -135,6 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
@@ -162,10 +163,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		gnome-base/dconf
 		media-libs/mesa[egl]
 		x11-libs/gtk+:3
+		x11-libs/pango
 	)
 	gtk2? (
 		x11-libs/gdk-pixbuf
 		>=x11-libs/gtk+-2.24:2
+		x11-libs/pango
 	)
 	jemalloc? ( dev-libs/jemalloc )
 	kde? (
@@ -211,10 +214,7 @@ fi
 #        after everything upstream is under gbuild
 #        as dmake execute tests right away
 DEPEND="${COMMON_DEPEND}
-	!<sys-devel/make-3.82
 	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
 	dev-perl/Archive-Zip
 	>=dev-util/cppunit-1.14.0
 	>=dev-util/gperf-3
@@ -225,7 +225,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/flex
 	sys-devel/gettext
 	sys-devel/ucpp
-	sys-libs/zlib
 	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libXt
@@ -252,6 +251,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
 	"${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
 
+	# 6.0 branch
+	"${FILESDIR}/${P}-enable-gio-w-gtk3.patch" #bug 661062
+
 	# gtk3-kde5 vcl plugin backported from master
 	"${WORKDIR}"/${PATCHSET/.tar.xz/}
 )
@@ -265,6 +267,7 @@ _check_reqs() {
 	else
 		CHECKREQS_DISK_BUILD="6G"
 	fi
+	check-reqs_$1
 }
 
 pkg_pretend() {
@@ -277,10 +280,7 @@ pkg_pretend() {
 		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
 	fi
 
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		_check_reqs
-		check-reqs_pkg_pretend
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
 
 pkg_setup() {
@@ -288,10 +288,7 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 	xdg_environment_reset
 
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		_check_reqs
-		check-reqs_pkg_setup
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
 }
 
 src_unpack() {
@@ -408,6 +405,7 @@ src_configure() {
 		--disable-fetch-external
 		--disable-gstreamer-0-10
 		--disable-online-update
+		--disable-openssl
 		--disable-pdfium
 		--disable-report-builder
 		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
@@ -420,6 +418,7 @@ src_configure() {
 		--with-lang=""
 		--with-parallelism=$(makeopts_jobs)
 		--with-system-ucpp
+		--with-tls=nss
 		--with-vendor="Gentoo Foundation"
 		--with-x
 		--without-fonts
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 3df147edf4c0..7fa72b5977b8 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@@ -113,10 +113,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	>=dev-libs/liborcus-0.13.3
 	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
 	dev-libs/nspr
 	dev-libs/nss
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
 	>=dev-libs/redland-1.0.16
 	>=dev-libs/xmlsec-1.2.24[nss]
 	media-gfx/graphite2
@@ -135,6 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
@@ -162,10 +163,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		gnome-base/dconf
 		media-libs/mesa[egl]
 		x11-libs/gtk+:3
+		x11-libs/pango
 	)
 	gtk2? (
 		x11-libs/gdk-pixbuf
 		>=x11-libs/gtk+-2.24:2
+		x11-libs/pango
 	)
 	jemalloc? ( dev-libs/jemalloc )
 	kde? (
@@ -211,10 +214,7 @@ fi
 #        after everything upstream is under gbuild
 #        as dmake execute tests right away
 DEPEND="${COMMON_DEPEND}
-	!<sys-devel/make-3.82
 	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
 	dev-perl/Archive-Zip
 	>=dev-util/cppunit-1.14.0
 	>=dev-util/gperf-3
@@ -225,7 +225,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/flex
 	sys-devel/gettext
 	sys-devel/ucpp
-	sys-libs/zlib
 	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libXt
@@ -265,6 +264,7 @@ _check_reqs() {
 	else
 		CHECKREQS_DISK_BUILD="6G"
 	fi
+	check-reqs_$1
 }
 
 pkg_pretend() {
@@ -277,10 +277,7 @@ pkg_pretend() {
 		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
 	fi
 
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		_check_reqs
-		check-reqs_pkg_pretend
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
 
 pkg_setup() {
@@ -288,10 +285,7 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 	xdg_environment_reset
 
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		_check_reqs
-		check-reqs_pkg_setup
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
 }
 
 src_unpack() {
@@ -408,6 +402,7 @@ src_configure() {
 		--disable-fetch-external
 		--disable-gstreamer-0-10
 		--disable-online-update
+		--disable-openssl
 		--disable-pdfium
 		--disable-report-builder
 		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
@@ -420,6 +415,7 @@ src_configure() {
 		--with-lang=""
 		--with-parallelism=$(makeopts_jobs)
 		--with-system-ucpp
+		--with-tls=nss
 		--with-vendor="Gentoo Foundation"
 		--with-x
 		--without-fonts
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index ae37700e0e39..46abef27e981 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@@ -114,10 +114,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	>=dev-libs/liborcus-0.13.3
 	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
 	dev-libs/nspr
 	dev-libs/nss
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
 	>=dev-libs/redland-1.0.16
 	>=dev-libs/xmlsec-1.2.24[nss]
 	media-gfx/graphite2
@@ -136,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
@@ -163,10 +164,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		gnome-base/dconf
 		media-libs/mesa[egl]
 		x11-libs/gtk+:3
+		x11-libs/pango
 	)
 	gtk2? (
 		x11-libs/gdk-pixbuf
 		>=x11-libs/gtk+-2.24:2
+		x11-libs/pango
 	)
 	kde? (
 		dev-qt/qtcore:5
@@ -211,10 +214,7 @@ fi
 #        after everything upstream is under gbuild
 #        as dmake execute tests right away
 DEPEND="${COMMON_DEPEND}
-	!<sys-devel/make-3.82
 	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
 	dev-perl/Archive-Zip
 	>=dev-util/cppunit-1.14.0
 	>=dev-util/gperf-3
@@ -225,7 +225,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/flex
 	sys-devel/gettext
 	sys-devel/ucpp
-	sys-libs/zlib
 	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libXt
@@ -262,6 +261,7 @@ _check_reqs() {
 	else
 		CHECKREQS_DISK_BUILD="6G"
 	fi
+	check-reqs_$1
 }
 
 pkg_pretend() {
@@ -274,10 +274,7 @@ pkg_pretend() {
 		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
 	fi
 
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		_check_reqs
-		check-reqs_pkg_pretend
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
 
 pkg_setup() {
@@ -285,10 +282,7 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 	xdg_environment_reset
 
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		_check_reqs
-		check-reqs_pkg_setup
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
 }
 
 src_unpack() {
@@ -405,6 +399,7 @@ src_configure() {
 		--disable-fetch-external
 		--disable-gstreamer-0-10
 		--disable-online-update
+		--disable-openssl
 		--disable-pdfium
 		--disable-report-builder
 		--with-alloc=system
@@ -417,6 +412,7 @@ src_configure() {
 		--with-lang=""
 		--with-parallelism=$(makeopts_jobs)
 		--with-system-ucpp
+		--with-tls=nss
 		--with-vendor="Gentoo Foundation"
 		--with-x
 		--without-fonts
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index cc4c2bc8ce11..46abef27e981 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@@ -114,10 +114,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	>=dev-libs/liborcus-0.13.3
 	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
 	dev-libs/nspr
 	dev-libs/nss
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
 	>=dev-libs/redland-1.0.16
 	>=dev-libs/xmlsec-1.2.24[nss]
 	media-gfx/graphite2
@@ -136,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
@@ -163,10 +164,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		gnome-base/dconf
 		media-libs/mesa[egl]
 		x11-libs/gtk+:3
+		x11-libs/pango
 	)
 	gtk2? (
 		x11-libs/gdk-pixbuf
 		>=x11-libs/gtk+-2.24:2
+		x11-libs/pango
 	)
 	kde? (
 		dev-qt/qtcore:5
@@ -211,10 +214,7 @@ fi
 #        after everything upstream is under gbuild
 #        as dmake execute tests right away
 DEPEND="${COMMON_DEPEND}
-	!<sys-devel/make-3.82
 	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
 	dev-perl/Archive-Zip
 	>=dev-util/cppunit-1.14.0
 	>=dev-util/gperf-3
@@ -225,7 +225,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/flex
 	sys-devel/gettext
 	sys-devel/ucpp
-	sys-libs/zlib
 	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libXt
@@ -262,6 +261,7 @@ _check_reqs() {
 	else
 		CHECKREQS_DISK_BUILD="6G"
 	fi
+	check-reqs_$1
 }
 
 pkg_pretend() {
@@ -274,10 +274,7 @@ pkg_pretend() {
 		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
 	fi
 
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		_check_reqs
-		check-reqs_pkg_pretend
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
 
 pkg_setup() {
@@ -285,10 +282,7 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 	xdg_environment_reset
 
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		_check_reqs
-		check-reqs_pkg_setup
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
 }
 
 src_unpack() {
@@ -405,6 +399,7 @@ src_configure() {
 		--disable-fetch-external
 		--disable-gstreamer-0-10
 		--disable-online-update
+		--disable-openssl
 		--disable-pdfium
 		--disable-report-builder
 		--with-alloc=system
@@ -417,6 +412,7 @@ src_configure() {
 		--with-lang=""
 		--with-parallelism=$(makeopts_jobs)
 		--with-system-ucpp
+		--with-tls=nss
 		--with-vendor="Gentoo Foundation"
 		--with-x
 		--without-fonts
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 174cf72da38f..b63d524dac8d 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,7 +14,6 @@ version</longdescription>
     <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
     <flag name="googledrive">Enable support for remote files on Google Drive</flag>
     <flag name="gtk2">Enable legacy gtk2 frontend</flag>
-    <flag name="gtk3">Enable experimental gtk3 frontend</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
     <flag name="odk">Build the Office Development Kit</flag>
     <flag name="pdfimport">Enable PDF import via the Poppler library</flag>
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index 23f6f77f97bc..33c4a7253bc3 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,3 +1,3 @@
 DIST orage-4.12.1.tar.bz2 2590788 BLAKE2B 0f00b5704e11923c2ceaac81f0956457402a90f65709c165c98b6942745ea3adee176691555a18548ead258951693187e1b3ce9a718abb3b13c2a1c2a4754e7e SHA512 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
-EBUILD orage-4.12.1-r1.ebuild 1540 BLAKE2B 32e995bf7b5a3518a30f3dddb2a1ccb74f45fd5c249605dcf168ce9bc6e9cac557cae37d927f1754faa6aacf6b04b48c384a491c4ff941a21d8722f5781c6530 SHA512 43a08917b88afe4b324975dd098fa7046353fe42734d1a4ec156955622800397f4154581a4c70fa67b8328077ab926db8a93db866c3e84f6875f526f6a409b2b
+EBUILD orage-4.12.1-r1.ebuild 1551 BLAKE2B 7b68711f09b5263f72248ea59a11616f61c9e188fb3105ca7c3ffa54f6e88abdc5d6e235175cba3f8130d9ae4431d5a2a286da77c90fd574cde7f0b44ddce12a SHA512 83e6b2110405c82c3c72389563f9180e26646c9d91b8d82383cf9fed91acc90ca005658c00be8283bcdc5d2dcd5a4ab93eb31182defda79b82d553e8ef3ea773
 MISC metadata.xml 355 BLAKE2B 4ddbf38a80be81b7e131d7c616dfb88dff1e900952c17c4cc4dd26711e720351177d92d8225825dd57354399ecdb8b7bccd18f883fcd927846e8614dd4ac4a99 SHA512 a5d3f875ac31caa10ca77ce8eb38449b3007094d1b9d7d307bd15ee29644c09530d44ac6a4953e10adfa3bd45b6a3fe44dbbb3b80ab7d0c8572c48523ef287eb
diff --git a/app-office/orage/orage-4.12.1-r1.ebuild b/app-office/orage/orage-4.12.1-r1.ebuild
index 68df47c6f19e..afbcd0af7e23 100644
--- a/app-office/orage/orage-4.12.1-r1.ebuild
+++ b/app-office/orage/orage-4.12.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
 
 DESCRIPTION="A time managing application (and panel plug-in) for the Xfce desktop environment"
 HOMEPAGE="https://git.xfce.org/apps/orage/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index fa6847cad962..7302756362c4 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,10 +1,12 @@
 AUX texmakerx_my.pri 439 BLAKE2B a520129f6a0630ea5032f619b425847bc58956553840dbe1c9a97d1587f9eebc4958450b264a124a8342fb839276314854af3bf41d18084deee0a49b45320904 SHA512 859bd280c5d5c319fe0c4c5af04a2ec8118babeef3b22d14a03384ab25e8d0721145b453179e1f16b989068bfe79d5831efcab545069a9cb5018382e2e8c6d8b
 DIST texstudio-2.11.2.tar.gz 24143941 BLAKE2B 2c17b70cd497338ee9c7cd7fda0bdcb8775c3b487ae940fb0e755c8621d45a45a4381b064c0e18b9c134560e9a322d9c321453b01c3b05991d7d37467ea90f01 SHA512 774cea12339b19c7d33d034e75386415b89c59de1e149f3973bd0cf789a28c4cb1cdb026a897228303071dc05f985d4798924c6b253e964d6bdced877ab9f1e7
+DIST texstudio-2.12.10.tar.gz 26770850 BLAKE2B 7dba024c34f6cf53ff8cfa21eedb53bbf7fb5aba0b00d1c7983240a46c46360bf6fdd783ec539019a9d385dd6862fc3bb9a0198c234c9546798835e1621d11ff SHA512 c3d1e14df8efe3f37dd71e5d0148f57f117c666b9487712fca5a7bd967eca4f7951c970bc5bffab14daef4fb8497af33edf2fce23cc9ae4cf598d905d9312ef0
 DIST texstudio-2.12.2.tar.gz 26311798 BLAKE2B 1eb3add771a28918f39c69bb167eee31456ab87afcff0f4ae66ccd73d96fdfba5cbfbc57666908f7e7ffb5c69fd2d5aebf342338b9e3a56d3c31fb774f9cd1a7 SHA512 255b211fe715ffc91706ab20877ffaa4b8e0710d3e6f381e7a6b8eed19bb889d89d0913756839c1f0c427029c0da9713b78bd1e21769ccc46cf976b65c91c6f6
 DIST texstudio-2.12.4.tar.gz 26401510 BLAKE2B 53f1aca4f28154c5ae0f941e074e2da6d727dedf6b5604b301efccd95eea256a6cb91bf887985d81c65964c0e407cd1a8c2037a3bd73559aa115bec3954df744 SHA512 6e1d114ae87c854231399004504e460d078b9bf26ceb25c7fc592b79d3234f9880f8c021c3ddb2ef26a883dbddc2b94f98f368c976aa16973d3c1a6823a4150d
 DIST texstudio-2.12.6.tar.gz 26511069 BLAKE2B 95f2043222e15f96ed56dabb9bbbb937e3f8f1869cb667897bbdb48b99626089bf14a5e321c57ca5c9196d1cf2ce0beaad322b04d90f8a0b62189ff7c5be0d33 SHA512 16e846137b529f89f10dba3f847afe5a875ce1bc4029d002f76a1bcde491dd44756b27e38b4c5c159fcdb12b025759c8a0ebbbb8d8bd296e954b53032434170a
 DIST texstudio-2.12.8.tar.gz 26555418 BLAKE2B 172c36aed91d273629109412e43f947c00e7d37d392098cc012826391c88f461659764b6b8c4fcff3d84e6ba7b10a4adddcc4298267e0fa0448a61f4c9b9da15 SHA512 0076617f6421fa959c8c327bc81d4d27779358481b377d83856fe26b963d7c3c1e04d3b11e8f7eeb99cab9c089c8e7afcbb9c93a5aaccd00cf493792b802bfcb
 EBUILD texstudio-2.11.2-r2.ebuild 2118 BLAKE2B ef3cf0188f7be031583769e3936f91b8c40514bb7f308abeb568e2b1061f3683c62d35301969f30356f62c477ec65a429d97d69138a9b5f90c12949fb88d485b SHA512 18e063c1bd1927d0b433a3eef4739507921e44d028e3816f12736bacd68d4d64eb91db17efd55e108372ccc2dd0c0cdf760eb2b14c606a9613166caa2e1011fd
+EBUILD texstudio-2.12.10.ebuild 2007 BLAKE2B 56e06c2185573ab1ab9471dcd02a1cd8e02c24c8d3ed8d8f1a80536f837d54a06393a9fcb95c1ac4dada186d2b5f8bff198197e5908c7643bc67dd9f54a0f1a0 SHA512 42b5bd7dd4c5913ac91763869c003b297b538de155766f77ebb5587dedca75ab42bfe048905c55c2d0aae9245f3a616518554d906f226c9d3bbd853134fcc8ad
 EBUILD texstudio-2.12.2-r1.ebuild 2008 BLAKE2B f1f75a8bd3aa0e7670f07ca4d8e1f277efe73571d41defd0d9aba41135724e2f416c3c8ec42ac3789d822de27ea043c926c033076aa795181f730139a0f900ea SHA512 c9c41476e79ec6a18504df3374f2c9548993e7880d4d4ce78e986704f2785fd7a4eeba939b9dca7bd7c2ef800d62c046b52a73768bd19bd204cc739180047b3a
 EBUILD texstudio-2.12.4-r1.ebuild 2008 BLAKE2B f1f75a8bd3aa0e7670f07ca4d8e1f277efe73571d41defd0d9aba41135724e2f416c3c8ec42ac3789d822de27ea043c926c033076aa795181f730139a0f900ea SHA512 c9c41476e79ec6a18504df3374f2c9548993e7880d4d4ce78e986704f2785fd7a4eeba939b9dca7bd7c2ef800d62c046b52a73768bd19bd204cc739180047b3a
 EBUILD texstudio-2.12.6-r1.ebuild 2287 BLAKE2B 2c3382c11397fe7d66f36afd2f0add6b5c1cae1d9253212a546c4d23d9097f182a53046756d35fb5135bbb08b0525c3769f2ddedd02d8fc4beb047f64ee4bda8 SHA512 2a49c0caf28da9b255ea4ccd729544bdd610bedfafde221babd4af540e459e6e0169cef7056b4e77054cabc7743449389f258b001726aa53466b9273a2ebd31e
diff --git a/app-office/texstudio/texstudio-2.12.10.ebuild b/app-office/texstudio/texstudio-2.12.10.ebuild
new file mode 100644
index 000000000000..eb4cdb1b7549
--- /dev/null
+++ b/app-office/texstudio/texstudio-2.12.10.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils prefix qmake-utils xdg-utils
+
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
+HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio"
+SRC_URI="https://github.com/texstudio-org/texstudio/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="video"
+
+COMMON_DEPEND="
+	app-text/hunspell:=
+	app-text/poppler[qt5]
+	>=dev-libs/quazip-0.7.2[qt5(+)]
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	video? ( media-libs/phonon[qt5(+)] )"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	app-text/psutils
+	media-libs/netpbm
+	virtual/latex-base"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
+
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+
+	sed \
+		-e '/qtsingleapplication.pri/d' \
+		-i ${PN}.pro || die
+
+	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
+	eprefixify ${PN}.pri
+
+	# fix build with quazip-0.7.2 - bug 597930
+	sed -i ${PN}.pro -e "s|include/quazip|&5|" || die
+	sed -i ${PN}.pri -i ${PN}.pro -e "s/-lquazip/&5/" || die
+}
+
+src_configure() {
+	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
+}
+
+src_install() {
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
+		newicon -s ${i} utilities/${PN}${i}.png ${PN}.png
+	done
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 0f40ac669d37..19d131bb3248 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index 27093c11621b..e7e2dc7ac619 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -5,6 +5,7 @@ DIST elogv-0.7.6.4.tar.gz 18481 BLAKE2B b7a81e5d736b589cbee3cffbcd0df64c76ba83b1
 DIST elogv-0.7.6.5.tar.gz 19021 BLAKE2B 0b9f67357ac8fc617ca922a5de64da8559b98cd929d48ed8ba758f8e9a694c60c1e49c33d78aea8c4b5b5d7fc788595c56ff5903b9bc93f6cde5cd1128c6920b SHA512 4a596653ca1c1dc3c315cdf111ddf12d7af5514582da50bf659c48d063fd971c2466d1bd0e4fa1e92e71afaa9715024269cf7ed3a5969ce986742a2c5f648c4a
 DIST elogv-0.7.6.6.tar.gz 19362 BLAKE2B 79ab57c2e30e077731836a3137889c7093fbddd0c10e1e0f3da3160dbb801e928e93a01d3cceadc6fe21f11a8d1eeecad713e915c4cee3cd3ee8ef8255540960 SHA512 d044feecbbef17d676551e545dcc4e6e27779668371d40d891d53bb7187474f665a422a732a0e95246fbd9d689ddeca509a74b6ce677f3a50871878e12895cba
 DIST elogv-0.7.7.1.tar.gz 19437 BLAKE2B 07f39ce5363541020332d8af72fc9c3145ed1ba435bd37f1c0a8846a7e8831e55898c5a9eb65510e821a0f1067fc461c5b124db88600696cfeacdb74c77189cd SHA512 5a766e7ccf1da07795b111dbe45656203a54a6e9fe2aee12caa3ad4c28f122e4845274a4af45b492a34b93d316b241e1a1c33acfc7c366daa328563da04c165d
+DIST elogv-0.7.8.tar.gz 19554 BLAKE2B 653a1dd8d5cb142c78c27ad4c7110a7dac666eed649213ef62c1548d5248c4add561242290a59178470736cffc9ac15fb7ee796a2954239ba382001f1e6c9c4f SHA512 be90f01b4d2e114608b13aeba78ab368af6ed66ca329de6952d7f422c90356fd1c6988827f0c60ee66636ae92e089689c7cbd725f6eb20545747fb24d0d1daf2
 EBUILD elogv-0.7.6.1-r1.ebuild 1600 BLAKE2B ea0deeb9e37125a411641216a09caf887e1b087f7de7b76bc6e4de314e18259e3c796007711533c96ce03cec0770e9ccc0b6668eb2ed5bd03e0d59a9128b4f02 SHA512 6f46ef4653736467ada2660007c2e7648430cb1fa1a5dbabe2932028e34de2e968d53fa6b974283448ac57a8a34053c26479addc88617decffec583eae29c9d1
 EBUILD elogv-0.7.6.2.ebuild 1604 BLAKE2B 79843abb72fd03926aaf766f130d97267aa2421a2b4c68c51b52c07151ce045a7590b0427478a65abd3afbbd41c10f69e55c9a1c49e9017afc3cc35a8ed18869 SHA512 818a5d0736eb2d89680e3269b66a12254ba1e05058a731b55f9d07bcf224df1004ea12bbccff911bef3acc65c499d8fa7e670adea2b5679273516b22f5abcd17
 EBUILD elogv-0.7.6.3.ebuild 1604 BLAKE2B 79843abb72fd03926aaf766f130d97267aa2421a2b4c68c51b52c07151ce045a7590b0427478a65abd3afbbd41c10f69e55c9a1c49e9017afc3cc35a8ed18869 SHA512 818a5d0736eb2d89680e3269b66a12254ba1e05058a731b55f9d07bcf224df1004ea12bbccff911bef3acc65c499d8fa7e670adea2b5679273516b22f5abcd17
@@ -12,4 +13,5 @@ EBUILD elogv-0.7.6.4.ebuild 1604 BLAKE2B 79843abb72fd03926aaf766f130d97267aa2421
 EBUILD elogv-0.7.6.5.ebuild 1604 BLAKE2B 79843abb72fd03926aaf766f130d97267aa2421a2b4c68c51b52c07151ce045a7590b0427478a65abd3afbbd41c10f69e55c9a1c49e9017afc3cc35a8ed18869 SHA512 818a5d0736eb2d89680e3269b66a12254ba1e05058a731b55f9d07bcf224df1004ea12bbccff911bef3acc65c499d8fa7e670adea2b5679273516b22f5abcd17
 EBUILD elogv-0.7.6.6.ebuild 1604 BLAKE2B 79843abb72fd03926aaf766f130d97267aa2421a2b4c68c51b52c07151ce045a7590b0427478a65abd3afbbd41c10f69e55c9a1c49e9017afc3cc35a8ed18869 SHA512 818a5d0736eb2d89680e3269b66a12254ba1e05058a731b55f9d07bcf224df1004ea12bbccff911bef3acc65c499d8fa7e670adea2b5679273516b22f5abcd17
 EBUILD elogv-0.7.7.1.ebuild 1610 BLAKE2B 7bc1b57184f26a53ca29f2267f405a2025203c2629f709e6edf66c6261c8af43b2179a9f47f4c29c2da1a6abbc28a3120caf8d8c9dae6b64bb7e1f8d9748c2bb SHA512 23b3c6e4232a9ff4c16a982e8d54c8eb42203c323d23c684906ab80a9607fbf9e24974af3a960d478002d3a1c79c39f1c25c1dc084fe51c4c83dfeb030776e0d
+EBUILD elogv-0.7.8.ebuild 1610 BLAKE2B 7bc1b57184f26a53ca29f2267f405a2025203c2629f709e6edf66c6261c8af43b2179a9f47f4c29c2da1a6abbc28a3120caf8d8c9dae6b64bb7e1f8d9748c2bb SHA512 23b3c6e4232a9ff4c16a982e8d54c8eb42203c323d23c684906ab80a9607fbf9e24974af3a960d478002d3a1c79c39f1c25c1dc084fe51c4c83dfeb030776e0d
 MISC metadata.xml 470 BLAKE2B b80ae78f2033fbe4623e47b9f24581e2781a374cb9b85ceb9f990b2505666c19cb003050dea8dd532c1641c0c4fc27d84347ec39c5a5624bf79adba1e42ab873 SHA512 ad99227415869525deb25fc3cd2ead8023a03cddd0d546d14a8669cd681e5aa47cc40977a1664d466aa40c6100479e24e1228b3761ff331bc2436443e9c1443c
diff --git a/app-portage/elogv/elogv-0.7.8.ebuild b/app-portage/elogv/elogv-0.7.8.ebuild
new file mode 100644
index 000000000000..a47dbd42ebab
--- /dev/null
+++ b/app-portage/elogv/elogv-0.7.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
+HOMEPAGE="https://github.com/gentoo/elogv"
+SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DOCS=( README )
+
+src_install() {
+	distutils-r1_src_install
+
+	# unset LINGUAS => install all languages
+	# empty LINGUAS => install none
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(ls "${ED}"/usr/share/locale/) ; do
+			if ! has ${i} ${LINGUAS} ; then
+				rm -rf "${ED}"/usr/share/{locale,man}/${i}
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	elog "  dev-python/pyliblzma (for xz compressed elog files)"
+	elog
+	elog "In order to use this software, you need to activate"
+	elog "Portage's elog features.  Required is"
+	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
+	elog "and at least one out of "
+	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+	elog "More information on the elog system can be found"
+	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
+	elog
+	elog "To operate properly this software needs the directory"
+	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
+	elog "To start the software as a user, add yourself to the portage"
+	elog "group."
+	elog
+}
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index a2c9b41a8558..538ef7303adc 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,5 +1,7 @@
-AUX implementations.txt 781 BLAKE2B 8bd653731c5a92073a98fe69dc98fefbb1c3c7bfe0bfbf4417b4bcfaa8f93d23b95bb11dcc19b75ff4b3f1cbb597fa65d323df2836e9a610519fdeb528356673 SHA512 f442fbc1a4da5e3ecdb51b3b3a72f5f4f2f8b3777fc514c923d8ad885a89dd725486eae803fe481a7f8d5a32691ba2fba974f887548094599a27cb3b39a0ab89
+AUX implementations.txt 809 BLAKE2B 64d5776621de4f6d522c2e07529f41f154c4253f35fff9f7dc6967ac2970a8911666644401cf657a05d500665680dc0b6cbaf120fc6bacb50fa2e058fcf2901c SHA512 e3b20f8cd0d34da4d506107a38b176a36960f97090d06de1475f12167ae28f95d5dd2d062baf31942f517d0e40b91fde485581736a40eaa9de838b28855bc62a
 DIST gpyutils-0.2.1.tar.bz2 15044 BLAKE2B 44a67a70c42b07523232f3e8d6db0b9155709100c4fede41e1f96c2d3fa396a1d4a67529c7e70fa75c2729c1a8f769cff35936606784a9ddc2a59cb3d163780a SHA512 58b796647bf614e4ad492fe97539bd11f0d5beeecb7fd903a81917bfaac54ced4fb14813f499010093884891eda9c43226bcf2cae7744e7290bf9b16928b6172
+DIST gpyutils-0.2.2.tar.gz 19646 BLAKE2B b5c24817b8a5ef3122d46330d2311a328ffa9c936878f494586ed62fd9fa9d54210c4edcbd9d07f61af7c27faf410e0abf60943188e8340ea52f06d95359c6b1 SHA512 28ca27b3688b593665037bd7a811014a11b3192bc0acc4568c3e70d13cf7a163b41ba3ffd9d8caaaaf4de2758e1cb68b7dcc255d9fb26ca8448a6bfd6416e66e
 EBUILD gpyutils-0.2.1.ebuild 519 BLAKE2B 1d1f4767c7f3ab0d2e5791ac1e3fa9bba0b6e93f091273a4bfb20260beef1febb5877e4e6b6c21bdd069e421719fe6fa997b93051bdf0fada7d9c796220889b5 SHA512 e19aa3fad32d70354d00b28ef019243cfaeb64cddb6ce7ede3397588b870b9f16bfe5901514a0df3982432432b254a94c5901e79bb73402ebed7bb3d05ffd42e
+EBUILD gpyutils-0.2.2.ebuild 518 BLAKE2B bc896e18ced6fef2a661fcff9f6a9082f6cdd9612e14a9288c8d1011b7b2172580d52847938f6efd6ca8aac5b39c868f460032009ae34c6fd56d6a61c9c7ef97 SHA512 d5caa813addbfc2747e2727b4289548c08233f68dbc602f6a91ada537b7e20d953027a7d0f151912f98ebcf25a8bf9f958cfb6c5bb037848d82fdd222f1e5f68
 EBUILD gpyutils-9999.ebuild 498 BLAKE2B 8dbdf34500e17239e1045d9543a57d6a39471b94352d935c59130142306b32de4078bd3db80bedde5bd9f22209257b6075184740696ab1a71a07656789fca003 SHA512 d7a4e377084238a4eae3698258c33156348986a12f10cdf9a528c4d9697a30502cf628c640326f514ec034806eafb8f18cfd071f12b16ec1c449dc70a9fc6c71
 MISC metadata.xml 527 BLAKE2B 14b3e5012c6b0543eb70b56132d289837eb9b5e355ea38f21c0fa5de841eb3dd9cc9d89f60136b523121648d8a94d62563b1f065fbe9f120f2e03cc7e6d84d0c SHA512 52f6670e1fd8b5b58a566226a20ea405aad364eb085a7f2d62485086e5d9ce2ceebfe9ab3c6321892fa775187cecfe8148cc25ed5256ebbe1ac3fba8d7d39ddc
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
index ead622173966..63d7ec0b0f1e 100644
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -16,6 +16,7 @@ python3_3	3.3	dead	3.3
 python3_4		current	3.4
 python3_5		supported	3.5
 python3_6		supported	3.6
+python3_7		experimental	3.7
 
 pypy1_8	2.7-pypy-1.8	dead	p1.8
 pypy1_9	2.7-pypy-1.9	dead	p1.9
diff --git a/app-portage/gpyutils/gpyutils-0.2.2.ebuild b/app-portage/gpyutils/gpyutils-0.2.2.ebuild
new file mode 100644
index 000000000000..d46dffd50704
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="https://github.com/mgorny/gpyutils/"
+SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.2.9[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/kuroo/Manifest b/app-portage/kuroo/Manifest
index f51d90706123..f1001e03a002 100644
--- a/app-portage/kuroo/Manifest
+++ b/app-portage/kuroo/Manifest
@@ -2,4 +2,4 @@ AUX kuroo-0.90.5_p20180410-qt-5.11.patch 1178 BLAKE2B 944d08100d9b3a75bddc9fa441
 DIST kuroo-0.90.5_p20180410.tar.xz 241920 BLAKE2B d182df57f0c6628b849f6f6e4d7919281117396ea30360e6eb0993b3c61ba67956a8e0648926f77e23d8222a8337108599f657cb7e49091fd51b98febb6593ce SHA512 f1894c90b8b6df06818cab6cc3fb55a3348f8a9df669b515796dabe9a0df3773d69ba89a4aa3569250b2fb379c1169d8789c82fcd3868ddb9f640f010aee811d
 EBUILD kuroo-0.90.5_p20180410.ebuild 1377 BLAKE2B f024e0cc1e5d5e36ef956a930ad5292e0a8bba33b204a7ff95268d03607a9650fdb3101f2a0118b65038a3066b9e79fe52618b8cc924e20688a5cd5917793eec SHA512 9ed7aaf28ab4321c919f60ca1d6e97b5445882829ecd7bc910ab6b022ad90c9569b9b3a4d7b9fe3c97028bda378693db578d0087827c6ad5d18868b87b0b7d31
 EBUILD kuroo-9999.ebuild 1366 BLAKE2B c7b79fd860a1e181942998e2a876422b0fe83a751db12cd431ad9f22d634bba14b8b02c33a74c0213cbacd75b76a5cbdbb738662bb5f4791d390c5e95eb4e4b2 SHA512 3c3c67e3dccd4e451a27a598c2e95cfcf7c9d6324a73b6020b33d19e6eff79c37a8b61ffbabae4b4e454fd640c3739c4c663524f95d4849b9bdf2ffd62977415
-MISC metadata.xml 848 BLAKE2B 206ea97ff1d664d67c7a7fa532702364ef8d32cf8169cb00133fe38be7170592142deffb6a85ca1ef1cc9e7afa48e8fe72a141cc690a4c9db46d8986336c7a49 SHA512 b474295993a6b05a885bc9873f18f3c880b953417471059d06cd3a367b0b8d482809091126caf5443f5f761776eb96f128138352dbeaa86219ba4554c924f3db
+MISC metadata.xml 757 BLAKE2B 338d2d4cb0c2d198f8d38ccaa33dac9b9b745baaecbd642f6a0cbf4a3471642db421918eb292a1e7ebed9305429decd70c1cb27f98328cea17f3dc87c893fc53 SHA512 86b24f163496aff68fdfe3ad7fb1648100d1f9757dd18194899b512242236b8e3130b70f74576adbdcc7f570ddccea6655714875f39b52fb6bf4c2bc46b55b11
diff --git a/app-portage/kuroo/metadata.xml b/app-portage/kuroo/metadata.xml
index 22f510c8b7d6..880a4473e188 100644
--- a/app-portage/kuroo/metadata.xml
+++ b/app-portage/kuroo/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<longdescription lang="en">Graphical Portage frontend based on KDE4/Qt4</longdescription>
 	<maintainer type="project">
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 3828fb9c801e..46e288d1b1ec 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/pdsh/Manifest b/app-shells/pdsh/Manifest
index 407dc48281bf..9b8e39ef2b5d 100644
--- a/app-shells/pdsh/Manifest
+++ b/app-shells/pdsh/Manifest
@@ -1,4 +1,3 @@
-AUX pdsh-2.18-unbundle-libtool.patch 1738 BLAKE2B dff39459032013b770cfab19407475c06b246369092aac77c071f0654f89f9874f1883068542a606b88cc83fd735ec4091c4f9b6b0ce6c1df677b1ec6fe346ba SHA512 e36e284cc9fde9cedc9d2daac31dd1c272c306b1b84d2ee6a55430ad755ced23d6bd5e5a50bf4f6621fcebe96cb105cf49e70c6d4c5cf5913deb66ba0d86491f
 DIST pdsh-2.26.tar.bz2 490732 BLAKE2B 809a7ee0a1026e0cdaea8bf97c046a3a6e2994199dbbdb2cebe56de0393e8422a07e86f1ff60d6e750bf7279ccb43c03ea3aa4529b6fa6a34e3d77d90f0c3597 SHA512 3f15b3bb4fc2cff27a3b5d68de3e6cb74bb4001288a787763358a0641d0cc77c840b2c6641213ef31bc9d9d69cfe9531b25d7a9375630a5b008b1bcffbe95c0a
 EBUILD pdsh-2.26-r1.ebuild 1287 BLAKE2B 4acd78fedf0a8ec33a223502d0c93d0038d912ddea66fa0513a018f2e8ca3a437c17566feee8c63f3cd527a50c2b1968354c7940764bb3c1e49366f5411c266e SHA512 5af633bc908bb1176ffbe79c8ca69689807315aac079a0ba80cfedd08bce905ec7dbb2c97e2aab564db47db9a7139459fbfab995624e6b9780388407514ca20a
 MISC metadata.xml 1204 BLAKE2B db664f8622eaf0976ab1899583abab0268758d2edcdf0dd038ef59f54f1cf86c30956aa9cac35fa1a28a6760196050da01cfdbfcb56742aa233075aaa77a4eed SHA512 abaa972d578e11c47d16497fecbf7d72a07915b0b57c7f6458f82b0a36b55575b2d94a43f6f6a71a925a0e4ed56346056f9bc1d939a4190f2c899fcf58c9c752
diff --git a/app-shells/pdsh/files/pdsh-2.18-unbundle-libtool.patch b/app-shells/pdsh/files/pdsh-2.18-unbundle-libtool.patch
deleted file mode 100644
index e73fb12d2e79..000000000000
--- a/app-shells/pdsh/files/pdsh-2.18-unbundle-libtool.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d055c4e9e2d414c9d51f7a6f2cf51cedfc79260f Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Tue, 6 Apr 2010 11:48:28 -0400
-Subject: [PATCH] unbundle libtool
-
-Bundled libltdl is vulnerable, CVE-2009-3736.
-Patch grabbed from Debian:
-http://ftp.de.debian.org/debian/pool/main/p/pdsh/pdsh_2.18-6.debian.tar.gz
----
- configure.ac         |    6 ++++--
- src/pdsh/Makefile.am |    5 ++---
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2680344..196356b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,8 +38,10 @@ AC_DEBUG
- # Libtool and ltld.[ch] support
- #
- AC_LIBTOOL_DLOPEN
--AC_PROG_LIBTOOL
--AC_LIB_LTDL
-+LT_INIT
-+AC_SUBST(LT_CURRENT)
-+AC_SUBST(LT_REVISION)
-+AC_SUBST(LT_AGE)
- 
- AM_CONDITIONAL(WITH_GNU_LD, test "$with_gnu_ld" = "yes")
- 
-diff --git a/src/pdsh/Makefile.am b/src/pdsh/Makefile.am
-index dfc48a3..beac854 100644
---- a/src/pdsh/Makefile.am
-+++ b/src/pdsh/Makefile.am
-@@ -14,8 +14,7 @@ if WITH_STATIC_MODULES
- MODULE_LIBS =              $(top_builddir)/src/modules/libmods.la 
- else
- MODULE_FLAGS =             -export-dynamic $(AIX_PDSH_LDFLAGS)
--LTDL_FILES =               ltdl.h ltdl.c
--LTDL_LDADD =               $(LIBADD_DL)
-+LTDL_LDADD =               $(LIBADD_DL) -lltdl
- endif
- 
- pdsh_LDADD =               $(READLINE_LIBS) $(LTDL_LDADD)
-@@ -25,7 +24,7 @@ pdsh_LDFLAGS =             $(MODULE_LIBS) $(MODULE_FLAGS) \
- pdsh_inst_LDADD =          $(pdsh_LDADD)
- pdsh_inst_LDFLAGS =        $(pdsh_LDFLAGS)
- 
--pdsh_SOURCES =             $(PDSH_SOURCES) $(LTDL_FILES)
-+pdsh_SOURCES =             $(PDSH_SOURCES)
- pdsh_inst_SOURCES =        $(pdsh_SOURCES)
- nodist_pdsh_SOURCES =      testconfig.c
- nodist_pdsh_inst_SOURCES = config.c
--- 
-1.6.6.2
-
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index bede219fea05..cfdf35eaf97f 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -6,7 +6,7 @@ DIST zsh-5.5-doc.tar.xz 3216400 BLAKE2B 3d07b336222b08d7deff0ded6f603a47bcdcec97
 DIST zsh-5.5.1-doc.tar.xz 3216632 BLAKE2B ef1274799604d74eb9cec3c29927703c98bb63bde3aa5ce4880eda45420fe1eb79c54a693fe529c9e79161f924a76bc2a650253216c7b1e565af65f1ac3c0d91 SHA512 e240f6c6aa2efb941c2baaaf749c66c9e304ba54ce2be90586671ba47e380aac89315516e5dce41fa0ae1d8fccfc36f61ed1400b6aab3382927e2715a77d62e6
 DIST zsh-5.5.1.tar.gz 4578700 BLAKE2B b58fc763bc64e8ed6de0db2e0fd454aef995fcc86b18c2ffd4b39e037ce1cdeb04e6e2a44b2495ca89218af41ad1dd7d29e429d21fbab39377d95e62d249732e SHA512 c4f7327a3f5480bd9a169fb07e34812e0106fa9de3b5f7d38bb0db85a3e4d01b9a4a8f35553da03a15d7d819108305cfaa2811c945273e2cac84512219e69ebb
 DIST zsh-5.5.tar.gz 4576506 BLAKE2B 4f5923d519b0c96475f4832cf0e5cabc1432e765d201c992903ead45b175d5bc76410ebe248c2bd01ad75a5b5939bc5bc58e9263bb4501f9b2c1f5b4d7755896 SHA512 aafa29e1bc29d35fb5822ad4ca5f4c64b1e4a4e3f9bff70e9e5976918fa9e7906467bd11f69291e694dfa77efa1e5433d7839fc668aa572228623f1c131c381f
-EBUILD zsh-5.5.1-r1.ebuild 5819 BLAKE2B ce90b05f67237ac99adce8927cc29985dad103c9fe1b781b134d144bc8dd46e19a08fdfe86655dde9acb289b7d7dbd3ff3b367fd69ceed0961b61125cce4381b SHA512 4e23162334c1a521adc76fbed5b185546c1dc539272ec215359a13fb8d146151098c6437b27d9eb49c24f9a2a487f874276150edf16ff42bc7067e62296ac13b
+EBUILD zsh-5.5.1-r1.ebuild 5815 BLAKE2B 2de69268e1f33af03aeaa916c5bd131ce2af119289188009a77f411b438133a14fcba24930d428a6f9d164dbd136827875289ae323a5a74889e81a786efd6c84 SHA512 635d6e440d16c5ebde6695f49085974f3ffc6be21770051c29582fd8efcc2f2d7fa208099c5979ebfa54bbaf5f264025cb7a6e654081ea81d68d7fab0b7a2d6a
 EBUILD zsh-5.5.ebuild 5809 BLAKE2B bc7175e593de89a97c11d613881fe269417b5f2ef9a0cb131292dc3299c45041a87e03572620156723194bb24fbe77245b0fc64bedf6a9c9cea98dfbfb33a0e5 SHA512 5fe29eeafee8b5de30e8a606aa8b6b7950740cd0b1f6852955ff4f4cca30f9cf1be28a74adf760189f9a010334408ab3eddec1243a6faee335296efb39e08ed3
 EBUILD zsh-9999.ebuild 5819 BLAKE2B ce90b05f67237ac99adce8927cc29985dad103c9fe1b781b134d144bc8dd46e19a08fdfe86655dde9acb289b7d7dbd3ff3b367fd69ceed0961b61125cce4381b SHA512 4e23162334c1a521adc76fbed5b185546c1dc539272ec215359a13fb8d146151098c6437b27d9eb49c24f9a2a487f874276150edf16ff42bc7067e62296ac13b
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/zsh-5.5.1-r1.ebuild b/app-shells/zsh/zsh-5.5.1-r1.ebuild
index 9f6dc303d882..82381ec8d41a 100644
--- a/app-shells/zsh/zsh-5.5.1-r1.ebuild
+++ b/app-shells/zsh/zsh-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
 		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 0c70a6b9f626..8e11e9a22e33 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 86ba33194ca5..0596c4a9b93e 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,10 +1,7 @@
-AUX calibre-2.83.0-lzxd-bounds-error-bug-540596.patch 1296 BLAKE2B a600a8777868b7f73c95d62de9097382cb1d3e076ea756b589811f5e33aa86f1724f93177d82247132a85779ff82960f178cc325b497f8b7f1391ff113729c69 SHA512 fba16c95a69b38113d4331faceae4a81f2319ae1631a03662bd3483ad6f1b687d16db28f9df019990a3bc6918c75f4a4492ca7ef772168a575cb06ff0761bddf
 AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
-AUX calibre-server.conf 523 BLAKE2B a9fb65a327656f9b2f54eab27dcaf2cdfbcbe5f0d637204ea39f891c515ae899da156098609bc99398354337524843afbf45409bbb1098605f293661bb8381e7 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058
-AUX calibre-server.init 1811 BLAKE2B fe22257128896d4299c5d5edab6ac63cdcf79da483f4afc49b0d1649b17599389dd4b9f88c35a964e289cbe6d961136f1e5760a2244137c404e573510899bd60 SHA512 760aa7a8f51b23b116ba07749855737869ff2313f0528d67e5a46bc362e5c0a04a7e1f46c32dd6e82add4fa5dc41d397db32dbd1a09c912008e0890d1a133eeb
 DIST calibre-3.15.0.tar.xz 38177684 BLAKE2B 7d3892f81db61f8d4a08589a42ccd71183d9dc7fa401480d4426d1205a9a633216a79865140481f63e1e3a741d34f604ea9d7f98c490949d0d4452cb9123fb9b SHA512 93a9f3b7122d8f4cd1d847727f6d1ccd1f9d828651e9ee77a34544742884b3e925552ca61ec1d0a1196b04a0874e97fc877e679dd8a69ba8b754b7688b730697
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
 EBUILD calibre-3.15.0.ebuild 9288 BLAKE2B cf28b1c8127288117bfaf3454a61a3485c1636cec5c2ab8dd07df47a9b5d3665e0c5a86768e6752ee57d88d24d7eb6cc2c1f78fb46ab53a71db695aec4cfd4da SHA512 fc2c83770465ad21f358b5592da05838527956b9e491ad3f1adead3a575936e5bba5fe1e1153200171ad9aaa3c10e313bd3f5c678614d6e6784651c2d9af33c1
diff --git a/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch b/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch
deleted file mode 100644
index 5f7d5a4682f9..000000000000
--- a/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f335c8719b224d3ca7a967b6e91cebd5b26684fe Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@gentoo.org>
-Date: Sun, 23 Apr 2017 16:13:00 -0700
-Subject: [PATCH] Fix bounds error in lzxd_static_init
-
-https://bugs.gentoo.org/show_bug.cgi?id=540596
-https://github.com/kovidgoyal/calibre/pull/650
-
-This includes the changes from the following upstream commits:
-
-https://github.com/kyz/libmspack/commit/6a42ddd1d472afeaf0f7da91e16b60ab2063fb92
-https://github.com/kyz/libmspack/commit/ce3cc03aa500dd9c0b6b820f9519f6b6b9dede05
----
- src/calibre/utils/lzx/lzxd.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/calibre/utils/lzx/lzxd.c b/src/calibre/utils/lzx/lzxd.c
-index e683a9e..c531aaa 100644
---- a/src/calibre/utils/lzx/lzxd.c
-+++ b/src/calibre/utils/lzx/lzxd.c
-@@ -357,11 +357,12 @@ static unsigned char extra_bits[51];
- static void lzxd_static_init(void) {
-   int i, j;
- 
--  for (i = 0, j = 0; i < 51; i += 2) {
-+  for (i = 0, j = 0; i < 50; i += 2) {
-     extra_bits[i]   = j; /* 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7... */
-     extra_bits[i+1] = j;
-     if ((i != 0) && (j < 17)) j++; /* 0,0,1,2,3,4...15,16,17,17,17,17... */
-   }
-+  extra_bits[50] = 17;
- 
-   for (i = 0, j = 0; i < 51; i++) {
-     position_base[i] = j; /* 0,1,2,3,4,6,8,12,16,24,32,... */
--- 
-2.10.2
-
diff --git a/app-text/calibre/files/calibre-server.conf b/app-text/calibre/files/calibre-server.conf
deleted file mode 100644
index c1bed84289cc..000000000000
--- a/app-text/calibre/files/calibre-server.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# /etc/conf.d/calibre-server
-# Change this to the user you want to run calibre-server as.
-# You may specify a group too, after a colon
-# NOTE:  This must be set and not to root!
-CALIBRE_USER=
-
-# Set the path of the library to serve.
-# Defaults to the default location for CALIBRE_USER.
-#CALIBRE_LIBRARY='<user home directory>/Calibre Library'
-
-# Extra options to pass to calibre-server.
-# See the calibre-server man page for more options.
-#CALIBRE_OPTS="--username calibre --password password --thread-pool 10 --port 8080"
diff --git a/app-text/calibre/files/calibre-server.init b/app-text/calibre/files/calibre-server.init
deleted file mode 100644
index 2f905424cfa7..000000000000
--- a/app-text/calibre/files/calibre-server.init
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	need net
-	need localmount
-	after bootmisc
-}
-
-checkconfig() {
-	if [ "${CALIBRE_USER}" = "" -o "${CALIBRE_USER}" = "root" ] ; then
-		eerror "Please edit /etc/conf.d/calibre-server"
-		eerror "You have to specify a user to run calibre-server as, as we will not run it as root!"
-		eerror "Modify CALIBRE_USER to your needs (you can also add a group, after a colon)"
-		return 1
-	fi
-	if ! getent passwd "${CALIBRE_USER%:*}" >/dev/null ; then
-		eerror "Please edit /etc/conf.d/calibre-server"
-		eerror "Your user has to exist!"
-		return 1
-	fi
-	if [ "${CALIBRE_USER%:*}" != "${CALIBRE_USER}" ] ; then
-		if ! getent group "${CALIBRE_USER#*:}" >/dev/null ; then
-			eerror "Please edit /etc/conf.d/calibre-server"
-			eerror "Your group has to exist too!"
-			return 1
-		fi
-	fi
-	if [ "${CALIBRE_LIBRARY}" = "" ] ; then
-		CALIBRE_USER_HOME=$(getent passwd "${CALIBRE_USER%:*}" | cut -d ':' -f 6)
-		CALIBRE_LIBRARY="${CALIBRE_USER_HOME}/Calibre Library"
-	fi
-	if [ ! -d "${CALIBRE_LIBRARY}" ] ; then
-		eerror "Please edit /etc/conf.d/calibre-server"
-		eerror "The Calibre library, '${CALIBRE_LIBRARY},' does not exist."
-		eerror "Please modify CALIBRE_LIBRARY to point to a valid library."
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-	local pidfile=/var/run/calibre-server.pid
-	ebegin "Starting calibre-server"
-	start-stop-daemon --user "${CALIBRE_USER}" \
-		--pidfile "${pidfile}" --make-pidfile --background --exec /usr/bin/calibre-server \
-		-- --with-library "${CALIBRE_LIBRARY}" ${CALIBRE_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping calibre-server"
-	start-stop-daemon --stop --user "${CALIBRE_USER}" \
-		--pidfile /var/run/calibre-server.pid
-	eend $?
-}
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index c4ba1a8cfc31..3d4987d3b593 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,5 +1,5 @@
 DIST htmlmin-0.1.11_pre20170909.tar.gz 123229 BLAKE2B 7cc22370afa045ac13bf05082d396534e08a454f13f6bf321bc45c4743c33813bc32c31b655c21d731f091f11d13aeef405bc82c8e2b0ed0d0a12a25e4e7f3ad SHA512 85b29bca8f40680574fa21e2720a6b573ba69b94c239cdbcea80cdb1d0032bbf0d735f596f2a3beb3b3691b2366cdfd6051dd2499eaeb6b4b7618c7b59ebd7ec
 DIST htmlmin-0.1.12.tar.gz 19940 BLAKE2B 66e9596f687b70fa44362078075cb5f70553e65a7a1a6c55a4abac6adc5d0821b8936507cbb56f4e8ea96575a8801ec341416fead54b18ff9e10d199ed506529 SHA512 5669327dc64d8d28accdfe0d9a222e723fccdc12b52e7f0315fb9caf958a734a0cf0514ad476cbd0b7d0f2d83514a207867127f135f5e51cfda9b15dbfe24b78
 EBUILD htmlmin-0.1.11_pre20170909.ebuild 634 BLAKE2B 9a55a43ee6ffaa3e5a363df3f776164e9671ff0c43d121bf575ef43a5e8d6de35368cc187e8af782f14a993966f8f141dc93df7eaf89d72422d757a6f881e0ab SHA512 c39a88b40626f7e8e943d8ef05fc355d523d13b65577c6e535139e8fa958489a83490bbff47a9cef2595f1e3c871512e4083bc3b115864f2d6644662e7a2b608
-EBUILD htmlmin-0.1.12.ebuild 510 BLAKE2B 7fbcff6d9ba90ef0b0fb54cfb2193dd6af3df6a48fb26770fe4a3c7a7fe760052359e06210156c46523f70efcc05ef4934bd96abed2e53cb11010b006d27f648 SHA512 7161bd303a555e2d70dda490d5c5ced5c2b43891c4455767736ae69d8790a90dceb75312c3c0fea7ab59a070b7ab9bc98a55213ebbe51c37e4f369f2e609fb7e
+EBUILD htmlmin-0.1.12.ebuild 508 BLAKE2B 57fa9adb75cea920eb9ef209a31f8c329315f22c269c75f714a149d8e1c07b4fba41b6a6c8fd9e170058555c1e455b05ab5d718c8a7d027e46b2792efb4ee34c SHA512 97feee6c9be7a7d96cf9a0acf2b70b2580c6e240d9de77c5487e1df260fa4327c1a365bd1d182a50fffde330b82411673514d40c9da546476fb648af13037593
 MISC metadata.xml 424 BLAKE2B 1026b0d3b470845caf9f575527f76c10b691c855426e5fe48972943ca067e9c4211f3e5af025b85f3881c321614c174f6c2f751c2f3f0764aedf04abb2dfe125 SHA512 53ae65ab7e6dd530f398c228e7ad38242a367efdd398a5bd321704e42f33b997c4fc5bfb942a90722b164ff29b35c1f6e3d3e15414241995bd371c3090c250e0
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
index 3f036caef84b..cdddc86d92a3 100644
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index 37bfbb757692..e197d4d5107c 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,5 +1,5 @@
 DIST libepubgen-0.1.0.tar.xz 319652 BLAKE2B e6573e0a680711380ac3d2ef742413e38030e76dc50639f9659544e7410f7d7f987cdf1aa20cf2f2afa924bbcbecaf7141225d387fc509d0db6387cd144cb16e SHA512 6be431d06321807991048567aebd7111359f8aa364fe33e651c991553f832c03ad3bb3520b9f7e8d72a861a9ebd84483587becb9062e226bcd1d8ade1819b4a9
 DIST libepubgen-0.1.1.tar.xz 324380 BLAKE2B f2dd4ee4987aa69f3972f83fe6348e8f0d4ba2d5c2f8f871e81d7e9dd5dcc00e10fc2be27fcbbb6170f5a673b86c62261fb8d25ff3bf788cda726e64a254ec7d SHA512 9d911384672b5394ff1df3280a5c9fe12888530c41f177aa100f135954e2ec279b64193f8388f12c96f6a6e587483ce853e74fe45b29fb748a930512dd011c2b
 EBUILD libepubgen-0.1.0.ebuild 725 BLAKE2B df6c45b50db98bc979374adead89de3e2cb5d7a055b298d6538ce2dea44790b201cef4b437e1af86755ea3bae0c7cd6f8eb4de27f3c610e6db78df4ebf497f4d SHA512 8de1cf0aa61451aa11703e3dadb1fb00a03e3945f4ed2dfb8b4e7fa96f28fd0da2d14124f45e71b5868c72bf62e7488cd63785a4f68c652df618b15f25d43691
-EBUILD libepubgen-0.1.1.ebuild 706 BLAKE2B 00fadb6d869bf4866b3aaaceee60c70284af1ad92e487ec9d382bb329e7ff17e053b5acf22a3aed2494b05bf38498b1037a0e8cd7d0198fecc478e124519dd2c SHA512 b01ef9bedb52c698aa18d64378b41a72f72738cb3f64d1ce8040dc28d193864a1374a92db39f6c85a279eecd271999d163058fb4efc0cb91309628a4214f43e8
+EBUILD libepubgen-0.1.1.ebuild 713 BLAKE2B 57119868a143aa90b78c9e82339fa108e2cdf988220626a759459bbfa084d3ac9dca2a93af3488d9f2409a79e4876e75bc1cd0ac075df00c8aa291ad26c965a4 SHA512 7372214a9bd3f0576c5a23cde82b528dbcd9d16e2d2a3cfcf439052282da13b8e9eb03e7aea97b514c2fcd013a8574ae53c38ee0828d39c8a386642cedd319c7
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
index 2fe034fa1608..80387cdb8ac9 100644
--- a/app-text/libepubgen/libepubgen-0.1.1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 01a514a334cf..b6ae26a14c21 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,6 +1,7 @@
+AUX libetonyek-0.1.8-glm-0.9.9.patch 409 BLAKE2B b0731eba3a65ea4e88bd24a633875157acbb4c1e727bc7bcf2a4f1af67197c1d9762a7aa6265e31357eead2baff13c28126d6f4bbc698a997f442bc58771b5b2 SHA512 edc407a4958befee95b53733b0c73bc8281575b53b8d2c65491eee6aafc63d775d3ce9d0a0578ce51cf8bc8f047a683bb0dbd8b79f2b1914dc5df6de64b835fa
 DIST libetonyek-0.1.7.tar.xz 1256232 BLAKE2B ef2abcc427014d515a75ff75d90a78da0b5b28d54b5de3793540e8448f163da0b6d3ff4026373ffc3a4973d3e0e4fee280e75a77407620b3ba0e833bd7d8c82a SHA512 bec4819e161f68b7315567464bfe9e0259a59822a7926c54208cceb04061664a1220716539816a24a6f259eac6f7063c72750aaaf8d8886e3bfb0c4d5f1e0b0f
 DIST libetonyek-0.1.8.tar.xz 1324868 BLAKE2B 2088349df75011f54f5822ffd69336a7942a148ff829111c02efbfb99c705a9e00105147942f3e9e81278be3b1f2be4d63aba8cbf6a54127f04fc547df6b7b1d SHA512 c8c08100b0c75e0420bbcd796f7cb9285e77ce1be34757df5b237d114a428a4a6094f12e442f81769a2fac5be45ea4376ff9e1d90448e18b3443bfe7c645a865
 EBUILD libetonyek-0.1.7.ebuild 1181 BLAKE2B cc869861947ebb3b5a3e117999f2f2aea14e012f9412f07d610af7c4c5df02ede968557b821d2c88252742796fbe2010f2749d6d0df5631054f6276722f0cc7d SHA512 d5e73167601b6fcd21568f4f9f45254d4b8098a1d503aaa6794b6c5af4de497bb607613eced94d4adbd9c93ccb15b1a6fbc115ced80c0db2c041989ba5b2b85c
-EBUILD libetonyek-0.1.8.ebuild 1183 BLAKE2B 326e3f725846dbda6102ccf8a4ef4a1b63c723c80c36cdc927243482c38cf2d745d032149246bd6b3d083b455042e6eda60d4212c36f8239c621ccbaeb0e9ef8 SHA512 3993f39d97f9e53ce01237e2eb94ce458538903b1a66b8462c4fe9135b3101b0fe534e61d36ae79de939df2988cfd061463ffed06dc08172a289284661fd4ad3
+EBUILD libetonyek-0.1.8.ebuild 1218 BLAKE2B 27d32c5df3acc0abbfbd33ed52dc5893ca124bfe77d2e8dfe8176aad2b0f78d0e8b2fb418006b5d8c3d4d62ef94faf19f34dba6b06d3e3d4a8dbc5e0433b6bf6 SHA512 95166c5ede3f644277b2b5efa36ce212a288916b8bd690bb24107b35008005dce89e92bec7d52419d9ede991301b4144f9603d7d75bd5270b86fb0e374575d50
 EBUILD libetonyek-9999.ebuild 1183 BLAKE2B 326e3f725846dbda6102ccf8a4ef4a1b63c723c80c36cdc927243482c38cf2d745d032149246bd6b3d083b455042e6eda60d4212c36f8239c621ccbaeb0e9ef8 SHA512 3993f39d97f9e53ce01237e2eb94ce458538903b1a66b8462c4fe9135b3101b0fe534e61d36ae79de939df2988cfd061463ffed06dc08172a289284661fd4ad3
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch b/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch
new file mode 100644
index 000000000000..db78fa81d471
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch
@@ -0,0 +1,12 @@
+Gentoo-bug: https://bugs.gentoo.org/657820
+
+--- a/configure.ac	2018-03-18 14:51:31.000000000 +0100
++++ b/configure.ac	2018-07-11 23:13:14.901127036 +0200
+@@ -119,7 +119,6 @@
+ saved_CPPFLAGS="${CPPFLAGS}"
+ CPPFLAGS="${GLM_CFLAGS} ${CPPFLAGS}"
+ GLM_headers="glm/glm.hpp"
+-AS_IF([test "x$enable_tests" == "xyes"], [GLM_headers="$GLM_headers glm/gtx/io.hpp"], [])
+ AC_CHECK_HEADERS(
+     [$GLM_headers],
+     [],
diff --git a/app-text/libetonyek/libetonyek-0.1.8.ebuild b/app-text/libetonyek/libetonyek-0.1.8.ebuild
index 39b6f10a69f8..7e445ac2171a 100644
--- a/app-text/libetonyek/libetonyek-0.1.8.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.8.ebuild
@@ -4,7 +4,8 @@
 EAPI=6
 
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+[[ ${PV} == 9999 ]] && inherit git-r3
+inherit autotools
 
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
@@ -20,7 +21,7 @@ RDEPEND="
 	app-text/liblangtag
 	dev-libs/librevenge
 	dev-libs/libxml2
-	sys-libs/zlib
+	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
@@ -32,10 +33,12 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+PATCHES=( "${FILESDIR}/${P}-glm-0.9.9.patch" )
+
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 1d8d8d9769e6..4bd817aead09 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,3 @@
 DIST libqxp-0.0.1.tar.xz 340184 BLAKE2B 759e5d0fb5886485f4ebe4a6caa34d1d98dc623c0ae124c6666a1be5ce7fb73686fc83360712d59d020e4788b39aa57d32149b7641d71b73dde917df46617f17 SHA512 a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607
-EBUILD libqxp-0.0.1.ebuild 732 BLAKE2B 2d925322161bd3762152d89d3502fbc81b4634fb8ea3df1509728ed483e61d4b9a1f7603f690a131f2b907ae38c2e8534f41a6182deb1ad6fe64e782e822e1e4 SHA512 4bfafacd9383f0f666c0f3f6959bb9e319d32a6eaf74e0d4629abf8de482da52a877ab0f213dab8182e31e94fe4bbeb5f01de0f7359574b80ec2195c340fe155
+EBUILD libqxp-0.0.1.ebuild 739 BLAKE2B d4430fe59ef2c7a64a2d96a87354ae15cdb26849ae752927d87fc6c9aefd77a957c6104862fbb6689bc4b1b543e988068eedac682583c6cf34e5f14f80402a3d SHA512 42479a0ea9e024af42a40469a773c2830692dfa0b13b791f28cb29f5abaecab4766ce9debfae41ab6b41e21fc3464822618d09bc1c801ce1958bab0f39189fdf
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.1.ebuild b/app-text/libqxp/libqxp-0.0.1.ebuild
index 709bbbbb8ce5..bfa4a9fb2255 100644
--- a/app-text/libqxp/libqxp-0.0.1.ebuild
+++ b/app-text/libqxp/libqxp-0.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug doc test tools"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 20:17:25 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 20:17:25 +0100
commit	62f82c107c3904ac6917ece47301d2999c7dd90e (patch)
tree	48ddfc2291e77d0e3ad80f6d7c5f403d84ae8414
parent	7fe80ac8764ccbf354f82029a6bce4f96dbb8d5d (diff)