Sync with portage [Fri Jan 5 17:04:46 MSK 2018].

2018-01-05 17:04:47 +03:00 · 2018-01-05 17:04:47 +03:00 · 6a139717c5
commit 6a139717c5
parent 0c3ec3a678
15655 changed files with 38910 additions and 51221 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 28838 BLAKE2B 626fe297005c584666f606298988d9fa22e7dcfb542181b92e11649dccc6e2c340b78e15d50160d6613dcc11593ed3df4a61459e970faa8f703372810080a1e7 SHA512 f93828d55e4db0e4a7abe6cd4c598d02ecc57735342719a17e3ca67a8b5703bd7173d59b18946b289fb67d36c068c366e4703d40c4c788805f00bbd3efa0d35a
-TIMESTAMP 2018-01-04T09:08:41Z
+MANIFEST Manifest.files.gz 28815 BLAKE2B d9b5e81aebf1c075c6c24f25b207d8a9e1d744a68a34d9509e2d63f315a742aff40ee429d47e13d3ac46d3b5bf6868be1523842e570027cdafea43caf134ea85 SHA512 2116c7d4760a9b7954a54a8cad293bc9bf5542271950c371e54295dcf78196e3c088571067cd319e9639829507d1b8e5edbe60917023707f97951a5078316098
+TIMESTAMP 2018-01-05T13:38:53Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpN7xlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpPf+1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCV4xAAppBQoH9ErHEAKulZ3tetuwiMq0WZjbm+yVEIWT0aCuNtm1VazDmCiDpY
-SKZ7B71DJnd3x9mMZXDfqxdrhkB/r0lt23HaDytlp4ciZgvLonqoBGAYHY6CZe5B
-NwM2Sno5dxMMCGjQJLY/KeXHGAvFo3r7mrq8a4p3DcbZ6gj8CVFNdoEvD2ygILxE
-lt+TNp3HgcJ+BBgknSi8Wt5JicveLCblHSdDI+h/PZChV+dEbNFlovYUxjWsH4IZ
-hGvnJkzBUBYicpEQqntiOp0sn+YUfdV24hw6pETVJ0pCZHEJORgFt7Y0Pwl4ECsC
-hwPJcHKDzIo5SmVM3/XsmIawUcPf7NvuJdfkrBPVpZhNLN2Wq/etbH3Gc7TfQcuH
-c/TS1GPriOTY5S2KEkStQ7xPTZea7gIM3XSIPPL+kbyqFhU3mizMwKTA2RWkaSep
-LI3l29pZnPQHxJ5q5drjbB5XnX4/6Jh3PBBTEXWjZOecxlKFgov6VEqfsbRUTOoP
-t0GQr9RjLIyeNJA9yB7q1h5RhjByq+ldHX59T8QTFlREi6rR+0x04B/R5UNnnpYC
-Tw20WrE9Yd9bHkyAWK3RUZfWv/Pj3J16g57Bw3CxIDI+hOBvYEI2k1q2L56yTxUE
-MB6BzvQEG4W+M5HAyRAgQslQkpnxJKDQNFTpki5AFuZLcG8LNMg=
-=d5/d
+klCpUg/+O86sES1uUiHNYClwt9V/sXoBWJ+Ok58eV/Kl87G5slA3fRr3TupcIvWj
+jnFBta0v24QOKDj1y/2XnlCEq7CL9lPk4Wm/zJEoJG2e7fyyhmqrSDsiFbyXDnxw
+fsZ9YoftO0uGg67XL/dzSN2tU/o54jWGv+3fI5jbvBk42pRdd6Y/PtxxA/zd+vg
+ruVOmP3iD4N9mH4K5jTl2pspJnihyMD5zGjKoS57YU3xPo/2kQRjOiyoshvOOfN9
+K4lYOW83d33kh6SsyOoupMuq+2exW/3AYEuPRLSKBdl7xxST7PvyAHkQ+pSWzG3E
+tcLzYGvg6qJigDHdDmiyltFJSK/k3Rx0GzsGIfij9zH40McjhfCuFQ/130xGWRu8
+4fLj9tByqooEoChaxokFs4TOY8cMpS5A5SoBbrR/Ft6ugh5pEBIwVz7dm5BGQQXz
+Wrd/290jfuytm+egMLITgRAa5l9KpQxbNjEdNdsVY8xLhlKNidzu+3BG3Bid5BGo
+1TTN1PkYQ1hJCMlKIDaWMNYyW4D7eWnZ0TX0b5n9JkTq5DfBUE63QtSZqbpmJkw6
+DOXmyr5Ky09+P9x6PvzbIDvUJnVq9DF+sRIM61dCjnrZCZ6oQK+wbPTcXX3/dUmy
+hbRKq2tXI+fV4gWy5juIMez9NrEh79sEK2BjQNRCdb8bGNIVfvw=
+=lGZl
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/qtpass/Manifest
+++ b/app-admin/qtpass/Manifest
@ -1,4 +1,3 @@
-DIST qtpass-1.1.6.tar.gz 325329 BLAKE2B 091cc00bc276f637a5d7f954a715a6e3687e1b369f1fd572f90c956c721524159a82d4283b025980f9b31132e07236706bd79fbbb830adccd3167a979bca48cc SHA512 64d712a33df97b04ab1a9d5472aa7fa567e38e31ff7ba297e567d087a3f32b1c59097b339cdd4f568efc2bce16b93f2d2316e94d2605b6abac299d7cf7d0c3df
-EBUILD qtpass-1.1.6.ebuild 836 BLAKE2B d93e43f531d38b7e15fc89c539532bf585a1290a01d0fa77caed77cb822cda45352af6f304bfe5ba9feb827767036d68793c92aaa0d1518aea40dc0223da2aa2 SHA512 b928a3be74e020b6397e78c97d7573830aaea0468329f0b410490ab3d0680a6bb717ba11ff05aaa0f603e441561f970c944a934317db8b6350cd1e36da062c05
-EBUILD qtpass-9999.ebuild 761 BLAKE2B 2d3f283b751ae7a8384e6cdd954b762f6f6fb14d3a967ae5c639b6a530ecfef2d06c1f347c0b65c59a27c4f23128e5bb2bc811df2c00133fdb2d323dcedc1885 SHA512 351ce80ec7d8116e0f3b970d54d1ae59bcfef2ee24ba14ed61cae44e140c8b59c882b531afdb00552c3151eedb1e53052fca9f9fb1b0aa12b851ae1f09a3776b
+DIST qtpass-1.2.1.tar.gz 361147 BLAKE2B f46ce4362d4d3e0c0b0a425e5a40cf013181b899d5b1a2efc03cc5c4a3eca2d3ce1cdca78fdb95e8fecae23ffe56c01dbe65c9d07e2fff48934e995a710aac40 SHA512 3621a46aab5db5a41e80aea10bc6baf662510bcb249a1f56d33492aa66c824d9f018164f2d6a70256a7b3d59a9b73c4c8459b5d3fbe19886a607f8f0dc7410c1
+EBUILD qtpass-1.2.1.ebuild 1016 BLAKE2B 3ee5b9d94395092a92f71bf20f2392c8a4cbc36fbefd7a61ec8568913b1c52acf3bc7f4ba5ee1d347de187ae4e5dd8b031c58163987a2dd444ac59650e65f49c SHA512 2b12c48a02a6bd43fb3e105d26390cbb7fca23999634f04f4cf5f02a06aa7a583f9e120f1c9ee32f84982c99edb0bbb6832ccec6cede8c76a6536ea3ffcd2e26
 MISC metadata.xml 571 BLAKE2B 1fec9b040ae2b49beec1b99abd0853f631275d3c7f22584a42b503d008ff9403edcd451194881d09224ab0d41ff0598dea2dc7a403aea0227adc4909d02deaad SHA512 937b219855427d7423067037b05ea3b7f19c01eca32fa38e3d6bad9354da039bf2be63a6450f0ebd71fcbd7b6b15b8ca1f993b89391597b1bfb7e3db3d3c04ae
--- a/app-admin/qtpass/qtpass-1.2.1.ebuild
+++ b/app-admin/qtpass/qtpass-1.2.1.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

 MY_P="QtPass-${PV}"

-inherit qmake-utils
+inherit qmake-utils desktop

 DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
 HOMEPAGE="https://qtpass.org/"
@ -27,6 +27,12 @@ RDEPEND="app-admin/pass
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"

+src_prepare() {
+	default
+
+	sed -i 's/SUBDIRS += src tests main/SUBDIRS += src main/' "${S}"/qtpass.pro || die
+	sed -i '/main\.depends = tests/d' "${S}"/qtpass.pro || die
+}
 src_configure() {
 	eqmake5 PREFIX="${D}"/usr
 }
--- a/app-admin/qtpass/qtpass-9999.ebuild
+++ b/app-admin/qtpass/qtpass-9999.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils git-r3
-
-DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
-HOMEPAGE="https://qtpass.org/"
-EGIT_REPO_URI="https://github.com/IJHack/${PN}.git"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-DOCS=( FAQ.md README.md CONTRIBUTING.md )
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5[xcb]
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	app-admin/pass
-	net-misc/x11-ssh-askpass"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	eqmake5 PREFIX="${D}"/usr
-}
-
-src_install() {
-	default
-
-	doman ${PN}.1
-
-	insinto /usr/share/applications
-	doins "${PN}.desktop"
-
-	newicon artwork/icon.svg "${PN}-icon.svg"
-}
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@ -59,5 +59,5 @@ EBUILD systemrescuecd-x86-5.0.3.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e
 EBUILD systemrescuecd-x86-5.0.4.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
 EBUILD systemrescuecd-x86-5.1.0.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
 EBUILD systemrescuecd-x86-5.1.1.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
-EBUILD systemrescuecd-x86-5.1.2.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-5.1.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
 MISC metadata.xml 585 BLAKE2B e0ce16c78e84339e1171bbf2e0aee7e27c3c32d4f795b1d176d872596330c531e6f960acd52526707464da2ad8d058035c42f3b9ff440bce139ce4b5703933d6 SHA512 51a7820398c4c637017c4a38bc0cd7b8b157e5dca57af0495a05c3df0bf09662287954bc04b24995585e8ecf3ff510177561db4dae3fadc64490d184319c18b6
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"

 LICENSE="GPL-2"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+isohybrid"

 DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/afio/Manifest
+++ b/app-arch/afio/Manifest
@ -3,7 +3,7 @@ AUX Makefile.patch 350 BLAKE2B 67a2e4b01be33fa0151f018b06a80711e4c68084fc5ecadbf
 AUX afio-2.5.1-fix-build-system.patch 725 BLAKE2B 3ec8c1068d60db73727fabb02eae50005c1aef8db39df977add2ab312d627fbc16b107b1f007fad9be5b97d1afe02ec0fd38c97c80a804464f1e3985868a3f67 SHA512 ccf6af4e1591d9c8e519dcb9016c49c0a8601f2a03949270b205560bb13e90bdbd50079c4e0abcc3e6290a809ffb24455c00ee5cd70c0168b31b1c01b9bfc093
 DIST afio-2.5.1.tgz 191765 BLAKE2B 48a590c1180942444eb8fc17701563ee822cad9d0ae423e12996e7b3dff16ab7ba13d8041b78fb6415d1a422d14be8ba3443910ae1a57290dca801334ced7ffe SHA512 afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
 DIST afio-2.5.tgz 179184 BLAKE2B 2e4e31b27ce7c7cc60ea81d6d7101289e8cfbe4ff6a52c185abef482e06d233c739e60d40bc2ee35c79405606e5cfe27746813a8e74dbbe1b407d4092707aee5 SHA512 8e8fba115989b60284d09fb37b8f4782b6adc4a0887a05544615a38e62c6b3a48c3194b53ea4496fea64b25d420ff89cf6faab31646998f3612082118fcbb052
-EBUILD afio-2.5.1-r1.ebuild 690 BLAKE2B f5aab1c72bbc7f21b741563586e9cd714ca32ad4834128635c3f71d5b33c359ec5830cc1fbe52dbcf65dade51ec738bf21cc05370f0950135031369848b8d2eb SHA512 63dcb8bc259e45c5757ddac95df5c2d3987a76107d75f1bd047ec7d0a85bcc4515a97bbcb94f8d0895726d3efe577faf8a3897507f1944a725e08ed848831175
+EBUILD afio-2.5.1-r1.ebuild 689 BLAKE2B e902e2ec1360a3c7f487ad216565dd0ccbd25f6c9d4adb39b6d2b10e641726bd67bd5d200d69d03cd037263c6682cb6fb65f0e654f6de0e45b5ac3dbffa3ea7b SHA512 09b34b168dbce5dc28c1708117688d0cf7b74fac183db0e256918bf37946f84758144c10cd66e2e2bd3ad65dbe64a6f1ddcecfe50a1af02e04dced40820071d3
 EBUILD afio-2.5.1.ebuild 666 BLAKE2B ec8dd3cd9796a9a865c3d6ef985ae57e1ed2aefe1d86a4ab1141a0140edfde4863428c20848562c2716fbba84f91ccc8f92f5d3ba7a7c9adc80429ecdb789b3d SHA512 f1e396c6fa251be9a1753af5c0bf979af3bc348d9b6bb1d33c6ba048e73436729df9ff342a67e55ca72689cdb588fa3b8f3db533b5b99b4ed7a61d78ce483cf1
 EBUILD afio-2.5.ebuild 929 BLAKE2B fb37adb79739b5c0b5ce8fc9bb725f41ab7074c9b0ad8f2751bb682ca086d0cf350e6233f5a57835ffc0b9d760695ddb0767c9ef7af76d7b1f3dde82a5764356 SHA512 884f402c47f65285a694885626ec5250117ee2d988496d4b4c631ac3708b3fba00e254bd54ec25855782225640612f1355889fb0ae1b15c2daa0f93627f4e2eb
 MISC metadata.xml 591 BLAKE2B 1f4dfca240f8986aba12ac0ee887fc49ccb50248c300d318e09807aa2552f6dc642f0f8a629fd34f1156b9e8407f7a429245893f999afc87db90cb9860329fc7 SHA512 ecde4bb37f668f30eedbb5b07a648fa23183d64593595948e6caf575fa78f8c666a406ed33b4d590190203920e1db7368dfc99b95948a7ab7896d12490f50760
--- a/app-arch/afio/afio-2.5.1-r1.ebuild
+++ b/app-arch/afio/afio-2.5.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"

 LICENSE="Artistic LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc sparc x86"

 PATCHES=( "${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch )

--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@ -5,6 +5,6 @@ DIST xarchiver-0.5.4.11_p20170629.tar.gz 1052723 BLAKE2B c4f0b0ae634b6c11ea15d92
 DIST xarchiver-0.5.4.12.tar.gz 1074764 BLAKE2B 65d8968a470f7ea607fcbb1e2ff3b6c54ff8e521df1ca0cd29d3b7fc7b84d2ad5e2b9987bfb482979c7099d62287c463317d524cadc4a03d6b80ae61d28bfcc2 SHA512 18d177efed810576ee4dc4bc379817cbff390bcbfc541652d8288545bbb4a0e29b2136364e8675814a2780d06e2c5537ca4451a1c73a6becd45e1c0de7ba4554
 DIST xarchiver-0.5.4.tar.bz2 1003045 BLAKE2B 6f1303c1d1b09a60616977c04c771cac78a25c756fbac538401e22e4fe3a808f990848d83041d5c5ceb667e30b5bb1d694318f0d21953201047fefdfc9afeb2c SHA512 3b767c2601d94104e2fc72aa8d168afa5a154b5747a9b0518d1c348417e56e4c19d872a0029fb78decc897e0f3bc9573e17d0317b85f584e7275b0e519f5f30d
 EBUILD xarchiver-0.5.4.11_p20170629.ebuild 1420 BLAKE2B facfe37669671309ece170cbab8f29887bf84b4180aaec7e4cafe80c7a8e975a10430d7b573037bbb46e817cea9cea2314433684b43406736f9f7c63eb5c04dc SHA512 0030d3bce1e6dc695b90d15a97c7d66910d9e90bc9f0743e4b942eb3a59cf194ae6b82dd095255fc8eb2ec8b2b3c409f60aafbdf9ee2cb0c1b6b22b5e4a2267f
-EBUILD xarchiver-0.5.4.12.ebuild 1327 BLAKE2B 16085a97badc08f0723145ab4b443b9c1a8b94d89e5c08961df0c789390fccbe6746868628f0de5dc67d2a643657c8a1811d3c6e57d5fe679803a7ea4c2bb67c SHA512 3d68e09bd828a97de1782daaba2fc3384927c56bfd183248f83e98e721c07e8195f9b3ae26421dd51197600ea438e90d569b426cb5bd58c200c94745c01d1429
+EBUILD xarchiver-0.5.4.12.ebuild 1326 BLAKE2B 3dfd0913c699151272f0fd64ed0e0d3a7723997f026039abaf1de2b5bdabc980da7616ff77f564ae48e12625f0a238451280daaeea4b6fd76347492910ad5a57 SHA512 63b155f85e2753a4b37902d805226d0c9479b2857b8d024be9cf1f9260e1b581d1e8e41727ec2efaa14875d81f5e806a1143e04b547991c0135b8d23bd4aa351
 EBUILD xarchiver-0.5.4.ebuild 1328 BLAKE2B 76286bbf89e4782fd113168a8bd6b6b02def8827ca86805e166c9d5a3d50032ad87d9e6d2529b29a06e4fa4c2ed25b3ae95373e2f99c8c36a98efedcd7398417 SHA512 ed25ddd86d9c9d048f8a6cb155fd79c0c45d380b91f587bd8364ac3d455fc0a75d9eed271b64f7b42d293c762c57747c52608a30f2a1899ee935b091c9a0258e
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
--- a/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc"

 RDEPEND=">=dev-libs/glib-2:=
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@ -6,6 +6,5 @@ AUX zip-3.0-no-crypt.patch 1108 BLAKE2B 92de0a453e128a87a6d37f0a9cca55f5451946c1
 AUX zip-3.0-pic.patch 499 BLAKE2B 0b3ad7552ed4b3900b720360145f2466bb2835823a828ed4e3fe7e8ce22c547296ff0f74416f8b9a75ae4ef70d9cce521f96becbbbcc9ddb89481c3944d6b501 SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e
 AUX zip-3.0-zipnote-freeze.patch 2170 BLAKE2B b0080c9d5310a9cdd14eebc503d76e7463969982717476aa4359ae1c4651290112654f25c202defeddec5efaf1f32ec74c824a7370727b7e6a055dcac6211908 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
-EBUILD zip-3.0-r2.ebuild 1620 BLAKE2B 373efeea47d7a536cd94d2451b0010de2305dae6f9b53030e25376d818a1601eac9d5a067f8d7b59edeb76c9d813d29caa8cb77e9557debf5214b328d3d2e5fc SHA512 05f7dc22394c58b22435bad6c7de359ad994ccc1665ddae55a556f9f9dff6e14136a1115532b70ccb1809c3cf4b0eba14d3aadd26a3323a0b53ff3b5b2510b14
 EBUILD zip-3.0-r3.ebuild 1720 BLAKE2B 58973350277d37f4c13aaa19e300f2bdcbf1417f66878b2b83cb76cf2cd07e8b149c1dab5608fdf452a66416c728a6af3fbf1968b4869a21c03c8f8fa62699b7 SHA512 1910a94dc81acd0533d91b161a21b1270b4898708cdbb20bd9cf728add15456c23ba9f9b820e181beac7e77650c8cbabfabc1fc12993da281c9960884179cdf7
 MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
--- a/app-arch/zip/zip-3.0-r2.ebuild
+++ b/app-arch/zip/zip-3.0-r2.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit toolchain-funcs eutils flag-o-matic
-
-MY_P="${PN}${PV//.}"
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
-IUSE="bzip2 crypt natspec unicode"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0-no-crypt.patch #238398
-	epatch "${FILESDIR}"/${PN}-3.0-pic.patch
-	epatch "${FILESDIR}"/${PN}-3.0-exec-stack.patch
-	epatch "${FILESDIR}"/${PN}-3.0-build.patch
-	use natspec && epatch "${FILESDIR}"/${PN}-3.0-natspec.patch #275244
-}
-
-src_configure() {
-	append-cppflags \
-		-DLARGE_FILE_SUPPORT \
-		-DUIDGID_NOT_16BIT \
-		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
-		-D$(usex crypt '' NO)CRYPT \
-		-D$(usex unicode '' NO)UNICODE_SUPPORT
-	# Third arg disables bzip2 logic as we handle it ourselves above.
-	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
-	if use bzip2 ; then
-		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
-	fi
-}
-
-src_compile() {
-	emake \
-		CPP="$(tc-getCPP)" \
-		-f unix/Makefile generic
-}
-
-src_install() {
-	dobin zip zipnote zipsplit
-	doman man/zip{,note,split}.1
-	if use crypt ; then
-		dobin zipcloak
-		doman man/zipcloak.1
-	fi
-	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
-}
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@ -12,9 +12,11 @@ AUX burp2.initd 1091 BLAKE2B 55d7bd294fc4c603627c682a396f59e6004bcd131ac03210dde
 DIST burp-2.0.54.tar.gz 558845 BLAKE2B f6a868b09ad73e3b8aa171993849c8fec43c141d14a64ba7919ad73890905647741688d2f0c0b01ef2a584474ecd1464423b07279160d86c7f37d1bf37a384a7 SHA512 dccc4d3679dd759028cd6b71d09ae4e49a511e5d94b4df2f112ad974abb507bbc8fffaf63ef85c847b0f9363b20a9e817179ab556c5a788acacb7a25e7600fa4
 DIST burp-2.1.22.tar.gz 582938 BLAKE2B dbc0b7612e9cda2186d16426ec1a39559af965fcbc393259e5d4d1f376c666e8532f25dbe51d2ec816fc2e630f81b059c77aee572c562bf47f466f4114e875fd SHA512 028b48c585cdc607eb00af5f60e01541a54885b8084e0353d01b1e01744848967011cd330a443ae143884852c2dbc18fb25f364ce129a31ccbcf0f8d25ccb730
 DIST burp-2.1.24.tar.gz 586055 BLAKE2B 6186e791e8b0cea74ecfbd4a85624f2492bd2721e705d8f5fb6783eb03390c7c10d88e4e4e33095aff985c70e6da59b3bb3b0f652cc850f443dabef23517c05f SHA512 b23f5e33510493e08b9b6eda405a017c8f75811fa18c9bcb6f96fbf716a79934e6c714f1258c39a81dcc52ef1a88e3629a0862bbd2462fbdc30cc7fb1b117ba6
+DIST burp-2.1.26.tar.gz 588548 BLAKE2B f17d03cd79972d1a6bee3163092cd8957208024ca121113493c942cf268e53ab4dadfe05b74c5653a42088f1fb5e4e16b11632c602f2f1f09ecf1010ef43050c SHA512 abfd6866413b4bd9e382fde4cd1f2a51b41a306605dc1fce309011c4340c6e58900839878ade4e53e2d70077ea8ea92eac3ee727783e6a316efaa7b0e75e116f
 EBUILD burp-2.0.54-r2.ebuild 2997 BLAKE2B f1273b3897c72cab7a54e149e31c4ed9bc1ae3bf3c9c7f5cee706720161846d37622fd5398389e920dbb884b4a5c43f03e1218f6f1e28aca1ec079893833755b SHA512 e46d39437a830437ef6fa32e7406cb32c738514e22fffaee722523df4973b9e90ca8d2d1247b9c70b12e0068fb420016d2cdbe1522ea1d75622471feed0e6f3e
 EBUILD burp-2.0.54-r4.ebuild 2958 BLAKE2B e7ebacc80b7c78d92af1a13d069ae4aad495efcd4ed16baa05929c6fa5c6ea39afb2e33b61d1d0856f180bb5c9c839644dd60b00f64b68abe4c29f66243a8987 SHA512 d3f28bf715688bf5fcafc94d5242524ddf22fea6a898f2f71620439e49117dd626889f90d37875996c2f7fbb5521175af5a661a38ac93bf830af10a3f28d1390
 EBUILD burp-2.0.54.ebuild 2888 BLAKE2B 8b1082f4461af6be06f44487c3dd2f3a11cf6baeb16fa9ccf7aaf61226b7fbc49ab5fa844beabf8dfc8c619f798a82ec5fe0df2ade5aa5b59de329a0b0f0723a SHA512 25cbf3277f4d8a1ff6f897c06cd3205d9e2acf312cb9117120c3803ef1db97d0b0705b533dfb57b702cfc6ed4d4cfaad76a63d4a594b5853ff54a2b49b4b4be3
 EBUILD burp-2.1.22.ebuild 2944 BLAKE2B 4eace50b19e23adb1909efc2cd73846a852cd88c7ec3f03a0208f89b6eede0ecedce060fb3e41b87f899425d916c88952e226007444dec72d4ff2fec9daf2579 SHA512 afb696b8d45e7cd98f8db4a2c647a6c74b20e0ed5fa72010e45c594b56bbe8b340d434352733f50d6d368ad0f3534ccd5f40400021120230474c951263acab71
 EBUILD burp-2.1.24-r1.ebuild 2845 BLAKE2B 7ac52194fb89b2eeccfc66e28de8fcff590d92bded3bda76a24c722ef78dd19f15b2aa51f5a15d9b75df1268423a21c9630f61fc0aca826fb1cd190476ffb88c SHA512 2bd8f4f1c7928615b08b16a9cc1bff2fe38b601a7a71ea22487ba064ef4758e67792f99dfcdcc9ce0683d788ad7e9fe0362a32e1e26d1c6c735abb5e74fa0a0d
+EBUILD burp-2.1.26.ebuild 2845 BLAKE2B d2e9b2ea57a6cdcd4eba9e1ca385da7d1b8460a1f5d034f4f23c02ad5989e422d5631ec695d3824d98013d023be1e693e6c609e8a106f5b1eab341451e75e7f9 SHA512 ab0056b1475b9af65fc70a134419ab9f1029e393c6c930ecbf4eef18841823b00260164030f63d56c7bb21f42bbf9cd30843a397b3e2ec1b9dee358a24b20cc0
 MISC metadata.xml 684 BLAKE2B 3b4511a62d65ec23ef3b1311f57d703154f08e8d82d189a5ea0b555b5d7d686c54365d2992b85c6e5dffa0ee93f7331367925766ea1bfe349446c23d73dba392 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f
--- a/app-backup/burp/burp-2.1.26.ebuild
+++ b/app-backup/burp/burp-2.1.26.ebuild
@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd user versionator
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="http://burp.grke.org/"
+SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl ipv6 libressl test xattr"
+
+CDEPEND="dev-libs/uthash
+	net-libs/librsync
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	virtual/logger"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
+	"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch
+	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
+)
+
+pkg_setup() {
+	enewgroup "${PN}"
+	enewuser "${PN}" -1 "" "" "${PN}"
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		$(use_enable acl)
+		$(use_enable ipv6)
+		$(use_enable xattr)
+	)
+	# --runstatedir option will only work from autoconf-2.70 onwards
+	runstatedir='/run' \
+		econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	fowners -R root:${PN} /var/spool/burp
+	fperms 0770 /var/spool/burp
+
+	emake DESTDIR="${D}" install-configs
+	fowners -R root:${PN} /etc/burp
+	fperms 0750 /etc/burp
+	fperms 0640 /etc/burp/burp-server.conf
+	fperms 0750 /etc/burp/clientconfdir
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	elog "Burp ebuilds now support the autoupgrade mechanism in both"
+	elog "client and server mode. In both cases it is disabled by"
+	elog "default. You almost certainly do NOT want to enable it in"
+	elog "client mode because upgrades obtained this way will not be"
+	elog "managed by Portage."
+
+	if [[ ! -e /etc/burp/CA/index.txt ]]; then
+		elog ""
+		elog "At first run burp server will generate DH parameters and SSL"
+		elog "certificates.  You should adjust configuration before."
+		elog "Server configuration is located at"
+		elog ""
+		elog "  /etc/burp/burp-server.conf"
+		elog ""
+	fi
+
+	# According to PMS this can be a space-separated list of version
+	# numbers, even though in practice it is typically just one.
+	local oldver
+	for oldver in ${REPLACING_VERSIONS}; do
+		if [[ $(get_major_version ${oldver}) -lt 2 ]]; then
+			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
+			ewarn "the server config file by default. If you use bedup, please"
+			ewarn "update your scripts to invoke it as"
+			ewarn ""
+			ewarn "  bedup -c /etc/burp/burp-server.conf"
+			ewarn ""
+			ewarn "Otherwise deduplication will not work!"
+			break
+		fi
+	done
+}
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@ -2,5 +2,5 @@ DIST xfburn-0.5.4.tar.bz2 773300 BLAKE2B f2ab2cfe344c9643036ae0be2c315ea16a993dc
 DIST xfburn-0.5.5.tar.bz2 819546 BLAKE2B 180f50e9dc8e9bb2372ac7335374b09eade93b6477e557b4282ee65705e55d1f391578343e3473061921cfe296e0da9dae0ddb8823fc5daadc673537331f3085 SHA512 37574aa7dcec65c26a8fd5019c3776196763fa1ebb0f531002f5bcb72a6eb0ec19ed994dd14726988766d890ef257c39c26e64ca3f5944386c03d9b54c26a90a
 EBUILD xfburn-0.5.4-r1.ebuild 1078 BLAKE2B dccfb90703ec234dc293692d91853edfa38aaa580348185eab85aab3e88cde5787c24bf14caf4f6a45e7f0eeb6dae2a9b9cf417194f5eaf7ae7a508c5003ed87 SHA512 ddabe0de2b0ad76d3bbbaf4e300ad623372e3fe6d201782786685ae2808e226ef3e9235256d5ee5b0e6699cde2ff52bdd9eb79b481b7e499ac9cf083af687986
 EBUILD xfburn-0.5.4.ebuild 906 BLAKE2B a3c92c9d02623f7820b8ec53032c1e16b5fb6b05d0a63de04861220d5b6f55dd7b2c74f88fdd46e617d4319641023708a945ea2e082cab6491fcabea00f133a0 SHA512 cb57838c9d4f135b77df6488a2c5996495b37fa907f3991d8e70ac4f29f7e7c44cb0b1b7a21f55f953683afce1792b4a337ca774a9c4c724cf763ea32c3ce1b6
-EBUILD xfburn-0.5.5.ebuild 1032 BLAKE2B 1b6780e0bc6238c36201d39a202aa29bc891bd0fbd28e72fa20f46b2db699f010b9fb4d7afb0a426512f635b753a3745799bd47776189a331b4e846c790f2f36 SHA512 bf56cba90ba252f8a630b99388f6898f93d2ffb2e79f3f2879aabb4932ce6928d1af6d9bcfd3b109b5cd8a492dc8bf54255dd82dd2f14d7f33c2a87bee3caf20
+EBUILD xfburn-0.5.5.ebuild 1031 BLAKE2B e5d724345fc25da3ed430732c86fc77e46bf224141813ace2f75bcb0f9d3a6e2698beb3d02d34b2c6024e7ce889027f8eb5e235a02e760ae09526e69fe0b84f8 SHA512 921bd8806fdfd83a5bcdb8a8cedba2b8859dffe350f92966e0bf38fb996c9de8f880bbd68810bc1518cf8a3eacb5fa8fda919d2629ebf8d7534886ae8be51cf3
 MISC metadata.xml 481 BLAKE2B 336b6da9e50fab974d5d320a93ffa10e24cb4621f13835e6a0fa86a95067b28e26fc3c9ca2e17eeecc69f0c842f98bdcebc273bc164cb26baa6b87f39f7c85ca SHA512 1ef204c9fe28b54edffac8132485e3bc326b0452a3014f7be50378be871621e62771f53810b441e4db18b657707e875b67fd2e1231609f62534adbfee2270fc4
--- a/app-cdr/xfburn/xfburn-0.5.5.ebuild
+++ b/app-cdr/xfburn/xfburn-0.5.5.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"

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

 RDEPEND=">=dev-libs/glib-2.32:=
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@ -3,7 +3,7 @@ AUX gpgme-1.8.0-cmake.patch 1216 BLAKE2B 40510d7d2b700a58f12436ae81c2b978dcff450
 AUX gpgme-1.8.0-gcc-7.patch 554 BLAKE2B b31ffa5f08203dd0b896c04b47b0cb0d4916c7170c87e5ab8bf45896058817668660a0ee1648f2111a3d8c73bf896df015b4b371c95a1caccc7450dfe0792017 SHA512 3256a04a7dfeb7b3b5a20765b6350454069f2a96d79c786326868513a8b87f5337084a0e2a5afeab0485257b4b360ba2fc9f56f08bbc0c102d75773ba83c44f7
 DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
 DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de
-EBUILD gpgme-1.10.0.ebuild 2609 BLAKE2B 80f21fb323ec7c00f0a241870b0be3b8391b51fcdb41d1dfe51f798d7a8687d65eed0edc08f1c7af696c5344f5f4d65aa99c2d8c820505a39f1548c7072f5e06 SHA512 63db50b7d3aaa52ad35235f98b7d708c4eae617e6dcbcbad274e2422d439595b6e6f211758a7dc543639d99f0fc22cb238bf187f910bfadf334b396058d6dc7c
+EBUILD gpgme-1.10.0.ebuild 2608 BLAKE2B d29d6a77fbf3939355e8d88049c58ddb407cf6943698fe0740ded8e21fba058dce26fbe4b43aea02608942383d1c66d7605fde4153acdbeea0cf2ac809b5aa46 SHA512 39b4d8b389716f61c609b71ca3f6759cf4dadd3053f0432dd818df18910fac6337ff7f46bd71552a7590d2bf3b6eda72ecf08a4fef38f1b830c6fb03690b8366
 EBUILD gpgme-1.8.0-r2.ebuild 2530 BLAKE2B f51880eb8800e66df6954ccb73e2e330f69ea553c52d187bacb00921306c8250204d14dbe748612cdd4958ca5728e1f80914eedd42367bf70225ec173ec32c18 SHA512 d1f5f1aad5bb8de38ff049084d81443c82fe88ddd720a5770e89fadb00d06094493d1911d033ebcd6ae8cbf1117e9b921465d0730b2a17730420895dd60c9244
 EBUILD gpgme-1.8.0-r3.ebuild 2682 BLAKE2B f04e23cf0773a36e380ad71e4603ec2b26583eddf25670946d4d05f134c18da8ae830cf0228417853ea97e4472e7284a87c3ac50099156de3b569961baa6827f SHA512 b6beaec93a62270d5e87b5f3798655ce3c48b3da65947904ec7667963ba39d28d9e032eb72477ff88ec68922c677b1b921daf2bed1de09c9f48e0c788fd394cb
 EBUILD gpgme-9999.ebuild 2787 BLAKE2B 264fdf2cc60ed4a87bf1ed7897a24b56e16a16729d96c00922fb48a2413e899209154d4587698436c3000ce1b575b590d5d5ad2215fe3d2808367e1629424c7a SHA512 a70e660dfc2740c339a6d28875bb85c58438d384adb439c779884ae3e1446042e8e59918f44fdc0a55be57b66848ca64532298d9d560069c7319506664191477
--- a/app-crypt/gpgme/gpgme-1.10.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.10.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"
@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"

 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"

 COMMON_DEPEND=">=app-crypt/gnupg-2
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@ -1,5 +1,7 @@
 AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
 AUX xca-1.3.2-build.patch 5871 BLAKE2B 5870a5b5a6331f33f43b303703ab4346bfc150af0bf3a5cd11a357ca48311abb35ba6d426a12f393a61b29e0edd53702856e7b986ac83b25741cd3ffdc08737b SHA512 1007fa6aa54273e1d279965ea41945063288eff72622325bb61086b288234fcba45f962ced77ddc037f1a64838204614b1a15b1b47d8d7a7b7699374bd54938e
 DIST xca-1.3.2.tar.gz 897947 BLAKE2B b12cc95c908187d78304ce93111c89bb8e0dc01ecab37e0ad1bd78f84a90ed9f44afa4ac35d22185b7018e238b476e496fca3c2b3a240bf654d2e5160e784b11 SHA512 f0a9c4d47f0c20632f44364cc55293a7d2152772a746a72bc4a46622da4e48ae612bafe918c098a71c29cdfca8e6c03c27cf85a862ca0f356eddf061414c89b2
+DIST xca-1.4.0.tar.gz 940245 BLAKE2B 1f0c9d72b647fa803c2b6b6019b0b9828f37b1d38d89838ac6102d560b1c930c0f962e9064d984540b0c8e14d7546529af978673955555283afa1f089af7ce7c SHA512 b220adc7551cf853037c4f5ef0cdd8eef1dda44d0fde634cfde35605396b988452bdbc97a60459911f663d6d6977d426f27f47a46a482d1a30331ac06862c1c9
 EBUILD xca-1.3.2-r2.ebuild 1107 BLAKE2B 40eaa44f511936f3be91eda8632bafba91511e9596e0fffdca6f53acf75e2fe11d6725e136cdc8c5d1fcd1bc4ec467dbb26f5c29ed9763185447c5ebbf59a6d5 SHA512 9379423c902b218ba5b7d60de2d8074c05e7a65a2223e723429ae47f4ef491b215ab3c68d2204f80b9d88a16207b4b30c993735e73d0ff2f5ed38b4588190de4
+EBUILD xca-1.4.0.ebuild 948 BLAKE2B d1cb112f8b1214c346f612d4c63bbc1a456a29f2a5bb57d8f86148fcad51ee4e74ad8871263f45618ee4bc1b894926d4a0576abe4d3c7b20269fc3d1e761e6b1 SHA512 31929fba97fa0a3c4c74849ecd23cfa56786cbd64af748cf4e521f534fb4a613013016dd271e81d6f2632464987359ed6f026be2d1f01f53ddc531cf225968e1
 MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
--- a/app-crypt/xca/xca-1.4.0.ebuild
+++ b/app-crypt/xca/xca-1.4.0.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
+HOMEPAGE="http://xca.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="bindist doc libressl"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	libressl? ( dev-libs/libressl:0= )
+	doc? ( app-text/linuxdoc-tools )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+)
+
+src_configure() {
+	econf \
+		--with-qt-version=5 \
+		$(use_enable doc) \
+		STRIP=true
+}
+
+src_compile() {
+	# enforce all to avoid the automatic silent rules
+	emake all
+}
+
+src_install() {
+	# non standard destdir
+	emake install destdir="${ED}"
+	einstalldocs
+
+	insinto /etc/xca
+	doins misc/*.txt
+}
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@ -1,7 +1,9 @@
 DIST kicad-doc-4.0.1.tar.gz 23365382 BLAKE2B 61f67aafab84f9bbe5ab3b3df85b2a7899638cf122b03cfeb5cd277453d6a4ec6ad0c1c029978d8b0e20136af6aa27747e32def3b33a47e1697527261b503604 SHA512 ae57a9c29f3cd4b3d85d4b7d7bc940957c33b0e1c1404b82c8a9261695c0670866cb4a95ab7ad5c35b1faa6fbd3969f277467fa7d33e38e728a3dd9b65203021
 DIST kicad-doc-4.0.4.tar.gz 33705865 BLAKE2B 191865f4a1956424bdf661bfb968bd6fb392af48318dd097d71e04495688ff2aa38476195fac07a6b8bbea92807fd2e51c056bdc88fadb907c0656175405f6ea SHA512 97a45ebbd11ab7f92eff1409bc03512b7685fb4a85dd1d87675e92742cc6672a1332c5fe8d63577eba93ed976af1bb4acaa461dbada5e4695a161cefa82c9ff4
 DIST kicad-doc-4.0.5.tar.gz 47074652 BLAKE2B 09efb1d4b950b8a445d017fbc388a450315540a5c5c49a17c14146b75b48e163275d34985417957dad17cf393ed9d7bc468420f10966c5dd1583c40e6a500d9b SHA512 2705d5cb92ba7ae5535bcefc89016fbbf6b7936b458b3ea06446177285fd4a2d93cbb54e042d9b1e8953ad3e9c56e817f5729af956a7b1435d53a7c085da1bdb
+DIST kicad-doc-4.0.6.tar.gz 54215880 BLAKE2B e5667e804d2bade606fb982baad8c04490bf7fed5706aac203b7761ec714d9abf7c610fb508ffe216c688b69714c1b3d796c553e199c54b9218467e5d39ed4ac SHA512 14e7e2d60f3c7cd71de9a534628356bc01571dc62338926b6691fdf8107d77433c027ba82ec736206b3ae01a641a0a40f763ec27a06d80b76a7faa8329633ef6
 EBUILD kicad-doc-4.0.1.ebuild 1702 BLAKE2B 25e9163660ab32e5350156eb99954752aed0723d93245d7770e380a266f327d42c87efd348de3f2547431378d9c34bb1f6c1a9629a1bc5b762dd9139dc1b0084 SHA512 b8c97ced49eec28a58d1aeb6c5ed8c97ad345ec46ddb987db2cb4b9db1c0c87d9ea03fde5c5a9aa1a912e8e6c03316d150675ab534ac81eab274d121f68980d5
 EBUILD kicad-doc-4.0.4.ebuild 1713 BLAKE2B 22c4ccbcc9a1bbe3f85fda803ca5d5ea965c774056a6cc7ea181a1800a7f534dce6b9629f3876f75fffc63babd9b5b7dccfadcf657d7b683fae9d61640e9ef11 SHA512 9c90258b230aae7fe88df026f71597a9361065fdc6b11a1691d373719d7cc7e0b3cd416e03ef62a422273d7d8ae68b0783e9445cbbf4c24c148e27f312a1b098
-EBUILD kicad-doc-4.0.5.ebuild 1590 BLAKE2B daca625ab07fa9ae0c05d81a620daea11203b8dfa70bd25a303326e9d9135aa9d37075f812b6558184c18b6ca2380a15330c47beec85c7f5f24af00afff8edd0 SHA512 accfeb229c26b98c5cbffb81b8725e089c504c66726b24b8ada563af0faf232d6c4175f6f3da230eb37a39f29b1c104104fc1f24427283ba109106d8ba90c86d
+EBUILD kicad-doc-4.0.5.ebuild 1599 BLAKE2B c7e154d4c6c4524e7c829cd45c73c1a9c3b8c4f004ae07f664f35a38645cab4681a7a3c20b73275df85648b646dec2c31a5ad011b7b31f9512e2199d3cb007f3 SHA512 238958b3496854a8537c92aa442f19f63e0c9fde6fc130c21456ac4c0a44000c5cfd0568265d81f60362bbf7a53bc2534fad88605c0f473dda56fa74714c57d9
+EBUILD kicad-doc-4.0.6.ebuild 1189 BLAKE2B 11d17858b76064e3647c3237bb2d3ab33e9c6edfeae9e10d98fb2a79926d63ec8a278b548d0f5079ecf43ce105c0d922e1e7305a1d0b633e295175180eb44476 SHA512 fd175c78d99afe8db250c3fcb4ccb55fe5122afbc9e271b483b534a832bf8543de2bc7a2dc3fda09753f03867c41c2358cb9ae93db1aa88484faa320258063f0
 MISC metadata.xml 890 BLAKE2B 5fbea37f58fd50df5e9c124b4f687ebced1b0318d2ffbeeb8dec0e731a5b5b04b27cc80d8dc3028440c9292fe20ced77970d4375f1fd63acc5e63bb0ff673995 SHA512 2fe7617f6baca7581537138269fc03dc5c1589209b8e98da4fa505b45df66896fdae14861dace8f3f0d4dc453c6a616d5fec728447c7fbef1233615f502388c7
--- a/app-doc/kicad-doc/kicad-doc-4.0.5.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-4.0.5.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
@ -23,7 +23,7 @@ unset lang
 unset LUSE

 DEPEND=">=app-text/asciidoc-8.6.9
-	app-text/dblatex
+	>=app-text/dblatex-0.3.10
 	app-text/texlive:=[l10n_en?,l10n_fr?,l10n_it?,l10n_ja?,l10n_nl?,l10n_pl?]
 	>=app-text/po4a-0.45
 	>=sys-devel/gettext-0.18
--- a/app-doc/kicad-doc/kicad-doc-4.0.6.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-4.0.6.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools manuals"
+HOMEPAGE="http://www.kicad-pcb.org/"
+SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="html +pdf"
+LANGS="en fr it ja nl pl"
+for lang in ${LANGS}; do
+	LUSE+=" l10n_${lang}"
+done
+IUSE+=${LUSE}
+REQUIRED_USE="|| ( html pdf ) ^^ ( ${LUSE} )"
+unset lang
+unset LUSE
+
+DEPEND="
+	>=app-text/asciidoc-8.6.9
+	>=app-text/dblatex-0.3.10
+	>=app-text/po4a-0.45
+	>=sys-devel/gettext-0.18
+	dev-perl/Unicode-LineBreak
+	dev-util/source-highlight
+	l10n_en? ( dev-texlive/texlive-langenglish )
+	l10n_fr? ( dev-texlive/texlive-langfrench )
+	l10n_it? ( dev-texlive/texlive-langitalian )
+	l10n_nl? ( dev-texlive/texlive-langeuropean )
+	l10n_pl? ( dev-texlive/texlive-langpolish )
+	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )"
+RDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
+		-DSINGLE_LANGUAGE="${L10N}"
+	)
+	cmake-utils_src_configure
+}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@ -6,8 +6,10 @@ DIST vim-8.0.0386.tar.gz 13000882 BLAKE2B c38c1b75334cae916f76562ec5a06d59c4f2df
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
 DIST vim-8.0.1188.tar.gz 13363260 BLAKE2B 545b2d6e8322b27967c974bb960f4e5ea2c6811d2649ac4c008eb8e6af78fe555a035657704af40026f96f12f83e3cebe435e90d21d7da87980446710424f79f SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b
 DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
+DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 EBUILD gvim-8.0.0386.ebuild 11569 BLAKE2B 2e9803cd0cad4f6d9ba86f7a4f9242a1850c4017a1b7cc894ab57d9c450f173d9f24f7deb2a2f7c26a4598bfb79d2bfecfc29c777473e0759c6e89fcd99cb5d6 SHA512 93d54860172f0e8caf22d129d55a26276e4ba0d68f91c74dcc969fb2f738f3197ee77de983d65c9533029a04e0cd74fbefabf6802ecba6bb0d4ba0807b68783c
 EBUILD gvim-8.0.1188.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
 EBUILD gvim-8.0.1298.ebuild 10472 BLAKE2B 06445daf6e99a9acf9ffdc9e4f7de0cfcfeb0c14b327cf48f57d13301e0ba98987713fd8edea9c6f973cdabe73d5f17d55ca13b87feee7b2289043ebbc0acb6f SHA512 dc6700fbf59921d13b24787023493c1c0617ca783e3d961235bfa43b0e7aca13779502796dd1621b14e9b87330a62e944b1cb5960a8c682ec221cf1ae422b65f
+EBUILD gvim-8.0.1428.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
 EBUILD gvim-9999.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
 MISC metadata.xml 675 BLAKE2B 4c96806a5744b61f168512c28512c9c6114ca42522ff8ed266cb14c5e16ef538e4de8aa15ce233cf1044f98dabf27c6654592eb296e4a83175940f88ddd4b1a3 SHA512 df75c9e935ae47b8961c8b6b984483b8032e39d3833ffcf4784e2630cea870579d45ef5f104b71d6b35f4128ef689394edd72510fce82a76e596749ce69d835d
--- a/app-editors/gvim/gvim-8.0.1428.ebuild
+++ b/app-editors/gvim/gvim-8.0.1428.ebuild
@ -0,0 +1,371 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE=threads
+inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk3? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk3? (
+			gtk? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+				gnome? ( >=gnome-base/libgnomeui-2.6 )
+			)
+			!gtk? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--enable-multibyte
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python pythoninterp)
+		$(use_enable python python3interp)
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk3                    GTK3
+	# -aqua -gtk3 gnome             GNOME2
+	# -aqua -gtk3 -gnome gtk        GTK2
+	# -aqua -gtk -gtk3 motif        MOTIF
+	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
+	# -aqua -gtk -gtk3 -motif -neXt ATHENA
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk3; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk; then
+		myconf+=( --enable-gtk2-check )
+		if use gnome; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=( --enable-gui=gnome2 )
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=( --enable-gui=gtk2 )
+		fi
+	elif use motif; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Call eselect vi update
+	eselect_vi_update
+}
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@ -1,5 +1,3 @@
-DIST kile-2.1.3.tar.bz2 4911212 BLAKE2B 5cbfb1853bdb1f35c8e53988265a7a1e1181b27f40aeed59524736195d568e42ee88ee17215c3ed83eb37c8ec3f67a29dea141c0c7fca31c0be444b975c64df2 SHA512 820cb5e2579f243ce87409aa4d483a58b0a2cf1d86bff72dd12264570bfe72e7819c88aa4333080f8281e54e8315e2c11f961b41f13a6215913dfa4f7bd3feda
 DIST kile-2.9.91_p20171209.tar.gz 3624273 BLAKE2B d6e4798869b8f5be7a2a6b00b1b067957245373f560a7485334ce1f3f932670a0cb8ef0b551fde2eea1d54a6114e8405025dbd3daea587a2d30b74fe614d332e SHA512 b7e4a6e434057cf04e8712f543cdd74a40659843b1e2777d0a031b5a665e1de34e36ec9b3f5d9bd3bf9202f9dca8595fcee9a81ab4875bc4b6da3a2fb449b2c6
-EBUILD kile-2.1.3-r3.ebuild 1183 BLAKE2B e3dadd6f03a2465b4ccfe758947ef427fc0dba310b8f6caabed93eac120e26e20fb66ceca7aa34b27c1945449d0b4ef0ed085a264c1e645f9f69bd5433432c3b SHA512 9573fa41fe2473170ed5651e0c8bcdfec792e7f6ce8327c957589e7b1fc4641d9c394f76a78df55765cd08a3a51bf8eeaf2dc18c572efb2250ad7fd4b40bc57f
-EBUILD kile-2.9.91_p20171209.ebuild 1740 BLAKE2B 58c02de69fddbb5ac183c2e7bd3309412901a4957db4aa5ce89769af33eb7d9b7548c46b2e506e2ef60db2d0fc42520eb4073fada9fe1343d06a46997cd39270 SHA512 5207cdd83de46a0d453b4b4e150bd1f6b5ac306944d80597d7b70ffc5f95047920e9a7b408234ab57580663b4a9d67183f56bdc0bca4a1f677f1f48b965dcd62
+EBUILD kile-2.9.91_p20171209.ebuild 1739 BLAKE2B 59439791d21b9386155a91dbde14e3717ec16d12c2e433f8bb995f239a0bf45db1e6d39374eb148d4a57096ce8949c309ab7bb29760c72314a796e7a66847e7b SHA512 572707b747dd38b3e6deda8a2fdfc651a95fd7bfd698b51da1ffcdd87cbd147eaf6cbf6cccbfea1f2c4bfa04b45ea6b59b18547cf8f48f39c12fd19c28769b76
 MISC metadata.xml 476 BLAKE2B a152c0446aad3c66df2574332dc89f6797a16db142daafc82c3845f159b68bfcb922615f5912429d9965141ede27945512e5af1f5811ccbfa761026cc105b4b3 SHA512 82eaa93d944622e571887200fc50166b34ad4098ca2612749e72fff4e80f9f3fa07736cb8cd171fe3258fcd18209f7e60b01c859ad3cf20e4e238eab9dc3e486
--- a/app-editors/kile/kile-2.1.3-r3.ebuild
+++ b/app-editors/kile/kile-2.1.3-r3.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DOC_DIRS="doc"
-KDE_HANDBOOK="optional"
-MY_P=${P/_beta/b}
-inherit kde4-base
-
-DESCRIPTION="A Latex Editor and TeX shell by KDE"
-HOMEPAGE="http://kile.sourceforge.net/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="FDL-1.2 GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="debug +pdf +png"
-
-DEPEND="
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep katepart '' 4.14.3)
-	$(add_kdeapps_dep kdebase-data)
-	$(add_kdeapps_dep konsolepart)
-	|| (
-		kde-apps/okular[pdf?,postscript]
-		app-text/evince
-		app-text/acroread
-	)
-	virtual/imagemagick-tools[png?]
-	virtual/latex-base
-	virtual/tex-base
-	pdf? (
-		|| (
-			app-text/dvipdfmx
-			>=app-text/texlive-core-2014
-		)
-		app-text/ghostscript-gpl
-	)
-	png? ( app-text/dvipng )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( kile-remote-control.txt )
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# I know upstream wants to help us but it doesn't work..
-	sed -e '/INSTALL( FILES AUTHORS/s/^/#DISABLED /' \
-		-i CMakeLists.txt || die
-
-	[[ ${PV} != *9999* ]] && { use handbook || rm -fr doc ; }
-}
--- a/app-editors/kile/kile-2.9.91_p20171209.ebuild
+++ b/app-editors/kile/kile-2.9.91_p20171209.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -12,7 +12,7 @@ HOMEPAGE="https://kile.sourceforge.io/"
 SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"

 LICENSE="FDL-1.2 GPL-2"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+pdf +png"

 DEPEND="
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@ -1,4 +1,4 @@
 DIST mousepad-0.4.0.tar.bz2 578483 BLAKE2B d723ee7dc721703cfc46ad359dbf37c676ba12db4c8f4e874e1578b203a1f35cc077229ccbc9950b82e1784042f191018734cfaa09785b6b602388011db4a7b0 SHA512 5196abd04268d1ace118dc485b72bfcfb7f9175eeaf52bc97c08c1646371d26401403a3bb199d882380bcb998547c65af9bd054f0365afd846c0ad74d3c3b1fe
-EBUILD mousepad-0.4.0-r1.ebuild 1040 BLAKE2B e0dd7831b2c06501649edb5e4f15172c43b0c15a9eb5fe9aa95a60a8d147447f001a0a964edd2818cd5668226d36997b95e82967286b0b8f9b137075af1736ac SHA512 28243bed58f86bc954e39fbec0e911e9691d559b75a91d74bb3be37913c637a4733ff84ac1594903e787b551202f04b93e86871db904c60b8c738d6ce76a2cad
+EBUILD mousepad-0.4.0-r1.ebuild 1039 BLAKE2B 1429c533eab3c7e93e9fca9ac4f41e37a66af558827a6b4d5bfdd56338d792d6047114cbdb73196ae94743808d86acbcb7c402a130eac4742bd8a39944072814 SHA512 3fde3b78f86f858c5522695f7dbfe21c1ac1f708f177a6f65d896006b7ddab2f4ce443788f831c8fb986bdb15e89085a884a5eb4057e6c4c6b717349e7cc6bc6
 EBUILD mousepad-0.4.0.ebuild 965 BLAKE2B 2e25aef980fc01270e16ce5a3403700c6fef7014a0f8c5599e91dd5b368a65b6a5f834dbd41ebebcfaea54bd04bff63fde1714c3609e84c7693e7442c2d65343 SHA512 4ed9ee026c2334e30f8996ee6863e592f5242f750afc4b17c61cca669b27e5b06da6b208b4fc54644eef60c72b8849da33a914ecc8fd0dde9a945272fcc749fb
 MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
--- a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
+++ b/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"

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

 RDEPEND=">=dev-libs/glib-2.30:2=
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@ -4,7 +4,7 @@ DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c
 DIST nano-2.9.1.tar.gz 2839465 BLAKE2B e0d443dc3c86446478edad73042c6b4698a86fdfe3727deac858fa99d52bf319e2b3a120ba57bf79f3b78d9d3d7e8f4b5bdee234f6450882fee06647be371191 SHA512 7eeefd4cb5f02f1ac14ca10c536f873a1a85f3a5ccc5d5c40a12770b26dd0d5b0bbb3a0770b394779c8234891d7226e0d06d72465d7687c971bc62606100d0b6
 DIST nano-2.9.2.tar.gz 2839256 BLAKE2B 6e27ad0ff72a17461d614f2222ef33bf2abaaa0f4576a8e378524b090c702adafa86e78d976cf5b5dcd2ca1da802aeeff9b3f4bc5e81fa31b8164ef2979708d6 SHA512 b45afb593a04029a137f49551242f2dae901482878cca4aac6cba1c0c8af38a83994daadbd025e90f019cfa9d1273784de4491bbadf47104914904af804661d1
 EBUILD nano-2.7.5.ebuild 2281 BLAKE2B ad2c9f6a6b66c74e309022de21f0e233af8e0f091d7be79843753b244509c98e5c7115b3dfcd42566d2d3da46c1856a72dfc8da96399ad5eedd3a3d73395ecce SHA512 65c76d2744ad7bfc0fca1b0c9dcab041777a542c921f0526de18251b64bf32d12fe71fb8fd050eea4da074b56c12f0086036065e7ecdda4dd5b66b06382d81a0
-EBUILD nano-2.8.7.ebuild 2332 BLAKE2B 0a98df04fa22d392153fc07e29c257191111d5be195da16355eb27a22dc789c744462d0b09ddf0cf061f3efa714188d7784f0ceaff7f888bfa1bf536d225c3fd SHA512 9ba6668cb8a0de5e83b0e57d966a83ad7c10636835e92349ebd15bfcaea7aecaa431c71dfe743c7345b8a53b9a640176d68f323c9e5f86978ef3b67d2afd5bc1
+EBUILD nano-2.8.7.ebuild 2330 BLAKE2B c9e16f91e508783e34d528503d4638c0c6c7b97fcbb2ebd0fc288f5c745dd3f0c4375249dd72bf8384639b380e8029f31193991320b71a5677a3ac1ec00a4b28 SHA512 cfa1e8ce464d9efc695a5e2686203eb28e6926d205c9607c30bed9c217c84f32e6b0c0e102332fed50cafe91dd7fb545ef0e8675a97abe27316cd3c48372175f
 EBUILD nano-2.9.1.ebuild 2265 BLAKE2B c47ba305fd6dd42749764ea90bfc9f5b5482b7a5eadea6c179e01f082657398bf89d586f17f0e3eec23df78f6d4d76038017314905acb06cda870b4b80dbd471 SHA512 0bd91b9afea8c8f6592e84047870098c9948687d516fabf8e18be5fa8a2690db0b76f96fd45aba59743dae4cb6630fe2b76825628f0b954550ff95de3feedcb4
 EBUILD nano-2.9.2.ebuild 2265 BLAKE2B ae9bada0b50e6cce6d136e56cdaed2e40b2b86564a5f6367587f19690641cda8431d6399c5ed959c16acbf859edcdae51eed961cb57729644bf39514271dc71f SHA512 05be72b2e1dc44db6211f154165dd6268fe51bde7468ad3f2c2628bbdc161fef47e90672f43a0200048134711fcb415e6da3386dfc601b8ea052c33277cf8cf3
 EBUILD nano-9999.ebuild 2265 BLAKE2B 678ff8f900f19d4879d857dc2f06a99edd0db894cef8d78abce94fce25684930cce93c0e9822d693415b5c5a5ca87217c4f6ff7b0da7ee4f65312eca5c9a6cdb SHA512 9d4902c001632ba5139d4dc14ad8faba1f1bd133c85092682376ec8835c5b491fdc2cdb1abda2aca311fbc57e72b93ab6f38923e067c744e02c6ee6795357d9e
--- a/app-editors/nano/nano-2.8.7.ebuild
+++ b/app-editors/nano/nano-2.8.7.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@ -1,22 +1,7 @@
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-DIST neovim-0.1.0.tar.gz 7644722 BLAKE2B 81364b998c697e7f1ccec5c66c1de04516f275469456b77da54582bfb1a8fe1e196db7dc4e730d75adfc266524dea9928a6379c6020a35696a1c550ebcf04b18 SHA512 b91e5ce5561155ecb3554f56fd4371219612ed3bc35dfeb60a225eb1dbe1473fce5f573eb996bdb01fd9569f764da86493108665c98dc7555fc44f410befb00a
-DIST neovim-0.1.1.tar.gz 7584560 BLAKE2B 3ed242e83d1be5cb9afd0da89643decebd1cfd68aca80a2daf3a379c942ab48ba6a46df3fb90e196ea8955f9e0cef686d2476946e86c757da7e8e368033fa497 SHA512 7098bef9b81862f009789cff49a063d56d52d2f5c74e2fe68ad65c952c61c07eabeb6be150b369a5a179957f20187de3051caaa30b1e0cb4ec1e9e49b4e77333
-DIST neovim-0.1.2.tar.gz 7610804 BLAKE2B 186dd73c16c49490ba7d3c520f983d4340d14284dee1ab125f2d3f65e98a4e7d558513a8f938fed5b2ff003140ab493a5f85c41d337257e1f13b7550309d501e SHA512 dc03d92ff296f3ff55225d514479f1ac201a5a65eb8a6c02e71935ca44feb8ab15897b26a2ea46e53771f902c57b027d07e02f95673268ee060c6b77c4aa90e4
-DIST neovim-0.1.3.tar.gz 7636777 BLAKE2B a39ffd668e5a69914062415aef6b1c4ff4f1093b9519432fcb6284798a425f95c0dc589ed71f5168163b72dd32dbaab9ff4443f80b98dd781b5caa8eb192ec6f SHA512 70c979fa06784cae4ded43c7fef7906c743729ed43a50003deec1d2ab7a800bfeab81c394893796a06d0f37811867062b2f766936c2a871f7d968b350729d4c8
-DIST neovim-0.1.4.tar.gz 7678847 BLAKE2B 3204cd3859cb45bd360cc18e783b15b8be1621835c5d66b5c726c38279f806abeefa4b6dcef00cc5b408eddc8af1d68373d1dfe626e52aa8c500570100f91e6a SHA512 e96e768703e4b842355a7543e5c9980b148b9b10cd032570fb420e3e1207102f9769fa6d36fba1d263ed9333d339eab387a196d4a8f724d89db2800097b89d37
-DIST neovim-0.1.5.tar.gz 7813974 BLAKE2B 244633b131b86a15bee13abf003ee04d5c3243d1d6af21ff6374737d6cdead85a956c5e994451484a205f2da0b8b84cf7b152f064200d8691c642581a6b45d94 SHA512 3332b151d23b4f2b133b8f30f4af41686f7092cebbc7ab402b742be7b302bb6acbe9a01c2f475caad8d14a78dd3570109a5c447ab31f0b65ebf442631a31c6f9
-DIST neovim-0.1.6.tar.gz 7810818 BLAKE2B c36cd224d767687b07c187940033fcbabb00f4b0a2ed2fc1838aadbeeb5acbf0c729c42ab0f82029fa2dc10b997e69f3ec2e85a01500f11380160ad9202bbba8 SHA512 360d69bc11a3cb7b2c203adc7e76edad736b1a2fb7033d2d0c6444da168053ea0b621daf7978e9c158e14c5e04af8599005bf5eb800d9d1776007257b0e0e56f
-DIST neovim-0.1.7.tar.gz 7601279 BLAKE2B 473665470740256fd9f555b3e85901f19a1800c68e2303f5fbf062bd5961f2735c6a836a48d6616e31c56ae97481d461e299bb358b7658ffea1a1b1b9c2147dd SHA512 f7dbac4b2090fbf9764585ebf147c529b655d6e30cca9404cd161e2bd78f3aaa2f714d86a8c3efd1935dc92363757c381833d0059043807db0bea3db2fc6d10c
 DIST neovim-0.2.0.tar.gz 7846467 BLAKE2B ee929122b3855ccab6247a0e8ab975b09d77e1034229ea324ed82ad705cacbd39f55d2fa96eea3f3677c7efe64c69ebecedd5fde09e508a6fd23acb6a1f5b489 SHA512 fc4be03c5bee1c9928376938679f9a900f3ee2e58df817d1cb9b5af51350dccca63a7638114b0326ec4565a047faaa4b50fecfc932c1d59ee92efa54625e22cd
-EBUILD neovim-0.1.0.ebuild 1871 BLAKE2B 74bd4e4d31951e6fda8519048fa8c2975f3e63024922d60e61d8f4f4700e238748aaaf2beabbbeddeef569407ae02c02766fb078fedba9d62de9e0132d0b10a2 SHA512 fc9713e49aa3b740107f5767728d0f399c9ef038eedcd3efb920cda965bb0a86b9bddf3058ec4e3b6201e450082499e85936d71b65214d15c4327d4e15844414
-EBUILD neovim-0.1.1-r1.ebuild 1866 BLAKE2B 88fdba33284a52847db34a6b1c984df2d7fbffcfe95cbf1b1cd6427e48da99c04d30feb2de775a443eb27f2f8c1e7c981bb042d8a24c13d90d403290d7299bf4 SHA512 03551ea2585738b51c26be872ffd0534d44da1089adbd025c51f65fb518f7fe9da0f2c099f9cde8b9d69a8d3980009f4a1d420e873add1721b23685e89781bb1
-EBUILD neovim-0.1.2.ebuild 1854 BLAKE2B a15e24d757789fc1c2236d6c91b04a5de0dc2f3b36367469d0aa4ce6b02ba9b22bdb126785bf4d074e2da28e02dda78dd5605a5277f19c6466d6867217e45d7a SHA512 64856d802ff90f8c933d6c9f2c36b8160ab7d44169ee7c6857ebc642ca7f81b278b91de7e32857a1f7dc575ee958c93adef7f9776f5604b58f15c3d75e1cdd5b
-EBUILD neovim-0.1.3.ebuild 1747 BLAKE2B 6b000d4496203f82ab25c26b340faa223b710ad042ed3bfaa341ce9ee1b4b21aba65f248eeb4913eb8f34f8efd9fd4c5e8df45a6c508030d7696b993eb6f54aa SHA512 2ce69cccdc4ad2d5abe9329fe03df01552fd600b066e68bcf8b4b1d11903e27c521d9f0ed3b02e9cf34dec965e146f603087e1bc8a1008fc288e7d8557b36d59
-EBUILD neovim-0.1.4.ebuild 1757 BLAKE2B 3f7d765a39f400ab2ad6e0d7439be0310944a205280479ea3225c161524a41d5aecc545bf4c825db1210340356559c522673bc2226d3c802df23d64b491ac6ca SHA512 fc434c3dcdde97b531b4f247146f237aa32704f8129408643a5e0dc6d77a756ca8cd549bc44452d50851a1c26fe691ee4699c26a1166260c26c9827e9526252c
-EBUILD neovim-0.1.5-r1.ebuild 1776 BLAKE2B e240fec11a11315542ef8e39f092e0131d484205578342e1c7dd17160e62a3a6cb61ea7fa0eed5b84f29a355995d6f729fd1e7f080d1ce1cfc0016c85e6ae052 SHA512 6eb3c152fbad2c6864203da0150f6f837b4414f0b02096740720ee758276698bb6c21549da38c81fcd933005acaccc759af05133e5856e6c4cf78f877d2781dc
-EBUILD neovim-0.1.5.ebuild 1797 BLAKE2B 1fe1eef04d9b3ac9ad8a494e91797a4667400e3140ac8ca1d077dbe7a560f15b2a5cb2bf6150dd98935bb531252c8048d35a28b5375b0cb76b1efc033e1d7792 SHA512 613a4e81f62f1a9f15edef436f7b4263a91229d4baf448783edaa73e9b80248f0ac4772c3aac84c58d82800bf64f8c6c4fff3405de42c0db13195fc19ea20bd6
-EBUILD neovim-0.1.6.ebuild 1776 BLAKE2B e240fec11a11315542ef8e39f092e0131d484205578342e1c7dd17160e62a3a6cb61ea7fa0eed5b84f29a355995d6f729fd1e7f080d1ce1cfc0016c85e6ae052 SHA512 6eb3c152fbad2c6864203da0150f6f837b4414f0b02096740720ee758276698bb6c21549da38c81fcd933005acaccc759af05133e5856e6c4cf78f877d2781dc
-EBUILD neovim-0.1.7.ebuild 1776 BLAKE2B e240fec11a11315542ef8e39f092e0131d484205578342e1c7dd17160e62a3a6cb61ea7fa0eed5b84f29a355995d6f729fd1e7f080d1ce1cfc0016c85e6ae052 SHA512 6eb3c152fbad2c6864203da0150f6f837b4414f0b02096740720ee758276698bb6c21549da38c81fcd933005acaccc759af05133e5856e6c4cf78f877d2781dc
-EBUILD neovim-0.2.0.ebuild 1776 BLAKE2B c122b202446cfebb3e403eca0bbb2e3db92d82b5c2267781e96d7c6972b8b3d4b8d1558acff47a0271588977e2a618c4e48293899e193884df6cda1e388895b5 SHA512 9b85850a47b62f7098e7c1b2a70c3d49ec8ab462a32d7d62666b930122c2ab323be5e284003b249be1574d9b9fdc6ea1b5477b61f0ea9677eb1394724a5ee54d
-EBUILD neovim-9999.ebuild 1776 BLAKE2B c122b202446cfebb3e403eca0bbb2e3db92d82b5c2267781e96d7c6972b8b3d4b8d1558acff47a0271588977e2a618c4e48293899e193884df6cda1e388895b5 SHA512 9b85850a47b62f7098e7c1b2a70c3d49ec8ab462a32d7d62666b930122c2ab323be5e284003b249be1574d9b9fdc6ea1b5477b61f0ea9677eb1394724a5ee54d
+DIST neovim-0.2.2.tar.gz 8325879 BLAKE2B dbf43c5927b8c8719adae9a3f73c57429de47f1b7c7489a118b7467df2f0d32cd02df8e10889727b4dd77fe8b4fb4f95520c678d6775d5d908705770a47cec0c SHA512 5609defe86ac98356f1b9ae9adc6049bb4df920a9a2ae3104f761d52d4dd54cbc84d2596231595dd9b0aa97201fef2121e6c5c86a19267ab6b871dbf4b568209
+EBUILD neovim-0.2.0.ebuild 1802 BLAKE2B b28c67e67b6fb793e1d589d844b3b04117974036d908a96aed3b7ab0e8893f66d742af71d235907989114b9df0b8d98cee52d8a6b4ee98214a78abba2837dca2 SHA512 719e37a3304fc08980a37021b49667dd5a53a4963c479e1f60136d88455ae6c2df7ab669f2354a8d974bc49dd218c116377cc8c5128a1b29473d9735de7c6946
+EBUILD neovim-0.2.2.ebuild 1802 BLAKE2B b28c67e67b6fb793e1d589d844b3b04117974036d908a96aed3b7ab0e8893f66d742af71d235907989114b9df0b8d98cee52d8a6b4ee98214a78abba2837dca2 SHA512 719e37a3304fc08980a37021b49667dd5a53a4963c479e1f60136d88455ae6c2df7ab669f2354a8d974bc49dd218c116377cc8c5128a1b29473d9735de7c6946
+EBUILD neovim-9999.ebuild 1797 BLAKE2B 8757b9202080cb83c496ad23abf00bba1236e6b7285f6fb943925b92e8cca524751fd3680d3af7b64a69d4ff758c638a66aee37c014d3443d3d4f08aeea43f06 SHA512 c11b007009324353e8f1e8ce56c41299b4cf3e0a9b5f38df12b7469f409432763f4af49920409b7b86161b8cb7a03369bec551c0f32120e0c3d93df5fa038c52
 MISC metadata.xml 748 BLAKE2B da762c7f4f1703b28f8720651f3e148eb8921546c20c258a303e175c5ca0ebc276d0d2bf9a660763a58c7ec5b603d098ce0b132e737648cc2a3d7360044d4772 SHA512 6c03ebda6086660d862bfc7bb863e5602f91b5e1715a21c0776c49fa2efd6ab9fbc540e757d858c52dd35a9597348a19c5f0b2f04858a399fa26ed4f41854235
--- a/app-editors/neovim/neovim-0.1.0.ebuild
+++ b/app-editors/neovim/neovim-0.1.0.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager perl python +jemalloc"
-
-CDEPEND="dev-lang/luajit:2
-	>=dev-libs/libtermkey-0.17
-	>=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-0.6.0_pre20150220
-	>=dev-libs/unibilium-1.1.1
-	dev-libs/libvterm
-	dev-lua/lpeg
-	dev-lua/messagepack
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-python/neovim-python-client )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/os/unix_defs.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	# make less.sh macro actually work with neovim
-	sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	local mycmakeargs=(
-		$(cmake-utils_use_enable jemalloc JEMALLOC)
-		-DLIBUNIBILIUM_USE_STATIC=OFF
-		-DLIBTERMKEY_USE_STATIC=OFF
-		-DLIBVTERM_USE_STATIC=OFF
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
--- a/app-editors/neovim/neovim-0.1.1-r1.ebuild
+++ b/app-editors/neovim/neovim-0.1.1-r1.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager perl python +jemalloc"
-
-CDEPEND="dev-lang/luajit:2
-	>=dev-libs/libtermkey-0.17
-	>=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-0.6.0_pre20150220
-	>=dev-libs/unibilium-1.1.1
-	dev-libs/libvterm
-	dev-lua/lpeg
-	dev-lua/messagepack
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-python/neovim-python-client )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	# make less.sh macro actually work with neovim
-	sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	local mycmakeargs=(
-		$(cmake-utils_use_enable jemalloc JEMALLOC)
-		-DLIBUNIBILIUM_USE_STATIC=OFF
-		-DLIBTERMKEY_USE_STATIC=OFF
-		-DLIBVTERM_USE_STATIC=OFF
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
--- a/app-editors/neovim/neovim-0.1.2.ebuild
+++ b/app-editors/neovim/neovim-0.1.2.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager perl python +jemalloc"
-
-CDEPEND="dev-lang/luajit:2
-	>=dev-libs/libtermkey-0.17
-	>=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	>=dev-libs/unibilium-1.1.1
-	dev-libs/libvterm
-	dev-lua/lpeg
-	dev-lua/messagepack
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-python/neovim-python-client )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	# make less.sh macro actually work with neovim
-	sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	local mycmakeargs=(
-		$(cmake-utils_use_enable jemalloc JEMALLOC)
-		-DLIBUNIBILIUM_USE_STATIC=OFF
-		-DLIBTERMKEY_USE_STATIC=OFF
-		-DLIBVTERM_USE_STATIC=OFF
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
--- a/app-editors/neovim/neovim-0.1.3.ebuild
+++ b/app-editors/neovim/neovim-0.1.3.ebuild
@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager perl python +jemalloc"
-
-CDEPEND="dev-lang/luajit:2
-	>=dev-libs/libtermkey-0.17
-	>=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	>=dev-libs/unibilium-1.1.1
-	dev-libs/libvterm
-	dev-lua/lpeg
-	dev-lua/messagepack
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-python/neovim-python-client )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	local mycmakeargs=(
-		$(cmake-utils_use_enable jemalloc JEMALLOC)
-		-DLIBUNIBILIUM_USE_STATIC=OFF
-		-DLIBTERMKEY_USE_STATIC=OFF
-		-DLIBVTERM_USE_STATIC=OFF
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
--- a/app-editors/neovim/neovim-0.1.4.ebuild
+++ b/app-editors/neovim/neovim-0.1.4.ebuild
@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager perl python +jemalloc"
-
-CDEPEND="dev-lang/luajit:2
-	>=dev-libs/libtermkey-0.17
-	>=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	>=dev-libs/unibilium-1.1.1
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit]
-	dev-lua/mpack[luajit]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-python/neovim-python-client )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	local mycmakeargs=(
-		$(cmake-utils_use_enable jemalloc JEMALLOC)
-		-DLIBUNIBILIUM_USE_STATIC=OFF
-		-DLIBTERMKEY_USE_STATIC=OFF
-		-DLIBVTERM_USE_STATIC=OFF
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
--- a/app-editors/neovim/neovim-0.1.5-r1.ebuild
+++ b/app-editors/neovim/neovim-0.1.5-r1.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python ruby +tui +jemalloc"
-
-CDEPEND=">=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		>=dev-libs/libtermkey-0.17
-		>=dev-libs/unibilium-1.1.1
-	)
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit=]
-	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
--- a/app-editors/neovim/neovim-0.1.5.ebuild
+++ b/app-editors/neovim/neovim-0.1.5.ebuild
@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager perl python ruby +jemalloc"
-
-CDEPEND="dev-lang/luajit:2
-	>=dev-libs/libtermkey-0.17
-	>=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	>=dev-libs/unibilium-1.1.1
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit]
-	dev-lua/mpack[luajit]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	local mycmakeargs=(
-		$(cmake-utils_use_enable jemalloc JEMALLOC)
-		-DLIBUNIBILIUM_USE_STATIC=OFF
-		-DLIBTERMKEY_USE_STATIC=OFF
-		-DLIBVTERM_USE_STATIC=OFF
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
--- a/app-editors/neovim/neovim-0.1.7.ebuild
+++ b/app-editors/neovim/neovim-0.1.7.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python ruby +tui +jemalloc"
-
-CDEPEND=">=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		>=dev-libs/libtermkey-0.17
-		>=dev-libs/unibilium-1.1.1
-	)
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit=]
-	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
--- a/app-editors/neovim/neovim-0.2.0.ebuild
+++ b/app-editors/neovim/neovim-0.2.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi

 LICENSE="Apache-2.0 vim"
@ -32,12 +32,16 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
+	jemalloc? ( dev-libs/jemalloc )"
+
+DEPEND="
+	${CDEPEND}
+	dev-util/gperf
 	virtual/libiconv
 	virtual/libintl"
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+	${CDEPEND}
 	python? ( dev-python/neovim-python-client )
 	ruby? ( dev-ruby/neovim-ruby-client )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
--- a/app-editors/neovim/neovim-0.2.2.ebuild
+++ b/app-editors/neovim/neovim-0.2.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi

 LICENSE="Apache-2.0 vim"
@ -26,18 +26,22 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 		dev-lua/LuaBitOp
 	)
 	tui? (
-		>=dev-libs/libtermkey-0.17
+		>=dev-libs/libtermkey-0.19
 		>=dev-libs/unibilium-1.1.1
 	)
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
+	jemalloc? ( dev-libs/jemalloc )"
+
+DEPEND="
+	${CDEPEND}
+	dev-util/gperf
 	virtual/libiconv
 	virtual/libintl"
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+	${CDEPEND}
 	python? ( dev-python/neovim-python-client )
 	ruby? ( dev-ruby/neovim-ruby-client )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -32,12 +32,16 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
+	jemalloc? ( dev-libs/jemalloc )"
+
+DEPEND="
+	${CDEPEND}
+	dev-util/gperf
 	virtual/libiconv
 	virtual/libintl"
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+	${CDEPEND}
 	python? ( dev-python/neovim-python-client )
 	ruby? ( dev-ruby/neovim-ruby-client )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@ -0,0 +1,5 @@
+AUX qhexedit2-0.8.4-fixtest.patch 479 BLAKE2B 1359815f0c072a4f8a036b8168796e22f8522c5e311220d6dd76b12df5c138693582f26a9d09ab33ca5e10a1e9d8dd6bb7b668d6bee09785b163dee6048a39af SHA512 6f72dc45c91da43a27bb66f7a81f33f810eef45711e6d84675bf761dda3a296aca7931e955526504c53a173a6ef65ef4712f378f8d4a1fbdd2437829aa2f49e6
+AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
+DIST qhexedit2-0.8.4.tar.gz 340766 BLAKE2B af24031fdd9f8d677f7e8ab8fd69667852dd971db30f5406b9aaaa08bf7f2dc692c87e99c141f355adc82c8226b5b29f53ce07ba63656d866f8688cb2cbc67f2 SHA512 8ed831d75c8ec1897dfd7ef497423908b26b0f56e6577928ed035654e52b437f64edd61cfcc1de6eaf5d1f29f9dc97da84d2edd7f427e3c09c9d75d7bc6504ff
+EBUILD qhexedit2-0.8.4.ebuild 1823 BLAKE2B 290507913c6189cba96885eb1105bdba20c629ea50a92df395607f29c81d9960bac52aa9e8b77cce7323dd359234de6dea901047671be4154202ffa21de81f62 SHA512 37b647971a9f64cb6878753716a3139abc4a59249192831dae5ef9b49d0d15eff01517cfaec7422b43e964ad965226162a8fbdfbe5200a47fc0aa499b9e9ba22
+MISC metadata.xml 1188 BLAKE2B c77c4946d1d0b30cb98d1aa5043ffdd97511687eac48a014d5393e4fb9728ec5e56a2e7e8616369ac2b13bb12439b66f963d48aa31a9d4d84120d98b2cd23250 SHA512 399c8e332a7eebad8a7eccaa555eadd29b2e8cf2a3fc5423eee9bcdda472581d341a683eef186519eb07c88305a6943687569e2ba2343d4b2bfeaaf3767064cd
--- a/app-editors/qhexedit2/files/qhexedit2-0.8.4-fixtest.patch
+++ b/app-editors/qhexedit2/files/qhexedit2-0.8.4-fixtest.patch
@ -0,0 +1,12 @@
+--- qhexedit2-0.8.4/test/testchunks.cpp-	2017-01-17 02:32:54.000000000 +0300
+++ qhexedit2-0.8.4/test/testchunks.cpp	2018-01-03 21:34:24.988555308 +0300
+@@ -1,8 +1,7 @@
+ #include "testchunks.h"
+ #include <cstdlib>
+
+-
+-TestChunks::TestChunks(QTextStream &log, QString tName, int size, bool random, int saveFile)
+TestChunks::TestChunks(QTextStream &log, QString tName, int size, bool random, int saveFile): _chunks(nullptr)
+ {
+     char hex[] = "0123456789abcdef";
+     srand(0);
--- a/app-editors/qhexedit2/files/qhexedit2-0.8.4-setup.py.patch
+++ b/app-editors/qhexedit2/files/qhexedit2-0.8.4-setup.py.patch
@ -0,0 +1,11 @@
+--- qhexedit2-0.8.4/setup.py-	2018-01-02 19:40:57.542961661 +0300
+++ qhexedit2-0.8.4/setup.py	2017-01-17 02:32:54.000000000 +0300
+@@ -98,7 +98,7 @@
+                                       lib + ".framework", "Headers")]
+ else:
+     if PyQt_Version == 'PyQt5':
+-        for qt_inc_dir in ('/usr/include/qt', '/usr/include/x86_64-linux-gnu/qt5'):
+        for qt_inc_dir in ('/usr/include/qt', '/usr/include/qt5'):
+             include_dirs.append(qt_inc_dir)
+             include_dirs += [os.path.join(qt_inc_dir, lib) for lib in qt_libs]
+         libraries = ["Qt5" + lib[2:] for lib in qt_libs]
--- a/app-editors/qhexedit2/metadata.xml
+++ b/app-editors/qhexedit2/metadata.xml
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>coyote@bks.tv</email>
+        <name>Victor Kustov</name>
+        <description>Proxied-maintainer. Assign bugs to him</description>
+    </maintainer>
+    <maintainer type="person">
+        <email>zlogene@gentoo.org</email>
+        <name>Mikle Kolyada</name>
+    </maintainer>
+    <maintainer type="person">
+        <email>maksbotan@gentoo.org</email>
+        <name>Maxim Koltsov</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <use>
+        <flag name="gui">Install Qt5 hex editor</flag>
+    </use>
+    <longdescription lang="en">
+        QHexEdit is a hex editor widget written in C++ for the Qt5 framework.
+        It is a simple editor for binary data, and has bindings to PyQt
+        with python 2 and 3.
+    </longdescription>
+    <upstream>
+        <remote-id type="github">lancos/qhexedit2</remote-id>
+        <remote-id type="github">Simsys/qhexedit2</remote-id>
+    </upstream>
+</pkgmetadata>
--- a/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
@ -0,0 +1,83 @@
+# Copyright 2017-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 qmake-utils
+
+DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
+HOMEPAGE="https://github.com/lancos/qhexedit2/"
+SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gui python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fixtest.patch"
+	"${FILESDIR}/${P}-setup.py.patch"
+)
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	python? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+			dev-python/sip[${PYTHON_USEDEP}]
+			${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \
+		-e "\$aINSTALLS += target" src/qhexedit.pro \
+		|| die "src/qhexedit.pro: sed failed"
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	eqmake5 src/qhexedit.pro
+	if use gui; then
+		cd example || die "can't cd example"
+		eqmake5 qhexedit.pro
+	fi
+}
+
+src_compile() {
+	default
+	use python && distutils-r1_src_compile
+	if use gui; then
+		cd example || die "can't cd example"
+		emake
+	fi
+}
+
+python_compile() {
+	use python && distutils-r1_python_compile build_ext --library-dirs="${S}"
+}
+
+src_test() {
+	cd test || die "can't cd test"
+	mkdir logs || die "can't create logs dir"
+	eqmake5 chunks.pro
+	emake
+	./chunks || die "test run failed"
+	grep -q "^NOK" logs/Summary.log && die "test failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	use python && distutils-r1_src_install
+	use gui && dobin example/qhexedit
+	if use doc; then
+		dodoc -r doc/html
+		dodoc doc/release.txt
+	fi
+}
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@ -5,8 +5,10 @@ DIST vim-8.0.0386.tar.gz 13000882 BLAKE2B c38c1b75334cae916f76562ec5a06d59c4f2df
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
 DIST vim-8.0.1188.tar.gz 13363260 BLAKE2B 545b2d6e8322b27967c974bb960f4e5ea2c6811d2649ac4c008eb8e6af78fe555a035657704af40026f96f12f83e3cebe435e90d21d7da87980446710424f79f SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b
 DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
+DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 EBUILD vim-core-8.0.0386.ebuild 6754 BLAKE2B dce17b159afde5cba37cd6dd7010dfdf84f6752bb82a85993142bc13eb103afc99d27b48039fe61db115a55a364a95e11b123342630478eb46de0fd00ddaa585 SHA512 ecdaf79298f242819af450ea366cb51b428f4d0054203dde424bce6ffd754954273f59802a3b1f582ad1d3455d2b844d3b6613f06fe3b17fe43e19102984b118
 EBUILD vim-core-8.0.1188.ebuild 6660 BLAKE2B 5f2e062a5aed9edc326ee1385b732f9d902490a571640df149b722ca6904c786182e93c6bcdb6b2d7ff9b33276e14e07c8c7bb2b996e7e7e9a9ca0a1f9347425 SHA512 920903e21d36555b3276f15fb95c59a26cc0355f6327ba1caf625a0d3e2e2d3be877d4244437a68e29ad71ddc3c7c85bf0ae58228b2f7fab17416abfbfc9d368
 EBUILD vim-core-8.0.1298.ebuild 6654 BLAKE2B ce894bd51475f3c9dd8c23ac850312b340d640626d59a88d17a8d1d7a80cfe09b7a12bf94eebd78cad33aeff7ebda619ad0ae5c04d13e535690c480ae087e1d4 SHA512 9fcbd99cfa31e3084051ccd9655f524ba46e44b1676f9e39d530291fa3baba26c3ec61adaa6834d99c1252fef98a9e4982f93138107af63161c0205f2a3be8d0
+EBUILD vim-core-8.0.1428.ebuild 6660 BLAKE2B 5f2e062a5aed9edc326ee1385b732f9d902490a571640df149b722ca6904c786182e93c6bcdb6b2d7ff9b33276e14e07c8c7bb2b996e7e7e9a9ca0a1f9347425 SHA512 920903e21d36555b3276f15fb95c59a26cc0355f6327ba1caf625a0d3e2e2d3be877d4244437a68e29ad71ddc3c7c85bf0ae58228b2f7fab17416abfbfc9d368
 EBUILD vim-core-9999.ebuild 6660 BLAKE2B 5f2e062a5aed9edc326ee1385b732f9d902490a571640df149b722ca6904c786182e93c6bcdb6b2d7ff9b33276e14e07c8c7bb2b996e7e7e9a9ca0a1f9347425 SHA512 920903e21d36555b3276f15fb95c59a26cc0355f6327ba1caf625a0d3e2e2d3be877d4244437a68e29ad71ddc3c7c85bf0ae58228b2f7fab17416abfbfc9d368
 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
--- a/app-editors/vim-core/vim-core-8.0.1428.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.1428.ebuild
@ -0,0 +1,214 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir -p failed"
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i \
+		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "sed failed"
+
+	# See #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+
+	# Remove src/auto/configure file.
+	rm -v src/auto/configure || die "rm configure failed"
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1 -C src auto/osdef.h objects
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	emake -C src \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r5 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
+		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@ -4,8 +4,10 @@ DIST vim-8.0.0386.tar.gz 13000882 BLAKE2B c38c1b75334cae916f76562ec5a06d59c4f2df
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
 DIST vim-8.0.1188.tar.gz 13363260 BLAKE2B 545b2d6e8322b27967c974bb960f4e5ea2c6811d2649ac4c008eb8e6af78fe555a035657704af40026f96f12f83e3cebe435e90d21d7da87980446710424f79f SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b
 DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
+DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 EBUILD vim-8.0.0386.ebuild 10124 BLAKE2B 1076b778939e88d839a2ff357bcc1b2e5d728f1cb323b1fbfa1998afe49a7127dd0e8c7baf76626811de7843913b02e64a8bab9c73327c53f93214278bfa69af SHA512 df3604a0c5025cc34bffa597107e7ee0013a4aa691ad284cefbef701ede72d0db5648d01d20ddd4791b1a30b5359dd2cb1a8f70b0e75e57fcec7b4f045c8d040
 EBUILD vim-8.0.1188.ebuild 8794 BLAKE2B 5ccdaa2b12ef7e7f573623e07548b6631286d5a54e8a4f6c53ac8f062660b1e5ddc620ab3133e2b6eb880f422f50c21c86844b8545f0399632093bbe9676f06d SHA512 d19b8648013cc4ee343ef86b7f60115c52b8b77decda206d15bc2530667b48dd69cb92c1db06ddac2c29a21b528e0c08059a7711bdfd0e8ca89eb046f34be516
 EBUILD vim-8.0.1298.ebuild 8788 BLAKE2B 3146bc4ea74da216f4bf73abdfc77f62d98a9a40c00473247588d96c1298cf5d736eec812f783c3c1fbab8025a84321c646c9cc25d83498636308d4c4bfc3949 SHA512 df51ddfd1d94223963649191dbed5b8d8e2c89070060f69c1ba0a12cb5473de21808e3e259172571447ddb3a354be731177a67e8c8c8f207f03772d5cce10e44
+EBUILD vim-8.0.1428.ebuild 8794 BLAKE2B 5ccdaa2b12ef7e7f573623e07548b6631286d5a54e8a4f6c53ac8f062660b1e5ddc620ab3133e2b6eb880f422f50c21c86844b8545f0399632093bbe9676f06d SHA512 d19b8648013cc4ee343ef86b7f60115c52b8b77decda206d15bc2530667b48dd69cb92c1db06ddac2c29a21b528e0c08059a7711bdfd0e8ca89eb046f34be516
 EBUILD vim-9999.ebuild 8794 BLAKE2B 5ccdaa2b12ef7e7f573623e07548b6631286d5a54e8a4f6c53ac8f062660b1e5ddc620ab3133e2b6eb880f422f50c21c86844b8545f0399632093bbe9676f06d SHA512 d19b8648013cc4ee343ef86b7f60115c52b8b77decda206d15bc2530667b48dd69cb92c1db06ddac2c29a21b528e0c08059a7711bdfd0e8ca89eb046f34be516
 MISC metadata.xml 849 BLAKE2B c0edeb64be8810f6aafa20ed67a4eec6a0961ff6af3b1390217fb185ceb03a405239dd1ebc4f1f76b1dfb3df3ef841796b0881eea8e8db810afdc828580d9b5f SHA512 a4369827eaaa72339f17b1c673aa5f71625b657afad9d2f6079ffc6fd23775aa8f6c52aca0cb193b4815bc6ca9918617c251767343f7044ab79b83b69038c58b
--- a/app-editors/vim/vim-8.0.1428.ebuild
+++ b/app-editors/vim/vim-8.0.1428.ebuild
@ -0,0 +1,309 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE=threads
+inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir failed"
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			_EOF_
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
+	done
+
+	if use minimal; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-multibyte
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			--enable-multibyte
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python pythoninterp)
+			$(use_enable python python3interp)
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+}
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@ -1,4 +1,7 @@
 AUX wxhexeditor-0.23-syslibs.patch 2587 BLAKE2B 157759185c8a5c8f93dea51a118c2c9648340c64bdc785e54cbefc2cc6b3213601ad4d21bf94544cbe7db43f0514315e63bb4ad083fbc87dbeff60147c0b353f SHA512 243fe4573d442e66e41fdc1c73c2038bb802cd0822762de30b44c77e4ec15632a03cc06a7694ee45ac81f2c895fe283ef8d30996df9de8cd682dbd9359f805b2
+AUX wxhexeditor-0.24-syslibs.patch 2458 BLAKE2B 65dc8a710fb33826b5ae9a9ae2b31cdf58e58252aa4be8df37a4e18495faaaee066c95f1b527d91c71b9b38d8123cc1cac91e9e0386a67ed77b0b8e24ad43016 SHA512 658526b38bb3e3313174ac464711ccceb3606e38e6826c62b4dcb5dca79c6ef32c6d7c84e883035572431eebaf0b7e2ace154df406f2338f39aace84d9fe9403
 DIST wxHexEditor-v0.23-src.tar.bz2 2534659 BLAKE2B 932b2d9ab14dee71b5f5f57d89bc71c190c136c106339563ade44ea47e47819c4fdb32511296c14b3bebdfedd55a331c74e9a722e1d54e22ba53d203f753b57d SHA512 abbd2338c2d0d7d514342f5c330ea42c9ee1f3489c4661426927f51c802a7806e4ee965fa5d467c7b928ba87395eb6c351ab5f43f18d5fce836adede5f1d6be4
+DIST wxHexEditor-v0.24-src.tar.xz 900868 BLAKE2B 6748249d75e7570197a6c78378a8f3109bfa4c72bf32fe63e2abd31734d97fda3d56ecddb52ac5f9a18cc77b2c727f8277688f1bf75ef8f665a3a9cefd1cb8a6 SHA512 8589da169c90cca5abf6ba957d5c5e17e4211123dbdbaf0e04d31757113e7e302d40df58144ec25d431c7c4ce2fa2721b16621d03630ac8b90478c704a8c5b09
 EBUILD wxhexeditor-0.23.ebuild 1016 BLAKE2B 8c28390aafa8d8c3976b6c5aeede19cd3b8e2001a87194329d978c4bedb0a8856c448bf3d28a4105d070b0395c7dbf422022063f2c9f4d759ae77786564b487b SHA512 7226c5c5f9f3e4e58d2f82707b6a6cdfce5ec1b0eaedded0da033e149b06b0811f323e2d32eb698c222a6209a78a98f5c70eb74b976520e5d4044cd02369016a
+EBUILD wxhexeditor-0.24.ebuild 759 BLAKE2B 28a33de33abec1d86cdd8fb414ef56fd14f76b9f88307e268a2d8e012f36eae9eb2a6e3ef80e443be5e37c47ff3c4441eb9c6a37bb927e4395785c835e0dffe8 SHA512 2691699ea8b2ae58e5580349ec1415bcb4269ca68c1d84a6df01f1d73db8a6c06de239d12c0a9c35149f12be653efeca24b4d8268dda4e3d865f99e753d30cc9
 MISC metadata.xml 352 BLAKE2B 6b049a05b438e20e604ed3c93e89e66d5f18cb0dc7322a9f4d5cdd976ba074b625b162baa30ff8b2276429826caec1d22a757945e14a845be3b6bfe9eaeb69b3 SHA512 918e551de8f159920d7d98010dc748efb0e9a79c9a11f6d6fcd44127d3779a66510da18cbccc69a974472bf3f230fd5cadbc15665a4a3710b8c1b92237725f6a
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch
@ -0,0 +1,76 @@
+Use system copies of mhash and udis86.
+Also pass -fopenmp when linking to avoid build errors.
+Remove -O2 from forced CXXFLAGS.
+
+--- a/Makefile
+++ b/Makefile
+@@ -1,9 +1,9 @@
+ WXCONFIG ?= wx-config
+ HOST=
+-WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp -Wall -O2
+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp -Wall
+ WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core`
+ WXCXXFLAGS += -fopenmp
+-LDFLAGS += -lgomp
+LDFLAGS += -fopenmp -lgomp
+ #add this ldflags for WinConsole  "-Wl,--subsystem,console -mconsole" for win-debug
+ #LDFLAGS += -Wl,--subsystem,console -mconsole
+ RC = `$(WXCONFIG) --rescomp`
+@@ -22,7 +22,7 @@ SOURCES= src/HexEditorGui.cpp \
+ 			src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
+ 			src/HexEditorCtrl/HexEditorCtrlGui.cpp\
+ 			src/HexEditorFrame.cpp
+-LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a
+LIBS = -ludis86 -lmhash
+ OBJECTS=$(SOURCES:.cpp=.o)
+ DEPENDS=$(OBJECTS:.o=.d)
+ LANGUAGEDIRS=`ls -l ./locale | grep ^d | sed s/.*\ //g;`
+@@ -68,15 +68,6 @@ langs: $(MOBJECTS)
+ %.mo : %.po
+ 	$(MSGFMT) $< -o $@
+ 
+-udis86/libudis86/.libs/libudis86.a:
+-	cd udis86;./autogen.sh
+-	cd udis86;./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}" CPPFLAGS="$(CPPFLAGS)"
+-	cd udis86/libudis86; $(MAKE) $(MFLAGS)
+-
+-mhash/lib/.libs/libmhash.a:
+-	cd mhash; ./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}" CPPFLAGS="$(CPPFLAGS)"
+-	cd mhash; $(MAKE) $(MFLAGS)
+-
+ src/windrv.o:
+ 	$(CXX) $(LIBS) ${CXXFLAGS} ${OPTFLAGS} $(WXCXXFLAGS) $(WXLDFLAGS) ${LDFLAGS} -c src/windrv.cpp -o src/windrv.o
+ 
+--- a/src/HexDialogs.cpp
+++ b/src/HexDialogs.cpp
+@@ -24,7 +24,7 @@
+ #define NANINT 0xFFFFFFFFFFFFFFFFLL
+ #include "HexDialogs.h"
+ #include <wx/progdlg.h>
+-#include "../mhash/include/mhash.h"
+#include <mhash.h>
+ 
+ #ifdef __SSE2__
+ 	#include <emmintrin.h>
+--- a/src/HexEditor.h
+++ b/src/HexEditor.h
+@@ -25,7 +25,7 @@
+ #ifndef _wxHexEditor_h_
+ #define _wxHexEditor_h_
+ 
+-#include "../mhash/include/mhash.h"
+#include <mhash.h>
+ 
+ #include <wx/ffile.h>
+ #include <wx/clipbrd.h>
+--- a/src/HexPanels.h
+++ b/src/HexPanels.h
+@@ -27,7 +27,7 @@
+ #include "HexEditorFrame.h"
+ #include "HexEditorCtrl/HexEditorCtrl.h"
+ #include "HexEditorCtrl/wxHexCtrl/wxHexCtrl.h"
+-#include "../udis86/udis86.h"
+#include <udis86.h>
+ 
+ #ifdef WX_GCH
+ #include <wx_pch.h>
--- a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER=3.0-gtk3
+
+inherit toolchain-funcs wxwidgets
+
+MY_PN="wxHexEditor"
+
+DESCRIPTION="A cross-platform hex editor designed specially for large files"
+HOMEPAGE="http://www.wxhexeditor.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	app-crypt/mhash
+	dev-libs/udis86
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-syslibs.patch
+)
+
+pkg_pretend() {
+	tc-has-openmp \
+		|| die "${PN} uses OpenMP libraries. Please use an OpenMP-capable compiler."
+}
+
+src_prepare() {
+	setup-wxwidgets
+	default
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/x48/Manifest
+++ b/app-emulation/x48/Manifest
@ -1,4 +1,4 @@
 DIST x48-0.6.4.tar.bz2 227991 BLAKE2B 8db2962860eeb161a8efc9d46730c71d95d0331157e3e2481a978385ad54b04b7a4eb601c68e7df966194b23e0cd04bed4e80511d22695bb7ccdd3959d8fd8d7 SHA512 60fdba1171a02e4a5f9bcefb29fff9398fdbda50553c3d3b952fab0b4ebf87b219d4615139ca3673b1c61ff6d6559aab3e93218334aa6cdb442d4861347138ce
-EBUILD x48-0.6.4-r1.ebuild 1734 BLAKE2B 695c7a6cacfef42fa42a721a9b3e57dc78b3fc9a62559145f4641ce6063b18a97f9775822654adfa7456e809a272eb029241d21f2c89e8b35f5f7acee2ad07c6 SHA512 8241bef9012930a50747c6d8ec04533f18af3ad9d8e773681fa4ac859b6bd98547a6231a66f1c36a50a043196a1df65c88e5e88f0b8fdb4ee84d0df8c85646f5
+EBUILD x48-0.6.4-r1.ebuild 1733 BLAKE2B 87f5362c0e9a2e5a8a8edd24ea5f9551d0c111127ec5b54eb2c1dea4c038c4f52e8a3035c9f48f17a2276764ff203ec87e7d890141f1e391af31695cbe030e3e SHA512 ae001f2170fb2e97dd2f1d6231305fa1cde4dc1489b0aef5e9df27e6a2b18881d54f7ca161beddec6a4ee2f8eda6e99a2bcfcd00be1a22f81b85bc50728c58e3
 EBUILD x48-0.6.4.ebuild 1658 BLAKE2B 188fa81f668f207fdf11b780dec7ed88d85aa361fe1d496a5e1aaa5c62525afce937c3fedae24927fd66746ceea936d5b7a0a0c2ca19181ec513234b4fd0ea91 SHA512 4c3d4048b5c51fa28d348c52ec61281eeca0a5765d69e96c2f978892f6760b6ba06dab713cd68483551022d3b08d5e74c4bca9ec47e03337bbdc59d16bba45eb
 MISC metadata.xml 716 BLAKE2B 6869cac178f0a9b87c943acbced134699bb4deb1309a14ceffd6ae71ec876224e50657b2adf8329c05f180f35317bccad048d4c4597b5945e940d98a734b1787 SHA512 518c89c4c0d49f9482a9dad05c0d6df7b28121807a9893dedd6448169c62f2719bf4bd1097ce88143bc44e80a782bf6ddb7897062fbce06a5c345b3efb8ffb14
--- a/app-emulation/x48/x48-0.6.4-r1.ebuild
+++ b/app-emulation/x48/x48-0.6.4-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/x48.berlios/${P}.tar.bz2"
 LICENSE="GPL-3"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="readline"

 RDEPEND="x11-libs/libX11
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@ -5,6 +5,6 @@ AUX php-fpm.conf 29 BLAKE2B 505e957038315f8668a558f91eac2ad8ae6bc3e87db238001042
 DIST eselect-php-0.9.2.tar.xz 48356 BLAKE2B 9ad886b78c0a0ca71c1082d9265f28b1f9ea46dddfd52ad1a1ebb1a4d008954a59baf4cf69705e9b527fff64e8dfa3b25a2d522e2455e2e9ce550e917112ee58 SHA512 ebf4c9039aaa3ffad79dee181b5cd77f144a4b1b49d80291b290377b7ca5a9618d8b18922f0624e646c4d80266c58199bb936a7b8dd5d2e2bdc296099f583edf
 DIST eselect-php-0.9.4.tar.xz 49576 BLAKE2B 417956b355ffec7d7cda03dffa94e4d749a2b33a64a216c2ed8492181a5385f5219078efe6cc4d0d2d81b0fac40901c0cf07914a826484b83833542a12b47359 SHA512 2ba1dd75d4bb9611c6687ed4449f715728263538f772652aa1ac013103cf9ddf328c854326cf6da4f9b3ff2279bf99d973325520fe8b4e3ba7a76a9c3264e78e
 EBUILD eselect-php-0.9.2.ebuild 1956 BLAKE2B e8381990bdafaccd7a2f5dbc117af2309089d2bf92901b0b31552c1351b584a6c46a68b50a4fc4497c3e3b9a9a342a38a6660d645a69a56312326bfc423fd393 SHA512 5ae4cb205892103b1ccbd809d07f46ebcb64587663ca4bddb47bc194992f8b208b41852cd3d639421fd9c14fc070df083b44017bfa68f09c06e3865bd04416a5
-EBUILD eselect-php-0.9.4-r5.ebuild 1391 BLAKE2B aff14f4c53af6ba803db7f14fdc099d268c49dfc620e1297e9dbca97ecfe5edd57a8760b25cd1d5444d7bf47dc631892583d852ac4f0b753e5ea1322fd535123 SHA512 484a404cd9d651c8f465cd9b5345d20cb24e0388a3ecfa48e990d95e645bacc1d1dc0c2ac391f8629fb61866f5b06f4b941905b888353907934f51cd5354d35e
+EBUILD eselect-php-0.9.4-r5.ebuild 1390 BLAKE2B c79782438fe1100cbf08b7276c392d48a2296f360c709be937c2c2e582d405f15d85a51e411a2483bf078da77f43427fa42f5d78303324edd2675ad0a23f042b SHA512 53e96d89dcc0a42a25e0cef997495203666608bd874ec5ce9f1653577639f07b4e32739fb6f259f9a2f06500af7d17b9ddb9ced2c49390855d7e87eaaef8b576
 EBUILD eselect-php-9999.ebuild 1306 BLAKE2B 45c8551979e6c5cd4623cfbd77aff888462ddd18121892b6891459e2281581382c0c6738370f859f5dbd21fcf7ead4056afd78de587b8387bc79cefd689d88b3 SHA512 9982c8bda294445cf3496da2d58f0126278924165cf66967d31628a2eb907c258e50d460e3c1daf5b9c042386730452d2c02a096d1f45c86d10c6538e8afeec7
 MISC metadata.xml 387 BLAKE2B 956f8e21e799bd346de09b2814c359c3c28a37dcad3bf42a11e58e33acfe26354069fce71e3ecb687dac83e176500c2127cb8dda5651e083e27aad92cb385862 SHA512 80a043e0836a1ac58120f1471e997face2f60117e3a83d490ad259a05cfdc39098c457573e3550c9fc3a7712f28b9faacd427c076e8f46ed3476e42f58f8f1b5
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="fpm apache2"

 # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@ -4,6 +4,6 @@ DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f
 DIST ibus-1.5.17.tar.gz 2522960 BLAKE2B a0d19eaae809549d678b42394e76107b8869232c90932bfaa5072621598e83db0569084e931c51c15b7179d9d8e0a2ce144b726229dae81a009665a5de87afc4 SHA512 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c
 EBUILD ibus-1.5.12.ebuild 3695 BLAKE2B b22d441277f55324c4d5ecc6d592f3057900a46e0f4bed4ccc90c14ec10890fa26bab18c5ded5649f9bb83c3485899bcea8e9d0fc80410e55199ad97b51f2009 SHA512 2593129b58c41301ea94f7b7761cc40e13f3b6458230478067d6a0a1c6a23ad8aa5f225d4203259ad54eb38d87b3bbac1a029a4de5282aee82147891b3c2b394
 EBUILD ibus-1.5.15.ebuild 3552 BLAKE2B 040902ad38258aab1ff4b0d2b3eb495a6f7a3b5148b1cbd06378773b1c421da8e3240395d4412a712243663b1d70754b33356c2316d072dcc847f80a902d04ea SHA512 dec56dc700cc9e8fbe2280cf75e2550cc92d51e7ecbae307b87ef6e5707a2a7e31c5b82e8228818290bc94527f3c2bbdb34e0a4b61a0c8d5f1bafe5ebd00d485
-EBUILD ibus-1.5.16.ebuild 3961 BLAKE2B 6e53813b636479b1d34b238398950bd60f11407c1fe4c082e1936c0a4b71507ad5d205e663caf5818e2ea86d66328ae4304188320a3d22a5bfaaeae791b60061 SHA512 2e5c7cc15171fc83a76a793f4c307ba459cd2083ad52b94c48b6eecef71da1e409cb9982fd6973529a8ec97a6179414f9bf544b8444498d037b665dd1df5b076
+EBUILD ibus-1.5.16.ebuild 3960 BLAKE2B ecad2f16fd1884e1f24cbafe25978100799bc277b54046a8c82122e4779a2420663205d15f3453d79602e575e2eabbfaa7e3b6341b312039718e53dcc6dfd798 SHA512 8bc4aef21cc023d6fda187a2a2821234a64207d1b19b45aa2a1d019eb0926c53e049cbbbebc29b5f0145d6a502c1660f47cd9a995f7be5100334199af419a812
 EBUILD ibus-1.5.17.ebuild 3965 BLAKE2B 56b920f04cbcf8de88b0cc4347f8876fd6972670c48d4717f372a5436a88e99f63a9b07bcd52a72dec0d313f06d8893fc3f6fda0e03fd7ebc78f6ed3e1c8ef79 SHA512 514bf67cb6331b0d7e1d583f865e66d5ab8c8f13db40de925e8bf51f976f89171f8b028b377676ca22f8c7465b53ab66bddd0237ff67a0319710d194bffc857b
 MISC metadata.xml 876 BLAKE2B 0594f787b71a972b67f1f52fde4e6e6c4eead1f604a1152ea9af2a15cd678677a29adaaba1a53251efbb95f0d12baa7d3dc63e54676757bbc7d9bf6235cf7e1e SHA512 eff80e5a8db4276c1138de9e661e5735c42abfc32950bc439eda9f342e5d2a68a8d5c848dc0000a2960a315ac38dbeda6b9fc44de8b9d526e7dddd94122f9f32
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@ -1,8 +1,8 @@
 AUX xinput-scim 240 BLAKE2B 8c235304288f531db5bea179ff0100f6152b55348057a2604f37e37522a54883d06c954f2804ad4c04dfd3b3518fc5401ad5185e85a85a68d80e38dbbd728eef SHA512 1cfe95fdbf840b9fa43c980bb3f2e16fc6008714f8807650582ca906cb91ddd28b3b7b3c9f1325035e2c614d587d172071b2b7e3c6b30ca3128902b335773893
 DIST scim-1.4.14.tar.gz 1519287 BLAKE2B 6bd2f7328e9a75c392b0f8d1d096b09b55dc88489e4524213743a9be61b29b2d610d20394d59aa83001d17d7a210e30627ab06148a4677b02344a2872608babd SHA512 00fe7a1b40b69aae123c0a1e67eb3744ad1e6b1e66726bb011a7426bd28012c52b346c62f08c7ecf0977ac3e88ee416337c9fa89b39142d5eea338d99641f5df
-DIST scim-1.4.16.tar.gz 1361105 BLAKE2B 669c0836cd0fc220a78d113214d948b0f3f961bf2910967e2f8b4ef62e2e23dc4d604656232bb4030219a826dfb4e2076151e43916ffe280c2451ed8f25f8eef SHA512 23fe60202d74dd8cba84da40f80b6998d96180b08a618b052dde54b4d16a65246608344f63d6dd9b3d8a98102adcfd4831d850d81348539074273a2062c133d8
 DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
+DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
 EBUILD scim-1.4.14.ebuild 2685 BLAKE2B bcbf792257404fa964580c7435fe18d0ec4998b939fd17203dbfaa0a941435a14e8e90ee41e1982ea4c25386e28dc0cef2ca7d1ec0c57c1001b29612f10110e3 SHA512 dec5a027f66361a4faa930bfa51d618208be71f05c7172171a8dfaf968d3969bd26e940bd34ffd00c414f57786362cc9aca35ccbb5e49774200abd8ab08adafb
-EBUILD scim-1.4.16.ebuild 2491 BLAKE2B 514ee9aae41267e23ac4d6bca219704315ed3e5997069ae9ff73d83ba515312ba90674b44a0d212e09045554f5da176521a45a10653fb4b3678300a60883bd02 SHA512 892f71b5a5ee38454db9474d0b3a9799353ae30ebd88b0ad37b27b974cd7ec3636caa260c20bed7a1a777363e66e7149fc14238aa2cae3ffa64bfd7085bfbd62
 EBUILD scim-1.4.17.ebuild 2486 BLAKE2B 144c1ba230b4cb8cac82e86d84a0a21080a1f04617c6448e3a8def0a4cd5a64d7a8a881ad851e28a9e62454e58fe9d2523dbf5981b0de28272f2d20aa34975f3 SHA512 9b8d71e3028358b2e7070266abf31a2d849beae8958d17087d19e0be5710e72fcbd7881031ca8a6f70852415cabbea0f1c124abe6adc9c16e0d5499eb3a71173
+EBUILD scim-1.4.18.ebuild 2521 BLAKE2B d52e2a4146ee2f0979cfb211e21972d5db261cdf325c72a9baab370fbe1a8af8de3a4288b7d94933ef9358bbdb330276e0913b175f143cafaed06ff5c85429e8 SHA512 937e79d87ac2997d3ec4d464b22bcfbf8c6adc8ef9f178f01312830c8c9822784194f3d5c44ded77718ede8f388d40c592b2d82164966ba312ff060a55b1a01c
 MISC metadata.xml 396 BLAKE2B 8f9d138bff9990a958ba79208e2ebdbee5174f84d6e7c6175aa70d514a3f0d53351c07745fed86d196e167f6854ab507b89557a586340e6b5f7973a4df54cbb9 SHA512 89418967f338111cae8dac484c2411891e9d496253fe59a38ec87a179da4d7ff415bd8942923a9231f6c80d48b457cafd43f2015df13a3d8749a22c0412ce9a0
--- a/app-i18n/scim/scim-1.4.18.ebuild
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -6,7 +6,7 @@ inherit eutils flag-o-matic multilib gnome2-utils autotools

 DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
 HOMEPAGE="https://sourceforge.net/projects/scim"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+SRC_URI="https://github.com/scim-im/scim/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@ -1,3 +1,3 @@
 DIST unicode-cldr-common-31.0.1.zip 16370865 BLAKE2B 46e941471074116eb00ba81848b37c82e025e12841d75ef9e4e2620f887384c4dbb3f8c36febcd86d19cd17d4d84e77e11121d1ed1cf2ccf67a09260cdddc9f7 SHA512 6ef4a73b31bde5dead5af9145e5befa5969e9449b4072c94c5370c979db54e3072ec5bf15f54152045da329bf4382e54edb532c0ec77a2ce451bacc8778b73bc
-EBUILD unicode-cldr-31.0.1.ebuild 491 BLAKE2B e92c026430a2acdfe58d53b8d67dc8032b6dd444ba3f27f0124c4d9b53998ecb2cda3649c6b13615bb459d08aa60c2632c9dcdb0cb906efde28100adde749f15 SHA512 42ce00bcd0132304c1f2b4857c38d1d3f4c0798c57c26cc761e00b0536e2d20bff0ee2834f11871faf1b261f4b51fa4444b21bdd0cbe6749d25e34e4fae78488
+EBUILD unicode-cldr-31.0.1.ebuild 490 BLAKE2B d83716ded8d8fd443708e9ce0cb77b191f13b517e571be06e71350bbdc43a8237de41dec7790c23335d267bb96488019299a405666c2b927720274aeafb25b43 SHA512 bdd0dd1d92ee1fd20d6c5fab06b323088f304c0b7d2c6ca8005b26d7a4297b10e480ed49e6065f102d8c43bba7b0b1fd5cb90c57d32bdfefdedbf8fb079c4c63
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
--- a/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -9,7 +9,7 @@ SRC_URI="http://${PN%-*}.org/Public/${PN/*-}/${PV}/core.zip -> ${PN}-common-${PV

 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE=""

 DEPEND="app-arch/unzip"
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@ -3,5 +3,5 @@ DIST unicode-emoji-sequences-5.0.txt 103383 BLAKE2B 1fc122b617963090d7ce165c9bc1
 DIST unicode-emoji-test-5.0.txt 341770 BLAKE2B ab4e0900dd685172ba686c3a8e501cb3333be5594338526179a3d851970546fdde2793f9c31c501e978608bcee57d7281b4722bc6f657f0626c4a48ca2ad8490 SHA512 368483fadaa2c87e1197d0b0351c1e68b4244e73ab93542d73df7169d1dfcdf98b0fc1da8a969645f6a2d45db1f2db5f75ba919dd05f1012fbc2f3fb524f5c5d
 DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc4fd7784ec9bd5869e58f934738fa1d46edc030202fb9490ddebd6f1cefb98dd78b3be2c4da7e3f2acef0ce54487a183123311efbf7205 SHA512 484509ed56c5ea5e73160e211643a938d3fa08474281d316e5ed2d2346f38f5140a147454a9cb81c9f463d6c62befd98a8b70b695ee50effdbcfc6085dcaa520
 DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
-EBUILD unicode-emoji-5.0.ebuild 873 BLAKE2B 9d7e7854faf05eda8f124d68ec4fcb60c89a6d32e74fd03560eacfc392628df4669f81c2b93ad7961b23f320bf844d284ec1f49d4323b0f7a4ba99740229e8af SHA512 97217eedeebf581f00b317d88a0472c86cc4ca05f48593afaa9ce21fae2f1749f7da34ce5ce1466d2c60f4ff73b99e8615fb9569b3bb00314a0b8efd9cc1c267
+EBUILD unicode-emoji-5.0.ebuild 872 BLAKE2B 9ebce1d86d2cd6fcd33572ceb69d1bb052ec277c1fa0d49d995a815aa317a52c44db0cd72a163dec8c5a14f5b0ffd7a9adddc08f8294f9df5a9ee6b442427d6e SHA512 566318fcd8865b90cb5dae786836492937b210cf405e20c8b3c6013b724717a8b589b1689eb1b26c2d29836cb9c29af7062fac3de376420d538fca5fcb651368
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
--- a/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-5.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"
@ -14,7 +14,7 @@ SRC_URI="${BASE_URI}/${PN/*-}-data.txt -> ${PN}-data-${PV}.txt

 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE=""

 S="${WORKDIR}"
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@ -1,5 +1,5 @@
 AUX laptop-mode-tools-1.71-wireless-power.patch 943 BLAKE2B 6c8539037d0e6bb5808df169f95868aeff0029566be47a4fc3232f41c93a3f2763561b738b3839c8370e937ea0c81b4e5c830af22431a23bc1419313e1573f71 SHA512 cf61599d5f9240e20bd6acec8b7b200cc33cfa21712bf71c5fc2053d344d2c9336a01ba4f3772caac441144c5c40880d61209319c9e58307e0ee0504a2191f97
 AUX laptop_mode.init-1.4 1059 BLAKE2B 24dcf91d75df6cffe13cda1c8b9c85c016dae393f79f14ac0bc37c293e0d40e7e7cb34bc31b1c387c10ee74978d1c030fafad60f4e2428a8fcadf03163d5e48a SHA512 4242cda1df6b55cd0bee66dfb9137b6f63118bc31c5f703ed44c42738f47dc794d7f1ed6dd9ba5696b606c4bf624428e8f21e1683cb698d8dda249833a4c5f68
 DIST laptop-mode-tools_1.71.tar.gz 118833 BLAKE2B 21e6399d35d3f35dd75e5640eb50d679de87bf40435484e0c7cb67dcd0f2a794b5f14b48e375c302ef749efc38677b8abbdacfd3612206fb0125c52b9d67a89b SHA512 67ef4ed4c80f3a64ab9f0f9003d415f9e8759fd0ee1c7a82837d423a0e7aeb03ab95724afd89ae223f954ae0baec5830c8fa600bd6e2e351aead83a656f9b665
-EBUILD laptop-mode-tools-1.71-r1.ebuild 2677 BLAKE2B 1306ff69bde4fcc0a994b97cc2a3b287ba18304452166e1a93b92b840cd362da4a80f366ea88f7d66840ac205aed1951fcdad3864dcc8a9a2de409255d35e6ad SHA512 f35f69b2d8f56deb519c27b074dff83f98135e8aa58351d908a4261235678815cfb7f688035dc2bd245622a595696597467fc0b930ffe1ae48614f32a151d57e
-MISC metadata.xml 537 BLAKE2B 1e54f082998276119a9aa8b7857784300073dd0a37fcf5400d6207241236d8283d6f438583621793e13963ca6b2e8502361c2aa7276aa4ecc71dffd5b6f6766e SHA512 7231612300dd7c106a48422f444edf3208807653e9f55675008c693f7d053e7f6e8f3ea3df2642f221c34509a70d1adf59db14163466f18fd3a6fc714b45bd4e
+EBUILD laptop-mode-tools-1.71-r1.ebuild 2599 BLAKE2B ec233f70a291a8a9d06348add2192d394c9a9ede36ad9eaffd5f9d583f81bae08681efb26eb1f587244763f7dac2b0516427fbe6299f99d43151dab50c857b4e SHA512 ba5534e5524bb4215a8a6c7ea2de896e1d3c3e6af014a96793e8706695d7fd1df87810ca8dcb05a63b4f3c973a288112c5add486d5001ea352093c91f87bc339
+MISC metadata.xml 436 BLAKE2B f89deae094b0a595dfc688ce45461a20a8b4b66191de36b3a40d01ee570c34ef59dbfae2fd14b6e4e7c76de4277907a74c21e7139d2f0c56d4eae50d4fcde32c SHA512 869ee9290fada409da987a2ecdd962591a425e43f89403046a208dee46802f3b0071c099590b486e4fe09a60dcf6de802088f153cedf44a361a58e7d9395d193
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.71-r1.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.71-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -14,17 +14,14 @@ SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="+acpi apm bluetooth scsi"
+IUSE="+acpi apm bluetooth"

-RDEPEND="net-wireless/wireless-tools
-	sys-apps/iproute2
+RDEPEND="sys-apps/iproute2
 	sys-apps/ethtool
-	sys-apps/hdparm
 	sys-apps/which
 	acpi? ( sys-power/acpid )
 	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )
-	scsi? ( sys-apps/sdparm )"
+	bluetooth? ( net-wireless/bluez:= )"
 DEPEND=""

 S="${WORKDIR}/${MY_P}"
--- a/app-laptop/laptop-mode-tools/metadata.xml
+++ b/app-laptop/laptop-mode-tools/metadata.xml
@ -11,7 +11,4 @@
 		</maintainer>
 		<remote-id type="github">rickysarraf/laptop-mode-tools</remote-id>
 	</upstream>
-	<use>
-		<flag name="scsi">Adds dependency on sdparm to control non-SATA SCSI drivers</flag>
-	</use>
 </pkgmetadata>
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@ -4,6 +4,6 @@ AUX jail-1.9-multiuser-rsa.patch 856 BLAKE2B 4974cf19df37b5a9f5c75fdb31c65e3556a
 AUX jail-1.9-wrongshell.patch 330 BLAKE2B 5d707238febc3fa77daabdd39f74644873fbd7971d8e609b2112fe5b319dbd133bd6f75e291c92cb683f6552b06605249232f675f2217b5d42564d13b78e8a8d SHA512 ee92dbfb9e147d94d2ebfaaf597ad381d93bd1e5fc65e85a20ee37c9066dbe7560a3385977cd3d30b87f5cdb2d90c19827a7adac69f667ea61a4920ec0b02cbd
 AUX jail-2.0-sysmacros.patch 418 BLAKE2B d3c5b77e8b474b9822225e913e181dc754a2b54a273fb82da6589ae54221a703f216e583207a75e3ebe5aaf0a9121d1833fd60bf1639e2d14736ad1ac40df6f0 SHA512 26da017e6c1852938799ca5a1b768dde881a29b2160a57b69a741250717c408901b95c253c0e29c8b81e94bfa303cf42cf9edb9cfd7c43166035bf846ed89f1e
 DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae
-EBUILD jail-2.0-r1.ebuild 1993 BLAKE2B dff0c030b4bb267f1a08517dacd4aca23b15f431dac9c4bdad5fe07ec0701375be02c1c597f013d2f24fb5bc786f87c2119f3be7bd8dba04b0e4bef06affa8e0 SHA512 a55e908408e387faf7615be5d3e38a6bf6b67509ce723dba49f87b862ef5c421b4cd7ea0b91fb3d0307b1fc71791c378bc26e6299b5dd886cae76c5f2b1e7caa
+EBUILD jail-2.0-r1.ebuild 1992 BLAKE2B 4bae96840d998f734badf0863b45147700ada371407a0979fcfec83b0e914cf09095b74e5aff97b6f421af2cbba7077dd4b13474872dd5b9e23bfa107dcbc9e9 SHA512 1deb6fcf897c252d64a1eb66bbb4ec6ad2c5b075c5500dbcd72c907b9e420dcbec982d95b8ab55170264be6f6c0bace364487552f3373e0e1786c138d5ecde02
 EBUILD jail-2.0.ebuild 1940 BLAKE2B 6a8220fc07cd18556f0145bdb4af069ba4749dcb886e4b0439d9d05bba8c13a439338e6cd3b89b93ff6804300af2d59267af73c03cbf103631ecf44bfd12a42b SHA512 a8df73039d7c93d4952c9c010f465131e91f15dd4cc2a806a3d90a9a4896d744d40ce50dbd36e651646846bff3e2d93c0537748d1ac8351dd0e93f9f9e683555
 MISC metadata.xml 749 BLAKE2B 6280537aad78398b6a8eb29ca55982ca838f91ad547a71a78dbedb5e63e9e028740ef230d3fd8668079c3d2983daf55187a04fdf662cceaff1f39e468d6f6143 SHA512 a9cee89d1b10080ba67cbbce957b8118484c0224368728ba1dbb553c0c6189c73c2f9c7b257a5e4fcde39270bd4d83f8e43f25948b28c151f0d9170af121b7d9
--- a/app-misc/jail/jail-2.0-r1.ebuild
+++ b/app-misc/jail/jail-2.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="5"
@ -11,7 +11,7 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

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

 DEPEND=">=sys-apps/sed-4"
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@ -1,15 +1,17 @@
 AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c58c184c082c2c311281cdd57e7176abae0f5935466a4a8b4d931d1d1b93d8f0a4e6b558a268553af4a0170061e6ebfe SHA512 f4191ba1ecac3076f958f56309c0a1d523b455fa4e3388f1cfca59c8ccff0afdfb20ef18d54794ba539b2b6d1511ed599dc44787344dc5ccce2902c9b9848155
+AUX screen-4.4.0-utmp-musl.patch 1762 BLAKE2B 10244e1f2a13a3ffa9833ae16b9d58508bbc6cce62b1971b2b0f967e9642fe12fcf96b48cf79e20db186d92cf0b41c2870640f90f25a62d71e4e9fc7e3b390e3 SHA512 9720128e1c4849330b3e7ae8163beb0bf5b4c17e9c8d003a142db59d22dcce2bff0dd437afa209b3b1538c0f28f9d4521f54134d4e28104ee74ba73d57dc2314
 AUX screen-4.5.1-texinfo.patch 436 BLAKE2B bba167b64c504219a8ef893c4e2761b7fba607ce4801bf751ee900abf9be3884d2e6df753979762043faca03af2e590edd4d851b792b99c58fabe3a3836113bb SHA512 78b6e831414ef8cfc1f747f7eb9232ae907db4fa507967fb4b43b0266d045461f799ae37e71f8d93fed78e72bc0e7d90b93d131c9e24e47892468e96b880b0c4
+AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.4.0.tar.gz 846010 BLAKE2B 7c7d37b22c1993420dbd8d4083bee0a748f28ace434963b822607747879bda60c1f2f435814e9d07ea88e4bbc1b43b6f600fce204fda7fde4a52a6314a27494a SHA512 6e43f85c419f778822ec85e4340c95769e981a3d51abdeb5f26c6ebb840da9ab11b351ecc7f380ceea39bcfaa87f1124cfebd6af4ecb62b886eb189e7b79981b
 DIST screen-4.5.1.tar.gz 963153 BLAKE2B 8f7e20a0a3dde58435fc500714b49af97b4f2f225d34394170572e79ab9a8b49beac6c054021db367a01b6da91deaa726284a25c86eb57e11dcd09ad5dc44cb4 SHA512 ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804
 DIST screen-4.6.0.tar.gz 849062 BLAKE2B e08915bb34d4e356eb33c479f1b2dc7a8f4a855e9d1c27490ff31cfc88b4bd9dfb11101dd0e4508f3b37b023b9f9b987dfaff4c6cc930e994d22fcb024cf341d SHA512 2ee7cc51c62a478e72eda0647f3f347e63f40384e19bc11b074158bd94cdb628c6425b1dd7a472496d56bff11a30a9dc58859c2e7e539fae2a8718ed9b0f96d7
 DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
 DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576541bf1321fb32bc9424abf53415d00ebcb4a13a9613788c1baad6e132f209bd0a017b100e0687b3658603aea SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99
-EBUILD screen-4.4.0.ebuild 3956 BLAKE2B 759cef4d2db818124b4ed3acbf48b2f371b0bd0d87cf15b2199d1cb00abde2b32338f558ab4158e710b77aa424d41e4e8fe572ca6701828a6038889763231505 SHA512 e143bf0d0f01d1f505ec84b4c55f36ba70391b117cf78694373fdd7b892d5df4b208b27a3d711daac0a3edbf05debfd9aed03eaff961083bca791df504c07185
+EBUILD screen-4.4.0.ebuild 3992 BLAKE2B 9da66bdf4a45c12a3edb864ce7d818a8c04f9b14667017ffd4b12d078f5dfb6522ef0e99132adb6582721857a7736e47977eaf74fc426c88eaf5c24731dd089d SHA512 e729eb11f867eca28ba9fdbf00be2f6a545994ce880e03e8efb79b1c789f431b5c195020365e9f3d7d0db24178dc38b465a30e55190512d2df46b6634cbb8513
 EBUILD screen-4.5.1.ebuild 4139 BLAKE2B 78aa003685d14551cf61b8359193680b480c7513296735ddbeeaa23ccf54f551043b98a7f0891b44868b9d634b31af1ed3e8a8884ef7d6f36f061cc76ec97778 SHA512 11e9a7ad1a85dfa67dc6fb6a1e738529c74cb0b82ea96d6fa023b4e6b71cfa14046b318e42d742595e9bda33af1d7514d1a6b0efc48696975b5d939db177471e
 EBUILD screen-4.6.0.ebuild 4087 BLAKE2B b227ee979c0b357b20aff909f266276a2c5232a822607ac3af60f00f33b94cbd148112b711d9db203fd811df21cb470e53a3d4f85283ea722e5041c524856507 SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968
 EBUILD screen-4.6.1.ebuild 4087 BLAKE2B b227ee979c0b357b20aff909f266276a2c5232a822607ac3af60f00f33b94cbd148112b711d9db203fd811df21cb470e53a3d4f85283ea722e5041c524856507 SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968
-EBUILD screen-4.6.2.ebuild 4087 BLAKE2B b227ee979c0b357b20aff909f266276a2c5232a822607ac3af60f00f33b94cbd148112b711d9db203fd811df21cb470e53a3d4f85283ea722e5041c524856507 SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968
+EBUILD screen-4.6.2.ebuild 4123 BLAKE2B bae379a637baf0f7007fc2e87178727a8d94695a0a00c27197420d6713a1ab2ecbe81537faf9d70ccbd0a7ab8bdad4fd4704ef4e56c5bd9ef847d365a63d7027 SHA512 47db3610117484aad073d69eb1cdd3f084fc2c07b720e7a3454d7441f4794fc1b1675e7ea54042e0a7b483731e0d147f20e41311cf2cfe38e130d220ed85f7ab
 EBUILD screen-9999.ebuild 3680 BLAKE2B 2a30c6e1703a49390dd01132f03865a3fb355014f18e9f2bdf488ff58610d0d2e38bc397afb83804b6d69dc2bf32715c0b9c31e694c791def50096f91d051cd8 SHA512 f27332b033f31450f6cd66ea8e9a39866470633e17eac7d6ea26bc093aaa62f85dc5001875478592c417889e298c2eb87f16954735e015405f4d4ba712cf09e5
 MISC metadata.xml 1886 BLAKE2B 7e3e98299946589016013172efe577871d7dd1f364fde617842650bf262d5e3c49623fab5cd6640560a50f65ed0be875802dbdcd9cbe3450da01e8177da0678a SHA512 2fe77ff502ba653cf53a4a03159f085339881e23ce48b30f1bfc8638c3d0e33a4230dc82819464fd9566e42e8546e5a4011811902adfb2ed5e96938a8cfe5785
--- a/app-misc/screen/files/screen-4.4.0-utmp-musl.patch
+++ b/app-misc/screen/files/screen-4.4.0-utmp-musl.patch
@ -0,0 +1,62 @@
+From 74fdc8988b55633cd05f8625390cd3f6a8102003 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
+Date: Sat, 13 Jun 2015 17:52:46 +0200
+Subject: [PATCH] change checks for utmp/utmpx in header
+
+linuxes should've working utmpx, so this check was bit weird
+commit 2b1bdf96 mentions some "linux workaround", but nothing specific
+
+fixes build with musl libc
+---
+ os.h   | 7 ++++---
+ utmp.c | 4 ++--
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/os.h b/os.h
+index 55de249..e827ac9 100644
+--- a/os.h
+++ b/os.h
+@@ -250,9 +250,11 @@ extern int errno;
+ #endif
+ 
+ #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
+-# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
+# if defined(SVR4) && !defined(DGUX) && !defined(__hpux)
+ #  include <utmpx.h>
+-#  define UTMPFILE	UTMPX_FILE
+#  ifdef UTMPX_FILE /* GNU extension */
+#   define UTMPFILE	UTMPX_FILE
+#  endif
+ #  define utmp		utmpx
+ #  define getutent	getutxent
+ #  define getutid	getutxid
+@@ -260,7 +262,6 @@ extern int errno;
+ #  define pututline	pututxline
+ #  define setutent	setutxent
+ #  define endutent	endutxent
+-#  define ut_time	ut_xtime
+ # else /* SVR4 */
+ #  include <utmp.h>
+ # endif /* SVR4 */
+diff --git a/utmp.c b/utmp.c
+index fa8b87b..f5d7db8 100644
+--- a/utmp.c
+++ b/utmp.c
+@@ -631,7 +631,7 @@ int pid;
+   /* must use temp variable because of NetBSD/sparc64, where
+    * ut_xtime is long(64) but time_t is int(32) */
+   (void)time(&now);
+-  u->ut_time = now;
+  u->ut_tv.tv_sec = now;
+ }
+ 
+ static slot_t
+@@ -743,7 +743,7 @@ int pid;
+   strncpy(u->ut_line, line, sizeof(u->ut_line));
+   strncpy(u->ut_name, user, sizeof(u->ut_name));
+   (void)time(&now);
+-  u->ut_time = now;
+  u->ut_tv.tv_sec = now;
+ }
+ 
+ static slot_t
--- a/app-misc/screen/files/screen-4.6.2-utmp-exit.patch
+++ b/app-misc/screen/files/screen-4.6.2-utmp-exit.patch
@ -0,0 +1,55 @@
+From 2f1b9dfe03133c9b77ea450aed088d65128dc547 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
+Date: Tue, 5 Apr 2016 12:47:08 +0200
+Subject: [PATCH] check if we have ut_exit in utmpx struct
+
+---
+ acconfig.h   | 5 +++++
+ configure.ac | 4 ++++
+ utmp.c       | 2 ++
+ 3 files changed, 11 insertions(+)
+
+diff --git a/acconfig.h b/acconfig.h
+index 656e117..d173c9c 100644
+--- a/acconfig.h
+++ b/acconfig.h
+@@ -215,6 +215,11 @@
+ #undef HAVE_UTEMPTER
+ 
+ /*
+ * Define if your utmpx has ut_exit struct
+ */
+#undef HAVE_UT_EXIT
+
+/*
+  * If your system has the calls setreuid() and setregid(),
+  * define HAVE_SETREUID. Otherwise screen will use a forked process to
+  * safely create output files without retaining any special privileges.
+diff --git a/configure.ac b/configure.ac
+index 1a75020..8457619 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -374,6 +374,10 @@ if test "$have_utempter" = yes; then
+   AC_DEFINE(HAVE_UTEMPTER)
+   LIBS="$LIBS -lutempter"
+ fi
+AC_CHECKING(ut_exit)
+AC_TRY_COMPILE([
+#include <utmpx.h>
+],[struct utmpx u; u.ut_exit.e_exit;], AC_DEFINE(HAVE_UT_EXIT))
+ 
+ dnl
+ dnl    ****  signal handling  ****
+diff --git a/utmp.c b/utmp.c
+index da8d7ff..c864d07 100644
+--- a/utmp.c
+++ b/utmp.c
+@@ -381,7 +381,7 @@ static int pututslot(slot_t slot, struct utmpx *u, char *host, Window *win)
+ struct utmp *u;
+ {
+   u->ut_type = DEAD_PROCESS;
+-#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__)
+#if defined(HAVE_UT_EXIT)
+   u->ut_exit.e_termination = 0;
+   u->ut_exit.e_exit = 0;
+ #endif
--- a/app-misc/screen/screen-4.4.0.ebuild
+++ b/app-misc/screen/screen-4.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=5
@ -26,6 +26,7 @@ DEPEND="${CDEPEND}
 # - Don't use utempter even if it is found on the system.
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+	"${FILESDIR}"/${P}-utmp-musl.patch
 )

 pkg_setup() {
--- a/app-misc/screen/screen-4.6.2.ebuild
+++ b/app-misc/screen/screen-4.6.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -35,6 +35,7 @@ DEPEND="${CDEPEND}
 PATCHES=(
 	# Don't use utempter even if it is found on the system.
 	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+	"${FILESDIR}"/${P}-utmp-exit.patch
 )

 pkg_setup() {
--- a/app-misc/vcp/Manifest
+++ b/app-misc/vcp/Manifest
@ -1,4 +1,4 @@
 DIST vcp-2.2.tar.gz 20075 BLAKE2B 862ed1a816c45e50374e17d387d33bda3d758e155e6a38c1636000ce87de3b54928acaac5f89b0580098acb9b796e803406c9d95dec76c029fdc580d65a496b2 SHA512 3f9f60bce875f16a825b935fd241b11cc75d45b85b66133b27d16b86644c4bbfe69fa5f22571703e0ed6d235498f920a8796f6d74259db51a1abbd626c6f5137
 EBUILD vcp-2.2-r1.ebuild 829 BLAKE2B c8df56cefd1edaf23cc6f9a2168438e6a7b6c1f94ea8a778af5e141f23ab3c74f4494445cc4547a6ff3572264864bae65ba849d99fed5eeceae43cd36c8e14e7 SHA512 a25a27c4cfe12343c4aed26eda370effdd57520622a664bf96d8af67642af2f63ac4fa7a746913045fd6ed205094a6444e3c3c2fb88c302199a7245b9249079c
-EBUILD vcp-2.2-r2.ebuild 761 BLAKE2B 5d8bcbe118ff98f2b9d72aab80393240c70940223e54d1d856e6b643beecb795ad4a2cb515a1a56ca7e6dee9e2f90d3b2922652f8a84dbd503b21bf90f2ecdbc SHA512 1340743c4d91c3b9fd6eb72ebc746ca3e7360049dd6e6c5cc31c73b9b5b2132068df29c4d22b27349d2d83a059f954041ec144903241c9756ee1b23de8336ca0
+EBUILD vcp-2.2-r2.ebuild 768 BLAKE2B fe6e54d20bfc7e9f97556bd1bc555cf0520ff59ecc76bd6286257646913bace753642d693f2de6168c9db28a4931affe9eeea79c3dd5e012c3e0a879f50714bb SHA512 acaa4de38b3ba59a87022774f66cea48a801211725f0726f302320280cb1c41a65b09604deb5b3d5cdd65e8f5c101da068e5c91a6cf89847038a6d4356cc2db6
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"

 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -2,6 +2,7 @@ AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 BLAKE2B d95ded4f051c77aed22ce99f627
 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
 AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418
 AUX libreoffice-5.4.4.2-gtk3-no-gtk-build.patch 436 BLAKE2B 609d8867eee6830e79cbbbce96b260a9401b8b26385bb0af3a4627a8350f046282c9d8084787be03195bc36ed7cd91465b5017ca0801abaca8a0048cc8994bfb SHA512 d2d3e03c2962f4996839808a0c766d60ec897d764b3b1c8c588ba17da7d2d320083f88b8ade5709bbc359e3529ab5c4510806d7ec2a5aa79899b05da6f802851
+AUX libreoffice-5.4.4.2-poppler-0.62.patch 1556 BLAKE2B 73c6218c1b12308b80db6cf93c1cd3d5fa317b5a65832df942c521f931e9bc1b624b1a50b3f7a34e168dad2c4e8ea9db7169b3f3ee27787f3aa1815f771368bc SHA512 759fb125ac09309c4b7dee4ee2d57c4e275b95dd31dbf5df7ff25dec687fd473815ad307dc4dc500ace11823c9f2b2e7bddf5c986fdfa2eddd3051eee7240cae
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
@ -14,8 +15,8 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234
 DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92f367101f84c8639b84d86a1b8c2386d8aeec61dc01706078cbb251ad81abebb914acc7f5e977aa17fcd1f55db65c0861814e2 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112
 DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226
 EBUILD libreoffice-5.4.2.2.ebuild 17284 BLAKE2B 2f1c4a8f7a661b36fa3eaa8559eeeb9e7140cb3e1cc71ca1f4272512e3a268c7e24e60bebd9088a76f06e546bf0307a6e18626fc2e4fe55f04f7ad081befdc27 SHA512 3fde8087bbe39bc3bbf6509bb2faa9635a9e7ced06df58c67f143de24fc49f9e3742d5e61001a28fa9a0d600e8bb5ff72fb578acdd5637ac37c51679408cc810
-EBUILD libreoffice-5.4.4.2.ebuild 17309 BLAKE2B 186f9d88608fb9b7d4a4d8c807e43fa7dcba24ad3e4078177493522c842daeabbb2ec065953969649761194f32dfbf744ec1087e1628a8e7e3c5fa7a573f8f80 SHA512 78109e2aeeaadfc7e523867f00dbaeed8e9debf85fef6540f44befe08004d53a336b76bab74c5f53e62ed329cd38812bde17810079b08a38e6eaa62a92d079bd
+EBUILD libreoffice-5.4.4.2.ebuild 17361 BLAKE2B 7fa4ca01338ac8cd9e07288e672ddd033368a5a0281b4c56c2ebe21d6814fec6d1aedf9f06cab4ffa4d0b54f3285cf64781d205926860e3c03907c1b34171086 SHA512 8f551d2d9de46e3ecf10953ece19d9bd005164c6d407e4b980a57dfa74b82d6fce3481d9466a909a938d17cbcf87e27c57e12c186ae8d2c405d9cb32ac76a9b1
 EBUILD libreoffice-5.4.9999.ebuild 17252 BLAKE2B 428ec36f2c5a34e8ae917b665d2e755eb450e3e6429a7b9bc3c752de0acef58456a6ba5e95ed28c826f508027ad2b7a60b2eb348afda1ddc5b70991fd4b57492 SHA512 6ee98390f0f11cfe931cdc4e370c36d485f2cb5b32d2ffc94de94a9824986e0e944b0842a53ee80bf21614c850c17a1dcfceb8c7be8cc72525581c36bb392774
 EBUILD libreoffice-6.0.9999.ebuild 16755 BLAKE2B 280e9dafda7955a3e465336c37493a8d48ed266ddbc1c07d5b74d920a136b09890302fb0ee34956bb41151d31d7ba9bd58085b2dac43362ac388c5383e1060e1 SHA512 a3d58083662497e71904c522ecf5c2475bf00d40b97b81639e274416f2feea3b820a93e86b37c996ef98390b303f0f7b80a24e7c226d3d8f5af63c131bf5ec13
-EBUILD libreoffice-9999.ebuild 16755 BLAKE2B 280e9dafda7955a3e465336c37493a8d48ed266ddbc1c07d5b74d920a136b09890302fb0ee34956bb41151d31d7ba9bd58085b2dac43362ac388c5383e1060e1 SHA512 a3d58083662497e71904c522ecf5c2475bf00d40b97b81639e274416f2feea3b820a93e86b37c996ef98390b303f0f7b80a24e7c226d3d8f5af63c131bf5ec13
+EBUILD libreoffice-9999.ebuild 16668 BLAKE2B 0625317ed1b43d21ab6e96f001a69f75ae04cccc6bed712bbb6b6e623f0c1e76795420a4275d63ab53b5e4458a7d23c906e7c68b81a1dc1f094e5bd12a39d5db SHA512 e5e80d8bafaf32d0ff3dad306d456c2b2fa09e003974bca70c7742fde62c2215389ac0876c378e0f235ae9bb1953ce961496bb0dc79cc530f0dc9af96003bf41
 MISC metadata.xml 1393 BLAKE2B 011d5a2e756882852e46eedb9ef66977b93131c570491008a9ebc547b91276bc2e6a7a3db045d3de0758d1ea6ca486d3ea5b4d5c7c667b08534212cce25c0867 SHA512 72cff0c78665cb79e4cb3df72a87af3dc02d9d46f6293a02974602387b50245553d90e1d7d3134d8143ffda809b3a497b43279652ede8ae7eeee9e724918bef7
--- a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch
+++ b/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch
@ -0,0 +1,44 @@
+Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version.
+
+--- a/configure.ac	2017-12-12 18:45:07.000000000 +0100
+++ b/configure.ac	2018-01-04 23:57:16.410999542 +0100
+@@ -10403,7 +10403,7 @@
+     if test "$with_system_poppler" = "yes"; then
+         AC_MSG_RESULT([external])
+         SYSTEM_POPPLER=TRUE
+-        PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 )
+        PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 )
+         AC_LANG_PUSH([C++])
+         save_CXXFLAGS=$CXXFLAGS
+         save_CPPFLAGS=$CPPFLAGS
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2017-12-12 18:45:07.000000000 +0100
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2018-01-05 00:29:16.541246738 +0100
+@@ -32,13 +32,11 @@
+ #pragma warning(push, 1)
+ #endif
+ 
+-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
+ // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
+ //        because the internal poppler does not provide poppler-version.h and the macro always returns 0
+-#if POPPLER_CHECK_VERSION(0, 21, 1)
+-#include "UTF8.h"
+-#elif POPPLER_CHECK_VERSION(0, 21, 0)
+-#include "UTF.h"
+// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0
+#if POPPLER_CHECK_VERSION(0, 62, 0)
+#include "UnicodeMapFuncs.h"
+ #else
+ #include "UTF8.h"
+ #endif
+@@ -918,7 +916,11 @@
+             );
+ 
+     // silence spurious warning
+#if POPPLER_CHECK_VERSION(0, 62, 0)
+    (void)&mapUTF16;
+#else
+     (void)&mapUCS2;
+#endif
+ 
+     char buf[9];
+     for( int i=0; i<uLen; ++i )
--- a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -246,6 +246,7 @@ PATCHES=(
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
 	"${FILESDIR}/${P}-gtk3-no-gtk-build.patch" # bug 641812
+	"${FILESDIR}/${P}-poppler-0.62.patch" # bug 642602
 )

 pkg_pretend() {
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -64,7 +64,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"

 IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
+gstreamer +gtk gtk3 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"

 LICENSE="|| ( LGPL-3 MPL-1.1 )"
@ -157,7 +157,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		gnome-base/dconf
 		x11-libs/gtk+:3
 	)
-	jemalloc? ( dev-libs/jemalloc )
 	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
 	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
 	mysql? ( dev-db/mysql-connector-c++ )
@ -413,7 +412,7 @@ src_configure() {
 		--disable-online-update
 		--disable-pdfium
 		--disable-report-builder
-		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+		--with-alloc=system
 		--with-build-version="Gentoo official package"
 		--enable-extension-integration
 		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@ -1,4 +1,4 @@
 DIST orage-4.12.1.tar.bz2 2590788 BLAKE2B 0f00b5704e11923c2ceaac81f0956457402a90f65709c165c98b6942745ea3adee176691555a18548ead258951693187e1b3ce9a718abb3b13c2a1c2a4754e7e SHA512 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
-EBUILD orage-4.12.1-r1.ebuild 1545 BLAKE2B afc4e63e83c48fa0bdd704e8463a44401c20dcc0545e455682fbb5f5259b4dc8e19e7bdb8c762ef5cacec1c7eb398888c2f25cb25ae1c1db4c0457fcf8a6fcf2 SHA512 e0574025aedac981add0abbc5385e3f0d8b95d6f15ece0d68e7f535cbf3d98e38c9685ff09916e193d81299daa89d867cfcca942dd42f96196f4a1f899696273
+EBUILD orage-4.12.1-r1.ebuild 1544 BLAKE2B dc51c2888bdcf2de961ad47e50e4160e20e3528c78de31cc30473eb3d7d097f8d7174a60d390c5b20c756d336886ca04325fd8784129833a8e3f9076685223da SHA512 b2376df9a1c1bf4fa1a2cbf91b5ece5558bb43d3ad79740c0d04ea59db1cb1ca11e5aaa259a22ba404c9d8af567c0ab1ffe3ac571ba94bad99798280daddd978
 EBUILD orage-4.12.1.ebuild 1605 BLAKE2B 9a1afcbf79c3f71a2f825f5688f8f719623294416edb18cee1cdb37dc0aa12e412189d82c2885e272237e316f52e42612692f3849baea43e810c1940c46d908a SHA512 25d2a0f1aa8e63c3b8246efe5ac49ac86c861bef8dc4ee3287dc502a2b09bd6e908684d1ec788d7667ae25ed4e48f84da0b8c3ba53ff8fc65dc44eed6d400128
 MISC metadata.xml 355 BLAKE2B 4ddbf38a80be81b7e131d7c616dfb88dff1e900952c17c4cc4dd26711e720351177d92d8225825dd57354399ecdb8b7bccd18f883fcd927846e8614dd4ac4a99 SHA512 a5d3f875ac31caa10ca77ce8eb38449b3007094d1b9d7d307bd15ee29644c09530d44ac6a4953e10adfa3bd45b6a3fe44dbbb3b80ab7d0c8572c48523ef287eb
--- a/app-office/orage/orage-4.12.1-r1.ebuild
+++ b/app-office/orage/orage-4.12.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="berkdb +clock-panel-plugin dbus libnotify"

 RDEPEND=">=dev-libs/libical-0.48:=
--- a/Show more
+++ b/Show more