Sync with portage [Mon Apr 16 09:56:47 MSK 2018].

2018-04-16 09:56:47 +03:00 · 2018-04-16 09:56:47 +03:00 · 3de63d5ad1
commit 3de63d5ad1
parent 9146f0d35f
3496 changed files with 10975 additions and 20333 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 28959 BLAKE2B d179db958e204dec4b5835416a1342117e5b184960f81c78f57dba6536be1c49191d7ad3a0d4e31b1b4ebe86bc3b505e558d460da183eeb20ab17ab51a778dfb SHA512 a04194a43281899141d3b71f582ae99efb99b6c780a87fe6ac101cf0ca0a3c6dd6b1b14e75c04967d97cc6e815d8d1d73fdde2fd816c6f3bf3f1765991ac7e5b
-TIMESTAMP 2018-04-14T18:08:33Z
+MANIFEST Manifest.files.gz 28979 BLAKE2B 60aa7cfd1861bb1a4c03b9102b9ca45c11f26a4cb40de6f9a6e3ee4c7e0a4d7a85dad1c2ee3b36b12dc351dfc4d71760b0230f4c2409c6a17b1d6c58d7265a5b SHA512 8f9127adb5c975894693fd320f9469d62d2d375b02e2a27f1a810f24f7c4468d0cbd3ed6c89fadad8f0ee30299fc1e0f05aab6b105fd2defc58c8aa9f59377d4
+TIMESTAMP 2018-04-16T06:08:38Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrSQ6FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrUPeZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBDUA//Wj6B5s6mDEeKSc3h95q3bigH+ryMK5mkxRgRw9XaqMIkyaHxsdpdZyU3
-72CYsSfD9n1nXRdqDUHMwwh1c52nOx9aFvKy9cqt+Aj8nrp8BEw9sOHmWEa2DwV8
-CqGS5w3iUKrq9CzrKfcvxg+T3LuJ6Hgm5swr3yk0B271qep7tl00cc9ocxLaRidj
-5AD4OLH6nJFro8qcKmT2Vn2bnVFIBG28CBEVO20gJAlr8XC+k6+bKeP/m0YfYsKS
-xrJbZy4lIp3oRkTNHcVBEaGuOi4T7/mz4q3ZggEM6aoaqbrsa1g3DGdoLeweAdvp
-R58OnlDmlp4c77QYZNvT1w9zPapNRzp3lPwPtOjtOcAd9k8Qm26bfCvuE4OZru9u
-VmZ32JpcVtXVeyhmm0io8Rbm0ru+Q/3VvRVTzjJybRvEk9qzsYmiaH/NO8apDjR9
-Qr9i8zQfzN5fP/Xs3HL73I8TRtb2wqVCKOX9uOFhypFMf6aNPHubetmQh4Zy7Q7R
-hF/8wDTIU2jzJIitKgriV38PAuoitTLCsulo20E//AhwkZh/t78Q697q8Uts1uHj
-y9vQW2HYcWgo6VN4OcIx6S0igNNIWnEx6LiVFAP7jziRj2Qzm4X8G63MzS7EldP3
-ivvhZAAEVVAYvoraRjSrQUuRHUQxDSB5nE3tZKyBjSbtC2zSW18=
-=jCtv
+klDuJg/8DYlJ+r7opF1asQ02h81JAq7xNxDoA33SWwjN2k5csgp7luFePdLMVH7Y
+PnzTtkc+Utj1U2lIuWkykxFxZiC54K8kYZXW77Xe9U8c5EysfUOJzjVRfn7RetOi
+pPdAzjk95m6zcNiUBxIXvxY6m34OJ38ciRm8+0muNO02sXi/p9MKg5SRq4ro3d8r
+YLPFOW+G97qJ491Zl+qtQs8I1i2kcWOY2A+/6sPwncu8erDKrt9fI6x7Ze0iul2W
+IfeYhdl+PVD+r8T85ysj4+m+0WrzNXqLHR8eilZIooba8KvuTPPH7DoIm+G8GGsB
+OGKQzWEe4BGP25hatW9qighS8vJUIpfSLx1go2ptiaNsaIApK66P3l8Zc90M2Oio
+NjTT4ZS6gVU/I05I7P+yzHBp7oEWgZzxVZ3mnbhf8JQA+34OgJHnMKgqNIXVRIZA
+Tw5vSbMN8VxrGlbqSxIJoLO76q1g8m2YN3s2Zay7doZ+CrUZmy/oLazitwufuVpK
+lhSnltILTXCigXOo1wrPEzB/eix6cpyJ9SxxLMQw/oBUNJ6P38iUvGLN3bSTNq39
+0IHF2Ngey04q+lSSp4378/WoddptcIYEcfMFHQtiOp1KPeL3knRMTnycOwCf0gTu
+7fI+MgsDetSQ6Q9Ar8KjCzC4f+HAnM+n/ObTajsn1bxvMXdq54g=
+=tkKQ
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@ -4,5 +4,5 @@ DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338
 DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96
 EBUILD speech-tools-2.1-r2.ebuild 2702 BLAKE2B 9842d6916cb0e63163c012196f508c0377a473ddaeef30a670e815d96ae30b43a60c838aca9980360c416c9265db32f94fbd2ab9eb150051f43f0b32bd1afe97 SHA512 35d8852ae1e0e94ae7663e489cbb7277efe155fce213d2a323e56b1225950b8455b4e83a824aea84b39a244eebc22f2c6b94820574692c8da276181a57b933da
 EBUILD speech-tools-2.1-r3.ebuild 2985 BLAKE2B 7ed28e6f05a49c83495e85c8f2c8376fdc5eec78fe548f7308cc260174e0dbcb76edfce511a2e1176836a5ca2a7aa5e979a06fc0e2e8d20ed9780089aa02e853 SHA512 90950552bb5d5634bd28d5d538b452b86a9246b92142f591faed49587b010f461721df7092f986dec05081d340222f2d324f899278fcd38fd6d29b7478d95ff3
-EBUILD speech-tools-2.1-r4.ebuild 3063 BLAKE2B 4c360a334d0ce1ebe0ebd6ee2a2c9767c439cf9da9a187bc3d87ded695dd95c514f1fbdaa16f8391477fefe860b0e17f99353ac341e47b87ffd14c4722f655ef SHA512 dc04bbe5562558eb9bf1b37dcfb6c933e21f01057e2a510554b9eb624603e199535aa2920928a8f1a651eb8c28a486c07106dbb4f07b471d90e8f11c5656bfc7
+EBUILD speech-tools-2.1-r4.ebuild 3062 BLAKE2B 61092b20be394913b26d7e3656419862d51154553831231690acb3c3f53e31dd81ec7668c0ae543421cff78e16d0056ad0cfd307d748dca76658047a5d950c73 SHA512 c03b42406952e5b1376622eee13efffa9638f44da91a38bdc211981162b228882bff4c97e58671606e7821f24fb060b1470bae8bc686e96d6ca79ecddd8c698a
 MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
--- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz

 LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="nas X"

 RDEPEND="
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@ -6,6 +6,6 @@ DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0e
 DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
 EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
-EBUILD apache-tools-2.4.29.ebuild 2657 BLAKE2B 8ce57db2791cabda2304cca05bd023b09e7516f505d278caef6bec6f4a356165ac01dddb3076cfea8638d2ab7cc8d2131ef6d4b6f1adfd021911fd8ce4e76cee SHA512 c68bd22cf194f89187053c9c3a2a86ecb39321aaba39b6cccff755385e28d4b1405e84018009c29b5a14c3ff6d00f5fc8c845e05703421f3a63e52f5395689d8
+EBUILD apache-tools-2.4.29.ebuild 2656 BLAKE2B 575d33fc6ad9d95ec105f4318af317759f02135370ce8ffbead49cdb8ed9c61803f3652a50736ed9a1696ce902af9426002da2ead7ff8de7a3b783c5b76d340b SHA512 ef4f840c6f8fe5ac3bc12836b31a73a5c5038a58ee60259ebc9c52ac353803deacf78f56be837b30706ccd00c65aa9fd5e861fdd88bc86f758fbab390c63efb2
 EBUILD apache-tools-2.4.33.ebuild 2584 BLAKE2B 753da88acf51594057d803cdf7d30c47cea49bc9dde0bc95101b7188f13b59db91b3b7db84422f828efb8871fd95926c58ef9902823fb8d63ee18df12bf37bbc SHA512 d3c4a5bf85c81901e18bd7649d9ee368a478a2bd4b55ad2ce4820db68a576a26ea0aedcfd98dad0d2c6c3a63bb5f177d2a40a68ca5e1cef6bac7c830b41ed258
 MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
--- a/app-admin/apache-tools/apache-tools-2.4.29.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-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 ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"

--- a/app-admin/logcheck/Manifest
+++ b/app-admin/logcheck/Manifest
@ -1,8 +1,6 @@
 AUX logcheck.cron 184 BLAKE2B 5b773a77dace97e78efa565d8edf3bd715f564721ba0097e82a3894009fa86b6faffd3018a5270e224de2aefaaf07afa76c40b507d6ddffcf5ca4fb137ac6c09 SHA512 fd0b1bc8c836b766bfbb6102012996d27e378475571167b4d4df98301793624483aca2bd51ec19a2aa367e78b062ddde67355452db8dc1d69fe84a20a2081c30
 DIST logcheck_1.3.15.tar.gz 162397 BLAKE2B 111e16f482c8610ffc39c518b3fd523abaa9720e7873bcadba58d85bd13bd7a8a9d93881e64f5d8cc5cb30c8254f2216fe97d1b77fe1cf77d5e14859ec701621 SHA512 45c9e779fc1d1f417aea3f02e70eff4dbc7cd0b45e04f7efc458a4552866686cbb095d0b5ebaf32a57d423a3753b4573277a464f5539789350b087569e025abf
-DIST logcheck_1.3.17.tar.xz 130956 BLAKE2B 16fc80f983a17d55e4b5fdcefcc95657e99bb3f5229655b768ab6116a874bf0f080c368bae235802370534df27908d22f52168b9cf1123fce05f9b4d5a484015 SHA512 e4a30b6ccd7a9f0f51354b1a6e577f6a3837e3db078f61b3d3ceaf630a1f1eeae03324e6ec58307f8f723dbd017e1543c15f7dc34e50c0eeb9ee0b160b2c879d
 DIST logcheck_1.3.18.tar.xz 131252 BLAKE2B 024259d965c02d5f27a82f1df1e947d48e4b1bad705882243c4b743a1c061012f2437ecab1a97265f5a330fdec2f813a36c078dca282f54fdfaab03833340320 SHA512 3ab75969f732efa123d9df2c8b44557e4a7eddef8332a8357463930714148a13130c763c22e562bd60e106abf5e18cf39b3572e0c048727a117fbc67430b7e3f
 EBUILD logcheck-1.3.15-r2.ebuild 1189 BLAKE2B 008db9b5797783571c1ea2d7ffcd4909609ab206cfd0e9dffbd06ab2cc34d865246ff78d32de3905a2eca8410fd87b149b6c6b6cc1c2312121226c3942cd7209 SHA512 bcfc87c796cbbd553ffc18a5777ca0114c7be968512d17fc42c8dd99e80658e4d93d88208823258bebdce1323a2715aeb3a4df3888da11776bd946f9bbebf0aa
-EBUILD logcheck-1.3.17.ebuild 1190 BLAKE2B baae848c9c1ef93bbe2773bbf5ada3eac7300ec1ccc13f78929c564796b70c442026726bc004e2106d222c17fdc95ff62c0bdfb39f1a66ef55e9323ad3e23aae SHA512 161ac902f0aa625c9c26c41956926d39d63f50f8daaffb3df42f0f8faf68d45e5392b4679c1e8294f1140388692801f318644de18b6b38953ac784886f4758da
-EBUILD logcheck-1.3.18.ebuild 1190 BLAKE2B 7a298bdd14f5a957d28af0d5e6c64ad4c3d3674894af41f731c9e7a0c2a84e6d16ead3c112814bc0d21a8a1c8d29bdaa2995312a7abd31a75fbcf367ce61b202 SHA512 792074adc44cd65d44be803f9f0ee718dcfde3d6436b2662c02736811a163d3fa8a080500f5e2dde94c5fe086095cd6169b309dfb9cc2c923c451007451f35a0
+EBUILD logcheck-1.3.18-r1.ebuild 1368 BLAKE2B 7f7fedc652b010c6c4c0c9b36ac2f25a80147a39f718472d3f6a5598ee6974492ba8ac236d58e3e31d036c4dc56cb313ac39025f0f1c3ef8b93660e6800c3daa SHA512 a4532de06b10fc2d119d279feddfa78b1d912699a96a00c6b73c03f8011806cae7a44fd4e9db0829f7600dc240ddb6190702d496a5107875726292cb9953b0fe
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
--- a/app-admin/logcheck/logcheck-1.3.17.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.17.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user
-
-DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
-HOMEPAGE="http://packages.debian.org/sid/logcheck"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!app-admin/logsentry
-	app-misc/lockfile-progs
-	dev-lang/perl
-	dev-perl/mime-construct
-	virtual/mailx
-	${DEPEND}"
-
-pkg_setup() {
-	enewgroup logcheck
-	enewuser logcheck -1 -1 -1 logcheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Do not install /var/lock, bug #449968 . Use rmdir to make sure
-	# the directories removed are empty.
-	rmdir "${D}/var/lock/logcheck" || die
-	rmdir "${D}/var/lock" || die
-
-	keepdir /var/lib/logcheck
-	dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
-	doman docs/logtail.8 docs/logtail2.8
-
-	exeinto /etc/cron.hourly
-	doexe "${FILESDIR}/${PN}.cron"
-}
-
-pkg_postinst() {
-	chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
-
-	elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
-	elog "for installation instructions."
-}
--- a/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
-
-inherit user
+inherit readme.gentoo-r1 user

 DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
-HOMEPAGE="http://packages.debian.org/sid/logcheck"
+HOMEPAGE="https://packages.debian.org/sid/logcheck"
 SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"

 LICENSE="GPL-2"
@ -15,20 +14,32 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""

 DEPEND=""
-RDEPEND="!app-admin/logsentry
+RDEPEND="${DEPEND}
+	!app-admin/logsentry
 	app-misc/lockfile-progs
 	dev-lang/perl
 	dev-perl/mime-construct
 	virtual/mailx
-	${DEPEND}"
+"
+
+DOC_CONTENTS="
+	Please read the guide at https://wiki.gentoo.org/wiki/Logcheck
+	for installation instructions.
+"

 pkg_setup() {
 	enewgroup logcheck
 	enewuser logcheck -1 -1 -1 logcheck
 }

+src_prepare() {
+	default
+	# Add /var/log/messages support, bug #531524
+	echo "/var/log/messages" >> etc/logcheck.logfiles
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
+	default

 	# Do not install /var/lock, bug #449968 . Use rmdir to make sure
 	# the directories removed are empty.
@ -36,6 +47,8 @@ src_install() {
 	rmdir "${D}/var/lock" || die

 	keepdir /var/lib/logcheck
+
+	readme.gentoo_create_doc
 	dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
 	doman docs/logtail.8 docs/logtail2.8

@ -45,7 +58,5 @@ src_install() {

 pkg_postinst() {
 	chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
-
-	elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
-	elog "for installation instructions."
+	readme.gentoo_print_elog
 }
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@ -10,7 +10,6 @@ AUX salt-2016.11.0-tmpdir.patch 1480 BLAKE2B c5501459ba32a5ef08317f4e1a247a7ac2a
 AUX salt-2016.3.1-dont-realpath-tmpdir.patch 853 BLAKE2B e78c50d1050adad0d21523229034a24f1fd2c977172f3135dbf09440ed6d7e292f0dd9c267c3277edfe8528bf38d269939d068b4af8671da08c64f5712c0d7e1 SHA512 a6bc22959975ac25df84c54437a1638e95d78c057920ced38b0accddca11eb33ad39f2a43dd05648584cd10b140f7ee509a8c6739c4d89d30500452c91795b79
 AUX salt-2016.3.4-test-nonexist-dirs.patch 1655 BLAKE2B 5e7907e0a10c4ee78b599ec98d38088c97889ae2002602db0c207fb210e2960e7b4b92c08f027854e6dd9205b000bb09e7b243346af755e6824561752e3ef2e9 SHA512 ee81b8104f066e1d161207fe82d8349eb8c40701544784a2b6e66842fe9e07d7edffa24cad8c5d2037e2e7fa0368c614ed177fdf7359c89255d068767968e8fd
 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17
-AUX salt-2017.7.2-fix_disk_format.patch 2111 BLAKE2B e8a1c24cd780e29092e3112256bbe3cf518dac49479abfcac0b2432b8528c448241bfc0cce5bbf20b1be674cd49766c151547cfb4d5ef0894b3c9a1d28ad332e SHA512 33c73a70e163135c238b85ad6a0beaed5ed5d339fee19dfa15f7dd073200cb788ec5234d89939eab1a8b080ccd0b22ed0a5409cfaad27ac1abbbda3f018f3d75
 AUX salt-2017.7.3-tests.patch 3096 BLAKE2B bde978ec7d9ca3f303e859d8ecc728ee16e6b1753afe2325f95b0938ed2828ac5b3f80ac92451f6ab4bf7f08f141b71df88641da9694828657dd358059df9826 SHA512 0db8e8dffeabd9f7c0c619480425c58f4b58a486e1866062c8a482489bb79fd6f31c06020ed83e1903a346cbacb221ba541a2363d4e983e583313adb4652d22f
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
--- a/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch
+++ b/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch
@ -1,48 +0,0 @@
-From 18fb0be96a146589ccbd642caa9244480c51140b Mon Sep 17 00:00:00 2001
-From: Matthew Summers <msummers42@gmail.com>
-Date: Mon, 9 Oct 2017 20:38:52 -0500
-Subject: [PATCH 1/2] addresses issue #43307, disk.format_ to disk.format
-
-This change fixes breakage. It appears the disk.format_ func is
-aliased to disk.format in modules/disk.py
---
- salt/states/blockdev.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/salt/states/blockdev.py b/salt/states/blockdev.py
-index 4b0dc5ca81d..e6ecfeab3f1 100644
--- a/salt/states/blockdev.py
-+++ b/salt/states/blockdev.py
-@@ -159,7 +159,7 @@ def formatted(name, fs_type='ext4', force=False, **kwargs):
-         ret['result'] = None
-         return ret
- 
-    __salt__['disk.format_'](name, fs_type, force=force, **kwargs)
-+    __salt__['disk.format'](name, fs_type, force=force, **kwargs)
- 
-     # Repeat fstype check up to 10 times with 3s sleeping between each
-     # to avoid detection failing although mkfs has succeeded
-
-From 16e1c1dfc86920b7a00dbf7c39b805c359e4d13b Mon Sep 17 00:00:00 2001
-From: Matthew Summers <matthew.summers@syapse.com>
-Date: Mon, 16 Oct 2017 09:47:40 -0500
-Subject: [PATCH 2/2] fixed test addressing issue #43307, disk.format_ to
- disk.format
-
---
- tests/unit/states/test_blockdev.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/unit/states/test_blockdev.py b/tests/unit/states/test_blockdev.py
-index e5899f1c70a..9b559dddfe5 100644
--- a/tests/unit/states/test_blockdev.py
-+++ b/tests/unit/states/test_blockdev.py
-@@ -100,7 +100,7 @@ def test_formatted(self):
- 
-             # Test state return when block device format fails
-             with patch.dict(blockdev.__salt__, {'cmd.run': MagicMock(return_value=mock_ext4),
-                                                'disk.format_': MagicMock(return_value=True)}):
-+                                                'disk.format': MagicMock(return_value=True)}):
-                 comt = ('Failed to format {0}'.format(name))
-                 ret.update({'comment': comt, 'result': False})
-                 with patch.object(salt.utils, 'which',
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -4,7 +4,7 @@ DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d
 DIST sudo-1.8.23b2.tar.gz 3078589 BLAKE2B 4d3a003d168ef27382ff77d656c82ff830a53e402f4f717ad5fdde9eb1619b1d4af453d2dc9534b7206665d8a89e710a10b6f1343b5242e6a182737436365ddf SHA512 0fe984db67c3589b501c97cabd3e4a006bf6364f3397c73a46b34a14055226225416c2aee08a5fc60f5ac06e50a8fa1db9ed8ebf3c76989870e84457ea84e356
 EBUILD sudo-1.8.20_p2.ebuild 5739 BLAKE2B bd58250f5cf45c9a6480152ac0ceb11b628c5c6e05ba663b9c277c8f082b48de4be179a437e43de2f8c81d191a98840757387e655b0c2a04d4aec2827188be0e SHA512 cce6c399221a53baba5ab12c83c833c3a350ded0ca0a7144fb46b34bccaf323368408f6b4c05b3b1d7cf01563d0f53ff241f15fd553f0cb64c3164bdea052ac6
 EBUILD sudo-1.8.21_p2.ebuild 5809 BLAKE2B 06a01d30fb9642371be1a050d768eb42b011e1eb4f86238a96bfa7187025413badde2d92294411b6622ea55406f3d9aaa1492883706abbd999f42ae8a666ebdf SHA512 2847d70298fae4993128794f4b47dc093f3571f01ba5b1c60d221031b16385ab070b44c7c81dcea862e046bc5f390cda1f9af933c6ec196f7b198a4e7c36fe07
-EBUILD sudo-1.8.22-r2.ebuild 5997 BLAKE2B a822f9c5414dfd00c36d71d17e1061cde43a7dd065362bffbfe1184171e67dcde5d4d011bce3837bbec3e89e1b9232bbcbff71251c8658b3d0ace5dc2d55df69 SHA512 57bd6d63b6b12a5b0ee7ae82e773eaea17c28c8447c8df8cd620d4dbd116c2a376e361b30cbac8e7414e269274f43997eb51264967c44ab4f82fda80790036df
+EBUILD sudo-1.8.22-r2.ebuild 5996 BLAKE2B c39d0f62b5a35cc83b770b650ed90c6166caf976c1866d5166ab02045e181b6dfb7a5e7d789c8237dc9bb29dd243d0829a3f5b94bb2faaff67b4a0f32443bbf6 SHA512 dba017a242af87b476788104f8fb24bb9a98cdee74cb4220c790d135316500db23caf9bd7ee17312f04d66e359454fd41e85e3a9c2e209b64967000061584954
 EBUILD sudo-1.8.23_beta2.ebuild 6000 BLAKE2B 0f271466e3199849d365e2136700e3c2570008fa72054d60a27f84e515596359ccda07683c32defd0091fa7f41fcdfd5dde5f345f8b2cc73a418ac217b29bad3 SHA512 9f5b277fcbbbe9921d8e18b45b9935436e47021ee796a0fb65f3afea980b2d8da47e9ee247acd9da4434403c9d1ef2b39ceb678bf6f82c557328381d5d59bc33
 EBUILD sudo-9999.ebuild 6141 BLAKE2B 3fde1d106dc229a8bcf8c3231de2fac5695a61c2a87382bb22a5ef3a2959c7777b5c332d79ce22a5e8e82c7a15a71b688c42a08142ad2d564ae0e8654b4b3459 SHA512 4a8c1406ff43a6b32d24d277b4741deeeb075e68fb3ecf93afbf6a8c15d505595780daabef93f01d9b40ea599ac05a846f01e5736208592ee8c7db55398ae2f1
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
--- a/app-admin/sudo/sudo-1.8.22-r2.ebuild
+++ b/app-admin/sudo/sudo-1.8.22-r2.ebuild
@ -23,7 +23,7 @@ SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 fi
 IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"

--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@ -4,5 +4,5 @@ DIST siege-3.1.3.tar.gz 527862 BLAKE2B 9cc10b5afa15c5a7682452d8a4020de62c195192a
 DIST siege-3.1.4.tar.gz 530149 BLAKE2B 3721387fa1ace745ce7748612849b84c07e84456bd903460930ab407cba1e24f493d4a251bacd3e509aafbc653e5d74e96509bf74f0a2a8066a0ec2b7ad2e9ee SHA512 8e8b4c1e9c20833f4c3538e8929e47d1c9113cd1faf395e5f07734fb7f4291061cb7554cf500a80d8b1b6be0d6f4c8194b054f632f35533837220702784ee068
 EBUILD siege-3.0.6.ebuild 1137 BLAKE2B 1790115533694ff1e028ce8d5487672a3f29a2fffdab53d2a15cef1b8df1e796754c5e85ffc26001f208f36cf546bc470a73aa3f567ad99f54e6c7c983d9bc25 SHA512 51a1a5650f81440fa974b17479acf13e6ab58a96b74708a2169e0d42cdd459e68f7de4e1bc471635b4e28bff5d7a1006db3949a468f91c8af64baa43f986d2e7
 EBUILD siege-3.1.3.ebuild 1192 BLAKE2B 5a8bf0e8cee22e6b8f42bcc161e1cb8e7ae0052dadcb25700185eaf1db455b82ccc31ef39e8fbae12466bf36b4ca4bea191a83184df808f4142c5c5d50c86b2f SHA512 46650e12d37c45bd994ee7806d9130639d1591028fb3d9f3000a55747f177a7521bb666a871741ed9cdd245606d957873d5de77700f573854cf341ae3c613e00
-EBUILD siege-3.1.4.ebuild 1190 BLAKE2B 5880c84ba4eeebe1e44d1a030d98264046199f0faf4479ec8d57dbd8dfc89b0eb373e845a676cf215ff7b4421647bd18b9e5a93b95bb54b4827f11743d58c522 SHA512 86ec8c61e2e210d630726a04691a222c8721d9511973cd0f0ab228a85a6792c257e62952fd248b6d32a0da8bb55b7b9479487b4a6a2629aed1126a7cb16059c7
+EBUILD siege-3.1.4.ebuild 1189 BLAKE2B a72e0f000ae78e38e026666e23c7839e57109f8cfeaba90e476bbd34f880da9debd5f904c4e2a9482bb983573af72682fa7ba572a57575155771a8362bc7c640 SHA512 9a4d62ea2072f180eb99195c319f0b1546b31e4a50918db0bbaec8fa9cb9424afc8e18c03d258c7e37d4945046bba18890d68aa931c1d99db6f64195eb1e8c25
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
--- a/app-benchmarks/siege/siege-3.1.4.ebuild
+++ b/app-benchmarks/siege/siege-3.1.4.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://www.joedog.org/siege-home/"
 SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ~mips ~ppc x86 ~x64-macos"
+KEYWORDS="amd64 ~hppa ~mips ppc x86 ~x64-macos"
 SLOT="0"
 IUSE="libressl ssl"

--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@ -2,4 +2,4 @@ DIST stress-ng-0.05.12.tar.gz 280758 BLAKE2B 0d25a0ecddf75cfd19a0bd26c2ca7390d8d
 DIST stress-ng-0.06.00.tar.gz 311761 BLAKE2B 725e902344602a9922b2d39a247a7b6c4d88cd69506addb9b8910221a5d6aa438b69cc1f3ac5c8265de2be7e0973b9dfbc4f93493f4437ee23d4f84c8712cd5d SHA512 a23a3f020e1fa777c6141db8f9d91833b9758172974be0db341c757eb7b407520b80bc9889eb7b6348cfa64d8f8976ba6ad8761a5fbc31055accd8fbceb8de66
 EBUILD stress-ng-0.05.12.ebuild 418 BLAKE2B ad82794d9f12a4e558805ff30b489aaccdcd0b130a1bf2f43665fc83db760241f6e3d7d0bdfd645b40599e29056747be690fe16fa76b2466355c490ad1698101 SHA512 c4ce319d581ff494cdeca68b754d7cc4747edadffcc945637d43290414163409be98839c1dd484bc3264217f4f7e655e8fea5c1d2f62dd1da4d7bf99f852191d
 EBUILD stress-ng-0.06.00.ebuild 468 BLAKE2B 0a24271ea732c9175813c278ec841411a5c549e196f0c50c18bca9cf1606cc233531e97e7f432e7e06169e3f17f8a4f29c54168d762be5b7cd9bd2837eaa617a SHA512 b8cff039db84fc870cc889f27cc1a2023ced0effc4d7fb44efac4c7729767d1bce614f089941e7043bfc2d361eacfba46a53a50566ab4d3082a5a51185a42706
-MISC metadata.xml 362 BLAKE2B a7fd8878dee0af4787ff63acee7b672bc21211c1ae24ba810c619daff973a76b1ac74d5ccfe110a413a135239ade428d0541d03e2a4b78dc89a78116320454ef SHA512 55a3c66628035afad7b5231b67bbb792625b5a13c747d3e72e4ce4d63e4eed0d8072feb8ca4bf30938488b0ee04701ce5df12ff24e59ac0180e27dd959e6f1cc
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
--- a/app-benchmarks/stress-ng/metadata.xml
+++ b/app-benchmarks/stress-ng/metadata.xml
@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>brendan@horan.hk</email>
-		<name>Brendan Horan</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@ -5,4 +5,4 @@ AUX cdrdao-1.2.3-unsigned-char.patch 1119 BLAKE2B e5e52f03541d77740dd4a61f6b275e
 AUX cdrdao-1.2.3-wformat-security.patch 6279 BLAKE2B dabab6d2575e24b5bfcf690daa634cfbd795d18930e03fc9acfcf630408fcb6e60af077053a577507725365a23083c273f43f5efea65f8c58189279085a2e472 SHA512 aff829cf227658ac1a11975c818385999ee91582f239bd70ad440021cd08554cf80c29470683f55ca9d50aef05e33b326e853ba022ecfa9e7eae84fb4c51acd3
 DIST cdrdao-1.2.3.tar.bz2 1428695 BLAKE2B d5d8e9f2f17b4e4a385e226233d219afdf48fa98bade0dad57292ba45fc4f25c3bb146289884c9ad35224c26a826b305c6f8a1e43c22fe7f1cbd812f1a69790a SHA512 36b14180acf476de062f5f31e2b9dece39e3cc7a84552e80a6714931fa35d6090ec90ddfcdbd2651d690be8ce3fc78d483aa13856c3c311bcc2f571f0040adf6
 EBUILD cdrdao-1.2.3-r4.ebuild 1363 BLAKE2B 39976860881ab6c78968cbc03705cc52d693a25f82ca444567d7904ac6c517bc0e68c73279caf7b76cec3c663095435ec3907dbb842c61fb5e87c79fbbac96d8 SHA512 61bf45c88cb48a58375cee24fa82df7d45d2e4f3ca1d9712d087e625b8aee20c014a4954be6e47a2dd1a8d7466e72a7b1b47f39cab5e8821f0beb0ebc5b2786c
-MISC metadata.xml 590 BLAKE2B 1bbd0aa3df866bcc4c95e31b82e14d8329d5f2d8b6127694b6cd8acbd70590a48767e8f9d6e9839c96ec1bb30476708b26ece50e2ee98cb89faaca26b4b8d277 SHA512 039365c68647d7338fe71e313ff0aa2b423e5fc1151a9a151e0cf7c36b93ddf2c74a17d3f64e49304ca1bde011408e5442e66f4addd24d70142756fa928552dd
+MISC metadata.xml 395 BLAKE2B 271ac8836e1bc4bd8b8405ab9fdfdaaa4046b47bb44b07bdb78d063853a82433117d69d4dd46e89b4f42008b55f10e69d8262340bd29fe396061add32ed9959a SHA512 66d6f12a07e09dd91c828d34941963b1a498e1be14f0cadcb145b47471e148559280fb237a68c1d99ba3c2360e0603a231f124b950b3debde76fe476a5491351
--- a/app-cdr/cdrdao/metadata.xml
+++ b/app-cdr/cdrdao/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>brendan@horan.hk</email>
-		<name>Brendan Horan</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 	CD command line recording, ripping and copying tool.	Especially ISOs- and
 	bin/cue-files are handled very well.
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@ -22,6 +22,6 @@ DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3
 EBUILD mit-krb5-1.15.2-r1.ebuild 3913 BLAKE2B f4559c0b17ef398ac7168763d2e2225d8b1b061a61384313c93d69db9f680461008b48f4e66ed64f672fe1e6e32825a874084954e03b1dfa228ead6bb6d1e89c SHA512 b4da2e82b91b1fec83d94dcad8b2787f07f9b0bc1421519ce6a3b1545ecf30e14817debe67a9dd98ddb88b666b337be18b286b3d866e51664599b1e07f13eeae
 EBUILD mit-krb5-1.15.2.ebuild 3856 BLAKE2B 7b3d059b5bd6e68ba99bc896ae8435543a6128e4e7f9dc29e73a02cb145228a54c1f7eeca92bc3aec49582e1e0c24f9620089a8abe917b59a152b2608d0b5a25 SHA512 dc2d6fb486e95100a02a4b2f32fb93279b022195d82810e2a794f6d813f5c31f95b68b3449e2b885bc9a3658cb1d18acd76d76fa13907baa817215534531148b
 EBUILD mit-krb5-1.16-r1.ebuild 4255 BLAKE2B 00ccf28de187059c3b4f864e56782557ae79ef064dd90178491dd1d6ebfe5dd6706766e569f7800d841f10ea0ff62db5f609c4a14ac0abbfe7eda210962826fe SHA512 d73f5a9cde6cf3bbca2ccf1ad81a0efc7e3c3d27e329dfa76fe9eb32979bcfc77162ddf5de85f84e84af183cad23eaf44334498bf00f161add4c4c448db6b41a
-EBUILD mit-krb5-1.16-r2.ebuild 4352 BLAKE2B 66f14dfff8fdddcdcb8b9c9d7025c7969c23ef1d23d04cc0b19c3d7c03a0669c6e8b9d87f4e2a4f050937455b6c9bb69b3a6c8fac0234862defe9ffc91d0547b SHA512 3367e2ae4278407b5a92faae2508210299bde54a1e349b0e8a2458d434ce61d2f7b6676d60a94c6124f3335aefcfb7585fd79050443f3954a134f394c0683f87
+EBUILD mit-krb5-1.16-r2.ebuild 4349 BLAKE2B c5eb699761a5129c20362db8131aed253e26cfed922f4d98967435dc5f5482419d54f10e1d19977a278ab9d6f44023e739200389c6ce2a4e94805619187e8542 SHA512 fbc7400d98a5c168634798e75ffbde23dc39db237618d0aa9727b1c150959fcf6289fcd548ba22a7e84105e3d68d57b5599e252db9eb113f8049a55bc780fe7b
 EBUILD mit-krb5-1.16.ebuild 4190 BLAKE2B 906b1ae21a3d91d86fb3993eb076890812f3dee319fe2ae8599e2f728758e75c27374092f8157d70e5720d8615b0d5d6cd59294f831c4582319e294a7cf53d67 SHA512 0f91fb7d2364068b6917413ee317a1d8287f2be5c3f30889ae4c568cab61b37ae8e852010bd00fb61c7a0be2f9272a99f52f23709a063ce04d8f76a8bce4c2f0
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
--- a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"

 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"

 # Test suite require network access
--- a/app-crypt/nitrokey-app/Manifest
+++ b/app-crypt/nitrokey-app/Manifest
@ -1,6 +1,6 @@
 DIST nitrokey-app-0.6.3.tar.gz 769503 BLAKE2B 97b4f9951cb1ca1e3da1a2af32756b72a9a9e1f8b55d087115a6a95fe26a7aabde6c9503330f43308c3824211524dd1780e104ae6e28e3d60c38cc1b4158edeb SHA512 23960b0ca740a4c9520a3d7043f396ffb6fb730ef28ad44b299aadbb0b7d2fa1a182c38a88fd684fe664c2079c5a03c5a6b8e6ceb7f8ca69a37fb64ef64237a6
 DIST nitrokey-app-1.3.tar.gz 1132479 BLAKE2B 96a20ed4156137e13c0b0eb3f69edd537cf2a236781ba55d295b797a2a273ef3a412f27c2302c035569756146acb006752dd91d9176377f142e2a8c8108ef4a1 SHA512 b78830dee0957601b2e2de97ef267154e9b3444e9ef49e307f7aad5810e4184f1b5d5a278711431cac098e51217eda30d27425cd6a83040fb16bc27d6b1aec5b
 EBUILD nitrokey-app-0.6.3.ebuild 723 BLAKE2B 568bdb73d8a109ae377ba3f189ebd5c1760a13f886394f9421d7ee22ab9537a58aefe5adcb1b2204cd388edb4ba6865d0a96dfdcff575126602be61cf999d867 SHA512 11c36ae01ed31273939bf775b12d29063d9a08c9dd3d26a270f814b75c03e18863c10f702a0f7f6e00ee7b198e027d4fee31aa142b973e5fc08048fab0336c8a
-EBUILD nitrokey-app-1.3.ebuild 887 BLAKE2B 2acf4bab7849cef1d2a406640e165e57890d53f5f4d4a36cc3ee5ac6ef489fd538fa28446b36010861c4718f38fa766f0ceb667a0122a3c6e4b5a97b9234fb33 SHA512 d2918ed30023c9cb6be2e9c65c26f0e999e1f57904b67b419e98ef6989e87b286df3800e8f393f9ba34bc0a51c17688b2b749c480d68ea0e6af9cfc8674c1fdb
-EBUILD nitrokey-app-9999.ebuild 887 BLAKE2B 2acf4bab7849cef1d2a406640e165e57890d53f5f4d4a36cc3ee5ac6ef489fd538fa28446b36010861c4718f38fa766f0ceb667a0122a3c6e4b5a97b9234fb33 SHA512 d2918ed30023c9cb6be2e9c65c26f0e999e1f57904b67b419e98ef6989e87b286df3800e8f393f9ba34bc0a51c17688b2b749c480d68ea0e6af9cfc8674c1fdb
+EBUILD nitrokey-app-1.3.ebuild 912 BLAKE2B b18d2a5a3529af0e70649a3d00dcbef8050f9b5c21ee4f82b98624b191ca925b9045328b9fe21ab7167bf6b0c2b9070e83915267e878499e4c936047a0bf5c35 SHA512 54f1277dd88ffa41e877eadae14b5e0576ef0e596e9fe4a77f6e5782cb20644e850c460d3edda1ef49c159702dd0959e3d4ec8b40212b9956053b7c57333d79c
+EBUILD nitrokey-app-9999.ebuild 912 BLAKE2B b18d2a5a3529af0e70649a3d00dcbef8050f9b5c21ee4f82b98624b191ca925b9045328b9fe21ab7167bf6b0c2b9070e83915267e878499e4c936047a0bf5c35 SHA512 54f1277dd88ffa41e877eadae14b5e0576ef0e596e9fe4a77f6e5782cb20644e850c460d3edda1ef49c159702dd0959e3d4ec8b40212b9956053b7c57333d79c
 MISC metadata.xml 399 BLAKE2B 622fa027d3ed6c95ea87e6c533289af1b66229f76bc163b490a8c5a819373c85d21ab22505c9a159a7598fdc17b1bfc7d01ff6217d3d8f8e64ef38f2d68d710e SHA512 fa204891e67b5c6f1ac7082fe49f52ae287f6aed77dd1fd8972770c7a5ddb7f2af71f543a3888c9f572dfb04197f98486a75ecba5960506274c634782af110ab
--- a/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
@ -33,6 +33,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-libs/cppcodec
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig"

 pkg_postinst(){
--- a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
@ -33,6 +33,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-libs/cppcodec
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig"

 pkg_postinst(){
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/phrack/Manifest
+++ b/app-doc/phrack/Manifest
@ -1,12 +1,4 @@
-DIST phrack01.tar.gz 11984 BLAKE2B 5aeb5a03e1e3374b2bfcf8f3abf1fd6bada2e280de34bd033cfb288269f65ab0e186d49a763da39636bdfb9d43193f609b33e0e78bf6d1024de01d624d131541 SHA512 b4c88d0b23aa0c7f6d979767791ea662414fda28dadb0a15ee49d2b1ef80a4419f79f2af4427f9d458d22da729be2992884589dbb1106813c1dcae27405a87f1
-DIST phrack02.tar.gz 21135 BLAKE2B e3e8849aee20ffb4d8fe204f727600feae4153359ee0b5f6e747d77821f103fadde5d1eb090526994f17801d6658e685ac0f0fbc932907764862e9b8cd3f05b6 SHA512 97d8b3032c8edf13b3cda4c28f5746b17eae22fbacea4a480933353838d088b243887a958116916aa5551da45e23b0b794e3449d17504112b9dbe4a0aad8e279
-DIST phrack03.tar.gz 24577 BLAKE2B dda7414837e8680a0d7d789b689e25831934a9ce89df5c40953f21795f54a09d707295d640bb3cce189e17a1a0ccc99ef5ee15c5986aa87d8be45caa947edc04 SHA512 75abf19c97f070c6f170a2bff5e7d66893864205911a13f6f4646a69985606e8fb282cac7b10c62034cc07f28839cb399ea89f90ac8826506ccc3e9bcbeae8c6
-DIST phrack04.tar.gz 40455 BLAKE2B 27ace48582258207793754954eb9d11d41fb031aaf25930fab3c20889d1be8a30f528f91fef9d8c4ad407a1924af623815428262b057d1bca0e816cb56f0e62d SHA512 34967766001167321b328c9ab15681cfcd62827f8a155b14f636637f54e62239a7c90d552e9b72dd9385121a8518ec4d5e8da4eb3ce2d8d0c011259b3ebecb24
-DIST phrack05.tar.gz 51183 BLAKE2B 2de5d4b682c47b6f93517ceefc84b2f6cb23b12d3ee9a8731fbbd70c4803cabe3cac89bcbb7c7903c729e4c08740057cf26f11500251b87f699df30bb4d60b30 SHA512 b7f7edf4b378069696cc3514ab7d8f5845a126d84f04652a16f94aa768c269ac22752dd101333ff9d1c6d9f5a27be7be57bd57a47c098958319f6d8dce7e4d19
-DIST phrack06.tar.gz 95923 BLAKE2B 994286876f12e34a069f7910af41cadeabf241bd0244c2aad2fd19e5936f70e7193d9bd17ff2ba40640f8bca8993155fc1141e8aab1364f3e719250eb8e89a2f SHA512 4ec71a0377daed788a7a14fe78312ddebbbf91a8d1e9fa1afb2290402100c474b5d9c3711ef29d6cee3893ff064b95a5f0cfab3759f3d147689d1d75df6f2809
-DIST phrack07.tar.gz 41309 BLAKE2B 58d418538bb24bf9e9fd0efdf9509b62593fa0dac1320359b5d80b7548c8d7bfbee66dcd6676e30b2fa5f6121fe9cd2bfd813af8168ee676694479a21ec573af SHA512 2308884f0975f3dd58c22cda3a23f3908a1dcae07e6e134433fd945fb2ba80760c79147e993fd3e645be08f1a30082c2320d119d59ada2dff218e8cba3aefa21
-DIST phrack08.tar.gz 46369 BLAKE2B d559414745537333ee2f05d95b89114e71c6b48c0ac1f7f0c859181e619752a614dcd5adf8cb270f8374a245498b3242de4ae2255a672e05f5c866bcf22f4980 SHA512 bef3009c2087e7966c5514c28b26785a5bb8c3b5a8dbb135e5f947fc5392dd11ec81cb7eccdddfdffeff16398d26f421a49da59378886ebe55ef70c9b8963010
-DIST phrack09.tar.gz 40346 BLAKE2B 84af3e4766a8f47508d96fdb513cdd2ba71c29904620a1e7115649365dc4627f2e461a1329902a34caa881d6b77a20c92fdd8170da528bce74e2ce7772503b8d SHA512 fa395260a6790d1e39acb5fc238445111bdd18ff3e10a850adb08ecea15079bdda1462ad56958e1329bfef09f861c27dec2320d3c571199750327af0f96a858f
+DIST phrack1.tar.gz 10740 BLAKE2B 07832cae1b7ab63eb69117a85637e261295caf93abf9099534cda8656a3cad13f41bd9832d106953a29ac44e1c806e32f753c35faa5f15bdaa2fedc7b1132aec SHA512 9375b241bdf0d4c15ad4f42ac3c0b058ed55d412b870e56939d1a9cd64ca68a982c9841df498a08c9502373496827b2c6532a83a5d1fdccf07877fb1cd0eae4f
 DIST phrack10.tar.gz 35748 BLAKE2B ba776676aaf247f318200b40cadf701ede4adf17826cbcf78de9ef450f6361eab10e08e45aca616bfffca1ed82f1474332ece8c4e53a003ea7d5e1ee1e329e6b SHA512 633cf761262791d159074adab75278620a729b14d4274b10a449dfa0c8a74af9c157fdb9f805eb6552d64e377229cd9c71f18bf83366ed65460b452c530d8365
 DIST phrack11.tar.gz 51231 BLAKE2B 2f23069cdf37d39e60132e98f1ae0d8fbe339e6de2218ffcd5f6879e804c05b7c5dbbd940dd4347be1588f041a2f439b3db25f943eee1cd479583efabe20cbb6 SHA512 2c38b6d3794d6e192efc214c40b88a4451a90eac4fd9227c86b5277a9a108a38619c269202fabda6fe61969dbb516fb35798ee558c1219292ac2409a1c0db260
 DIST phrack12.tar.gz 48781 BLAKE2B 74df337b26d18f83524033235f417faffb59fb4e6817bde399343c98be5830e4453456831c182fb9dd0f954e9fd44c7045cfeec824fa02ee09463920f04b159f SHA512 d1313a4759a1cdac0319b8ee23f47daf893740c70b8d87a184c1bf506bcb71b2411b050c12144ced437dea5dc2a2a066f94f969e5b8b694e0e782ebca41c1c60
@ -17,6 +9,7 @@ DIST phrack16.tar.gz 26215 BLAKE2B f0c7bd783f8bd540547d1ff4c62d7704aef2a0ac6648e
 DIST phrack17.tar.gz 51283 BLAKE2B 80ec9509fe3d3ebd5b01ef1bed8e6859ef8b2bd85125a3a84d2619395dfdb1b01523199759e79988e59a04ee2b6f1800868a71d9dbc142787851318639b3dffa SHA512 2a3beb3c97f32f63d2ebfb4f1ae2f7838d73d4adcf56038e65a8be311e723dfa1fa29ed7adb1bc606086ddc26cafa3721c6e9da2ac4d13b64321178f4f2e794c
 DIST phrack18.tar.gz 59916 BLAKE2B aa497b3dbdd76e64a55f28d343ff2fb23c1e0c42fd45a2dc2364bca2936406fe967652e27905ded97ca210feb84e628e621e6475eddeea9883fc9b79333a75ea SHA512 2d96a0d26b895fdd58b131c674f9eca4a27675b1e1847ffcf28ddbd2a1db7df70cfacf9d449ac27e5784246af2faf971e73ea75efdc3c29f24bbbf514d9a9d56
 DIST phrack19.tar.gz 29438 BLAKE2B ba1e2a439d4ae87fad99947d0016b87bdbf4b7e3b8e16e0e63dff2a7221e17c50baa04406d88053e9fb94c34bd02f168369acb0717fcfd49255e6ce7f9e12666 SHA512 71d28e8f427ca84a46882463f01378e113da113e365ec22c5b1310baa9d5b273bc6f74d3f19aa6a88da6fe85d8cc6687e7a0ea52464fe7df06f7ea5f5236e9d2
+DIST phrack2.tar.gz 18695 BLAKE2B 6cb87f5f0461b741f148475fe63c6e0ee750db9c68817232a43078d11535c820ebb57fa200c45fbe3e3d30d11796ca4c4edc2b517ea1e0bc2a4439c61bcc4e02 SHA512 a2aa95c10e904f24c5c144e3354dd3fb592ec8c67e48133eeaaef9c39e9be32680baa136894da3a16f64d9a7d2527232ea4f1f5ad2c49aeb4023fb866e852742
 DIST phrack20.tar.gz 144550 BLAKE2B 6edafae6bce47594608470e493b5bf98b1509dd83417661d34e25cf5f27a8a535e293c879a4ebb84d819af2a1a597f57b862605b7874c9b1526367b4090472e9 SHA512 f6eebfd33a04a4145f1f0c93c4a707e8a8ebe40a803a49114b44b50150e4bb11a8b1492f78f816cb46d7353ab3cb914a37d31569d30d13e28caa003ffe6e9a8b
 DIST phrack21.tar.gz 95972 BLAKE2B 499e84f83793aacbc0fb126755a894fc7395d59fd58194686629a29342efaafa1493bbc90277aecac5c6678b76573826d47813a02c68b1cc2c0c2a336bafaf29 SHA512 85e05809c64b215cc40cd066ba2b841be6b03fd951ef3daff809a796782017a585b80e1ead810b6278afcc29758855b8b6897923845d57361fa953ccf68dd277
 DIST phrack22.tar.gz 106801 BLAKE2B 394afdab5980af4d2d757008ba90cd00d31e90f2013cdf5563c199535d0d5fecff7a7ee3612fdb1af11776dafe240f2be877f6d7b37f70e4e73e8123e660663b SHA512 6183e5a5b02fac707df6a930da64c843a84cd84ddbcf01645fbf9d7b70a9a3b2f9720029d2bfa5d9686f7dbab9324e81bb4b1e7b6aea0af1e29795a1ff62c940
@ -27,6 +20,7 @@ DIST phrack26.tar.gz 88929 BLAKE2B 477e9d03433bb7fec5fbde613d0488109197770e47316
 DIST phrack27.tar.gz 106266 BLAKE2B 36fe433ed57673c67e9d4b100f74875a9e6ebcff413b8f67dcc4d60438bd2700c863d2557c748d1c53600edee09ed6aa19e4fd61e205e3caa015f442f7f5d437 SHA512 7f71eeecfd3255a6f442db2c57b94d5bea45dc47bf396198d0e3d1ddb5ab95005ef21057bf1821c68b82d907a5d1cfacc736549d2a281e76faa6e8d1559095d6
 DIST phrack28.tar.gz 98229 BLAKE2B 7f367bfcb3134f2884d6789c2898def5dc8437a00981710f927d9fca5b623a2e373313ad2143743f9ab928d5510407ae6582c191d289a8d668319d6add3f305e SHA512 80cf0dd6319334714339dcd075b700c8b1af160c2afdaa74342141ef68c7f05b7c0f2893f888d0fb43d387280db51700ce08bb848bdfe298134694afa1c7d489
 DIST phrack29.tar.gz 99107 BLAKE2B e64bff9518813e49b442d3b4ec5b2e3a47e13bd6e2a724f00c9b248ef957686d75a152461c2dbadaa5db43ac6b0afcecc55bbbf6f6475f7edb7c0604506c9c22 SHA512 36c59f5a85fdd848d3f362bd3974f14ca2d4e7fa492b3276643a761a47f54b01569af580ae3ad8c15cfc870b50dce9960e9d9c19fc0647bfc4078a18b72c6971
+DIST phrack3.tar.gz 21491 BLAKE2B a62fccd8eac513bd37219cecdff7d81cb66643d44566a33cced5841396b7e6be7e14fb5adb4e7fd909454e1bcfde4f1ff8bdc8d2a3d0f8bdb3c1114ab7a34d8a SHA512 b5eb32d8042d8eb52848e3534b02e2cada7c080e8eb8669852c4fabf3b9d09ac5e520338ae2f89b6c1a2a8916aea8cc56616d30ec687689183b89474fe12e2b6
 DIST phrack30.tar.gz 82979 BLAKE2B bee6d76dd59f51a414773cf5f33af149b1b38c82e896a931cdba5c4ebf448af1cea534bcab745e793363fc2714091080eee0424e1646e6f204bfc5f3873852f3 SHA512 6fe75326d4fee644ba363c9e964665090a5aa6078ea6d8cdb335f4d0de73c9eec31fa1fdfb5af7c0e119526937b328effc244d511bd99aeac8fa54f35b20f23e
 DIST phrack31.tar.gz 68441 BLAKE2B 9d6466f8356891cff6b70b9a71c94deb83b4b52e2285d9eab833c55895c68f4e17b7c1033454321d399e61c139642ebb9e930cbca700079ef4c592ef3fef177b SHA512 12cbd37cff1b8086cb1ccb359a93072218660450f6e119713609d4c10e7a7efdc9826a0bdb8404bc4b0ba3938cbdbcaccd8180d87cbaef0d956d83febff168f7
 DIST phrack32.tar.gz 142273 BLAKE2B a961e18d2574d46225e01aae06074fd1fa8443a9cfcff25eab05ecc4f2de656e9e3d71a382d2787ef8e8f7d05bdf6f06688057a79f517ca939e335619c221753 SHA512 6e99847752e543550e77ee7b82289eb4822c3fef204f1e511f5467ed8460ff91758619b993a9e8e88915ac960d84ebb3d330cbba53940d06974fdfc2996e3213
@ -37,6 +31,7 @@ DIST phrack36.tar.gz 81693 BLAKE2B da27e75d47c23c266f14e7fed9b12d51b16ecacd598d6
 DIST phrack37.tar.gz 144552 BLAKE2B 51c2108d98ac39071b6dbc37f6eed64ff22cb610dc68ef281050d4e5e924dd4ac226188c06e8d43d0065d7b98b7939fbf370e770697979ec102d4dca168626fe SHA512 6450d218ec67e0652da29e52c91a03443143d296998d49eede920f5facee8f5914282b9e44bc36d274ceb5a010555f991de62092819fcdcb493066aafb9973b8
 DIST phrack38.tar.gz 153494 BLAKE2B 1bed1c4297abb06c59dd376e6eac1c957e63e0cb9221101cea90038b1c5885c6649a071f3344f73195170315902ed98d02363dd8fd01d6799f6a4db5ce0e04ae SHA512 06b67b073793fd26881e0e303a7ec17f7d64fef580edd7ec130192ad65083c638de7ac9a7f58cf5f89d15479ce6126b3b3d272d62fa0405a85167210ad00d7b0
 DIST phrack39.tar.gz 132502 BLAKE2B 5ba6a19bef7128c9f7d07c1d51308b847e3601004e1fe2c97b22b6fd986386c4b896d8612c850907c57111995405176e6680d3e96498794cf63eaeca5d28bfec SHA512 f434225e1f01dfffb27c378960e877351e2373d3c3e47d9b2bca18b41fa220680bff95d5e1f53f94df2592199523f48530274fb38bec97aec6ac2b12a0e2e8d0
+DIST phrack4.tar.gz 35449 BLAKE2B d199f96332fd293468212b635909ff7e1b5f7b07d21fcfdf59af7d288689b58327b70ac079db8df1c612c63774602d9b674d2402016e6399e21d9f635473d61a SHA512 e9ab67c1d387abec3350e0cc4deb47a5cc56148fd0993726157a6edda941020b409d08ecbe5ff3865df7a98f4d3308d36c1bd8c3faa1cdafc20a128a21f11dc8
 DIST phrack40.tar.gz 244701 BLAKE2B b92d81ea7c7235406c1820a9618328125c0ff3e782b35e2e79524360ec453ae14241687b7672da883a30c33d6cc30e0e1119e9b89956e85f945d0c0749bef690 SHA512 057303a9d1b6e516858cedf3c509f17339561691c13566c1d58a9d86a6165df2eb464fe5c6d7d65348076cb898c2199195462ca54eb5a85385c9a035c8fbc911
 DIST phrack41.tar.gz 154834 BLAKE2B ff2dffda3006d2a0db71190798b3a62a0bffedef548b5316eb999c3231adc792a61782d96cf6c08ce2a08e98291da5a4d37d78f9061d961f3cc8add37cb07acc SHA512 92e3e557ea4b639cd5ec3aee6dee1de8aac624bc9559940a7b297b25172ee1eea6f0ddb32b03f59a13b9d3285557f6593053c3efea98aafb39cfff91d14ea89e
 DIST phrack42.tar.gz 177714 BLAKE2B 3e81f92216acfd64bc2124b313f44534e6ebac2c9b1a833dd16d0dc4e60392fce37a1022a9592cf5215eb376bfa1d0f81b41864877ba5fffafe8dcc1018c753c SHA512 d418e2b7ba6194ba18f3808a5208d54cb6451d14031b53ba53c0a38e2031de72ab99562c9c68b8d36fc9cb7ec90615e11a39f47dd2fe068e9bc7f320953a123f
@ -47,6 +42,7 @@ DIST phrack46.tar.gz 451550 BLAKE2B f4697423d6c6c49046e5de400a023251ea284c7d3060
 DIST phrack47.tar.gz 378207 BLAKE2B 7eb292325d1b978a439e16c9c9a92588abdf933a7f0468ec8d9475d8293d253eb362e58c307eaee7dcf5921bc708605e8747d08a3d287fef57ec816be4707b61 SHA512 e5ada906229eb90f878bcec068c0818d9a5bc7c9ca1e3d67ab2b14bd1fbcf0f3a8d8dd4de1d4b85d099ecd9e15e6e7756fd2443dcba9dd2afa4165722544abab
 DIST phrack48.tar.gz 273567 BLAKE2B 8c0a72efe9465c9594e8b07e7b927185d007c6e992f632c65846056676958fadc4be6ea100fc4ce8b82ba1d461294cc67ca9e1d0fde83a802f76a8ef2e359454 SHA512 13ceaf295edcf4106691a95844f954eb8de4b7f699c59cbdf718560f3dd9c9cb0750523e486680e07deeaaaeacc79a4dba368cd66b635c9f1968bb4cbfeb695d
 DIST phrack49.tar.gz 220438 BLAKE2B 2fc26942571e8a626bf05f9289601ee857d9b8f79f43e04ad1b7246c71a8994e20a6ba26e6d5c00f1f000f7e64509aa67d18947fad7fcd11d2849551cb9b3146 SHA512 8e06c3b8e1dbd0a5d127b54948ec0a49e7f7a89fc510777af05464d9b2fc744fc6326b8ea96fe9daa50d48f24a9b2a80a574995e04b985e0ea75af3782c35288
+DIST phrack5.tar.gz 45869 BLAKE2B e4a68a6b62f4ead741f485b0a2bcc149480918bea1726cd858105b72a7d583a222e1215334d1e899ad43068d664221c09be31fac984f5c69977a4509af02940d SHA512 fc648fc6e9b6bed9f36ccd181ae935065579aefe1123e8b8fd072964f17d30f921f727c074321b3c1a0dcb2813f5e03417e96b43b97b3354928ab4d80a1b582f
 DIST phrack50.tar.gz 215865 BLAKE2B 91f09dd6fb3066930746a8f27622c303f1a1bc61a86bf72f4c92cb83905b7b4fb8b15d53e48717535382b922c05dad14c64f23fe29476cab3ed39a1e55e9d919 SHA512 4f8b9f047cde7486b1fc6b99fc8a20b9e974102db26f22a4bf8b29e221172092112d13518f49946946af45e98507bb642131c5725e3a19b0132fc0f31ec5494b
 DIST phrack51.tar.gz 336114 BLAKE2B 8a1738a2385e7023f5bffc4417d711b5faf245ebd926c300d24a2f01ff2e9006cb29216c9cb6abbf88ecb87886fbfa77c8efd88884da2f21823b73da37df36e0 SHA512 a4883b6462fa95859ff51e2773896393df46be647d3263e9c7d59f9fec3c86ea7515a2761e55eea2846c5e4cd2d7d3690d1a443002f087784aa36adfcccb8bdf
 DIST phrack52.tar.gz 285809 BLAKE2B f1a8e114a0b30c73a0dc0e685689a44e8e631f40e4afca1cba5626f4bc79ed4da48cef0e292547994802e8e1d9d9105ea0e09b3197f6d3a88da90c1a35f01ec6 SHA512 4955f98be67998dfe56f78de821ce3783fcd0e9be4a1a27ac6b38f8e410010e1938a1e2baa187a645e6bd6b8501dea2b7b3593aae869319f56e74d1268cd4af8
@ -57,6 +53,7 @@ DIST phrack56.tar.gz 163070 BLAKE2B a4fee7d72ea88b69a067a657684060dfc7dec849186f
 DIST phrack57.tar.gz 170186 BLAKE2B d9e2ca6d62f675ae06f70c6497d084abe2c89ce34642d7bba2dc4d6cbaad62600252cedc0be9436e6ff57f83fe0fb4c134e93c220536552ad4f7476335e05b8b SHA512 241eef6059d69d3eb78d195f5858dbf323aff2e9d6285b907de7c9004d67288bbf96fd0e875da18fa734700b8bc13fae325bb7b1459e914cd6f30e4ef147efc8
 DIST phrack58.tar.gz 194363 BLAKE2B 2f6b9393a0c0d90a019538bc490e15ac0edc0ca1cfc7a8a07ed23fc23077f5909ff2d16aaea6dfd4ee4268c1a361bca1544a1ad3845e58c606e3b5388d607160 SHA512 0a05a38aca1b70d7baddf4bec2b3f6846ef240e2c23334f7277651d01a6b4de94530718bdbdf0d8364d639174f5edc50f0b399623070348ad596eca3c4d66507
 DIST phrack59.tar.gz 349104 BLAKE2B b64f5f24b3ddc803a51bb31d5b2fadf92c85f98b140b30645d53f2076952ae60d6dc489e4a79e29506adad6db193f427744d678430c4f442c6e2dbeeeffeafb1 SHA512 1d7949e57ae7d2fc2cfd5bea4ec50828a30ad20ee379214a57ebd116bdebe487401f19cb5920823607f4da2246de4f9d26903ba9fdfcf3f5b94b96199af46559
+DIST phrack6.tar.gz 81206 BLAKE2B a3f519a2c4ddba4c2c2aff3e701d21cd980e4045f8c3ac82e55f93ea52e0347147541dc81d38b9b7ed5081611825ed74a2f7d0fc3ab04ae8bef3e92bdb6e6375 SHA512 6960727998a035208c6e11aa50e45fcbf83553631f3342bae3648ceed6a6301d10b21bd3505f21bdb838e7ec9d02dd797f90b370328131915d1699202f980041
 DIST phrack60.tar.gz 322991 BLAKE2B ea598dc6618956cd2ee5c7a5dc276a89fb0ec1d6f8eca5a53eaac78c1a5a119bbe853c06e46bbb40967151c8f7b5c8a63f2a883f262a6e1a36f1cc06b9c9c372 SHA512 e5944093e2aef95ec7ea83d05c84260746aab82053a49c445a1f9729141552a177aa0b29ff770170c9a979a740c4c23d3f649a8c34167f780235290757c1976c
 DIST phrack61.tar.gz 352662 BLAKE2B 5e6fd80188fcb1780e39453a9fd82f19ce3fc9328dbbbe810093a4dbd3f141c75cca5bc638619060de92494ca723a3f68abec3fbec50d8725cb07fe83fc8ee61 SHA512 a99e5f577464e5b983e1c92eec9bc9e8c725989be9ec42dd7765741d030ae445f81ef227137d43432f9659b30bff3aa4bbddbb26d9be513d9504f253b9d1460b
 DIST phrack62.tar.gz 346028 BLAKE2B ca8eee3ce0970e33a284a1090cd174562efbcd5aa57d5d141377dbf8d57ba1449335d065ddb2212b8287d5a1a461cbb5528990804f1df1b2e3ee0e7dd20de436 SHA512 067a3640f56e10c2c98c4facd7aa67ad2602d7f2d458f2719f771b6d28599ae947c479bc85165a78059aa264a1f4bd3a7da75ab5feb464b009522560685f07c1
@ -66,15 +63,18 @@ 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
-EBUILD phrack-01.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-02.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-03.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-04.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-05.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-06.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-07.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-08.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
-EBUILD phrack-09.ebuild 519 BLAKE2B cb4fd44cd449be021db0aa61207326e28dfbb3423cd66937108bcaebfe23421dd5042b5cc5cd174cdcbfc4db1efed18c2700058118a4b7443868d33ba06b85a2 SHA512 f332a6e2a08b2f208fe74842b969e856d752ce97269b6fb3c9bb8f36c779353a53dea44f7c539bc8ddc8cded756874c04c6aa2b48b2b2a0a909da41c43352a94
+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
--- a/app-doc/phrack/phrack-01.ebuild
+++ b/app-doc/phrack/phrack-01.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-MY_P=${PN}${PV}
+MY_P=${PN}${PV:1:2}
 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"
--- a/app-doc/phrack/phrack-02.ebuild
+++ b/app-doc/phrack/phrack-02.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-MY_P=${PN}${PV}
+MY_P=${PN}${PV:1:2}
 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"
--- a/app-doc/phrack/phrack-03.ebuild
+++ b/app-doc/phrack/phrack-03.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-MY_P=${PN}${PV}
+MY_P=${PN}${PV:1:2}
 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"
--- a/app-doc/phrack/phrack-04.ebuild
+++ b/app-doc/phrack/phrack-04.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-MY_P=${PN}${PV}
+MY_P=${PN}${PV:1:2}
 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"
--- a/app-doc/phrack/phrack-05.ebuild
+++ b/app-doc/phrack/phrack-05.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-MY_P=${PN}${PV}
+MY_P=${PN}${PV:1:2}
 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"
--- a/app-doc/phrack/phrack-06.ebuild
+++ b/app-doc/phrack/phrack-06.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-MY_P=${PN}${PV}
+MY_P=${PN}${PV:1:2}
 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"
--- a/app-doc/phrack/phrack-07.ebuild
+++ b/app-doc/phrack/phrack-07.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-MY_P=${PN}${PV}
+MY_P=${PN}${PV:1:2}
 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"
--- a/app-doc/phrack/phrack-08.ebuild
+++ b/app-doc/phrack/phrack-08.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-MY_P=${PN}${PV}
+MY_P=${PN}${PV:1:2}
 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"
--- a/app-doc/phrack/phrack-09.ebuild
+++ b/app-doc/phrack/phrack-09.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-MY_P=${PN}${PV}
+MY_P=${PN}${PV:1:2}
 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"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@ -1,7 +1,5 @@
-DIST emacs-26.0.90.tar.xz 43908428 BLAKE2B 20858eb7b06b488451ebdffd7cedf28055f38cb45960c2b74c926204be1225cff297a8ce95a4cf535349fe73b24c9e5347fed3c3decf55492c82daca9fb470c2 SHA512 c263d1d1a12d8b21cc43ddcb46a28ce3a54d0ef09e240518f19bfdabf4c4ceebc3c2d1521aae9808cafdd3e731c93dd22b4f1e7e619e38076aa4ffdbaadea93b
 DIST emacs-26.0.91.tar.xz 43988932 BLAKE2B 05e5b9d51f92f2719ea22806f73b17903f5941c82a2e4e762b7664ed1b05f7324c0b020ded311dc4f22b7668684f59eaf3f3c2495f85977f3510698d7e0edd09 SHA512 4e20743299ed419c8ad7bea00c5389fb7c81f4e631165fe2b19c4bbd7c2b401416073282814f30bb96e5c3961724bfbb565781c50ee481a4f4c762ca6f480fba
-EBUILD emacs-vcs-26.0.90.ebuild 12695 BLAKE2B e6f066d907ffd35dbe61d7c106254d89763d5ca458243fd3fcf0d79c7108d24950e0a07253df1f358b148587f296f8f630450776c7588f52a0eccd472f9e5084 SHA512 a7355d9d698e8d74ab9dcef086736031f9ce619989164d9f8cdcab83e81e3945b708eeee79e663daabb4da53becd0502ace2072a989462a4dc2336f557fb7515
-EBUILD emacs-vcs-26.0.91.ebuild 12701 BLAKE2B 9f7cea7af6c904be5025f49e22f9556b188577adfb0b661cdcde45a0178e1a18af788d65cd5b091c6ef3e3c11bfac210ff88e0878a0d1e7c345467700e59efd4 SHA512 586a0d440e4c6234e06805fddcdaa22b03e37bf29dc84f6be44a7633532e04c82c1b4dd775cf960798c1b10d8aebbb38c082f2823502e582a010767ee703b9c9
-EBUILD emacs-vcs-26.0.9999-r1.ebuild 12695 BLAKE2B e6f066d907ffd35dbe61d7c106254d89763d5ca458243fd3fcf0d79c7108d24950e0a07253df1f358b148587f296f8f630450776c7588f52a0eccd472f9e5084 SHA512 a7355d9d698e8d74ab9dcef086736031f9ce619989164d9f8cdcab83e81e3945b708eeee79e663daabb4da53becd0502ace2072a989462a4dc2336f557fb7515
-EBUILD emacs-vcs-27.0.9999.ebuild 12693 BLAKE2B 6039b5cfc72a086c84b303dbadf6500e7a0a5d9e53551b340e4e34c60f82599d00e8b29d8e03b0c95cdf3e80e18d5ae1a7327a5ec646318023b0d4ef55ab2d35 SHA512 d90dc9638867ae4666cb7846516cee4915699e246ea21f5c7fc6cce13a527c5111ecf02a40edf85ca20072bacdf09010b78c44161f7ffc2e3978644f5464ae9e
+EBUILD emacs-vcs-26.0.91.ebuild 12729 BLAKE2B a4c199947689fa3f0f93c22cf8542ba6faf8dae19f8d087aeeb7149ef531a971f9c9542c45b0e1c89d206bbb42ccf10b1df121e71523536f2db8b040024541ea SHA512 183b51312550aaf65b360929d0736adcc1381e28e3f944de7e68fde0262d5bba597f10fdddd27b1e72db31b7a03cf2b0c2bbdf0e4aee5c65e3ead3554e91e8e6
+EBUILD emacs-vcs-26.1.9999.ebuild 12783 BLAKE2B ddd7dceaeff16528d04f18501950676c224220d870b93467089692772c1df9ea4d9cfaa35d2d3590335b6c4fb05df05a18680d6f6d307de0c01a1d2e9c985404 SHA512 2a6420f9deb01f8251a6ea96124bd83ac3a65c1d8daf7a02706319fb19ccdeea66282c2cd85d4e0ae332c1ab190d4a3885f72d69e01d0785e60dc697d48ffc35
+EBUILD emacs-vcs-27.0.9999.ebuild 12727 BLAKE2B 18d435a62a2baac1d519d8c70dea28d77fafedd0a7b6710ffc16bea6d52d3a3c135276ef13fcbaa26fe6201c7e07294715592334cdd0520ef2e9b9d788c8bfd4 SHA512 beaa58a1ca07fabdf9a1c4240e6b9a122e601b180bd04c9fce2671c1d1cef72dc63a08640ada982c1b7463f60c97f5f9317649b01cea5a34e499c552afef6e84
 MISC metadata.xml 2875 BLAKE2B 0791cae7c67dd1dbd4cceb7da63771252f195dc4c90606e4f7d244ac562f1907325816bd40996edc8becfc1ed55fe9738bfe7e639dbb013a06171de32b8493f2 SHA512 49031fc328278cc6910e5ea566d807c9b5c8cdccd5f3fc9aa60902f566b46c47acf96e6388e2d43aa97ebc7f0a5a98041d936f12dfd06b7816f1720656d4799e
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
@ -1,402 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-26"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# 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}"
-	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="26"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel 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 )
-	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}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
-
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	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
-
-	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 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
-}
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
@ -113,7 +113,8 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
+	pax_kernel? ( sys-apps/attr )
+	X? ( x11-base/xorg-proto )"

 if [[ ${PV##*.} = 9999 ]]; then
 	DEPEND="${DEPEND}
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
 		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
@ -113,11 +113,15 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
+	pax_kernel? ( sys-apps/attr )
+	X? ( x11-base/xorg-proto )"

 if [[ ${PV##*.} = 9999 ]]; then
 	DEPEND="${DEPEND}
 	sys-apps/texinfo"
+
+	RDEPEND="${RDEPEND}
+	!=app-editors/emacs-${PV%.*}*"
 fi

 EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
 		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
@ -113,7 +113,8 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
+	pax_kernel? ( sys-apps/attr )
+	X? ( x11-base/xorg-proto )"

 if [[ ${PV##*.} = 9999 ]]; then
 	DEPEND="${DEPEND}
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@ -12,6 +12,6 @@ EBUILD emacs-18.59-r11.ebuild 4358 BLAKE2B d5db4c011da9c728092eeb75f8708c7ab3729
 EBUILD emacs-23.4-r17.ebuild 11406 BLAKE2B 9f57016f663a7f7e979df4e10a9a91bcfad282ad66e9baa8ba9cea7e58991da6e1ca4454f7eaa36925589cab8036404d8e58962cdcb0e2ddf1a3df0bf855d2a8 SHA512 8cc574a110555c3a42c26de664ef24a938e4ce2f956c28ffeae61a0b4606738a15f8cc3e6e53f8c2af3dec6f28d9e79cccd67addb79e3efb06171ede82202f64
 EBUILD emacs-24.5-r5.ebuild 11121 BLAKE2B 08ad42996a160029d5615a703211615f7230adfc46e3331c6a7f3ddbb27396b30f3266b9803fa980b4b4e1a80abb3e5d297de547e5d88be4796bce1390bfde9e SHA512 5c12fbd82c5b319fcc2da602d5b8ebfa68b215e350fff7ba23d33292e280b2603616eccc982751ab736cf1fb9da834ddc21743690af21484c6a85f62e595719d
 EBUILD emacs-25.3-r1.ebuild 11640 BLAKE2B 16ac50fda38a906936b0abfb294e1f09d929948befbc6087c99f20f5b894b818c625df9fc274ded2d633fd7034fb9cb53a7111fcf38e18f48e43e3ce99a9363e SHA512 ea8f14799e8a87f4f55c8f9d9488e021319d107432d8cb2f8a63c31e9f11f4e44e497d2f42aa5cc0702001d733f94b9811bbca66a7d7af69320ca9b69514a316
-EBUILD emacs-25.3-r4.ebuild 11612 BLAKE2B 7018b869ba576f4b76da28476659305319b8d861a83e4b4de8b4c487923b4aca541ba2a5fdd61fff125a5d8ea06d7f6d284cfc611c25eb542901db38e67df5f5 SHA512 a5bfa5b7b6ebf20b7e9152ad7864370c43033f669271048f0c0485ee9491af5359b970217870375e7b3cda2bc3033b0c8667c1386bf42a79bbcaf3ade69c96e6
-EBUILD emacs-26.1_rc1.ebuild 11943 BLAKE2B 359fe916612a4d39299998a79a2c73fb74402f1ae889d2cfea39b625e027dcaf9aeae57a7a7e598b50bb70cc9d74ccebeed02ea0d6602258b3d3a65ed06a25d9 SHA512 5c6f8fcd827ca80b30d5d0962858cd97776be47d81f73c456704631256b98dc73efd51aff64dc46a98344741ea788b6feeccd6f920c7372b1e1b1d92a06dfd59
+EBUILD emacs-25.3-r4.ebuild 11610 BLAKE2B 8d1d25c3f104bca4f79b4a1ca0ab06e840a9bb02fb8b17e39d926d5ee79993cccfc4b31417b3ebf2f0a61616dcd67a97f5a1fe0aded050bb2dae4bc8f053ca76 SHA512 81386945f5ee88e1c92244c572372a0456e4d8e8a404675c128a6694cd125e03210fe30113fda5c108f6ae66531ab89fbb10b76f3d56cfb988225b6ad9af8b39
+EBUILD emacs-26.1_rc1.ebuild 11971 BLAKE2B d1f0311acecafbf511584c70d469b8f044f13af028623e741180cc858d0cde23cc60bc0ae6e549525ade708e65e66c5a080dca253305ce9a39c9d777cd11c3b0 SHA512 5a52875d4969c1a7524f158d83e8fce8f7b583f4cc8c50355b0cac876a9d07bbeb6b40873ad082e62870b150717f05eedaa32d128e2816b9145529a95d3802e1
 MISC metadata.xml 2817 BLAKE2B 75ddf0acfc4520b1426bfd99146df35b36f40cc4cb0df7bb773361b786da3857744415a1a8a94a060aa99762e88caaceaa89d5f069fbc9662fcfcce10880f6c1 SHA512 64c729882bcab6a7cfe36d0d5ba5228b15d15000383aa87b5528763fb291cfedd1cd896c406b6e3783677bb772f362de4a54e54c6f056b959f6efffb65325c90
--- a/app-editors/emacs/emacs-25.3-r4.ebuild
+++ b/app-editors/emacs/emacs-25.3-r4.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz

 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"

--- a/app-editors/emacs/emacs-26.1_rc1.ebuild
+++ b/app-editors/emacs/emacs-26.1_rc1.ebuild
@ -97,7 +97,8 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
+	pax_kernel? ( sys-apps/attr )
+	X? ( x11-base/xorg-proto )"

 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@ -1,7 +1,7 @@
 AUX jedit-5.2.0-build-xml.patch 530 BLAKE2B c42c1a9f5350e66dc6e4160cb2b02d1e16eed53eebaad0f5dc725d00cab51fbd7423fc90d1b40de88b110b60a5263b0e1f48943975dcab291a0264c1d0abacfd SHA512 4396a20fe4d358b8ecf8938a467ed58dfdab81358a785fd56387dfed94b4aaafdbba4cb2639631c58c9c771a2fe9bdbcfc30807def5861473c9b35d7add73dbe
-AUX jedit-5.4.0-build-xml.patch 467 BLAKE2B c0a2b6a52eb522874f01afd7291b74224374c49070b1b8e0e047db2c6ec7ce2094913dfcdc300fc464f37f448e18dadaaa2285907ef7fa4eb084a1d93c85b905 SHA512 012dd3ee904d9970ea248a840a31d06f486420ef3dbf1b7a28db78956d4397b3476cc18e5d9562e05bcea6729a44bfd0eed10f6e24ca8aa3ad86cf207cdc816e
+AUX jedit-5.4.0-build-xml.patch 332 BLAKE2B 47bf100efa8d99ebebe9765df2c59f4bb4dfbed1922bab1dd7e5802c69c9ef3a124b065385df693159382b876a52fcfb3433c10177adf2c15653dd5fd314fb0b SHA512 6ea6e327f48a677063f0eb282baa1fff289b18b8f6e4106b7336ec2906a0652c24198f702cdaff283f48600e287a6e6525f562e5247af110a0ee60f3340e029c
 DIST jedit5.2.0source.tar.bz2 2456541 BLAKE2B 82723b5e5670324fe3acff6d6958a83331bf67ab5453eaa1109de192586e4bcce3832456fdfd493e233f30ccbbf256e48b60398f256d9cf4c0cc366816d8b23f SHA512 5af99ac864dd70701f24435840e26f73077ba02d155319965122bd24871e6825b82383054d29dfec72bbbedaac72bfb2d86097de6a0c79341f0a279dacd60126
 DIST jedit5.4.0source.tar.bz2 2535992 BLAKE2B 1560f680437e89cea789f2b0540225b0cbf92bc22f975c6d1850a7b3aa06a2b95d61a254fd0d4c0e7da916ee9de3a095ab5190ae5df3ad27e55c2f0ccef57db2 SHA512 2120370c54f8bd415f90b979c42bfca6101f76ba33f0ec6a8172adeb33173ba9c73cbd7f06b5dc8c12aa3eedf51f007752cdbf0c7423d77a1ac591beb5493112
 EBUILD jedit-5.2.0-r1.ebuild 2328 BLAKE2B e31a3a0d7b862d0b954865f4614e3b52c70f072d41eb56b6b36fabc6b35672e0f2b97cafb0378f4b9880b85d69bccfc8d8e63116b6f559d3d42dcdb5637bf4b4 SHA512 98063344be850a63477267a1dd34735a277b964acfe82b931e1e8b0490bbeda37c2dcaaa4be941725fa2648a087aabf362cb42ab958f6eaba72a5dff7dfbde2e
-EBUILD jedit-5.4.0.ebuild 2442 BLAKE2B 835fd5082341e822145b80ed4a7188c19102fea84f3cf76dbb6fba14fde67a57f4d99d4c24e73ab36ca560e11492b1351bb21281722526aa476cbc46f08c9d1b SHA512 780c1b9210e36df0f835536ad0dd612bb5df97b77480fa718d962338d60501e18379b5b2ea111fca00cfdb34975c0de0665f2dda5bb784a8200311798a926a86
+EBUILD jedit-5.4.0.ebuild 2442 BLAKE2B a22b05b40609326e042d609197e6d8d7d47061cfc3c7447ca8ceead704bd9c6351157d5b65d6f2f1af0e3a2b9bc2a28038fa0d5421f01ad80f104635ff954a55 SHA512 aeafe324da3648a884904f4678ffb6d0f19ab034b318881baa5fb4da7302bd6d965f6ac932cb9f6e454d56f9190ce19f27821256496d0229d20168246af363d6
 MISC metadata.xml 311 BLAKE2B 7363e29fccf6d99776fe1e6ae7cdff121272dde68207519df05b765e52ffeb4d0c4a3184847aa1ca10291c30ac1438da5e393c6b23cc9a2bed46b7be06afff41 SHA512 86e21988f7f67ca938bfad13389991533b89202be6b7e721bd3cac1a8e4a2316e62444a81de56848d016273795f4c166216f9a7b599ebb3aa43c7657a7d4f182
--- a/app-editors/jedit/files/jedit-5.4.0-build-xml.patch
+++ b/app-editors/jedit/files/jedit-5.4.0-build-xml.patch
@ -1,6 +1,5 @@
-Subject: [PATCH] Do not have target "build" call target "test"
--- a/build.xml	2017-03-18 16:30:34.000000000 +0300
-+++ b/build.xml	2017-08-25 12:24:24.000000000 +0300
+--- a/build.xml
+++ b/build.xml
@@ -505,7 +505,7 @@
 	</target>
 
--- a/app-editors/jedit/jedit-5.4.0.ebuild
+++ b/app-editors/jedit/jedit-5.4.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -39,7 +39,7 @@ JEDIT_HOME="/usr/share/${PN}"
 src_prepare() {
 	mkdir -p lib/{ant-contrib,compile,default-plugins,scripting,test} || die

-	epatch "${FILESDIR}"/${P}-build-xml.patch
+	eapply "${FILESDIR}"/${P}-build-xml.patch

 	java-ant_xml-rewrite -f "${S}/build.xml" -c \
 		-e javadoc \
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@ -6,5 +6,5 @@ AUX qemacs-0.4.1_pre20170225-nostrip.patch 1771 BLAKE2B af8ad554ea5dbdcd8e7a3df3
 DIST qemacs-0.4.1_pre20150916.tar.xz 1136592 BLAKE2B aff8875b81bd51f77bebcb4dfe60ed0d4396a05af1f42e6b8765e15f9e04e00162924c3514a9ea1e8cb8c0b9ecd2a4112b9d7a46b7d156c032d37d381f2ae0f0 SHA512 e9775ff3dfef6d6b6b263029a620e6575f9f4718b94c0acfcddc8e5da8cd835e57dfbd5fbd948778135b609ae0588924fc9a727b2e763a25148aa27886a9f467
 DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99
 EBUILD qemacs-0.4.1_pre20150916.ebuild 1664 BLAKE2B 9bb83316a5059a92c0eb04a1c07336ac0976b11778f60b0898bc79ba1a3edc1eb722327b08ba3bf766b67cf5a5f33d3407cfe86329aca377a62234f69b083b8b SHA512 9ca5f4c41d4232051070547d8591235c1ac4d3e5dbba738d58b5668690935f9e106ce1a4921d7004cf4bbc7ef33f717b782a8246d7f402fc9c35a356baa720f9
-EBUILD qemacs-0.4.1_pre20170225.ebuild 1492 BLAKE2B 18fa0b7f651b1abeb0ab3f2058b55d5222dc444760e04c3df80ace38acf2c9e55d7d194a068fadc56a66efe4011cf56fcc4a1d9fdb3610d7980aef7d0e15ca97 SHA512 861abaebf7454b648f0150329a1f6008129aebc093ae94dfed80ae85242ea09cb2fe69a07c91215af31d3e357030429e08d567b554169dfe836c510a12173663
+EBUILD qemacs-0.4.1_pre20170225.ebuild 1491 BLAKE2B c3a8ed051bc3f1bdfdae7480f0e66b226a0957c4f62052b54e51d372b88d945a00c105413c9236ae6bbb91bb3c6869058617dfb825531fd547afafb32c4388e8 SHA512 dd28c31b7d5367cdc33893a3955cc91db0d7f10e750083f81088e39aa37873659ab635c97983d271c083bf4abb815949f8d2c4cf0e2ac947d71f24902ef16724
 MISC metadata.xml 1937 BLAKE2B 1367de4b5e027102ce6a7720129bf21bd6d9556d748f0770d005ee0b9a4454f5ad0d27d0d25e8c7b97bc3c0bb796a78df636479d33bf6bd5acee36498e8a8a81 SHA512 a26f40107a0616980d3722685b1491eee4c606a685e78bbc23a62de6c9b67cf15ff3ac92cbc935a38d280844a0d15c21f92ee7bdbb28218f8ae664bbc526feac
--- a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
+++ b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"

 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 arm ~ppc x86"
 IUSE="X png unicode xv"
 RESTRICT="test"

--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@ -14,7 +14,8 @@ AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47ab
 AUX virtlockd.init-r1 570 BLAKE2B 734d582d867b79649f863504fcd7c87fe3c59569b56b0996a6229d6eebadc9d4c356c10bbcf5637483fbc930d0c50233da4fffa357d423029b3828b7a3be56de SHA512 65a05d406200da9a534df5caa1b9cb2af97f0b03f64e6b4157322975fa754f59ae74fff9ec8301a6c0510e4b75e2b72a78cddf004a76109e18c375e83527cee5
 AUX virtlogd.init-r1 569 BLAKE2B 20df60c23cee575577592d41d1a9913923255633d12de789c036e6085f9e7b4360e017155c61e3688332b493a0e96ffca55753bcc67a33bb877539b80eef81fe SHA512 0a3e083e742f9e0d8206ab9a48c63bbd395bdc24e5551e2cbeddffa3fb576a817b73dbafe646c392a35c354d6b65426a9b6f3ce3dcafc30077715e90684968c1
 DIST libvirt-4.1.0.tar.xz 15046956 BLAKE2B e5d4fb47d6308b2f74d464b8a4b236fcda96ca71357847ce7bc9c787e89111ed99538e9f7815287d14af24db1bc774012682843edc1e067cdf710e82d0b349c9 SHA512 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894
+DIST libvirt-4.2.0.tar.xz 15180120 BLAKE2B 0df6caef7f377e627a7ca1d169e1c8032d02fdfb5cc32a3036fbedd021063672114fcef09aa34e7218b56eef0fe64509024fbcd674a0c5f312a7afb9aa3e34a5 SHA512 ced3a7408e95f1663deec03b095780d0f805126506a064a11063d1f313f923eb0ff0ea95f99826514d8cb4e51c850f6f02904e06e5ef8106c38898a0cfe7f9ed
 EBUILD libvirt-4.1.0-r3.ebuild 9688 BLAKE2B 7990f26444badc344ffc9faab1d55c2accc06709d02e8318d37b9975035494b0e971e272ee0482b0c756a2cfed92699bbdc323e2f13dcd24041c3d15949b1a25 SHA512 5dcfa2c9118eb07f0732ea3ecb6af40fb4517300efd1cc2e1f36efc682469a7b97eb08dfae552e34cc93e58a297c5ed652f0eb99b7047ae3b3976490e929c045
-EBUILD libvirt-4.1.0.ebuild 9678 BLAKE2B 4b2a697630bcda1b28eaf9d43c8f441fe905e7612da11502a2ef5452b733f15ffd2b47d47a8afbfe1cfa956a780abe354dca43ff2a5d85a6123c7b92c87ccbea SHA512 0fbe6b67c6c74fac74bbcc91451c18d1cdbcd52424352570c96f32972fdd6b0d9bc5f46a265b1e26afa432c69e9c4d9e41dae85dea4ec56ba3e1e121ccec58b6
+EBUILD libvirt-4.2.0.ebuild 9628 BLAKE2B 74587b56782f61502d0bb78e1517417bdc90951d6591e6b59e55cf1f346e8d903a2efc089094d51ba7585afeb44094b3c32fde19cb869c6be240717d870e2b52 SHA512 5329a60f625950e012d1f60a29b2f3b82757f023bd375639e54c87065e07fc47c6e8ff14e8afd4be978c25aa8905aae6f5a6e850c86bc4c2f03f4fa9adea7856
 EBUILD libvirt-9999.ebuild 9845 BLAKE2B 6088d0682f657ce4b8137c7dbe28f325eb3814519383958cc558db8a0e8433d4f3c73a688174d6c9bf02d67d5f1e23f8951093d67288d24e89ce13a7d907cec7 SHA512 a895edde185daea93df3e1ffcd193724c796b72ee7eb6a8f4054c894ae8b14a91b45018eb0b0ee2b039d74a47be31ee95188fc0766552605d8bcdec6bc04b568
 MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed
--- a/app-emulation/libvirt/libvirt-4.2.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.2.0.ebuild
@ -18,7 +18,7 @@ else
 	else
 		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	SLOT="0/${PV}"
 fi

@ -122,7 +122,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0-do_not_use_sysconf.patch
+	"${FILESDIR}"/${PN}-4.2.0-do_not_use_sysconf.patch
 	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
 	"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488
@ -337,9 +337,7 @@ src_install() {
 	# Remove bogus, empty directories. They are either not used, or
 	# libvirtd is able to create them on demand
 	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var/cache
-	rm -rf "${D}"/var/run
-	rm -rf "${D}"/var/log
+	rm -rf "${D}"/var

 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@ -19,5 +19,5 @@ EBUILD lxc-1.0.11.ebuild 5899 BLAKE2B 015dd027c8ac9e51f7f93a0fe6e82ac66122929179
 EBUILD lxc-1.0.8.ebuild 5932 BLAKE2B f8f4843c5da5405e69ebee0b3c5e1d50057d15baa841f4b20edf8acc22cc6f761d1723fe1f9cac93b4129ce10ab5eec0c52c44172dd724f0f2c65d24e293e7e1 SHA512 6af1e114ecc64264eafb85e77fba744e4b8dfdf19c8d2b769959d642df237e29813f71bcf370ea75685cb728592c6b9f9a9637d0b4b00f13d40ee8c110045619
 EBUILD lxc-2.0.7.ebuild 6343 BLAKE2B 9b93d611f9ab364779579bbab92b0e11245f2df2bce41e2c0aa87dc3886278eda9d41466c8922cbc587bbb34933341e6afd26ed675df1571504629d2176c1814 SHA512 91312a9209a731026aa53f3d7bb73a0dc8f90f9fc37680cf56439067bd63aa3f35c60d2d320d5fae3d8469ea1a3fcd8e83ee5093ea4252643fd82e776ea5d58f
 EBUILD lxc-2.0.9.ebuild 6597 BLAKE2B 33bef88cb3a507674824f6dc38a61a633d16a2da037c40d06455a5b5b11cdcfa73e7f7975bf52bab6288017261bc031d0407fdbe4a5ce001d18c59f4bc77bf88 SHA512 def7c5c687e8a91fc3b763747ce7a311fb000c8fc1d9cf8270c2863694e79a7b6e84b578eb441139c9051c93bba90a82821d3cc930b171d53a6c4c7fd9ad514d
-EBUILD lxc-2.1.1.ebuild 6765 BLAKE2B 4bfa378f8c41bd4cb35909f3d3b16dce4e98e6e319941c6ebe9efd3c8c92993cef3b5f6a85c47c0f3594e5089fd3e8763648e2190db57166f0a55cae6e659bcb SHA512 ebec4209a7a1ddaa04100dc8bcc72e3a86c1a0cbfe8fb411c3b14c1c06439ccf1a834a1be04618c8312f156282abd68d70115a0f5fd0679528630d7fc9eb10bd
+EBUILD lxc-2.1.1.ebuild 6763 BLAKE2B a4d6e09451ebb728147e1ebeca98292422472040eea4a7664e8659d2d00774933b16e264b2af3a0ad6a90750586369a02cc6149959bb3a218a528f4f8f0aa773 SHA512 e5838b9a63d096284905d3f000c268a6c398835c2054c2d0bb92e3e6ed2d0b3aaeb2a417d2c04b8182ced7447a47fa9e1340e89f92d0fd6dd48238544684a727
 MISC metadata.xml 811 BLAKE2B 433a5cbe39002614c88eae4829c998493e95cb0b8eeb0a9f546e08e33a82fe5edb384e9a9f747d1129e0cdb7b8a634bdf4a0b7cf385bc3d243dc83cab06b899c SHA512 fea5f647ca7eb616307378375af86051034e03170f6ce62e2219f78343797072902102515f93cc0f809558fbfbca88eb81e9f8d0fa621ae18381d39a12c31aa2
--- a/app-emulation/lxc/lxc-2.1.1.ebuild
+++ b/app-emulation/lxc/lxc-2.1.1.ebuild
@ -11,7 +11,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"

-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"

 LICENSE="LGPL-3"
 SLOT="0"
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@ -1,6 +1,6 @@
 DIST virt-manager-1.4.3.tar.gz 2765924 BLAKE2B fa888dc78bb8ab27ff5a507829c5ace5d0e82b7840c9d4ec1857dfd2e62f39172abf116ca3f4d99f4a2c4366f06695a52561e6c816969928df79e623fb4ce9bf SHA512 007f125503fc2c774beefc8047ca2c36aa7177af40d9bc78fa3448fd50d4d35abd4a1dbbf761a8cd538fdf6541eba46c2cd019ba3ff0c7e29b1944d873b74274
-DIST virt-manager-1.5.0.tar.gz 2797380 BLAKE2B 45ef8c2b98fa1d6f7c4b4fe45bca74e27d595eb4d2e7c80c4e7671c445d8e523b8a4c21eaffc02dea756b7a93f5b3c7f3bdc795a0cf6ef99230bcf0c5683c81b SHA512 b375927776b9132fbd9dacd8223b6c94b89c32d6812394ec7e18df7c66f7e6dec853885e85e2b4b4ffd283e8afe0dd2526bafeac4b55511a4a115ef5798f97da
-EBUILD virt-manager-1.4.3.ebuild 2406 BLAKE2B b18ed780d146def605866e8468edf5505cee6913169381fa591a804bd25ce6b6ec4b09801ee42827871f6b08d9bd8aaa621ba819bbec682f6731fbaa8e984411 SHA512 0db0e050d64b2b6cf820c4dfa2a21c1154ee7a3bc124b38b78bbd5e6ab18239a5cdff49838597daeb3a1fe71b2b4ee167c685f2217087404fe7d6bcf9fa82c44
-EBUILD virt-manager-1.5.0.ebuild 2408 BLAKE2B eae4524fbacfa095a48dda0fd3e4cac44281ce5d7df862990cb8fe8ab72049185aaad886b3ccb4a957fe0367e1d587b62304a94065146f1b5e3d27ed90c80108 SHA512 960693352f33803ffb0049790e944482b6f7272a040137e25f78f4e0ef7015d0fb4a0fde922110aa6f90dcea9c35d075425d851a0550821b200834275666cf04
-EBUILD virt-manager-9999.ebuild 2355 BLAKE2B 56d4f90d91ab55ec2d0388cc49d238e3d3b314f16738734bf21f22283496243085ebc5a2828e34a66c0f03856f743edb335dd828dc9197de8c30ffeced9db5b9 SHA512 55fc8f98599d38c5f676104ecc6ec6085ad619f1ec47dc95a89406bd24669b65d65c233fc33492eb0b871cb67d9c4c6768a97d46ccf554488c2331aefa8e88ae
+DIST virt-manager-1.5.1.tar.gz 2796831 BLAKE2B 0fc8b266e7dd2ac3f337e3f95f4328ece930ff66605a444bd728183ffb8fb497204f5e73409f42e3d19ccaa009195a552864dc09f9d78efda7c04f4c5292dbf5 SHA512 e0da3b879ea33a8c394c33df85cadac4fbb9cfed65f9a904c5d9bf07232e29f8c96b5242e3f94cae390b7b5d7a20e1c25c3867962f0a39de40e71dc00013d32b
+EBUILD virt-manager-1.4.3-r1.ebuild 2385 BLAKE2B 1361cdbb0b185ff6dd6430e94c2416a9981ce360cbcd6330cde5f519989af3f9f85b98d194a23c2d6fe0f9fd9ccb701bf09f1fbae32d1906d1fa22ed30250bd3 SHA512 3a864d2802a1f61b3153c84c0cd1c91241d9003331aa749035133a06d21c06fbd094a9c7a5058b69f9a560961069611465b9054cfd57b7ce64299c83cf0fb183
+EBUILD virt-manager-1.5.1-r1.ebuild 2403 BLAKE2B 2e30a3cb3debac21490fb97a3bbc02bd7f24d5ebabe989340fe94ecc2dfbe30d9f7774fab428ca9d237e554f18863466359a6ab2f7c9e82f2dfa6a9dbf7f4e1c SHA512 952a3bb8d6f4e239b933e2b011db72dcb2d23ea34da193fcc58b755e44cb9acebaa3caceffff565c8db752188abba8d677858e96b76bdd801c8cdf54bedbb3d9
+EBUILD virt-manager-9999.ebuild 2309 BLAKE2B e215c429af443c797b2789dbbba3a87eaf792a918c082ea6f3a5a47eab503413523beff33610f981a2a0114094293d3c31bc0ab5c0c122cf0bcc0836d601f6bd SHA512 f70be63a5d9e02d3a560fd020c1b2cb8bf657ce6c0dc3dcaf7ba02c3b89504914de2beac4f7a252a6032ba21ffffef8cdb57e46a35806fbd5daa02c72ced7fd0
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
--- a/app-emulation/virt-manager/virt-manager-1.4.3-r1.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.4.3-r1.ebuild
@ -37,7 +37,7 @@ RDEPEND="!app-emulation/virtinst
 	gtk? (
 		x11-libs/gtk+:3[introspection]
 		gnome-base/dconf
-		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
 		net-misc/x11-ssh-askpass
 		x11-libs/vte:2.91[introspection]
--- a/app-emulation/virt-manager/virt-manager-1.5.1-r1.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.5.1-r1.ebuild
@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
 else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi

 LICENSE="GPL-2"
@ -26,20 +26,21 @@ SLOT="0"
 IUSE="gnome-keyring gtk policykit sasl"

 RDEPEND="!app-emulation/virtinst
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	${PYTHON_DEPS}
+	app-cdr/cdrtools
+	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
 	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
-		x11-libs/gtk+:3[introspection]
 		gnome-base/dconf
-		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
 		net-misc/x11-ssh-askpass
+		x11-libs/gtk+:3[introspection]
 		x11-libs/vte:2.91[introspection]
 		gnome-keyring? ( gnome-base/libgnome-keyring )
 		policykit? ( sys-auth/polkit[introspection] )
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@ -27,9 +27,9 @@ IUSE="gnome-keyring gtk policykit sasl"

 RDEPEND="!app-emulation/virtinst
 	${PYTHON_DEPS}
+	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/configparser[${PYTHON_USEDEP}]
 	dev-python/ipaddr[${PYTHON_USEDEP}]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
@ -37,7 +37,7 @@ RDEPEND="!app-emulation/virtinst
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
 		gnome-base/dconf
-		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
 		net-misc/x11-ssh-askpass
 		x11-libs/gtk+:3[introspection]
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@ -1,5 +1,3 @@
-DIST virt-viewer-5.0.tar.gz 908726 BLAKE2B ffc1e8ce7b74f888289a65a0ad7566c84278cbf1a412b426883313f1b66bb95e10b74fedb256b4ab6b39e4dc6e292e518585fcbaf07e7669b51a5be87cfd257f SHA512 924fa88fd0ca7cc5b3d0a348c0d1104337fe0a06328e32110b4417c64f5d9efaf6df534adbc1eaa69157d229763b773307fa834a66f16156e3703731525eb690
 DIST virt-viewer-6.0.tar.gz 922916 BLAKE2B 1c2246369474d06188dc2191b9756dbe69cff2d5f997ffb58bdab1143a0e4d6cda0e43b4b082d7921125caa4348635762070fa8e6686ccf7728a90e4e6fc3a18 SHA512 656d48f8ab387d025c406cb5f56164d79104c6c377fae37d9c524b90e512fe873d5d1d6c435d4ea95e71468b7d3384b89789495075cafb1a9e67f583f7d49ec2
-EBUILD virt-viewer-5.0.ebuild 913 BLAKE2B 82aabc3c398e50636ab8d934366b3c560382d10c848f94d11fadab63e83043cbd9c197e71b196f22d29edf96bcb5571d2f0618838bbe9cb11dda249580f901d3 SHA512 38e81719acda11fbe13604f607632bf0519c7274fb4617795589ac12e187c8801f5a93af46ca052ff2b5198e74af52c4b5acea34e96732637204db88e497d24e
-EBUILD virt-viewer-6.0.ebuild 913 BLAKE2B 72016aaacda1f38e7c35a2e032bac8aa1be31383b046c72d31e9f45b55774cfb9f64dba2190776dac6da3819104ea12a8120e30f601875442c32e36744e40589 SHA512 e491e7ab83ad8bd407a624196e39e9bee3e043b6dbcb160e3ab3937b8794ee29c126e63eff6cb2dbeff961dcbd92e75b06e73acf273aada49628b219c11851da
+EBUILD virt-viewer-6.0-r1.ebuild 916 BLAKE2B c43af1747c961f6e90bfc6d472047ba056ba60417a8252adbadc89d3cf15438efda23bc98da745fa26d4e3fc779821d7fc6aa756623e6ed6e84266245f51f6f9 SHA512 995db1ae9baad0d2fa3407c85da1d278706ad04a6a7d5d2dd2ad0e046b465242a31921e52e7712875cd582d0c7abccc111ad11be5b344ce1b89e7364fef571e7
 MISC metadata.xml 452 BLAKE2B cb307dd6593ae8c96ca9c6925783e0b26335f1d1b11c21ccbf7e54003ef2e9e32701304464380afea75a642914e2334c053417aa5e18de5737443b2b60f65d0d SHA512 c97651a4477db1452310d3b53efec56c596963827d1b13385bdbaee5bd8725774b40edc88dc5389b5c0a4ac50f9801de5f649d8f941d315f1e28b6ebf1c9cb79
--- a/app-emulation/virt-viewer/virt-viewer-5.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-5.0.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Graphical console client for connecting to virtual machines"
-HOMEPAGE="http://virt-manager.org/"
-SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="sasl +spice +vnc"
-
-RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
-	app-emulation/libvirt-glib
-	>=dev-libs/libxml2-2.6
-	x11-libs/gtk+:3
-	spice? ( >=net-misc/spice-gtk-0.33[sasl?,gtk3] )
-	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	spice? ( >=app-emulation/spice-protocol-0.12.10 )"
-
-REQUIRED_USE="|| ( spice vnc )"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--without-ovirt \
-		$(use_with vnc gtk-vnc) \
-		$(use_with spice spice-gtk)
-}
--- a/app-emulation/virt-viewer/virt-viewer-6.0-r1.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-6.0-r1.ebuild
@ -18,7 +18,7 @@ RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
 	>=dev-libs/libxml2-2.6
 	x11-libs/gtk+:3
 	spice? ( >=net-misc/spice-gtk-0.33[sasl?,gtk3] )
-	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] )"
+	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	>=dev-util/intltool-0.35.0
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-renpy/Manifest
+++ b/app-eselect/eselect-renpy/Manifest
@ -1,5 +1,3 @@
-AUX renpy.eselect-0.6 397 BLAKE2B d803e4bcafad3910b2bd9c5b995f2493272e76056e51a150b517b738e07c3d5dc6667ac887e280b27bac8a5341a15f40d4356c04936f3eec29179abd640fb9e8 SHA512 554419f7945c624f677dc93193655d6cadb6cfb4e03979c6414f61a7ae79c34bea46610792597b671c5ff754ea7bbd0aed41e3b9329e2234b90b057e8c9fe00d
 AUX renpy.eselect-0.7 335 BLAKE2B a00e5083ee8e0175c6617ad31af25ea5005371b84c2ad22b3982a6aa1fd15eac6ed627303d53ae352fdad507aab5085cc685d7e9358cc80be43243d367ebecb6 SHA512 fcf95cadd2d38ad675bf7d728a0d922e3f582afc6637baf2c6392289cca17cf63749d9e397a0732986df3b4db204a5c18f4911aad7d95171bb9d119370282d00
-EBUILD eselect-renpy-0.6.ebuild 654 BLAKE2B 7f4090e1c532119c4ae844b0834d4bcd9e695352976d3de763527c5bf30b5794584d124118cc6234b104447343fe9202fad5f356508dc9be1bab5bf4c8c368a1 SHA512 2ac46b956343c2f864a7ecc708b82c7a0528b7699b0c86216f13091ff0d6491f5e7775661c721c6ecd4fd8fbda2ecc2c363c968f45d488ad31c834833efe2769
 EBUILD eselect-renpy-0.7.ebuild 682 BLAKE2B eeb022db87e88135b60b2cf6c5a0631ca145796019682109051b12b003b33e53d345b5c547e2939d71e38f8b430aad16be0615f3132cb9118247f3d90a5c7725 SHA512 736af8b20927c24abe61519b2cb9b3926b5c0d5e17d687a5f1e632da68ad3719c928ebe8ec8c523a921fdc11a4d3d748e8f2e172be52d04adbc0d32c1b50c556
 MISC metadata.xml 364 BLAKE2B 057ff91da9295621f1c3b34e4858892514837e453e90a83b7108efbfef234a8e9ee5bb06bebf195e5e48a1ad36c428c05a8b1225ba15847414c318682a2203c6 SHA512 8b3ee6db4ec0d3c0a1e10ed14a6500c3cf743ed84b91fdabd1b98861141b87a23b32ed76ef31385ade1cb2d80b5d2a273b85e6dc6b4b39f0bd1072787064c9e3
--- a/app-eselect/eselect-renpy/eselect-renpy-0.6.ebuild
+++ b/app-eselect/eselect-renpy/eselect-renpy-0.6.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit games
-
-DESCRIPTION="Manages renpy symlink"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="app-eselect/eselect-lib-bin-symlink"
-
-S=${WORKDIR}
-
-pkg_setup() { :; }
-
-src_prepare() {
-	sed \
-		-e "s#@GAMES_BINDIR@#${GAMES_BINDIR}#" \
-		"${FILESDIR}"/renpy.eselect-${PV} > "${WORKDIR}"/renpy.eselect || die
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins renpy.eselect
-}
-
-pkg_preinst() { :; }
-
-pkg_postinst() { :; }
--- a/app-eselect/eselect-renpy/files/renpy.eselect-0.6
+++ b/app-eselect/eselect-renpy/files/renpy.eselect-0.6
@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage default renpy version"
-MAINTAINER="hasufell@gentoo.org"
-VERSION="0.6"
-
-SYMLINK_PATH="@GAMES_BINDIR@/renpy"
-SYMLINK_TARGETS=( renpy-6.14 renpy-6.15 renpy-6.16 renpy-6.17 renpy-6.18 renpy-6.99 )
-SYMLINK_DESCRIPTION='default renpy'
-SYMLINK_CRUCIAL=1
-
-inherit bin-symlink
-
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@ -1,6 +1,6 @@
 DIST eselect-repository-2.tar.gz 5441 BLAKE2B 28608b7e5d06747afea4ef28b0f45ac97dcea0310201d857f1248e7fc586a331fce01c9017df83c332cbfb55b51b52a45361e06db8a7d4b788a70f63eb4c83d8 SHA512 7667053b7d06117f49366d7bb6ad39b1b0715c778e49e18649ce38b364e58c0c31f4fa077a459374c52d3bb7f550002a4368cbb7fc14fd9961815bb1355c1f61
 DIST eselect-repository-3.tar.gz 5448 BLAKE2B 36a079f2a876709a2cc045e0c113f44f9feaa491c49d3773eb3e123ee7e7a7ffa2ad05060ffa62ac39ff8091a64ff995ea948f3c784ffbb7d8ddca5e468364d3 SHA512 ac3396a6d14fcc7d4df1f9b058bc3025875707f3febdf4d1e03122445d0e6273759b8a66443525c94daaf19f91b411c469aabc0e0082cd53980886a91f38a062
 EBUILD eselect-repository-2.ebuild 870 BLAKE2B e22c8fd54e02aefccb8281272f0525017ab2206a09cdd8541829c7de64d3ac5c1339a6b0e262eac938e6ab9bfd5bcd152504bac3e4fcd72f6a88aa9c9184111c SHA512 8ab3769bfa2cbaddcd180d12741cd21d1211dca039ec4ac9730b9f2ed8bc9c28be87aaec12a5eda3599efa8005b5f911f0e66b16cb8131e8e0c699a5f6f0f3b0
-EBUILD eselect-repository-3.ebuild 871 BLAKE2B 85fa325fcf6d9a2001755649cdc32a9994ac1dcb195d75c8d81340f71cc70bc2075553826e24a62f2305f43836b88864ac0822ee71cb1023c957a079e98a28f4 SHA512 d3f073230230a59e4263516860eacedef023a53c44e0c2e9b65d61166964bfa99cf6d70c452c1dfa156f132176bb4fe1b3505f2a52ebef22d473fe09cdf4b52c
+EBUILD eselect-repository-3.ebuild 870 BLAKE2B e22c8fd54e02aefccb8281272f0525017ab2206a09cdd8541829c7de64d3ac5c1339a6b0e262eac938e6ab9bfd5bcd152504bac3e4fcd72f6a88aa9c9184111c SHA512 8ab3769bfa2cbaddcd180d12741cd21d1211dca039ec4ac9730b9f2ed8bc9c28be87aaec12a5eda3599efa8005b5f911f0e66b16cb8131e8e0c699a5f6f0f3b0
 EBUILD eselect-repository-9999.ebuild 848 BLAKE2B a0487c133cc3096374e30c2e2d024f346e4f1f3e8573ef29cc416a8ba9066a61fa6ea0fb2d7acfb6bb3ede0eb31fac7fa71f81ecc04f73b7dcf47d800ea6015c SHA512 0c3cc2c3e2e894d2fdb1ddd4123b76283c56120da2332f5b364b9e4941b39c11cc28c200162f9f2c994deab34f5b97580116431652058a971282171923daa261
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
--- a/app-eselect/eselect-repository/eselect-repository-3.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-3.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE=""

 RDEPEND="${PYTHON_DEPS}
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@ -6,6 +6,6 @@ AUX aide.conf 2713 BLAKE2B c6868a81450bb3e66d73a60df258e0c6e1166fb0126a0664cf78d
 AUX aide.cron 5997 BLAKE2B 2273eb902b9ba8fc5e999375d0dfa59e2c5c56a919bf3bd06e7b638213332b34c4a1240c717c2189f787dc249847f7115e2a21ac139b5db1df2151ade9f5a154 SHA512 0931c1b9185e0b9a563c3589858b0ba20716344f29d6d1fc7226498f3c744af1d3c3fd72824f101f9b3e08710f443c9fdad312e28c0bcb93665d1dcb076f4b47
 AUX aideinit 2949 BLAKE2B 244aaec9a38f19c6a7af706572a896e922215d6321aee4537ef5ce47326f41fd84880331a86ec71dcf7ee4e2ac2a11bf979ce66eff73dd2e8a2072e9eb7e8aab SHA512 a6bce52432251458b977fb363d5801206c273fb9404c55f7bcb82b9d5a65aa19d1660d61d457c9af87f1a8fada95e2f8203489b1876b2b2a259e6374e15cdc57
 DIST aide-0.16.tar.gz 391009 BLAKE2B 8769d8c6bdf72f307b75f3c1feaa2effdeaead00a0c65ab25bbb50dc6f7c7b53fda4d0a3a54dd5030de1444a34a81c294437d45193aeb8aec7ef0af83a173d47 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7
-EBUILD aide-0.16-r1.ebuild 3712 BLAKE2B e507899958cd2f684855a82545ff23b50084757497cbfca8f231a0abf18516af7ba4cec0fa52b5b6dafcc41374fed242c6dc1474d8936d5880bb838dbec3f1e7 SHA512 409fbf785b6a9a308f225799580e8155d75faaf6f7010d3835a6909e39464a50ef96e3addb4c0f4f8460403de87269d562f02db6e9de3eecb43690277e2d53f3
+EBUILD aide-0.16-r1.ebuild 3711 BLAKE2B 39ffd25d0d18bf286c48d94c79d138354db9ddfb32516f5dbd742f14b9891dd60aad8ed8caa1d04e0028ebd4ed7dee7f66ece4eac9507d8eea8e17e209a98718 SHA512 4fd4f2fd1746a1cac0a7eac18cd8fa2bfc1329969477f49bca8dd702cde68d1e7b8b1a878b5cd7e8d05ea55606f34cb99d6de36bcc44bd4b5214d241c806ae6b
 EBUILD aide-0.16.ebuild 3664 BLAKE2B 1b936c5f6d0ea438f407b9f15d36d75430a8c8189af48980ce45fd1507e2556c7d30d6ba48cb95effe7d2f35c64ac7d353a91380d3077fa9fa2af6137c6c5fab SHA512 703646999c5c5d4826bb71da4ba0c1f60d6877b3a58d024396b1c2795b9cabf1c537a47b6c0492350f136785684e2e848d37ed087087ee4042b9ec8c9f00c552
 MISC metadata.xml 631 BLAKE2B f76bc4d2957df7f95c38c3e082ee8b2d211d4822ac7223ba5cb10d35a72e14f092d4ad455a6a96da2a1649e1c2b1f0736c9a58fa18216c3b1b87ba295fbacf51 SHA512 9f6eb547a55e72d2b75d3145282127abfdc737c68526995e628b98f2dd7930732eff9dbc492ddd4425e4090e8449a89c585b563618415d05dee6777273c5d4f6
--- a/app-forensics/aide/aide-0.16-r1.ebuild
+++ b/app-forensics/aide/aide-0.16-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="acl audit curl e2fs mhash postgres prelink selinux static xattr zlib"

 COMMON_DEPEND="
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/ibus-cangjie/Manifest
+++ b/app-i18n/ibus-cangjie/Manifest
@ -1,3 +1,3 @@
 DIST ibus-cangjie-2.4.tar.xz 150616 BLAKE2B 2e59acc1b05ce0dc3dad26ba663440d067bf28a549e79ec9d127de414d715f5e376f426db5b415255eb63aa13677e59643889481f5e39c946399d4d4fe15a468 SHA512 cef9562fc4a5f3b78881c09b43e502f02322148e501022d3f80989caef4ca98ae26903e9a3dcc422feeba7712a8321c731ba229429e52fe919db5144aa0ead47
 EBUILD ibus-cangjie-2.4.ebuild 1076 BLAKE2B f712e22d0810a4fcf451d1ff00d55b894cffd4a34c9a1598a642c7d2bfa6aa9c8e1d7e8dafa52a459a91bda0a14e0e2723502322072eb9ca791c98019322f90f SHA512 4b6e6f7da94cea419fc6583df02e53f8057a555068b7eb97b5b075f50efaecd8ef4458a1c02479421a4800e5de3adc69b1d41678a77cab4a51fc77a5ef6a9acc
-MISC metadata.xml 566 BLAKE2B c635df8ebc4f57453afe2310505fe5f68079d278f6b5fb8140cf8c44b0dd438262c486527de930332ce5e33fa45ee164c21da5af061567e169bd50e82369103a SHA512 38ff49d672e0d1f79fdbfe9e5d0fd6ef502d2c10efb363630920f8176732c5d1217052a30437ccb4f12c3c4bb2fc8f1bb8c2445c4d21f016f47d248799995ee3
+MISC metadata.xml 331 BLAKE2B 51f11d81e4be33a58b3a32274cdefc59588c0eb488d8864ded4352fee4680a9d888a014fa5f7aa493819ead18d68baf2ce5b0ce19a665887653d16f2641342ff SHA512 d50524d308a7dae58c23a9b2e39e149d28dbe08d78dc96f53db98ebc96ef09e871792a9608108dff82dd1023b5bdc5998b4c8863a1f48be37f7c505d896ee62b
--- a/app-i18n/ibus-cangjie/metadata.xml
+++ b/app-i18n/ibus-cangjie/metadata.xml
@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>brendan@horan.hk</email>
-    <name>Brendan Horan</name>
-  </maintainer>
  <maintainer type="project">
    <email>cjk@gentoo.org</email>
    <name>Cjk</name>
  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
  <upstream>
    <remote-id type="github">Cangjians/ibus-cangjie</remote-id>
  </upstream>
--- a/app-i18n/libcangjie/Manifest
+++ b/app-i18n/libcangjie/Manifest
@ -2,4 +2,4 @@ DIST libcangjie-1.1.tar.xz 573924 BLAKE2B d8d8543e2ab8717deb732a60668a8c66b07691
 DIST libcangjie-1.3.tar.xz 575240 BLAKE2B c7e3129a6dd9690223e46f20a7bf06148ed279880461faf031a6542a09e0b21f6740767a8e6fd43acb79175deef437c385df3448e672ebfb0b9f72701afb66a3 SHA512 216ad965cb265d700cc94e6b7892dd9a7d814eba364b7700870b7e704d17d8dc75be4c7af0a7a7fc0088a32e389e62822a05d089f1df714c5ffd347ece8b9f35
 EBUILD libcangjie-1.1.ebuild 399 BLAKE2B e2f7ab8e57e5e6135563e166670383c5bb28796d18dfcf6ad1cb56b431c420f790984e5494efee5fcf9186b021867919f92ac2a5339d2aeb6f042bfb3db9b06c SHA512 53ef35b0ff56bffbbb6b29081a4d7a107149556a2f58ba84b99fc3416625834a9942e231c87ac9dc9c6c82e760a06a02aa2ce5fb9dca7ed70a60bcaa8a3fc1bf
 EBUILD libcangjie-1.3.ebuild 414 BLAKE2B ca1f4c833b3b33164f18078b6ac20e38606904c8328d4da9054575b9de97296d69dcadcd4bae1ffe550ebd2e6a2243c66a40438d3ea87a29484af201adcf018b SHA512 86efcbbfa7a070d09d0d7f72a0d3ea1cbfc652bdc60d76dbbc586f25fadf305d66fb1096ed76d883e9674ceb27c70d4050f01a562888c45a270897584dce3ebe
-MISC metadata.xml 564 BLAKE2B c20a78ac9dde37b274b81c95e324f2bf4a52abbbdc372091f3017b7bca6b1e9f54afbb4efe2348cffe38cad95a03e8b4dac6ed62796a19bfef6a5b8a19d00480 SHA512 ff086e14a39173fba7132845a4c81c0adfff7b453fb8b4b7708cdd987015175a76de4a8b8fbe7aace6766d0c459d5adcc6c1d373271c08f2ca59273f921d6828
+MISC metadata.xml 329 BLAKE2B 54240b7439d7878368a995c57453fc5b77141c82aed47899d0615de5bc53aa7c97c7aea2b35acef40d4688975194cdf1fb1c27a538838c76b2380a125d5d652f SHA512 8dbaa10ab3789d09c97c20a39c57c8cc3d5b2ff9b90003352c6b07e250c1fae8f5418780da3edab9b7d23a8febb1d77d5e9fb1f48e6a4e612b65387482570c00
--- a/app-i18n/libcangjie/metadata.xml
+++ b/app-i18n/libcangjie/metadata.xml
@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>brendan@horan.hk</email>
-    <name>Brendan Horan</name>
-  </maintainer>
  <maintainer type="project">
    <email>cjk@gentoo.org</email>
    <name>Cjk</name>
  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
  <upstream>
    <remote-id type="github">Cangjians/libcangjie</remote-id>
  </upstream>
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@ -1,9 +1,11 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto-1.4.10-conditional-tests.patch 1142 BLAKE2B 66be5988681be543a1c9d61bbd47baa528be1d8d8b1206e7d711b0d7789aba41ae8bd28e2729d084c6bb64fc43386e31a426717b0719c5c26219d3fa0a166455 SHA512 d07a081830fe7d23db380033c0c68d366bf60652f86c43a39074faa9bbcc6286485aad225226b64ef3055b4bd7a6c6969fa9ddd97eb2e6d8d98e815a881e634c
+AUX mosquitto-1.4.15-r1-conditional-tests.patch 371 BLAKE2B 4e96752a6ef489a6dec24cb02381f11ec38f3440c13f99ee2adee2aa7995b591c341ff050793960d81e73849147e809f9cd98a29c035038ed1f3b2047bd7431f SHA512 a970740b0cabd34f2532fbd27037546c125337943b848c4489ed44c3e3408e802d223b6f2c8a0144c43ccf5d7ae1270f0c4bb23833827492994d7bfe569639de
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
 DIST mosquitto-1.4.15.tar.gz 368961 BLAKE2B 28bfab7d41d9e057ba8b52e0c428967ecc5d0c25a3d73dca420ae883c2b462ee02da1eeb9c22f4d392f0ccf62224acab6f24d4a0798a594f4b9f90c907fa1495 SHA512 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100
 EBUILD mosquitto-1.4.14-r1.ebuild 2462 BLAKE2B e747f7751b56d1f93a460985e19555fd7fdb1bf08540eec7ab2107ad8165797de2363f0383eeaab4b2bc5011d830022f63ec5baf73804a1f0492c03a7632de3b SHA512 59f100a47c98636c82f4ca5b4d2edb0c1e6399ef25d95dd62f576f9694b11fef32d01dc58c63d69d5aa4bd119dd467199f3d49d19760be9b8220ff7420749c0c
 EBUILD mosquitto-1.4.14.ebuild 2453 BLAKE2B e8785e9f2dcd4d8d1a627dff29a895b0ff1f149b0a63454371b31ff241a42e7bbb7288c7a5becf3175cafe29c4da11e5fd656f8bb311cb892909929e62e93034 SHA512 a7ce7e5f393cf6508415c044a51518891f7a953ecdaa680f952cfbfdb8905561a017b0a7dad5281d9fee41c909331b26712c0466a33e345a232d538ffafb2a7f
+EBUILD mosquitto-1.4.15-r1.ebuild 2417 BLAKE2B ba57bdf93457fdc7a4fb4409c58c77f89e507932c41641bf109494dd9f7fdcf148ab697ebd5ac2640f136f7171a5844a5fd4170df400c53c68562779f9e4b234 SHA512 9465914a00b6445930d34bd3ad5e9a8d45b02fd8002f54bf961e4503e981983dd46d57734f3d9263a2b8e3f2ab8f40b952a9182b7cac5b6804248fe9bd881536
 EBUILD mosquitto-1.4.15.ebuild 2366 BLAKE2B 6df167983ebe736631cc55fb47b9487bd456928e17d149653e7f5ec333ab874f41e4371ee882ee16a984fc055146ddb1fe7727ff71f5917fd1e3c0dd50db76f4 SHA512 609584b242bbabca2214fa6027f948ce6c237fe9e6be43acb38625abdf83e5c898c9158244612b5a4201a18e99b0fd78b987b71d54dbbf6a0a62f4a60ce4bb5c
 MISC metadata.xml 656 BLAKE2B 58ecef974e662c6dccf267ba8732116010a3db7679d6ee3e163cd351073a210f0bb06e5098945564f048353caf4ed7fe73d69bc96cce42c56ba298073fe95384 SHA512 2034ecb6ff73024cd905d275da23b27568d897dd616ca70a2485922667a74d4ac1d6df11b0a7a413bc8d595962697959e4cbe13c8934e8b3333c6a4e290d657f
--- a/app-misc/mosquitto/files/mosquitto-1.4.15-r1-conditional-tests.patch
+++ b/app-misc/mosquitto/files/mosquitto-1.4.15-r1-conditional-tests.patch
@ -0,0 +1,12 @@
+--- a/test/broker/c/Makefile	2016-02-14 14:36:55.000000000 +0000
+++ b/test/broker/c/Makefile	2016-05-05 09:40:31.440608209 +0100
+@@ -13,7 +13,9 @@
+ 	$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
+ 
+ 08-tls-psk-bridge.test : 08-tls-psk-bridge.c
+ifeq ($(WITH_BRIDGE),yes)
+ 	$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
+endif
+ 
+ 
+ reallyclean : clean
--- a/app-misc/mosquitto/mosquitto-1.4.15-r1.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.4.15-r1.ebuild
@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="http://mosquitto.org/"
+SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	srv? ( net-dns/c-ares )
+	websockets? ( net-libs/libwebsockets )"
+
+_emake() {
+	LIBDIR=$(get_libdir)
+	emake \
+		CC="$(tc-getCC)" \
+		LIB_SUFFIX="${LIBDIR:3}" \
+		WITH_BRIDGE="$(usex bridge)" \
+		WITH_PERSISTENCE="$(usex persistence)" \
+		WITH_SRV="$(usex srv)" \
+		WITH_TLS="$(usex ssl)" \
+		WITH_WEBSOCKETS="$(usex websockets)" \
+		WITH_WRAP="$(usex tcpd)" \
+		"$@"
+}
+
+pkg_setup() {
+	enewgroup mosquitto
+	enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-conditional-tests.patch"
+	if use persistence; then
+		sed -i -e "/^#autosave_interval/s|^#||" \
+			-e "s|^#persistence false$|persistence true|" \
+			-e "/^#persistence_file/s|^#||" \
+			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
+			mosquitto.conf || die
+	fi
+
+	# Remove prestripping
+	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+	python_setup
+	python_fix_shebang test
+	eapply_user
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${D}" prefix=/usr install
+	keepdir /var/lib/mosquitto
+	fowners mosquitto:mosquitto /var/lib/mosquitto
+	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+	doinitd "${FILESDIR}"/mosquitto
+	insinto /etc/mosquitto
+	doins mosquitto.conf
+	systemd_dounit "${FILESDIR}/mosquitto.service"
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto "/usr/share/doc/${PF}"
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	elog "The Python module has been moved out of mosquitto."
+	elog "See http://mosquitto.org/documentation/python/"
+	elog ""
+	elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+	elog ""
+	elog "    rc-update add mosquitto default"
+	elog "    or"
+	elog "    systemctl enable mosquitto"
+}
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@ -2,6 +2,7 @@ AUX texmacs-1.99-remove-new-declaration.patch 842 BLAKE2B d460a29e2c25467083f3dc
 AUX texmacs-1.99.2-desktop.patch 632 BLAKE2B cecbcf2b6cd731ef6e710d6e361af138a7ecc3f799fa1a046239319f481eac5a7ad4a7c40ab77e4c18809b9d80e51cb3b4815465e29d7e4597cbba1575fca885 SHA512 b523cde99001915ea83b1dfc644f1d4189b7c04ca11d7504e4f63dad1c19c6bb23af1d6b028ff9635594146c7263730a843b833cd77bf9a91023102f68e7cac3
 AUX texmacs-1.99.2-norpath.patch 428 BLAKE2B 3af37ef5c77816f15a46cf373d2052675e451ab78f13ca55f86da8f32a4327a17c850b7b533c72e0c94d1fdde22df306ac6fdf718ecd8045f603a1f26a3857c7 SHA512 7cd81f6199823fb1a50af697d9456db53db18ffb8de84bbbbd35a58020d288239dc7ab5e4e13b7db19189393292cb2d312bae52540999898342f7a505c9eb21d
 AUX texmacs-1.99.2-underlinking.patch 559 BLAKE2B 5f72d821cba36b3d7100233146f0f64ef1e8e74a75cc4f8c4bf3fc20315438c11c434d3223fd27b7f58ea3583caa3f1977b8b31ef4628c395a05f2d31c0ed858 SHA512 4d8805895b02adf107acc32e434a28f7def6fffe0d69d1b49f0d6cffbe94d55dbe31ee4c4c2ae7709313c6ce7b0d5c9cebb11004cf6e9f6a08f46cf3725a223b
+AUX texmacs-1.99.6-guile-size_t.patch 777 BLAKE2B de238311e50465a7644cd2b38dcdab093e7607edfb1b256b691a440c10254417c57c1cabcab694ff2e2001fe7772d23f0fbc0d75bd89807434805030adc60c5f SHA512 646123b545eb64c5af8041c0d93498ea8f984a6ac6c9820288c3e9a0e78a4dc3ef85665839aa48af02078aa41cf3ff60af6d759f5e16ad3a85f1a0dcf964c1ec
 AUX texmacs-1.99.6-math_util.patch 635 BLAKE2B 6846fbfc616937f09588520a0ea4a495edaeb93698068c3fd17c6705b3e70f571f28fb51e62e9568b22c77b8f20a59253bc9d994b890f555cf30ab58df84bf89 SHA512 9bc920c80ad5e68bf2262c1f808ac71b04fdeb301f0daa884ee1049c668f80151c4ab94972f902ec7417f6fed3057e5373673c0507597dcacc97b932bdf8ced5
 AUX texmacs-plugins-1.patch 2920 BLAKE2B b0b19c3e573b6d8d4a10b128feee839bd991eab46d39b5959d3afce3a02ccc471a6db9b5807523f35fb23dae87957b19fce1181296453fb19e2538c720798a38 SHA512 e8d9617166b712dfdf72b4c7b97a8945cbd5d505c092eb59a31de05b44b48d75839cb6344ba96ec378cca322a3fc17d99cb7f8e27c1fed86dc0d3329b02c1ca6
 AUX texmacs-updates.patch 1387 BLAKE2B 4a6014fb55e912611aab02fc27970aad58183f3cabded7f773def36c56a0dd1ae6e16c955c7b6ee37a696470e04219dfb5abaf64885c3d1af9c8dc792f73511f SHA512 209c5f64e21ae76fe41419101afb98ce4f61f040e9d29e3dbe37ec5bb0e16a1f3dd5aebe381db99e8d7278c5c36cd1654f78ba4af69e032670b1fdb62aafbda1
@ -11,6 +12,6 @@ DIST TeXmacs-1.99.6-src.tar.gz 25081652 BLAKE2B 08d0a141ff1b8ab59def50c636d917f9
 EBUILD texmacs-1.99.2-r1.ebuild 1859 BLAKE2B 5169eff496b09fb03b8756fa2e75f0b2904e333c6dafa93dd348915ccc633ef23c06973b39e4fbd6067ad39a7b982f2e8fe1f9dd52813e12e219a5ef933b08ad SHA512 0d530b0ab47462b964650ad0bd8a28c2c05cb2cd09b2c8054123c5e794fe8093b47645b3713edc1ecc772f846dae37bb821e3925048764480182aa4ac0b63a6a
 EBUILD texmacs-1.99.5.ebuild 1840 BLAKE2B ea7932a639605afeaad05ba624caf118a353f20880174923d4b2fc55b835efca2c661721e21fcf037a2a7c8805791c1f91cb5cf201f3f28d47e1ad8c7a7d3863 SHA512 cf5241fa735e93f87f5c630a13172c4ef7682ce1303f6a001bab79c2d573bc71322e359dc5a13f3430333fe75ec875ab6c1af921d05ccd4d5ff1dfacf719edef
 EBUILD texmacs-1.99.6-r1.ebuild 1619 BLAKE2B ddeaf9804ca92f537d24d759e3cf1683c02b3b849f688c08a501481ad1e838f2613ac6911f57df259b5fa58a52d30823690d3dda781d8c5a4e6588079a4457b2 SHA512 fd3858ad690822ddc9d6806fb98a8567230948d50fc65a5309bf2a1f7f060f100b813c5b4fa0d72c819b854964767fe8c52c2c2305c984fc0ef00521068940d5
-EBUILD texmacs-1.99.6-r2.ebuild 1683 BLAKE2B 8ab489e4869723eb9d4c260c2b070bd950c6558374e33ef67ce41bdee6d75b9941efa33a36f0e3d80a0ff885ab05fe3ed496e79131c2e2b925b5014a87b4a603 SHA512 7bcb6423e42eed285a0e5e75eb4c38f68a06ec9c9725f856364684f3992386f2920a3cc929ae6660c22a2e99b64202819f4e2af65ad8c90342f8e9c49478ef1a
+EBUILD texmacs-1.99.6-r2.ebuild 1783 BLAKE2B 8061bd4623ec16109a5789d4a253cb86e15a8b845834187a13c72b857fcb9f1304c116430f46061b3d7d7b7230080c4d4815e541350001f972c6c4fe5c0d8aa6 SHA512 38543f692745dfd80fa0c7b7bd0e5336f7d9f5de687f467d8d6defef2f479fa7a030ad3f84e342b620cbafd4541ac93b121f3c1f817e5cfc2a40d1ed45026668
 EBUILD texmacs-1.99.6.ebuild 1725 BLAKE2B f7687d9048bdd782c3ffa31e3f0f423d0609e334c090b66c89a09afa47ee53687054589d955fd4de61d82ca8bd86ba579d3a6bb314f0fc56dc00dc667dba3a89 SHA512 b3d58e9de7f1368bf6099bf2d5d98437f0ac9a81e734a9b0a9bba47eba315721dd356edc1d5c947ce5b697196453c7e896a63de44e9c251ab7ba2d5608018e00
 MISC metadata.xml 532 BLAKE2B 8f4a56ce00b94350aa8597db3fa2f65d676675ee212040b1bd5518563cf7c13e9499d2cb800b4e03e5159280ef17c6ca389b151833e587efe710835cc49ac1f4 SHA512 f7a15d31b19285e863c32dbe1a6e77b10d4a9295dc2f9444a69173eb13e5334acedb0b547253dbe0734a33402e11cd9859c07d8d5db1be3370e547cd96266601
--- a/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
+++ b/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
@ -0,0 +1,21 @@
+C compiler compiles this code for bot int-based and size_t-based
+guile. C++ compiler does not (and is what used by texmacs).
+
+https://bugs.gentoo.org/652054
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 37e9e87..5de2711 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -274,11 +274,11 @@ SET(CMAKE_REQUIRED_FLAGS "-Werror ${Guile_CFLAGS}")
+ SET(CMAKE_REQUIRED_INCLUDES ${Guile_INCLUDE_DIRS})
+ SET(CMAKE_REQUIRED_LIBRARIES ${Guile_LIBRARIES})
+ 
+ MESSAGE(STATUS "Checking the size_t of guile strings")
+ 
+-CHECK_C_SOURCE_COMPILES(  "#include <guile/gh.h>
+CHECK_CXX_SOURCE_COMPILES(  "#include <guile/gh.h>
+   #include <libguile.h>
+   void print_string (SCM s) {
+     int len_r;
+     char* r= gh_scm2newstr (s, &len_r); } int main() { return 0; }
+ " _guile_str_size_test)
--- a/app-office/texmacs/texmacs-1.99.6-r2.ebuild
+++ b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
@ -51,6 +51,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch

 	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
+
+	# fix build failure on 32-bit systems, bug #652054
+	"${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch
 )

 src_configure() {
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@ -8,5 +8,5 @@ DIST dash_0.5.8-2.diff.gz 41715 BLAKE2B d396eab85bd86b18cc532da192c8034da990e9e4
 EBUILD dash-0.5.8.2.ebuild 1696 BLAKE2B a5c998a035ceff8fe02e2c1a9898d2fc2a54c702718cc36e06e5ef2e90569809785a8e2bcbecc7bf17d406db9ab227a46e48569bd7040c54b10f0e12bbf6e31f SHA512 66d84df096ffdce607a3f4bc4e857d807955d945245f96db6e9a33640306ccd3418c79691f2f7e08efef7a877c3e79902c39340ec68d5bab9b0cc657554fbbd7
 EBUILD dash-0.5.9.1-r1.ebuild 1949 BLAKE2B b79feb6f265498cdf75993bc976092ed9687e67e3d653b800b45de4be45ffc52b290200e260ab0ef44cb67e4838a7c7830c0d220ce9b1060918e573b6fd1243a SHA512 37324ad3e7fdb9f23924191ab0ae841e6f1948e7b9a9149af55314ee13b1577965c1f3fa5b464536928adb5045a2b5573eb8785316dd60f5008aeae8efe7e199
 EBUILD dash-0.5.9.1-r2.ebuild 2048 BLAKE2B 55bef5c38c04b070e6e6f3df022fbd240abdf1ef16e91b82c5defa92bf28f54af6ec350d9d15f3750fc561d0e204d7d649f1c26868a8e61a72bd514eeba7e523 SHA512 59341ffefbc51e667f45412a518ae5264b2192657d201a2852e446445e243e8da2f1ddc0ade395616ec5359037ee38bbaa6804b68e809e30f106796964b8bc5d
-EBUILD dash-0.5.9.1-r3.ebuild 2104 BLAKE2B b4ccd4d2c94ae3f58eaf970068485fd453dc47f429b75d4e10b6df38df29acb9974518f9d252ced0d8ed343428489298f9c5ae32a4dea08c00d03f44406e67af SHA512 cc6a912a0ab95b44033edfbe532fc18f0d65b6c9f65fa7feb9adf6a9fd0989a7f84ad2445c607d7d60520d1c79735a705871a362206a4e3c2f507e4a6afd9893
+EBUILD dash-0.5.9.1-r3.ebuild 2103 BLAKE2B 08a6842e54dd595cb1fe4832f7df501af83933384a7b2a069dd89361222809fbf7ce0b16cb880c41bcaaf31f5ef1f9a255b34902c0efe17fa9914becf682ca68 SHA512 2feae6ef50dde2b0ba75a493982340bcdcc901db4812e777dac11bc8e3c474e365159df4c08df3c2b1d87eec201cdccaf36be46ca3d52dd4de7d6c09754ce2f3
 MISC metadata.xml 598 BLAKE2B 0ec9bc56758f158bfce29ffcbbb84c45abe17cd477014fa428240a9af5a4a9f8740c5a66f4aa4828795135d7464426c65410702e81aea81befec5e11a07ec3fa SHA512 a477ff729919625c910ef9a0b95ea85e683122383c4026c1c51f163d8faca06749ec05eef8b4f01ed9eede68b49e637f24f94202b8a00e67bb01bc21294610e6
--- a/app-shells/dash/dash-0.5.9.1-r3.ebuild
+++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild
@ -19,7 +19,7 @@ fi

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit static vanilla"

 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
--- a/app-shells/posh/Manifest
+++ b/app-shells/posh/Manifest
@ -1,5 +1,5 @@
 DIST posh_0.12.6.tar.xz 268872 BLAKE2B 8fef9e682344ca40b83c68ea639d1d684a6d743c97e07e3279b6d11928b0b28e2c8014f1d11e36a3374851c4ad41f078ff7e630954740c460318a70b8ed42677 SHA512 2b862264dd13c840facb158f1e2731dd1f11c7a567308feb6bd80fd5a7ea4d8e383cc13a0819f90da5fdad70d0adcc81e5adf2bd69a7a171e2e874f82509123c
 DIST posh_0.13.1.tar.xz 267436 BLAKE2B f534f64595eda7649a146555238309aba00ec79d53206b17c91ba9ed44ab47794541952af670c5040133d164167e8f2bc844fc4b3b646035e0d08e8495d7aedf SHA512 957fc2924ab8f634007db2e15ecdbb8a1c60ffb4917c127c1583c05e222f598a564906cc40c869c95d79995ea85af24010780e7d36d44a5907a691aa9044f23a
 EBUILD posh-0.12.6.ebuild 481 BLAKE2B 723f1cb8f7104f8956451e6d6f6c827cb325686dd07c99692dd8397e9a0d68a47b838605f901962ca591b8b41d6c14f133bcdb324c2d6c92af243bc69dd33413 SHA512 ecc86c5799f650bc85f37badc9be28faef49591bbec0c9f0191fa1308946f9edc2f1d631c81ab9e62d88a00cefb68b4a3d66229b3d09a21a8226c1b6ccdd9564
-EBUILD posh-0.13.1.ebuild 595 BLAKE2B 28c6d1c99fcac350b4ffec1a806104efb93849ec8ceed4883f802f07ce3ecc6b2558a79cc295099b2b4d784b52a7832634e27f172755c4a57d517830eaa6b8c5 SHA512 b122ca65b3509248ae15ef792be991f52051099f82cc9fe497ebc9920d3c0897dfe77568eb8476e184e3d00b31c2ffa65da61d89e81edcb915ba793ea0fe492b
+EBUILD posh-0.13.1.ebuild 594 BLAKE2B 3597877c2471425d0726b7d81f66f86c567cff15e11ab6e37023035392c9fecd3ae26263a1062dac89a0ff8a0d1da3c3bf0a33ace40deaeb8774787e84d24526 SHA512 6046007613ec2fc0a8e61f6fe4e97012a34e9cbbb512b2d5009f658913147ae23e4b43c8311fa35d7f81f26a1606b226f2603ba3454a79bb1cadee08d33d2f0c
 MISC metadata.xml 217 BLAKE2B 2c342b84369a3ba13606f35f163ee0aab11a086c23c83066fb5fd7d0ffcac5282b2cbb228982745c8ae1c1575b7d1605556f3562175ee150de6c701d86e347c8 SHA512 94cad0e7f10d53a2ee488ff9be4c417377f7cc6fed1ea4bad878364978cdbeb648974764477a18d2b222ad9111082ef0e00b14832ec7318646a47b56c58c828e
--- a/app-shells/posh/posh-0.13.1.ebuild
+++ b/app-shells/posh/posh-0.13.1.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""

 DEPEND="app-arch/xz-utils"
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@ -14,12 +14,12 @@ DIST docbook-4.2.zip 61830 BLAKE2B f9a26e9aefe2da7c785f065374bb082f15e3f39dded7b
 DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e7dc240b47d8b07f43f8c1053003f50c398c4723726980e553dee7b34db629f1eee19ef6ae95f06c6ae8 SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
-EBUILD docbook-sgml-dtd-3.0-r3.ebuild 1038 BLAKE2B bea382cc74d450842b340b2f4131f8454fe3cb023b0e57b709038d730a0853fb68f8cedf809a0ef52efa31467c3cf3363019a465d04fd90ccc29ab8cfa9b6f9a SHA512 f6f9c1183fe68817185786c665a0e3d0acdd82c56a1f2bb11e0eb411cf070a7583f66faf25bdf0c88f3822d5777e710430084fa5aa9d8db503066c0b89d1040a
-EBUILD docbook-sgml-dtd-3.1-r3.ebuild 1038 BLAKE2B 587dd834b106b4c66a1981d236e3e9a4d07102f1d995ca8e521c433decb3d0ec3467d53ac50853706162b090d472f0957251fca9483ff6a429676f52d8898957 SHA512 193d0561043034ec1328133724a6a9e233e35623364aef45a58807f383593bed33e9feb3289a4631b2a4d8e69fc508ebcf9f95b64ca6f5a073eae415b468c1bc
-EBUILD docbook-sgml-dtd-4.0-r3.ebuild 1038 BLAKE2B e570f274d56bb1f6011695e8f17e240dea09385f656e642d6f4fbfa883cd081f044a7a2602099b391a2b41c3b9d4a0c3d5fd39c38a5f7f02b3445efe8dd01422 SHA512 e4feaeda3d910d156e03e58d844dedaa8edfbe40f24c74660e0a00d4ca76e9509144e705a1c90315fab3c77d40728b00d17a3d1ae021c67faecf40e04bb1fd2b
-EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1038 BLAKE2B 7ef743a367ad084d2ba480fdac699237a53fb63b62d6467acf21fe8dc7fe8747bf04c1b3380ec7d0ce89e2fc821f1a009c9885a4f44fd3c8396d4407ff676e55 SHA512 98781f21a593c19d8a3f6bd15b345a3cd84ebf9e07b56c0e36b0411bc865414935a64440c96d6ba6f2c7aa02e11f9c5158ebd283589651e2c6acb4c55624104c
-EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1053 BLAKE2B b749921f555023f3ad1b22d0187f9c5b49c072907487652d86754cd67c4c517f139ec21da1b7804450cde0fa848110cf9048bed70cb93bc57ee92c72382696eb SHA512 d65d9f5b9720d47915eda5f0f978d28a413df7c47376698d9fe10570dccf8f4e12099193c5c5e1f4677ccb2a456caa923050e82517fd4b7c92ea98096f3b1e4e
-EBUILD docbook-sgml-dtd-4.3-r2.ebuild 1034 BLAKE2B 9df82149941d8c53a7cd04185c9dc42a51f6215ec89d1ed7f452e698b16d49d0ad80d150d8abcaa442d9e270541bc848f2c24806e395373093a0667a9531a4f2 SHA512 2d88c0f7c3d848a26aece7998a9eef6d0a31ba01ebf656d610664e5e1a8e07fe92418e837f5ef2e0ac56a594ed1d947da2e4aee092f855a7b2c1e1bf8dcf8b6a
-EBUILD docbook-sgml-dtd-4.4.ebuild 1044 BLAKE2B 0af3122f2b5d7ddd224b2434df8ab2c88d4771d3466d3480709d45974cb4005205864acb28f66183dfa1a86cdc5952b3ac35c0501ebcb184a0291ab78702a92d SHA512 9df85ac8bddd8c0d61b6526cbab67d4f0fd48b3c1e433b1afaa56dc66ccc6a4bae8e6b9d46929b83e596c0da7730e259f2d0fcb32ceaec27c2dbd48102bec9d9
-EBUILD docbook-sgml-dtd-4.5.ebuild 1053 BLAKE2B e986e5bf707dd3d1544a697301af30aea06c5c0aa91f6b05a60dad044359646c216886cf6ad5b588382c958662e158328f0722a233ab02fa78f341f5d6e38439 SHA512 4783873256131bba3c1d7c8f40b13cdee725a53699a6e8c06178e6ebf9eb0134b34bc9a6e0553ac3f52415628fcbb1ff713b6e7fc1fdd2aaa8929a148a802641
+EBUILD docbook-sgml-dtd-3.0-r3.ebuild 998 BLAKE2B fc8be7bd4259b96824f2384eaa2d54d3422737db2780d0a933e6919cdca4ad43e34f5c0f61cc9205ccd5a49d7fac69724df94de412c068fa797f8da2a7823760 SHA512 de1cf8959986887ce10333bf599a7f6af2c075550ebc935ca9013af9500c3ed3a18e86f7eb4b3f5b82f094e6905cc0ebaa0198f6a25b2efb318576348538a0fd
+EBUILD docbook-sgml-dtd-3.1-r3.ebuild 998 BLAKE2B 42b3769142f9892f769a4e777b4f4030b2dced088d2006d45d9fd77c3c463ed68d6a2f4b341eaa677d7ec7a339c8cd83d30297cec023d1ca0ac904bca1448fc1 SHA512 f3b626d5576e137bbe58f169ca11d237194e94c0eaf3d4e45c8e398493dad0e1c5a861d414c836af749d102ff899465977e705528675967ea9ce4cbc8a7d6eea
+EBUILD docbook-sgml-dtd-4.0-r3.ebuild 998 BLAKE2B 46ed9d8b063dabdfaad0f7165add39a1df5ef6c20be2bad899b760f013bcedd86b70d08b3fed04a7ee175ed2e558a3fdd11f82bcf941470c78e8ddeb471e65b3 SHA512 8a395cc78213ec47b3e18a5ed0edbfb617cfbd1c8d3bacb2bbae868b79ea192834acf7c53a9d2712b0a938c15ca55d8550241995b38b2e53147f11d014aa7f96
+EBUILD docbook-sgml-dtd-4.1-r3.ebuild 998 BLAKE2B 400ca316284254730bddafc254b2b05f74a92a85090d5e1f148dbc765eb7b4fc33544002cae0bb97e7797872340231862574d92f6555e75b45ebbe35427c6482 SHA512 560c60e3d575f6d8ee8992687394b1b9b417462f60f7cc0f4d2bc223b03fb5fe09c372d3bcae15b5ed69eabf408453e2a0d0941c08b556c3b3d0dff292589dcf
+EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1013 BLAKE2B cac364ca6db8c7a338e7aa246e50d11dbeaa7e1eae0fa90548e5e9696d739b9680927c2555c1b14387191cbd819017bd78b0485cb70634ffc618c8d09a88073b SHA512 0aa4acca46286a4c6af9c89ebbc959a2660c23c2ddbe576aa338548b4f101a1697cb3745151cb96d2b28c60dc1a584cbfce69af748284b8893743dd405c5089c
+EBUILD docbook-sgml-dtd-4.3-r2.ebuild 994 BLAKE2B 8563c3b0104fc86e7084ecf3bf6346eefbc843d9ade51b9646cffe1d560bd81df399fc92aa6a33d4e8d7ef9ea62f9f026aa41e0703631eec4837819135f10e18 SHA512 5428471de628c6821879af606f8a620f8ecd03a55457bd38b6b1915cb89b373e8989b3b55d4d00e9b4ba125abc6649559d1b5806c69abaca02fc1bb73e18bdc4
+EBUILD docbook-sgml-dtd-4.4.ebuild 1004 BLAKE2B c9e63807397bdad3b387f43f23663f58578db0d6b102c45a6ac98cfb2f1bc770e8fb208379f02ce6cbb4f9495bae8b8b1c80767d3d2ac2f6287311524c93e947 SHA512 ba8a6e5ae3d8edfa185bbf334326fae1a8b9a3fb57114a4b6b117de0053ccc9a09ae7c086c1b94ec0e527bd73526dfe99b0a5caecb3ea5c3d9c9339d41e30397
+EBUILD docbook-sgml-dtd-4.5.ebuild 1013 BLAKE2B d73fbbdde2122516b8aeb56e4b4593097886f09b5a088a7607c968d52a6d26c212a4d97f5bb1baa4e15b3c9e1f39ddd4142913862d0cb2b9437b94103681edd9 SHA512 415f0b59959430d3babb1bf62e29b0cb93e58751c591993e61752d5240b3a263e14be8728fa51129a5eb378a8c0859dc4ef7172f01b2ef4098799ebf2eac2199
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

+EAPI=5
 inherit sgml-catalog eutils

 MY_P="docbk30"
@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"

-S=${WORKDIR}
+S="${WORKDIR}"

 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"

-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }

 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc *.txt
 }
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

+EAPI=5
 inherit sgml-catalog eutils

 MY_P="docbk31"
@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"

-S=${WORKDIR}
+S="${WORKDIR}"

 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"

-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }

 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc *.txt
 }
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

+EAPI=5
 inherit sgml-catalog eutils

 MY_P="docbk40"
@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"

-S=${WORKDIR}
+S="${WORKDIR}"

 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"

-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }

 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc *.txt
 }
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

+EAPI=5
 inherit sgml-catalog eutils

 MY_P="docbk41"
@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"

-S=${WORKDIR}
+S="${WORKDIR}"

 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"

-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }

 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc *.txt
 }
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

+EAPI=5
 inherit sgml-catalog eutils

 MY_P="docbook-4.2"
@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"

-S=${WORKDIR}
+S="${WORKDIR}"

 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"

-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }

 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc ChangeLog README
 }
--- a/Show more
+++ b/Show more