14 files changed, 158 insertions, 92 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e774ad50ec64..d19eccc08851 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index c8abc85683dc..cf2d1ea0c65c 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -1,8 +1,11 @@
 AUX joe-4.3-tinfo.patch 1063 BLAKE2B 574f78a31200df60dab81fea278bb238fbfe0a2b3f70f1f9a2ed78f3ae7a6e7a5d979fec61ad3ed9934aece27ce7836730e7f9755a7f25225dd74928c5454694 SHA512 93db2de58d2a03412cae7dc2b2769103f3ad275b68e22d6e3379871155656c8d4d4f29fbf014c6c8eb5b70ec234189af52a6b6b6826bfde46d6ee93b92f55bcd
+AUX joe-4.6-db.patch 392 BLAKE2B 8ca4d25a1e1be76b87e581720903064f4a54b928c6c7a91991d6ae6227df00e4b13c6c9fa3ac47563f5924c5e9aa18a86f1cb471155d8ca8fccc67e151f7bada SHA512 47eeffc203879ae7a644ef3875bda41c7bd776a51fcf7f6e9d4a30a5e5f0209d1067b516efcd5faac3ecf2fb204e0105eb9cc453df5c853413a613cfdb6e4fc6
 DIST joe-4.2.tar.gz 1341048 BLAKE2B 112163e67311051dad8714e19cdee1a11ff3bbe297341c89a4023f7d68fac7eecde57d1d522f72407b0a77c227c7af424ce20567c0c47dea6c14ac41f2f2301b SHA512 7c34f4467d89330ac195cfa76481d9ede4ee3764d0b1b24d091d1e6325bff451d2a9bc9f86a73404c9909587bcbe3e0c14511b739ec121edb7595ea1fcba028f
 DIST joe-4.3.tar.gz 1270523 BLAKE2B 442e05dd29a0a8d4a26500c89a2cafee88bf2d1ed00a4cb539d940e2e849456e6c4c5bf347b4803ee02ab38311b225cc8034177a1e0b7a1967a2629fd283b7e2 SHA512 a711ce129518863856b8f581ac7acdd7661f5e571cb77c5411317e0db0344c9ba44e73ec2ca9a307e639170a7914d53352eebcd00a33c9270809551f12376e69
 DIST joe-4.4.tar.gz 1350062 BLAKE2B eb58117e313ef4abc31026a2800f2b9258c12d0d865c768138ec42a97c1f7fedcd8e397f7aaf13f8bb3776f2571d5a85e27ea7f9a6fbd6710d935a2b80afcd1f SHA512 ef31443dda30569c5193cd1907e06f1caba349f746dedf3611b5527080e49a4026001d3d06629f3c9c712ae9265866efbdbba6f51d110c0e6ee95f39f0e3059d
+DIST joe-4.6.tar.gz 1895046 BLAKE2B fbf53d3b5b066cb32bb26b08d7d314a3bb89ac5ae22db498cdf3597bf8cb322bd9aa05543debd47ac7380a33982c388e13f38c60747503494c582393ae8eb13d SHA512 3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82
 EBUILD joe-4.2.ebuild 1170 BLAKE2B c1d8e1c49a3cbcc8dba6c6d679bb0b7e543e5b7ce5b2cde63c5a1970d1c4e2312f751323d4ebcddf1612465e526551756528548db4f4aeb04c93e14df2acfd6a SHA512 e0b51d75d14eb5bc34fd8628ce36f77cb4154965fe8189fccbb2d5d4a4dc746f6ccee09b13a50347a532619b06f13ec254c0c1fd37caaefa9886ca1e6e8504c9
 EBUILD joe-4.3-r1.ebuild 1303 BLAKE2B 7359e4551103885dc2f31f6a0813095bc08b04db37697beb90b1ef89fd682352e8cf835a638dd14fb10016ff49716a34e2623f4f60c632cabe8e9709d0c87301 SHA512 a93ff4ceea8a3fabca0b5c8ffbe0a610ccb446e6ab77ac161c4b6b4a6d63b6ba72fbc7328e0f3b6973ed8808909de0751499d696a2b2e76c705852086ef73d5a
 EBUILD joe-4.4.ebuild 1303 BLAKE2B 7359e4551103885dc2f31f6a0813095bc08b04db37697beb90b1ef89fd682352e8cf835a638dd14fb10016ff49716a34e2623f4f60c632cabe8e9709d0c87301 SHA512 a93ff4ceea8a3fabca0b5c8ffbe0a610ccb446e6ab77ac161c4b6b4a6d63b6ba72fbc7328e0f3b6973ed8808909de0751499d696a2b2e76c705852086ef73d5a
+EBUILD joe-4.6.ebuild 1480 BLAKE2B f75038bdf7d60f8bee2c5d5a5126daefc449e9ca3aa2b69984a5504ca7239a99b593dad0a31d76c1ee3db6b5bac4330757ed4ed1d4a09e8eb1793572dd19238b SHA512 1ddb947597901e7d1b1633cb96f49b1744207ee01c4a1e5775a6386c4885613b7db47b5036c06ace6cce339ba43a7ceafe39795f2d0ed6fe6dc916dda29f962b
 MISC metadata.xml 914 BLAKE2B 9af1e6230a119f778ed4404922ba650ceadb0ae58966cefd2df8b4424efd2b813a5c9805a1796623028308172fc9bf94b6effc9b9b7f34b0d1de9c484150a8eb SHA512 12324115a08719acf2377848a9cb930b4ad69764624a1cf093e4ef3e124fef85e059476a0f1b353314a03d97089fe0c518adf47f2da102f7492a1e612c420b15
diff --git a/app-editors/joe/files/joe-4.6-db.patch b/app-editors/joe/files/joe-4.6-db.patch
new file mode 100644
index 000000000000..6270e9045cd8
--- /dev/null
+++ b/app-editors/joe/files/joe-4.6-db.patch
@@ -0,0 +1,11 @@
+--- a/desktop/Makefile.am	2018-01-15 12:01:12.624449958 +0100
++++ b/desktop/Makefile.am	2018-01-15 12:01:38.964448343 +0100
+@@ -1,8 +1,2 @@
+ desktopdir = $(datarootdir)/applications
+ dist_desktop_DATA = joe.desktop jmacs.desktop jstar.desktop jpico.desktop
+-
+-update-databases:
+-	-update-desktop-database $(desktopdir)
+-
+-install-data-hook: update-databases
+-uninstall-hook: update-databases
diff --git a/app-editors/joe/joe-4.6.ebuild b/app-editors/joe/joe-4.6.ebuild
new file mode 100644
index 000000000000..9c03dcbe1bc0
--- /dev/null
+++ b/app-editors/joe/joe-4.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils
+
+DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
+HOMEPAGE="https://sourceforge.net/projects/joe-editor/"
+SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
+
+LICENSE="GPL-1+ CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="xterm"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2:0="
+RDEPEND="${DEPEND}
+	xterm? ( >=x11-terms/xterm-239 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3-tinfo.patch"
+	"${FILESDIR}/${P}-db.patch"
+)
+
+DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
+
+src_prepare() {
+	default
+	# Enable xterm mouse support in the rc files
+	if use xterm; then
+		pushd "${S}"/rc &>/dev/null || die
+		local i
+		for i in *rc*.in; do
+			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die
+		done
+		popd &>/dev/null
+	fi
+	eautoreconf
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+	if use xterm; then
+		elog "To enable full xterm clipboard you need to set the allowWindowOps"
+		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
+		elog "This is false by default due to potential security problems on some"
+		elog "architectures (see bug #91453)."
+	fi
+}
+
+pkg_postrm(){
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 72335bc7b4a2..ffc120179233 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,11 +1,9 @@
 AUX nano-2.8.7-minimal_compile_fix.patch 1206 BLAKE2B 72265b226a23282baf1d16fe62637a3a6123342da9ddf9fa205d7eaafea710aa62fcafad1188cc1c08bd537be3ddb98403afbfd035fdac5712d6bf24bf2fa40e SHA512 1ebf43ca322c0cd49b7a3ffaad33057d4ac899c7a930569df124e54f713b28ece7e01aa625db91ece0126a07228256d188154bce464bd4c1a97945d686d9f0f3
-DIST nano-2.7.5.tar.gz 2031723 BLAKE2B 30cd6418c438d6a908d7bf0f64151f6fa3c9aa41f0c2657a1146c1702fa9ed517349f784af7aa18c8a1cb3f93d5819ed31d153d1dad3dde5232306dc6dad8cb0 SHA512 a5332a361c4d0d9d0a77ebb11cdcffa976bee4981d5665b2732a9e6d7a2997566d9345332f2e6e5cb74f0a81be4413f54ca8f719962ab10b32d7ec1c9271973c
 DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79
-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 2269 BLAKE2B 5a5dedd043bdc83e044660a1d36fd2a54205e619cc0b718304540d4d8fe80d49c7ab72360fbf380c151fb756efee43b81e6ceb38b34033ba09dc01b1d246a161 SHA512 7f144e4200fc635dd42c949f9214e2542f433c8bfcd31fd77c5821b215244ee49501808651975576058486cd1e9811b93dd94278ab4a4b403ba8ac21eba4725e
+DIST nano-2.9.3.tar.gz 2874342 BLAKE2B f0983af89037c15747e416df8b156d325994244dce3a1d3339a0a34597d6b25a1888132d28b393cde36c7fd18375036816a9e7f6b26afe8a85ea32b27dee4969 SHA512 cce389a00dc4db899d7f73522e991bee5fa1fd0538a1af08aa75563e29e6cfba38b53acbba1d95e7876f3cac6298b5cada102d700334446419aadfe61ac18d2a
 EBUILD nano-2.8.7.ebuild 2307 BLAKE2B b7ab4e20fcb2dcec5b6f2a198fbcb2a2619f9f29081521d1ce7a555be8bf44ef060ad9b8f3f229bf272bd5cf6c5f066e10d08f2596b5d3954279be71a4d09ad6 SHA512 693683af78bc48911cb50813cd8e02ded2546ce8efc79c5897c804c64479d889518d88f1cbcfa79e11409fd0f26543be270f2da451618d4b3756dd7d2bc7b4bc
-EBUILD nano-2.9.1.ebuild 2253 BLAKE2B c3b7d53fa6dafea37b151e5ee6296836d824a3f875da8250add163b862b12c8f037c383e2a258d0cba7e7667d53c001ed97c521d0b2920e9d6f968d9f8be9066 SHA512 52383eef617aa519b6084c88230d8cda018e447d3fcd032bc04aca1dad41c09f4a86203ce385accded5ea0c1d1cbb59f15f1736b9496c26d8e5b02a10e580ea8
 EBUILD nano-2.9.2.ebuild 2253 BLAKE2B c3b7d53fa6dafea37b151e5ee6296836d824a3f875da8250add163b862b12c8f037c383e2a258d0cba7e7667d53c001ed97c521d0b2920e9d6f968d9f8be9066 SHA512 52383eef617aa519b6084c88230d8cda018e447d3fcd032bc04aca1dad41c09f4a86203ce385accded5ea0c1d1cbb59f15f1736b9496c26d8e5b02a10e580ea8
+EBUILD nano-2.9.3.ebuild 2253 BLAKE2B c3b7d53fa6dafea37b151e5ee6296836d824a3f875da8250add163b862b12c8f037c383e2a258d0cba7e7667d53c001ed97c521d0b2920e9d6f968d9f8be9066 SHA512 52383eef617aa519b6084c88230d8cda018e447d3fcd032bc04aca1dad41c09f4a86203ce385accded5ea0c1d1cbb59f15f1736b9496c26d8e5b02a10e580ea8
 EBUILD nano-9999.ebuild 2253 BLAKE2B 0c5d1fa1a6cc54836bf07a83a4eec32d38217c4f5133d185d4e859219a236f73587d75fd2be1c03deace487032a35c59569e2df098af5b0ff0c88659916f74ed SHA512 8729d366c735abefbcd7d123599ef93edf0b3bad87507df4847751d4c117de6a2110484f509c4126b7417ccbcfc9bdda058960a4f7b888466e8f84bf9c5399e7
 MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82
diff --git a/app-editors/nano/nano-2.7.5.ebuild b/app-editors/nano/nano-2.7.5.ebuild
deleted file mode 100644
index 1b7c160db489..000000000000
--- a/app-editors/nano/nano-2.7.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
-	inherit git-r3 autotools
-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 ~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"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-	epatch_user
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=()
-	case ${CHOST} in
-	*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
-	esac
-	econf \
-		--bindir="${EPREFIX}"/bin \
-		--htmldir=/trash \
-		$(use_enable !minimal color) \
-		$(use_enable !minimal multibuffer) \
-		$(use_enable !minimal nanorc) \
-		--disable-wrapping-as-root \
-		$(use_enable magic libmagic) \
-		$(use_enable spell speller) \
-		$(use_enable justify) \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable unicode utf8) \
-		$(use_enable minimal tiny) \
-		$(usex ncurses --without-slang $(use_with slang)) \
-		"${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/trash
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-	fi
-
-	dodir /usr/bin
-	dosym /bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.9.1.ebuild b/app-editors/nano/nano-2.9.3.ebuild
index 74791e406856..74791e406856 100644
--- a/app-editors/nano/nano-2.9.1.ebuild
+++ b/app-editors/nano/nano-2.9.3.ebuild
diff --git a/app-editors/uemacs-pk/Manifest b/app-editors/uemacs-pk/Manifest
index 17e5a25ac8f9..f579787e4e70 100644
--- a/app-editors/uemacs-pk/Manifest
+++ b/app-editors/uemacs-pk/Manifest
@@ -1,4 +1,6 @@
 AUX uemacs-pk-4.0.15_p20110825-gentoo.patch 302 BLAKE2B b4e1e998b8befd15b0c6d9302a42f547848f346dab632a64688091b0e8180332935e3a72773247498314e82af31a904405c965dd7073bdb317f0d09944752f34 SHA512 6938e768e742ffcbd88469c58bba07325d0c2ae7d354bdba66fcc3f9d47d141a98923fce516a03a799032869461da301cbe8ce7f312196a51f69dddcbe5c069b
 DIST uemacs-4.0.15_p20141208.tar.xz 151500 BLAKE2B 18fed2319b7440583e4e5bb46b8f05a7fe3ec7ffc44c1c8d6311a760472a509a28bc8bbded02f1128d0d663bc78b6a9382173d203bad83a1d09503a992382d33 SHA512 a632c82275ee652412aec7d8f3549d80c5fd5bb1211675828ec4c58365bb7819927ff4e92f6fb7b5b9030b681062773ea19f1af345d4d3ddb652c3d68507bdbb
+DIST uemacs-4.0.15_p20180117.tar.xz 151600 BLAKE2B 76a6a3cd3d0abf720721c7c09687c1964958e6c1c05ad8db07e6e561d6714e436d31659d118af85d069ad77da2606b0ac86005824e2ac56db8040a0ea739aabf SHA512 aadf3f9e8ab3f2c9c7bccf305f7a37e75ac1c92c5c388ce35a10b24cedf886f7d9b0ce8b1196c2f96a0d874bd5af130edb3ecb1ccf571d8e8c00753564e38aa7
 EBUILD uemacs-pk-4.0.15_p20141208.ebuild 960 BLAKE2B 8ec0c49532a0e7fdafa19de4f53b0d1a872ae77979ef698bb49770f985f75c7f4963396877759929012a99ceb4194f0efba30ed3ae2f03be3c0192cc9affc4aa SHA512 576483dcbee259b580687c43cdf06da086627f65cfd28db1af092b363e03dd1ececd1feecf61b3a6163d4a1f8f20e0261a26fd1f1d4378dd394f377f002796fe
+EBUILD uemacs-pk-4.0.15_p20180117.ebuild 939 BLAKE2B 961d1397e9096f5643e47258149e6d8ab4381bd6a4165283f27c9674edbe0e2fda0e5cdfecda281c6d1f392f1fd87d45817a9403aaa8366a19607e5c45209697 SHA512 e9e26f98e7ede2f435ae23f9da2e51c6ea77eaf4a80fb560756d039817df5d8bf4a48a830198c8a7c4262e7b84d8c97d74bfb3c22ef2731a31146961872e832c
 MISC metadata.xml 1038 BLAKE2B 78d5d45edaf021f6be2ecb46cfc2c8538a14f7589d16a1891481633e23c272f8d76905b27535baedb4af0be51b7e1e9a2ea1bc286dd79c6c06d7b6658a856df8 SHA512 303232f4886511f0731e699a8c29a1925f506a037cebc60669c02aa060b2d555bdb2378919f5d66e61859e18a3b2ede21204edc5fce37a9220ab9dcf2f23c1b0
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
new file mode 100644
index 000000000000..726fa1800847
--- /dev/null
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="uEmacs/PK is an enhanced version of MicroEMACS"
+HOMEPAGE="https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary
+	ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK"
+# snapshot from git repo
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/uemacs"
+PATCHES=("${FILESDIR}"/${PN}-4.0.15_p20110825-gentoo.patch)
+
+src_compile() {
+	emake V=1 \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_install() {
+	dobin em
+	insinto /usr/share/${PN}
+	doins emacs.hlp
+	newins emacs.rc .emacsrc
+	dodoc README readme.39e emacs.ps UTF-8-demo.txt
+}
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 0d47579a6aca..9d8a711a4c98 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -10,7 +10,7 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
-EBUILD xemacs-21.4.24-r1.ebuild 6743 BLAKE2B c165faa3efc2f86562fbfb87ad2c331dc35985010519d1fb3ab2ddcb75ed381ba4807c222fa9f4ca6d1acc21f5b04ce52cda87dddb05c0389b48d9ea50565469 SHA512 3853149a0124af80e97a21d217b30d1ecbe2a0c1cb629cca25783d52e6e48c2529374de2b9ba78baa248e80bd1a0c4d42f09325e7c61afc5f747b5a8cf09b895
+EBUILD xemacs-21.4.24-r1.ebuild 6742 BLAKE2B 73211147c0bc411503b7db9ac74f9b3fae325257b1699b0fa7b3e8defed7248f1101a12db40ddbab136687c0b5a1bae1f6441039e512780559842ca02f867824 SHA512 8272bb9a7f410e0ef04c72c97606605667e37f77a2735e2049dc605169dd696b69351bf7682608f5cdd3ace8051b0fa64a82675aec296a5a07cece47f2546cc8
 EBUILD xemacs-21.4.24.ebuild 6788 BLAKE2B a8d5f8e02091ddf74fdfa162495ffb4e1916217c67a918ca6ab6608e8b93e27c1870837a928bc5e2c054fb01bcf30e2afd5d3408e5cf72899e71cf3a306c7d47 SHA512 16138020c9b6cbc0530bfb19e4d0f70761b07e4cff8d18cdb68685f0d377fb21537b2d2e96822a06cc78d03908e0ac1ea82e109b58a02bf1b0a32fa7388f4fc9
 EBUILD xemacs-21.5.34-r4.ebuild 7233 BLAKE2B ce8899fb0469c40d4e7d23c79acacd7572c2dd851c6552a4c5d1b5e90da5962cb5586aa9721568169a8d3387a491ae3086823a341e840ebf466eacf75a2d8309 SHA512 ae27520c812aeb17cd6de7dea660d3c2f5bc9394a608b17f1e254ce197b68aa05b9a1c7fa173ae7cc0f2ae0462189ecbca13b5ae6df3555fb8ab9727d0bffcd6
 MISC metadata.xml 666 BLAKE2B 973f63c51ed0fc6532c2ba3acdac88ae4224eaa9fc5a6524712660d24dc5b8672b39123841eb3122b767f454006aefc7b2b7ebb443a7e45063467c659c813983 SHA512 e106c48dd98ac741c2fe9780e86f77a339957ecb490b0f33b88e65b61724f8f96531c8cc6075bd724e97ea4efb9b7e4cae5d7a33fe51e5693fd04734d83c135a
diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 1ab267882133..91886480debf 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc ~x86"
 IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index ab93465ab690..68c3154bd01c 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -3,7 +3,9 @@ AUX zile-2.3.24-userhome.patch 980 BLAKE2B c72dd7bd03325b93d9ef46cd76ad6bf463821
 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 889 BLAKE2B f66a9c8e3049d9a837855979f54c06dc1e39bbe9ed14f6861d6701ec517adc546cc078d7da134633ab685530cad1e30cfb004ab634f335ade6dbfd70e8821a86 SHA512 22f325d01af4bc598c06c63eb5cd395fbacb982af9b697d3c93c32a68f34eb858d4ba71416d9bcb5733a32c1e576812da75413d88e94940275f5612f60cc799b
 EBUILD zile-2.4.11.ebuild 901 BLAKE2B e0ec9fa51062e9438d35aef6c8ccd18d5bb506719166c2a8198b331a8f0c94c034923e09a1becd65dcd8f09380e98cd061fcdf645dcc48883a13fffbe7e4ec03 SHA512 c0229948c5c9d813ae8a5530ce3de60a0eab82de587d985975a77933207e3034432dedb73f37b86fc824a1cbee747cb6b39b67e7c6571dfb04c6e240d31a58ad
-EBUILD zile-2.4.13.ebuild 907 BLAKE2B 7397084b22444aa0a6e17688bb30f2fcd6d063a38901f0ddf201bbd5cae29704f5ecfc03db06607bcfcbbbed7609632eb45819a0e3faecb47f577b5fb803338c SHA512 cba207e0ab9e48a733fbcfdf2e67645069cfc82a44f762f3933ab5883d3ddb6600593ac4230c57c98feae5a190eed787b9602da4c90ace917b600101656b4749
+EBUILD zile-2.4.13.ebuild 909 BLAKE2B 687ae226a301dfe13eb40cf0b99e018df99a3ec4dbb097f61af853e44c08c73f80adfe5b12792a06baea69702eeccc01b41f848f2e939c98c454e6d2b3ff915f SHA512 d3e8d0a0ab0cf46f18149b6403c19ca50de798cf5ff7d4b21e2977b100c5d6183381f15f6328591d2a54df536b43460044b92fa84115ba01dc42f61f2baa14d8
+EBUILD zile-2.4.14.ebuild 909 BLAKE2B 687ae226a301dfe13eb40cf0b99e018df99a3ec4dbb097f61af853e44c08c73f80adfe5b12792a06baea69702eeccc01b41f848f2e939c98c454e6d2b3ff915f SHA512 d3e8d0a0ab0cf46f18149b6403c19ca50de798cf5ff7d4b21e2977b100c5d6183381f15f6328591d2a54df536b43460044b92fa84115ba01dc42f61f2baa14d8
 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
index a7de10e06756..74d312cf2c51 100644
--- a/app-editors/zile/zile-2.4.13.ebuild
+++ b/app-editors/zile/zile-2.4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~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
+RDEPEND=">=dev-libs/boehm-gc-7.2:=
 	sys-libs/ncurses:0
 	acl? ( virtual/acl )"
 
diff --git a/app-editors/zile/zile-2.4.14.ebuild b/app-editors/zile/zile-2.4.14.ebuild
new file mode 100644
index 000000000000..74d312cf2c51
--- /dev/null
+++ b/app-editors/zile/zile-2.4.14.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}
+	test? ( dev-lang/perl )"
+
+QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable acl)
+}
+
+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
+}