gentoo resync : 02.04.2018

20 files changed, 124 insertions, 78 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index eebed1671cb9..5b5ccb3b7628 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emact/Manifest b/app-editors/emact/Manifest
index 2145cff5f614..0b0190c10789 100644
--- a/app-editors/emact/Manifest
+++ b/app-editors/emact/Manifest
@@ -1,5 +1,5 @@
 DIST emact-2.56.0.tar.gz 578640 BLAKE2B 2bdf0a88003c0cbd28153737eac588dbb068ed99a1166dc66a5fac33f91d2b3c7e058518733c6eddbfeb3291f3ad89dd4a6bfc4b11ccda0963a314a5fbf4e2b0 SHA512 96fce3bf3e00e84abd9de0778a02cfd284689073391e6f9eb3bb4a54e8899ae32d9e8acd45d0f1d575e36f171ca148fc574c9ecc71615df9a9907ee1d30bb99d
 DIST emact-2.58.0.tar.gz 581248 BLAKE2B 9be43cfc37973d683c5c824bf2f2d60d0ffab2791c46a4082f04d83fc705713d5806608e5802e786be4ced4b008842c5c6dca60b7a30c5483b29736ccc21ffe5 SHA512 43108d0bc1989ba6e11f12e86ad5fa4e0b06dc2cc11f54a8b1ca548bb91d2d201f62ffda5e8c11ff75a724229ca1a2ae3e2f439ebc62e1fe3f484f811a88a2c2
 EBUILD emact-2.56.0.ebuild 605 BLAKE2B aaff4cc4d961a4886aed31adc6a367783b344aba442c569ac4e573e3fdcbb71db1caf08d2f6a2d02993db42ca8e86fc6fc0494a20b995abf78d604c2fb990aac SHA512 c1b0ba7d6eafe7e177e412eb7310aff4ca2244c28099e05d38ec668346d3e518cd79b271e9204cfcbe0e9d654a2302105c8288a7b9eacfa4fde395c11737874b
-EBUILD emact-2.58.0.ebuild 508 BLAKE2B 9af94bd2cd97dedf4f9cc34ab6a29f2ca0a6a7fd12acae7c8fa5b7f532c01f0363eb6e8f35d069a94b2796b0cd02a3c7f7fa0a75df97b9e379274372a7ce0c24 SHA512 7f12b81ebaaf97a6b508d7803d9d44788370a394ddb560dd1f69ecc2299274aa9c0c86da06afdbe7c11b08000ee93079641c74eca0e506bde37494c21285ecb7
+EBUILD emact-2.58.0.ebuild 537 BLAKE2B e490d6d41e27d98eb5b8a5f94bf8c54aa63a2189622e0587cdcc7a5259870f4d30343d5e6fa5eca133888efd4bf28984868d0cd52d7be596d07d36ab2ac48a14 SHA512 de9cbd218952362a79b705d6afd672925c03905ec3cd421435cf67e143b6f2f98ef46cc1df9d3c37926c872606942d9320c0af1e60a4eb88bd5ced052646046e
 MISC metadata.xml 1356 BLAKE2B 6038a2811fe4103bcba606fe464c1ca1ddf0765f064507d84aaeaf92f92de0c51ca4d75a88a32576a50631f694ad2e84d842602c50f03a2e9ac9ee4b8a0a12e4 SHA512 f376c46dc531f259dda9842b817c5eb040c4c2f9ee811e728770b660e4af1b8d588081e34bd3149c88fbbfbb976cc6cdb3013a8c8a5ae488a198a9c3ac10d75d
diff --git a/app-editors/emact/emact-2.58.0.ebuild b/app-editors/emact/emact-2.58.0.ebuild
index 8d8b17864ccd..b2f3b4a4d8ff 100644
--- a/app-editors/emact/emact-2.58.0.ebuild
+++ b/app-editors/emact/emact-2.58.0.ebuild
@@ -12,9 +12,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
-DEPEND="sys-libs/ncurses:0=
+RDEPEND="sys-libs/ncurses:0=
 	X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
 
 src_configure() {
 	econf $(use_with X x)
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index 516fad6bdf88..e579b9c99591 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,3 +1,3 @@
 DIST gummi-0.6.6.tar.gz 792642 BLAKE2B 4f6096999b06361811a9149fa08eff5d2315f01e55539c5849c4bc86aab5a482ad9a0adfe84de5d093e66a328b294b4d88e1e2e2f0355bab320f0c094581da97 SHA512 3be94927c9aafa4914ed2b6f6f5022dce5bcca315a1f947fafb8a4c8bbc5a2bc57f07f8ceaaacdd0b92a5a30483ea8b00e570faf62479280d2ad874716e4c47d
-EBUILD gummi-0.6.6-r1.ebuild 916 BLAKE2B d9eecaaceb5a63d0b2e8a4743898b1490e23a4e13f50b70a6b3836d20222fae83dbcbee9f3b1397b599e3be0fe600b80090aadad7a38d8135134ef7a4bb87bbe SHA512 c270fab91385edb852fdffe343a2b435c82cffc8c3857172665d5365c0ccff02b645528e9c928fb966c0713a2aeaf1693100ddb83728f59458083403c03bb61c
+EBUILD gummi-0.6.6-r1.ebuild 923 BLAKE2B 5192de8451af829ae3a9a2b673c17bb84263304d0ed1dc0a4249843c58ea0fd743d09f3dcdfe627dd22fa21ae4e42d444f63e25994c815178e6dd9c54def2668 SHA512 e65c0d73e2e9f4210048e50dda8247f1bebef281a5528edae821e45b407545933091c9446a7dc47d4c140f169d283281c643eece5bfab8c87f13bf24667f9a8c
 MISC metadata.xml 696 BLAKE2B fc79a12f64bb7a8961b064fad0deffdaaa483b26cf2899594828396bad3c431bebfaa6cd4c1259b2e8ebff13cc569b4ba787065cd241007a78b5c391f9279149 SHA512 dc55d2a4588bb6d42e4e97c8a383ea5a8b22668ca59083cb3acb50b703c2f6478b6dd51c1af82f622cb4c9b5da8062d80c569212383e7a904023eb39d84f5f9f
diff --git a/app-editors/gummi/gummi-0.6.6-r1.ebuild b/app-editors/gummi/gummi-0.6.6-r1.ebuild
index 1c0c17e25b5f..e1b1546fc67e 100644
--- a/app-editors/gummi/gummi-0.6.6-r1.ebuild
+++ b/app-editors/gummi/gummi-0.6.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/alexandervdm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 46720f3fd815..b79cd4680c0b 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -12,6 +12,6 @@ EBUILD gvim-8.0.0386.ebuild 11569 BLAKE2B 2e9803cd0cad4f6d9ba86f7a4f9242a1850c40
 EBUILD gvim-8.0.1188.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
 EBUILD gvim-8.0.1298.ebuild 10469 BLAKE2B b0f04d4d5a1df2854184d2d0f9b64129524af078e86096704348a86710b8b551b77f3d8b0a2071a56a650cd747b45cf437e58ec7a3259b5b1332c46de1dd7f2e SHA512 27f0671ee4de3ffbbd4d6d56c09550fe4774ec1d9b5b45513f6314719e1f1c6e0ea55215dfe5b88c253d16bd97bbcc7cbf734d7c9049b11df625da300e7c589c
 EBUILD gvim-8.0.1428.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
-EBUILD gvim-8.0.1645.ebuild 10495 BLAKE2B 2c3e61a00479e7adf15fdd2bb32a3eb4c806c67b40aefa068bda7270a5af7cd27ed3bd02c04c07d60697b5710e47a30097e925d86a88062a3fb3bdcf35636b20 SHA512 6335c49298a9e01775b0baf9f52bb8aae61bd6cae0ecf51f43c1b5b9fc19fbd8b2919c02280e38cf391a80bce364ff83b7eddcc0acdf2f0c64e58ff8609c4296
+EBUILD gvim-8.0.1645.ebuild 10502 BLAKE2B 47db270abf2ea71b92173df98377634c0b59d04383059ac557c0c8fcd8aeeb11ff8aaa1a7cb4b40819f386b040952ca356457e500d9b0a9a553e1bea60379a16 SHA512 da4f6c564a06f5f8eb50a56836235eddadd20515afe66a74efd0fce24a3a048db52a0cc0ae8d7e5fbf5fd57f0861e0a50e966a4a31f106059f0952ceccb7b589
 EBUILD gvim-9999.ebuild 10495 BLAKE2B 2c3e61a00479e7adf15fdd2bb32a3eb4c806c67b40aefa068bda7270a5af7cd27ed3bd02c04c07d60697b5710e47a30097e925d86a88062a3fb3bdcf35636b20 SHA512 6335c49298a9e01775b0baf9f52bb8aae61bd6cae0ecf51f43c1b5b9fc19fbd8b2919c02280e38cf391a80bce364ff83b7eddcc0acdf2f0c64e58ff8609c4296
 MISC metadata.xml 578 BLAKE2B a0b7e41324455706748f79109affec89e72dece0b41346d0cc804742cc7e5aa88f89556623b1aac4f53387afe6e6145049079b1cd44d3411bcf2f8ee8c7c2bfd SHA512 b2db961a6e59b803e2371c4e6dda496917d6c5e332f36062be8dbfa4fb47b4b640d8deb6871c9ff3c5a527fdf9c16aa13f14b9e0a37f93a3a10c6f6b57808126
diff --git a/app-editors/gvim/gvim-8.0.1645.ebuild b/app-editors/gvim/gvim-8.0.1645.ebuild
index 1de46facaa9c..7b9da4cf8c27 100644
--- a/app-editors/gvim/gvim-8.0.1645.ebuild
+++ b/app-editors/gvim/gvim-8.0.1645.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 @@ if [[ ${PV} == 9999* ]]; then
 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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 71815663e79b..344160d63769 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -5,5 +5,6 @@ DIST jasspa-mehtml-20091011.tar.gz 628008 BLAKE2B 97c8326e7acfdc4bc4ddd2ef6bbcf0
 DIST jasspa-memacros-20091017.tar.gz 1105437 BLAKE2B 0a74715db55498fed646f209a9121a96c673cb34c487968c4f838bacf6404db717fbd8392d26f8fa120174923724af91e4a14bda088bf229765d1e99c785d8ba SHA512 08908acac4dbe56695362172dabe621b8cca77a35da599c6cf5b4e87700c03f4ee190ca12d5c69b2d88c623cec527daac0980dec2ed713ff563e88ebe636a725
 DIST jasspa-mesrc-20091011.tar.gz 810128 BLAKE2B ce627dab7cf4ec09b099e755c3eb17e773c64fbff60741244cdb134ee1555ffff592ef3684eecae72d5da36c10cd7caa23a03112154c616ad3c7667d913354b4 SHA512 60cc5a83b3cafd8e517f88732dc94feb0329b962bc714eaa5616ba89776fbfac41833be88fd3a666443291184086494434fb8763747c1dc5e216ce793b694b68
 DIST meicons-extra.tar.gz 43345 BLAKE2B 5b3d6e8a76604364d8e5464ba764aec96d822054c02bffed4cd763f7691f78bc3455904cd06d89ddcf8a0861134ada3c7d228751d4f3685e6700ebfc3dda2354 SHA512 bb6879fb12ec1c7b346bc1df2412a837ffdd0569f6be2800a433307a7736bb31798b3c2a71e02cebdce39c59d93d1a986f80c92184604e4292606c98285fe02a
-EBUILD jasspa-microemacs-20091011-r2.ebuild 2112 BLAKE2B 0ee0fa34a3ddedf3c6d3a540fffb735f32d89838acd97888d7491551bd231e6c49b27e5be747db464732452a4dcbf3ded757ac921ac07f594149b0ca593dff88 SHA512 a0c924ea30ef893be7c374d12317dda6f1374f84286b2ed749e416b86d7c71965b271610e988f594a1dbe0abe0aaf65ba22d22f95cf2f114cf0fe1d6ce7f3858
+EBUILD jasspa-microemacs-20091011-r2.ebuild 2115 BLAKE2B 007a275b88257cc808c872a7e659851f13fbc0916d4b8c1789e0e83fcf849b9bc317819de2e9785e240412bd967f6eeaf2f7d403399b28f102f07cbd2c6bd17c SHA512 ae515ed70c9b13b891de1cb703323555df57a7002a5aa69815b7f50aaf6f4e11bb155aaeb52d4cd60295a4d27e2cb50f5b0d8a3c61e99aa33bf01bb13986576c
+EBUILD jasspa-microemacs-20091011-r3.ebuild 2322 BLAKE2B c0f6dfda03b15f0a1b308b4e0a78ac18b2384fe4b12f751444319c8285dae66b53ef2290e0c0b1e37f29cdc60757db295f0480502fcc33477eb869a0bebe16f3 SHA512 2e9575d8093c8208ad41ecc199fca54cff4ebaf7c603fb3aea615d9f5fec0366ea9d4faa263f5a94a3c24c5fbd8414ad0939b1edbdb29f01767df127ff93e416
 MISC metadata.xml 1094 BLAKE2B 9983b2ebf7f9d7a979180ea0d4aa063ace2fa5a3a630339bb8112a8691eb6b46964d298d9b49c2d02b2dba2750e501b5740de2242da00abc4b24ba08af8d7fb1 SHA512 2116ed586b24da86206c4d38977c118bcf2381d455a3cd0fb9d672f8d709b5113fe4c8767e2d2f20f8c879a71f0e6bfb6384b9efe30cba82e177fa75dc4e0d6a
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild
index 55e0722235c9..eb138ec6f5bb 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -27,7 +27,7 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	X? ( x11-libs/libXt
-		x11-proto/xproto )"
+		x11-base/xorg-proto )"
 
 S="${WORKDIR}/me${PV:2}/src"
 
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
new file mode 100644
index 000000000000..770b292dd3e7
--- /dev/null
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs xdg-utils
+
+MACROS_PV="20091017"
+DESCRIPTION="Jasspa Microemacs"
+HOMEPAGE="http://www.jasspa.com/"
+SRC_URI="http://www.jasspa.com/release_20090909/jasspa-mesrc-${PV}.tar.gz
+	!nanoemacs? (
+		http://www.jasspa.com/release_20090909/jasspa-memacros-${MACROS_PV}.tar.gz
+		http://www.jasspa.com/release_20090909/jasspa-mehtml-${PV}.tar.gz
+		http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="nanoemacs X xpm"
+
+RDEPEND="sys-libs/ncurses:0=
+	X? (
+		x11-libs/libX11
+		xpm? ( x11-libs/libXpm )
+	)
+	nanoemacs? ( !app-editors/ne )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXt
+	)"
+
+S="${WORKDIR}/me${PV:2}"
+PATCHES=(
+	"${FILESDIR}"/${PV}-ncurses.patch
+	"${FILESDIR}"/${PV}-linux3.patch
+)
+
+src_unpack() {
+	unpack jasspa-mesrc-${PV}.tar.gz
+	if ! use nanoemacs; then
+		mkdir "${WORKDIR}"/jasspa || die
+		cd "${WORKDIR}"/jasspa || die
+		# everything except jasspa-mesrc
+		unpack ${A/jasspa-mesrc-${PV}.tar.gz/}
+	fi
+}
+
+src_prepare() {
+	default
+	# allow for some variables to be passed to make
+	sed -i -e \
+		'/make/s/\$OPTIONS/& CC="$CC" COPTIMISE="$CFLAGS" LDFLAGS="$LDFLAGS" CONSOLE_LIBS="$CONSOLE_LIBS" STRIP=true/' \
+		src/build || die "sed failed"
+}
+
+src_compile() {
+	local pkgdatadir="${EPREFIX}/usr/share/jasspa"
+	local me="" type=c
+	use nanoemacs && me="-ne"
+	use X && type=cw
+	use xpm || export XPM_INCLUDE=.		# prevent Xpm autodetection
+
+	cd src || die
+	CC="$(tc-getCC)" \
+	CONSOLE_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)" \
+	./build ${me} \
+		-t ${type} \
+		-p "~/.jasspa:${pkgdatadir}/site:${pkgdatadir}" \
+		|| die "build failed"
+}
+
+src_install() {
+	local me=me type=c
+	use nanoemacs && me=ne
+	use X && type=cw
+	newbin src/${me}${type} ${me}
+
+	if ! use nanoemacs; then
+		keepdir /usr/share/jasspa/site
+		insinto /usr/share
+		doins -r "${WORKDIR}"/jasspa
+		if use X; then
+			insinto /usr/share/applications
+			doins "${FILESDIR}"/${PN}.desktop
+		fi
+	fi
+
+	dodoc faq.txt readme.txt change.log
+}
+
+pkg_postinst() {
+	use X && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && xdg_desktop_database_update
+}
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index 002d3c99f3ee..5d1f3dd669de 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,3 +1,3 @@
 DIST jed-0.99-19.tar.bz2 884198 BLAKE2B c3d967e59b909a39d0f7fb49c8ce9aef70585ba433bc5c6bebf5db1b6b88de0c41b35059a242a38be91a97a5296a279bdc85ac30ec9d4ae221d94e50e41d8995 SHA512 db8a30284f9b8e3e2c5d1a600eeb7af29c9f943a5c23d7c74fce926e0b0252f54805e214670e7c9357ce0e6918ad67cba2769a523979bfbd285328f94fff747c
-EBUILD jed-0.99.19.ebuild 1132 BLAKE2B 229e63741328912b9e2e0321c8113c46c9b5c7f3029e5aa6f69f3af667ec29e3628bf33b766598fe06819642a761379283350106572b151e8db8b65887dcf5ca SHA512 2a13c24a1b5653cac76788b37f888022897785382bd1bc316448d6e06a893d2481a2a39b55e3fca1a13e4c507e1eb593709221896b4a8d8e28f0dba264b787d7
+EBUILD jed-0.99.19.ebuild 1135 BLAKE2B 31333f1321e4f07b5d37b3198f4f91c22c7578996723c288a2d0152cf31b8dcc2f7c4343bc9c902c47772bcce8f670c048b48ea4eaf7272afd79d3510ca98bf5 SHA512 1311e8b402ab97a696f6538543da6b313fd84d62fd0fb3000642e03205d693d867fcb076843e9edcf1cab139ebeeda898875b6c33e6304381a537fa800d5981f
 MISC metadata.xml 614 BLAKE2B 023aea459e74aa16cbfd069da28b6c2bc1b87e17be50f1f49e4f070ef8764a75f53b56b6d61a9741caf93ccc1b07cd34a523940754fc33cb6591bdf7f6f417cc SHA512 79f54c7d84965a95e575c4c38d5c9a2158de0a1c539ee32f5839312bed707c8d0df00f7733c3cedeee1cfb3ac10619ff60dc0441f7062535f0d7f79094f5443b
diff --git a/app-editors/jed/jed-0.99.19.ebuild b/app-editors/jed/jed-0.99.19.ebuild
index f58a30d246cc..04e69c80056f 100644
--- a/app-editors/jed/jed-0.99.19.ebuild
+++ b/app-editors/jed/jed-0.99.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -28,7 +28,7 @@ RDEPEND=">=sys-libs/slang-2
 DEPEND="${RDEPEND}
 	X? (
 		x11-libs/libXt
-		x11-proto/xproto
+		x11-base/xorg-proto
 	)"
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 161842187fd6..0796fd228efc 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
 DIST mg-20170828.tar.gz 141028 BLAKE2B a0243ee05f86161f1a9448ec92c8cf14362a60dd3643ad49f79fdd6c2ffe56f51415321eb6f3d7b78c1ca6eab9cb91380cdb63f699359080011d6801feaedd04 SHA512 1ea16b1dd5e9e08abf9fcf0889130b4f39d36872bb64df85470a9ced1db87c0eecb18cc6e8c3c5a04f9049d58ef4492d5a88cf3502ec3351abccb7bddfb90c14
 DIST mg-20171014.tar.gz 141045 BLAKE2B a5b3bda6ff3b6416093069b471762687c2279737aa05b297ccd3077aff195cf52831566768613a81dcc977a27ac5ffd6e8a1874aa1010b6d90f4c678b6825cee SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56
 EBUILD mg-20170828.ebuild 1047 BLAKE2B ee8886aaabefaeb4005d711eb0520c4508407ff0d44c1b1a0094b025764242c9ff35df8808288b7b9df3a48120d0f00de880b454d1fb7176c0c570e5a3781e07 SHA512 e2f54dbdccc36ed6055b96c69246507c085fd88bb5bd136a05e8d2c364c0c887dc866405116fe1f28d63a03392c82da2abb2bee34db1075490cb3cbce24e92b0
-EBUILD mg-20171014.ebuild 1048 BLAKE2B d148f97337ba3e10e0431a6865037f2c1269baa641c8a48d537acbde354b6b35027374d7b0acb11ec98cbf2da961b4412b5664b0241a27e08fbfc792b4207837 SHA512 7b3432aa1ee4f993d908e0aed4c4fb38009b31a5c140784604bc00340e509db807f8cca41a9e248aada131eafc324df5f8be0375837042717b7bf6d29d6f7844
+EBUILD mg-20171014.ebuild 1047 BLAKE2B ee8886aaabefaeb4005d711eb0520c4508407ff0d44c1b1a0094b025764242c9ff35df8808288b7b9df3a48120d0f00de880b454d1fb7176c0c570e5a3781e07 SHA512 e2f54dbdccc36ed6055b96c69246507c085fd88bb5bd136a05e8d2c364c0c887dc866405116fe1f28d63a03392c82da2abb2bee34db1075490cb3cbce24e92b0
 MISC metadata.xml 384 BLAKE2B 86ad99174028addfaef8bb9f143949161c8d1d81f2e946b3aa9088bd644b61ce97869d0a0b669abcff56e925fe8757d77f6123a2dfe340b8620db2ae84ba0b55 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf
diff --git a/app-editors/mg/mg-20171014.ebuild b/app-editors/mg/mg-20171014.ebuild
index d02db8372099..232a6b42a429 100644
--- a/app-editors/mg/mg-20171014.ebuild
+++ b/app-editors/mg/mg-20171014.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 5792ae1b8f3c..eebf5cee3c0c 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -4,5 +4,5 @@ DIST scite365.tgz 2391190 BLAKE2B 0cd2b1b24bcd15815357125725b1453935dc944ca1ddbd
 DIST scite402.tgz 2424648 BLAKE2B 84a331865310058d26ca45a25b99d98a7c3374d0463024e31694e2ebbd519a20e8e368dc1dfabc2534e8f015fc95ca53382bc223476b882a7be543ffdc44ae2b SHA512 97898cbb8675d013dd91828792de1c71e3f013b21c59c5112ddc00e7ee35c2ba8cc29e2c3256b91171e052145a25cddfd0034505e3c185999c734504bb702283
 EBUILD scite-3.5.5.ebuild 2116 BLAKE2B 6804a7de3d7d491d901a7ed2c0acaded903864579b1045fea2845ff63754f35328ad39e1308e9c4462cbe63d147e3d22844dbef37b0469235a8356e4de722bad SHA512 3cb6bea06bb846d448eb5643037cf961d916fdcca96efce4202fb4eb351741300f170b91c777831129dab523fc1644bf1955b586811cdb3b02dcd4a93a9f98bb
 EBUILD scite-3.6.5-r1.ebuild 2242 BLAKE2B 2203a916c7e4b9eeb2c78dc15aa8bab6ba18021c8796ee5b3eb03f198d04360153622fbf031bfe5bac10ce1e1880cb1bea61d5ebca4b068daf272ece5f19ecee SHA512 1fa0330ecbaef2dd14b39eb5b285a6ce7db9ee227749675e9658d278b3c0cab26920f633525717e129e7a95ea134b8cd95aab839ea180c8099512d408c2c8969
-EBUILD scite-4.0.2.ebuild 2697 BLAKE2B 6f4a3d594f4a98980006c4b9c4ff8e38ccd57440ba7813b780fdc9d2a8aa62a51eae65dd23d59ef01ed8b095f5e4f41f4aca03f1ff141dee76652ca661a85131 SHA512 4e45e4056e891f35ccd46518523d3cfa6f10fd7fcdd95c2d1aecc3abf88c1556538b0f80cddde7fd3cd8adb737a9575c5dd9c165b4a5560f8f7762b713e92554
+EBUILD scite-4.0.2.ebuild 2696 BLAKE2B fb806e58076633f9afd123427367262817bd3ce41d9d3541dbad8cbe250e2bc354112b78335f074a7cd11f5960279743620bd00c8d5e5621566374c85fbd7190 SHA512 e42f8edb2cba0438baba51879f5f376a12d7fce542f2ebaaedd9a8c2623b515f4d28b207d128fc3521315520da80ad887edbb701ab0ccd0cf405a5880dec98c4
 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-4.0.2.ebuild b/app-editors/scite/scite-4.0.2.ebuild
index 36a304e51703..b480aae0dade 100644
--- a/app-editors/scite/scite-4.0.2.ebuild
+++ b/app-editors/scite/scite-4.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="dev-libs/glib:=
diff --git a/app-editors/yudit/Manifest b/app-editors/yudit/Manifest
index 5d46bcdbd49d..388161f88f6c 100644
--- a/app-editors/yudit/Manifest
+++ b/app-editors/yudit/Manifest
@@ -1,5 +1,5 @@
 DIST yudit-2.9.2.tar.gz 2831966 BLAKE2B a7ac8b3b538820e6101b57f8407fd99e9aaa4baf16fd3b09c4d4322b53b85fd631a3b36b6bfac214cc378fb4fd8b9ac30c2cb77959b680064e5ec625998ec6c0 SHA512 39bbd6f1696a97922a5db83b25b52609660ea77c7651cfde1d7189789e7d9a6298f6dd91acf17ab9d1bef1fabbdeb7bb1f9ab95a14198913c84c30154efd9e07
 DIST yudit-2.9.6.tar.gz 2797142 BLAKE2B 76fb8e0ade65c84389db71b4100e458f5b70aebba27eea4b604bfcee08974060dcd2bab2d86586b5ba729d8d5090c943e825dfe58d71c609f0ca2f2e0c3900c9 SHA512 a9a0b6f6c44451cf2fefc4fc0bb1bbd9ffccd17c4c622dc35b08113245b3bb9f3ca949f3e7b9d2aa919ebf3840295c5e63c0297576e74a5f2d1fb99cfc97c46b
 EBUILD yudit-2.9.2.ebuild 774 BLAKE2B 5304e2e5e5f9dcaf5f8847f5709d5457b5d4ba2b15d3b4a555ace0cb9f91edc26e7d2521dc388c8a3f538d01ef92cc7416e8b6f5aa6c59ecbfb29e1e5bfbebf9 SHA512 7964bc24e1309add3b4a1a9368270db946cddab68ca27747f91122124cf9bb64e77e8d9f2ed366e29dee56e9dd174cf97118063585443ffe6e84af4028400744
-EBUILD yudit-2.9.6.ebuild 606 BLAKE2B b85829503705b202f02169d92df124e5b0cfbe87f84cc442d2168c828e7ecb5928efc08d30ce863c0d2f787f35d2c6ea4f33c82165516f85acc3fdc44546d704 SHA512 a2b41b8414b291ff75a5a1cdc4e7303a4961da7cfde950348be9e341d10192a7b4bd85ee6a7b8e08812bb9de9309123fdaf9341539c5dc33dff5d83aa6079096
+EBUILD yudit-2.9.6.ebuild 605 BLAKE2B 45d689a80e13e419d91ff82225d3187e8b0223085438f028c83eaf0b12220c3400367001b4bd698613bc68f5916b715c1dba13b6b511885350e269989bc92321 SHA512 e7282a4f3531726c3cc1d91d512f5681b0a88dfa149f8c5dfdaf984e34da7e3c357e710290ae38c73faf0f83bedee9ea8a23b78175080878c0778d8c9ce916fa
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/yudit/yudit-2.9.6.ebuild b/app-editors/yudit/yudit-2.9.6.ebuild
index f6907b50b917..6fc40b09664c 100644
--- a/app-editors/yudit/yudit-2.9.6.ebuild
+++ b/app-editors/yudit/yudit-2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://yudit.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index 18ec159034d1..15c2ecdbe628 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -2,10 +2,8 @@ AUX zile-2.3.24-gets.patch 904 BLAKE2B 7d5bca1774f2a507281b17213289bbc15a75e112b
 AUX zile-2.3.24-userhome.patch 980 BLAKE2B c72dd7bd03325b93d9ef46cd76ad6bf463821fe611396743a64e161c3268086e252651b3fc05745fcd00ce614a94c776d7305251ea971adeb80e799d7edbfca1 SHA512 b1d0e4453771d36efe6547d9c30c807af0a05866bd728a94d30f25b8e9248d880a02143c5d1d9b47fa7a5cab9174804feeb3cc0f2956474c948349581d7a25e7
 DIST zile-2.3.24.tar.gz 953962 BLAKE2B 242f0f9532a536d5ba36664031cf86eba753239c0f6dcd47c086496628a730bdd0a9112dc1ffd26965068f6d66d35d3ad3c92fc2753e129adf9a5923321e2cdf SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9
 DIST zile-2.4.11.tar.gz 1293707 BLAKE2B 30317856303cd093e767f7c057fab74cddcd49e95d8218b550e343d689914db02c82c5f35c66335e0685df9113dcbef93b4640fcf42438fb600f360b82c4e396 SHA512 dbcbae98d8b9fc7ea71abc8ad0c4248edf1498a731172e800dd4b1fd598597924cc61e24fbfce5eb44dd2b3a0b2aea416c6373843a450e19cc8c98aa83d6ae0e
-DIST zile-2.4.13.tar.gz 1296379 BLAKE2B 00dce642e6b452f66fd06e70a7f9e9047abb2c79af7fbc0c9150da37bfda31027c06c43028e22b657ce6a948f2e3e89375a6f5bddfe5222aa69f843cc5fc3ec9 SHA512 ada0eabe6285894ab4c25fa71c3ca6f07f0df2d36ad64f92037cb1b02d7b898dbd64fa47ef96800b7d995a5958ddec525e0d849a427e1f9bf14da944a4c30e88
 DIST zile-2.4.14.tar.gz 1385314 BLAKE2B 43815e87bb037a8de42b00510ce8addd748fe2a639f78e736c7fe6220c972ce600a8db557dd592065bb27e1d35a5d3a42b6a4a8d5d76eefc4274a8ce27b1d9c2 SHA512 0dea56fd13a82015ec73de3139a4b2c27ad4c001ed535f1bae557ee49f9d8a188610a08160998d0a36b95fec42b46a019fd43634ef6502ebd27e162164de98cc
 EBUILD zile-2.3.24-r2.ebuild 1364 BLAKE2B 40fa024bc57b7c62136001d4885943d670f6c2f8f7f49ae283c846648ec58c863dc24d2509c08d6288093e74f1d6af6bdb4eaeabf0e959ce0afbfa796a1fb2d9 SHA512 6eb6bcb7a5364d2615a957da3c6ceaba32f646b7ba263e749a49937b054d6d409c178e8b78b17ae820e0e81aa3d6f0d8fb888a95185df690a9e666bb37558fa3
 EBUILD zile-2.4.11.ebuild 901 BLAKE2B e0ec9fa51062e9438d35aef6c8ccd18d5bb506719166c2a8198b331a8f0c94c034923e09a1becd65dcd8f09380e98cd061fcdf645dcc48883a13fffbe7e4ec03 SHA512 c0229948c5c9d813ae8a5530ce3de60a0eab82de587d985975a77933207e3034432dedb73f37b86fc824a1cbee747cb6b39b67e7c6571dfb04c6e240d31a58ad
-EBUILD zile-2.4.13.ebuild 1380 BLAKE2B b548475202c1c1e147329433516d35135f697046048fd630f62c6f8cf1955096e2e0d8b78ddc4036f7ded03fc760128a01df68d487d26b95509848f6adcf9f3a SHA512 08074f364ccc5a5755244317a2520dca2637666e4f01c71cac78c42fb239c93e037004cc22786dd687bc43f9d9ede32e8b5892e8da73a0711ed31b161b123b1c
 EBUILD zile-2.4.14.ebuild 1414 BLAKE2B 58877639a95bb2069cd4c62a98a5e970748c19891db3536f0a0cbf074bfaa51c520d6f4ecfde6486bbdc3e852c11d0c6fd02285d23063c4d9a93eaa9bee64d64 SHA512 421171734b26201e48a1b686023002ae34ea7fe498ffa1bf866f7b68ab9517ffe96ac6d827e68d2a51e768509422e62da57bb042af1504d76d243c8f7c30209d
 MISC metadata.xml 638 BLAKE2B 4830ef65d641a21c208c6e856daf949d8b931c1beef92f93e5428fae095e0c81e39ca93b9d9ec4cdafc74b689b1469e86d73f8a31fd3f775d728f1f973b1b743 SHA512 f2214ca22b8c80124f264991e70ad97047a5705dda78bc59573f1c80d3ee144343502bd7f610117af263611c11cb1c7c0b732fe44b6274272a50b7cf5d595ad1
diff --git a/app-editors/zile/zile-2.4.13.ebuild b/app-editors/zile/zile-2.4.13.ebuild
deleted file mode 100644
index 98fa830eec21..000000000000
--- a/app-editors/zile/zile-2.4.13.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Zile is a small Emacs clone"
-HOMEPAGE="https://www.gnu.org/software/zile/"
-SRC_URI="mirror://gnu/zile/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="acl test"
-
-RDEPEND=">=dev-libs/boehm-gc-7.2:=
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
-
-src_configure() {
-	# --without-emacs to suppress tests for GNU Emacs #630652
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--without-emacs \
-		$(use_enable acl) \
-		CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_test() {
-	if tput cup 0 0 >/dev/null || tput cuu1 >/dev/null; then
-		# We have a sane terminal that can move the cursor
-		emake check
-	else
-		ewarn "Terminal type \"${TERM}\" is too stupid to run zile"
-		ewarn "Running the tests with unset TERM instead"
-		( unset TERM; emake check )
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# AUTHORS, FAQ, and NEWS are installed by the build system
-	dodoc README THANKS
-
-	# Zile should never install charset.alias (even on non-glibc arches)
-	rm -f "${ED}"/usr/lib/charset.alias
-}