17 files changed, 225 insertions, 68 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index f24ffca42031..fae0481c5f06 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 9f73e8af2191..974b878e6bd3 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -6,9 +6,9 @@ DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7
 DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aaf0b83eb6fa841ce4569bc58e2bd12802890c2a8496375280c0ce8fa56515918dfdcbc958f349bc2472104e37ad1fcd1 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
-EBUILD emacs-18.59-r11.ebuild 4230 BLAKE2B fc6f41ecbacf7318de3db12189406d00a2a652c8c10f638a667ba83214f6d7ebf8b78e79c1bb1d04b5ea861001e57ef1d6dd29411f9f660528170c119c55e461 SHA512 686d67d281bc9e39087e2d804e9f9db578293ebb52f9730ac971fa3b938e1310923e78b488e4a97d0e6432d10ee7bcf4338ee7190763a1e03792c4105923beaf
-EBUILD emacs-23.4-r17.ebuild 11543 BLAKE2B 7d81a885b1e616e2ad999551f71b2b5a148343b12aae151737b5016ebf3907c14f742e5b5027c69d96ca30973005c9672ab2df4e6a1cb8937c5b3c9306e3d1ee SHA512 f918a9697111a0acf74a3a85ca1ddae9bf31ba67f3813d8ac935323dc8fab919d3780a144bdb81e763205c108ff023d3b05287b8c1558019769678d7572e4cbd
-EBUILD emacs-24.5-r5.ebuild 11262 BLAKE2B 43a9bfd9e8f3d8a9f455de0259be93190046125a07409bc207619a649571a6f3b73f65a0fe47a4924fade80e063b7a71540a27118af28ec434b9d0860c908e9c SHA512 9fbf4f3ba1440a96fe8965fb74ff225ff00286793cdfc47a707a22837068bbb92eafabe51224a805eec557546d45bd09320749b98fb6c087ad6b80c2fa506bb5
+EBUILD emacs-18.59-r11.ebuild 4358 BLAKE2B 891a95e5cbbee86dc136ecbdaf5b7c2aeac06b8d2fca5e10095d5052a4ad8d68903ce8360ae98425c457993d51c166d2bc766fc280f00dce859f0396a1851b43 SHA512 701fb20f7051a8e66577b02647bbed62d9ca83343b4dbb87d87337f622ce35ef41d85e8c0f575874b3a4454dc5f0b2ef545acf199564b7cb45020ec5c34540f0
+EBUILD emacs-23.4-r17.ebuild 11606 BLAKE2B 2e97c8718805e43451cf0983f40778a9978dfc5e5b3b052d706e5334cf71f696e19930dd770fd3b9b4e2bf13fbb8b6d44092843e426d3d3727c202aade82c8e2 SHA512 cbae99ac079f2cd6fa2924219cbfc13f66c0b40eb613aad58c276eafd599835199651fa8834d59fab9b7fe459155cd8f915323fbbc91327bea1eaad1fca2a055
+EBUILD emacs-24.5-r5.ebuild 11321 BLAKE2B d85cf7cb787c177a934e6609295d05d4fab1d93f3d14a0fb9fa5d67796825e07f263dc884c92b4a877c91f16d16ad2b319bec49ca9c63e9287400b1d394fa3cb SHA512 53563e09fef028ecef516dd40fbf1f090e270ec3fac57c54c54812cb5b2bd50ce268ce328c15719067f9271728239a3a2ddb002c962f711fa4ef33c53278c11b
 EBUILD emacs-25.3-r1.ebuild 11677 BLAKE2B 49cf26e17c3d336a888f8bcd5eabe2723f4345784c4df836b4f62f056521cfd18e8d78340d892867810bef0ec61de468929f32d70f08d6f91984b2fce3eb294d SHA512 53d0b970fa78a1ae938d46d6e7af0ea28a4b46f66df50927aba7d2bf6b5c895c785fc917a016704a6dad8b481824481c76e99193d5a2ef3a02cd4d2d1011f052
-EBUILD emacs-25.3-r3.ebuild 11743 BLAKE2B 8a668fcc47f8f3f7bf9629fbe8156f7aa52eaba7e912f6f77b2127bee972312074f0d2db8d13db695c2cad996d8aca5a4cae3e6067d179582bdb30b2cf6a6bfa SHA512 ff16e4f8ea26e9d7c2b9e22d632c1a818481ec12b05fe81349e455c76bff02bd71827dcbb3c7c07883ea12bcb788b63ec08332ecff9e2b60713dfee6082917e5
+EBUILD emacs-25.3-r3.ebuild 11741 BLAKE2B 597459f40cc19141488a3353ea83f1b3eb8d6edbcb828879d34a6457e1ec99ea92d8b386a6a7c04cef7e7564216e5486ab836c851bcd651b8da44be7cb8dea99 SHA512 484aaebfa350361360c0d3a2b52bc929fa73803ff27dc2f03fc3dc7a49c9ba5714b370c72d5d7d53bcce09668735b7cc6a8e4a276a6442efe6c901c9a986cd72
 MISC metadata.xml 2764 BLAKE2B 07a117a3c5b6b04f34c4e390de8af8dcda3d4068d5139607790282740bd71dc11f06138be0cfb2871b167f9dee4320b8bff6894c10ac40d5df8fc2a3cb2a4dcf SHA512 7e115d381271b2e3a6e8de9a0590f3f5c41318ae814c71b6c85be6a24f234179d691d7eb9e9f19c148716d1090d18abe2e874b8772d3987791f9612b0f2eeb59
diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
index 8b9d3d2c04e9..9b260064e0b8 100644
--- a/app-editors/emacs/emacs-18.59-r11.ebuild
+++ b/app-editors/emacs/emacs-18.59-r11.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
@@ -28,6 +28,14 @@ DEPEND="${RDEPEND}
 
 PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch"
 
+src_prepare() {
+	default
+
+	# Do not use the sandbox, or the dumped Emacs will be twice as large
+	sed -i -e 's:\./temacs.*dump:env SANDBOX_ON=0 LD_PRELOAD= &:' \
+		src/ymakefile || die
+}
+
 src_configure() {
 	# autoconf? What's autoconf? We are living in 1992. ;-)
 	local arch
@@ -70,8 +78,7 @@ src_configure() {
 }
 
 src_compile() {
-	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	export SANDBOX_ON=0
+	addpredict /var/lib/emacs/lock
 	emake --jobs=1 \
 		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
 		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild
index 92884cb78c16..b331aae1a49c 100644
--- a/app-editors/emacs/emacs-23.4-r17.ebuild
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@@ -223,10 +223,11 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
 	emake CC="$(tc-getCC)" \
 		AR="$(tc-getAR) cq" \
-		RANLIB="$(tc-getRANLIB)"
+		RANLIB="$(tc-getRANLIB)" \
+		RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
 }
 
 src_install () {
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
index cc5f76a02d49..2668c7388bd9 100644
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -224,8 +224,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
 }
 
 src_install () {
diff --git a/app-editors/emacs/emacs-25.3-r3.ebuild b/app-editors/emacs/emacs-25.3-r3.ebuild
index b6a41e500685..9b664cf0cd89 100644
--- a/app-editors/emacs/emacs-25.3-r3.ebuild
+++ b/app-editors/emacs/emacs-25.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index f9f19500e3e8..110f08b2bf40 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,4 +1,3 @@
 DIST mousepad-0.4.0.tar.bz2 578483 BLAKE2B d723ee7dc721703cfc46ad359dbf37c676ba12db4c8f4e874e1578b203a1f35cc077229ccbc9950b82e1784042f191018734cfaa09785b6b602388011db4a7b0 SHA512 5196abd04268d1ace118dc485b72bfcfb7f9175eeaf52bc97c08c1646371d26401403a3bb199d882380bcb998547c65af9bd054f0365afd846c0ad74d3c3b1fe
-EBUILD mousepad-0.4.0-r1.ebuild 1038 BLAKE2B 9550d6b40d2a4e5ac785c6f04ac7202a468b170df1d2d3e8982070c43f1e04c6ef882ed702ada8f4c2b4ee69b3c151d40b8b1fe77f736a6d8ba046cdd9a0a5cc SHA512 e25e733d314fafd29d41f539fd59936af2f69f781c84680a2ddf2c5934693cb99e4d87d7940d923b5a7f2457fead3d50a672f006712e901e48664debb13107eb
-EBUILD mousepad-0.4.0.ebuild 965 BLAKE2B 2e25aef980fc01270e16ce5a3403700c6fef7014a0f8c5599e91dd5b368a65b6a5f834dbd41ebebcfaea54bd04bff63fde1714c3609e84c7693e7442c2d65343 SHA512 4ed9ee026c2334e30f8996ee6863e592f5242f750afc4b17c61cca669b27e5b06da6b208b4fc54644eef60c72b8849da33a914ecc8fd0dde9a945272fcc749fb
+EBUILD mousepad-0.4.0-r1.ebuild 1027 BLAKE2B aeb9e173b9c4a08d04d53c5ce54b33e056c20d2f2fdadc61048eea6e51b73d613850affba9f83707cf190541d29f7432bfa514e7d1614c37df6cd4705d0e07e5 SHA512 5e68a193a93757c1450a3e63aa5a97712c91434ffddba4e64d3c82d61b3b5f1d318c4d9b2e73f12728090230220f5be3d85d10afb448c967f391e8c8a63bb1f9
 MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
diff --git a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild b/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
index 120f33947162..c9dbd50b21e2 100644
--- a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
+++ b/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit gnome2-utils xdg-utils
 
 DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/start"
+HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
 SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-editors/mousepad/mousepad-0.4.0.ebuild b/app-editors/mousepad/mousepad-0.4.0.ebuild
deleted file mode 100644
index e144702820d0..000000000000
--- a/app-editors/mousepad/mousepad-0.4.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils xfconf
-
-DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug dbus gtk3"
-
-RDEPEND=">=dev-libs/glib-2.30:2=
-	dbus? ( >=dev-libs/dbus-glib-0.100:0= )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2=
-		x11-libs/gtksourceview:2.0= )
-	gtk3? ( x11-libs/gtk+:3=
-		x11-libs/gtksourceview:3.0= )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		$(use_enable dbus)
-		$(use_enable gtk3)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
-
-pkg_preinst() {
-	xfconf_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xfconf_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
index 362f0c4c3602..d7aac0a872a6 100644
--- a/app-editors/nedit/Manifest
+++ b/app-editors/nedit/Manifest
@@ -1,8 +1,10 @@
 AUX nedit-5.6-40_Pointer_to_Integer.patch 10379 BLAKE2B d7a855d17ca5744ec3d1a8f6b286911458236b452a98d36fe57e0779e17101786e7c52702dbc20f98b460f3b3ac05093823214adc99eb17399919d2361a60085 SHA512 263fd5109c5fc16ea8328ad7855b8ab74e6e744d89374d68bc7db495a3295888f3599d2e9d6653097b4f7b68bae968a5deb7240a565f8fa1beba451b8b1f1b55
+AUX nedit-5.6-fix-crash-with-noX.patch 4726 BLAKE2B 1378cd446adf148d5a69b772e790c6bbb052ce27c668c4b391f3f08081bc523368a6c4a63eae39c503b4f569c7f374c0b9c5303bf23505acb2f322dcc98f1121 SHA512 38a3292370482b295afa3eb7033061e2837819c519fa1d3215c4d69bdf11871ee193615ecec8a01a102da5e27e3098337db06ab296f3feffac53ed84d660bb90
 AUX nedit-5.6-format.patch 453 BLAKE2B b8a226e93e2c1666caefb5032706d8ac08284af3e2a2658f794b4af6eaae18311db52ed01a49c368d050958e55ef2fbc0893ee3b8bc63418bce676c5c4d7aae1 SHA512 50e93d7f297ae0b10bec34176c707cc61d4c205e1293cb02b94f85359604864df8698bf35725f007b9c9eb585d0cf18c2498b6d7f55960fabb93b3d98bfe02b8
-AUX nedit-5.6-ldflags.patch 800 BLAKE2B 4fee6b83215739f6fe58347ff24b7ff0e29f0b340dc4f27e1aa7f5d05e4435e97fd3dc20beff4bead79f156133ec54d3709c58c6d70c11d8c2b1b6870ca941e9 SHA512 ebe6add4f5b73ffc33fe65ddbb085373109e150c8f246610de1bb3273042451959bde4a5ec675261f4da1c9853256314c0e78c972bc0c61e206d523b92adf29e
+AUX nedit-5.6-ldflags.patch 800 BLAKE2B ee06dcdd07f7d01c23c943e85382d33d316e85c364b1c3bc243ee3468078e8a47a770191389dd53a94d83b6e896e9dbe15b40d365aab4f3a8ef5c8705941ea9a SHA512 65818ef8b425414bf4c9f0bd9b71b56df5a6ef05f0e2914558733cbc7bbe435199e8c69c66b2f460964d1913bbc6fb8722a77d881ea4efa1be07f8fb55ad66e4
 AUX nedit-5.6-security.patch 1944 BLAKE2B 8b3e21d074f274c5ba24f1888d9d13d71ac08f80c0e063a5e0e85794a1677c10f7d6d64298e0588a73e86af1d3dfdacb32a389a53ff7a4e408f9006006adc60e SHA512 437ff658c4ae4918fa73dee97773d9b8bf9b2dbfd4af3752ab3bdb735ded2508e449170e2aeea43d9bfbdb48e75d52154a847cb9a3a59e7f4b6ad0ec9027bfcd
 DIST nedit-5.6a-src.tar.gz 1353454 BLAKE2B e3e8ed86b12a4c3673513b65c7ca08c11b22dcac4816287be680f112c5c8de0c59510f26605a7f288846fb4bb8c28dd958c534a52450a905f7639712d832e69a SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0
 DIST nedit.png.xz 14000 BLAKE2B dd50757a52fe3a2c57490cd0783f323877dc23733acc28b2c303d73724b6b66ed73dc819827ea52b96410fd7264a991040f00d609070bd87945d406328567ca0 SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3
 EBUILD nedit-5.6-r1.ebuild 1989 BLAKE2B 8d5cde4cb3ecd3a20db4ecc763a1a97db7ba9a86dbea7c5355d8c5c7056ef3afe7d90fb94f97dd4652b8d71a7163ef17346b71fdd0a1ad9dfaa966d5b2c8a203 SHA512 147d9308121e65466d22b9973f8d0ab69b0fca53769b51dce8da933a8a069e025cf1222f4ff5d03af3df71fd4c0a93def2f99c0b9402456e3903bce5ebf5dc3b
+EBUILD nedit-5.6-r2.ebuild 2037 BLAKE2B b881666c19e2d9aa63e219ad2a1a0d4d632470d80bbe74bbddfcbd7272a210882bc172e9499d61c77afd8fa63fa30f465fd9c7814c893e635ad0833adf05bb31 SHA512 ed954cd69acc1652f597d188c72c38f38e8ff0d06ede0f7b98c818b1c0a442c9e688a1ade3cb245ab3de907966c86210dd6b28528ddef448fc367c6d8aab20ed
 MISC metadata.xml 292 BLAKE2B 10ee90c2d8d7cc7bdef834d511467fe8dc1bf90929caf19a919d2e428c6d42f432f996bddd4cf1e4f2fbee70621e85144a7458b70b8c139aac20e3f7f82a0710 SHA512 0c0cc8a66f8640a0239d6b971d6faf8ca3b5a50909306b47c02b6f5b401b71534e6965cec6cfb38a47bdb09cb871cd217f9316220b6d7ca2a1019b27bf2f7699
diff --git a/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch
new file mode 100644
index 000000000000..92b0778e2ab2
--- /dev/null
+++ b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch
@@ -0,0 +1,118 @@
+diff -urN a/source/highlightData.c b/source/highlightData.c
+--- a/source/highlightData.c	2018-03-13 08:42:40.930188154 +0100
++++ b/source/highlightData.c	2018-03-13 08:44:59.651196431 +0100
+@@ -1280,7 +1280,7 @@
+     XFontStruct *font;
+     
+     if (styleNo<0)
+-        return GetDefaultFontStruct(window->fontList);
++	return GetDefaultFontStruct(TheDisplay, window->fontList);
+     fontNum = HighlightStyles[styleNo]->font;
+     if (fontNum == BOLD_FONT)
+     	font = window->boldFontStruct;
+@@ -1289,10 +1289,10 @@
+     else if (fontNum == BOLD_ITALIC_FONT)
+     	font = window->boldItalicFontStruct;
+     else /* fontNum == PLAIN_FONT */
+-    	font = GetDefaultFontStruct(window->fontList);
++	font = GetDefaultFontStruct(TheDisplay, window->fontList);
+     
+     /* If font isn't loaded, silently substitute primary font */
+-    return font == NULL ? GetDefaultFontStruct(window->fontList) : font;
++    return font == NULL ? GetDefaultFontStruct(TheDisplay, window->fontList) : font;
+ }
+ 
+ int FontOfNamedStyleIsBold(char *styleName)
+diff -urN a/source/text.c b/source/text.c
+--- a/source/text.c	2018-03-13 08:42:40.931188154 +0100
++++ b/source/text.c	2018-03-13 08:46:37.785202286 +0100
+@@ -778,9 +778,13 @@
+     textBuffer *buf;
+     Pixel white, black;
+     int textLeft;
+-    int charWidth = fs->max_bounds.width;
+-    int marginWidth = new->text.marginWidth;
+-    int lineNumCols = new->text.lineNumCols;
++    int charWidth;
++    int marginWidth;
++    int lineNumCols;
++
++    charWidth = fs->max_bounds.width;
++    marginWidth = new->text.marginWidth;
++    lineNumCols = new->text.lineNumCols;
+     
+     /* Set the initial window size based on the rows and columns resources */
+     if (request->core.width == 0)
+diff -urN a/source/window.c b/source/window.c
+--- a/source/window.c	2018-03-13 08:42:40.937188155 +0100
++++ b/source/window.c	2018-03-13 08:48:07.727207652 +0100
+@@ -1839,7 +1839,7 @@
+ 
+     /* Change the primary font in all the widgets */
+     if (primaryChanged) {
+-        font = GetDefaultFontStruct(window->fontList);
++	font = GetDefaultFontStruct(TheDisplay, window->fontList);
+         XtVaSetValues(window->textArea, textNfont, font, NULL);
+         for (i=0; i<window->nPanes; i++)
+             XtVaSetValues(window->textPanes[i], textNfont, font, NULL);
+@@ -1861,7 +1861,7 @@
+        size appropriate for the new font, but only do so if there's only
+        _one_ document in the window, in order to avoid growing-window bug */
+     if (NDocuments(window) == 1) {
+-	fontWidth = GetDefaultFontStruct(window->fontList)->max_bounds.width;
++	fontWidth = GetDefaultFontStruct(TheDisplay, window->fontList)->max_bounds.width;
+ 	fontHeight = textD->ascent + textD->descent;
+ 	newWindowWidth = (oldTextWidth*fontWidth) / oldFontWidth + borderWidth;
+ 	newWindowHeight = (oldTextHeight*fontHeight) / oldFontHeight + 
+@@ -2244,7 +2244,7 @@
+             textNrows, rows, textNcolumns, cols,
+             textNlineNumCols, lineNumCols,
+             textNemulateTabs, emTabDist,
+-            textNfont, GetDefaultFontStruct(window->fontList),
++	    textNfont, GetDefaultFontStruct(TheDisplay, window->fontList),
+             textNhScrollBar, hScrollBar, textNvScrollBar, vScrollBar,
+             textNreadOnly, IS_ANY_LOCKED(window->lockReasons),
+             textNwordDelimiters, delimiters,
+
+--- a/util/misc.c	2018-03-13 08:50:54.892217626 +0100
++++ b/util/misc.c	2018-03-13 08:56:50.346238834 +0100
+@@ -1018,7 +1018,7 @@
+ ** a Motif font list.  Since Motif stores this, it saves us from storing
+ ** it or querying it from the X server.
+ */
+-XFontStruct *GetDefaultFontStruct(XmFontList font)
++XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font)
+ {
+     XFontStruct *fs;
+     XmFontContext context;
+@@ -1028,6 +1028,17 @@
+     XmFontListGetNextFont(context, &charset, &fs);
+     XmFontListFreeFontContext(context);
+     XtFree(charset);
++
++    /* FontList might be a render table with no only XFT fonts */ 
++    if (fs == NULL) {
++	fs = XLoadQueryFont(d, "fixed");
++    }
++
++    if (fs == NULL) {
++	fprintf(stderr, "Unabled to load any fallback fonts.\n");
++	exit(EXIT_FAILURE);
++    }
++
+     return fs;
+ }
+    
+diff -urN a/util/misc.h b/util/misc.h
+--- a/util/misc.h	2018-03-13 08:50:54.890217626 +0100
++++ b/util/misc.h	2018-03-13 08:55:52.790235400 +0100
+@@ -65,7 +65,7 @@
+ void AccelLockBugPatch(Widget topWidget, Widget topMenuContainer);
+ void UpdateAccelLockPatch(Widget topWidget, Widget newButton);
+ char *GetXmStringText(XmString fromString);
+-XFontStruct *GetDefaultFontStruct(XmFontList font);
++XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font);
+ XmString* StringTable(int count, ...);
+ void FreeStringTable(XmString *table);
+ void SimulateButtonPress(Widget widget);
+
diff --git a/app-editors/nedit/files/nedit-5.6-ldflags.patch b/app-editors/nedit/files/nedit-5.6-ldflags.patch
index 4532c6251894..a549b02490c0 100644
--- a/app-editors/nedit/files/nedit-5.6-ldflags.patch
+++ b/app-editors/nedit/files/nedit-5.6-ldflags.patch
@@ -1,5 +1,5 @@
---- source/Makefile.common	2004-03-21 15:25:56.000000000 +0100
-+++ source/Makefile.common.new	2009-10-24 10:47:03.667835157 +0200
+--- a/source/Makefile.common	2004-03-21 15:25:56.000000000 +0100
++++ b/source/Makefile.common	2009-10-24 10:47:03.667835157 +0200
 @@ -21,12 +21,12 @@
  # we only want natural rebuilds to regenerate the link date.
  nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB)
diff --git a/app-editors/nedit/nedit-5.6-r2.ebuild b/app-editors/nedit/nedit-5.6-r2.ebuild
new file mode 100644
index 000000000000..a37c9fcd64a5
--- /dev/null
+++ b/app-editors/nedit/nedit-5.6-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Multi-purpose text editor for the X Window System"
+HOMEPAGE="https://sourceforge.net/projects/nedit"
+SRC_URI="
+	https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz
+	https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND=">=x11-libs/motif-2.3:0
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	|| ( dev-util/yacc sys-devel/bison )
+	dev-lang/perl"
+
+S="${WORKDIR}/${PN}-${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-format.patch"
+	  "${FILESDIR}/${P}-ldflags.patch"
+	  "${FILESDIR}/${P}-40_Pointer_to_Integer.patch"
+	  "${FILESDIR}/${P}-security.patch"
+	  "${FILESDIR}/${P}-fix-crash-with-noX.patch"
+)
+
+src_prepare() {
+	#respecting LDFLAGS, bug #208189
+	default
+	sed \
+		-e "s:bin/:${EPREFIX}/bin/:g" \
+		-i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
+	sed \
+		-e "s:nc:neditc:g" -i doc/nc.pod || die
+	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
+		makefiles/Makefile.linux || die
+	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:"                  \
+		   -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
+		   -e "s:-lX11:-lX11 -lXmu -liconv:"                   \
+		   -e "s:check_tif_rule::"                             \
+		makefiles/Makefile.macosx || die
+}
+
+src_compile() {
+	case "${CHOST}" in
+		*-darwin*)
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx
+			;;
+		*-linux*)
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
+			;;
+	esac
+	emake VERSION="NEdit ${PV}" -C doc all
+}
+
+src_install() {
+	dobin source/nedit
+	newbin source/nc neditc
+
+	make_desktop_entry "${PN}"
+	doicon "${WORKDIR}/${PN}.png"
+
+	newman doc/nedit.man nedit.1
+	newman doc/nc.man neditc.1
+
+	dodoc README ReleaseNotes ChangeLog
+	dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt
+	dohtml doc/nedit.html
+}
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 6ca211aa0880..b6dc7bf1169e 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -8,7 +8,7 @@ DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 EBUILD vim-core-8.0.0386.ebuild 6742 BLAKE2B 7c60a03815ee7bf63b9676c45d12f78511c526bc3dcd4eb7a3ece264e141650a15e9ce8fb0111b3f0aacd75056205ef7bbfed3d828c4592b43cb09eb3c90f4b1 SHA512 20b78ddb0bf153bc0e6111703d6a77f500ff8cf4cb71b1c01c22619027619f9dbbbc9b25163c888d5faf780dc5c4b05a2b8a8ec888ca592167e0ebee4b86b49d
 EBUILD vim-core-8.0.1188.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
-EBUILD vim-core-8.0.1298.ebuild 6639 BLAKE2B 25415ea93438de2ae61145f5412b9122b6fca5aa9c2b64908c6db48db1c85a818864bb9f8253b4291484b5cedb2340b6941aea2ec685f0e8d41c45d431be7926 SHA512 b8860e4cfebfa9a66f08dd1601d5667dde854e584e54d35b177706b40c4477f26a89ebcb5cfb7d1ae908fd3d6df20421d017146d7ec7b12a6280d7815253b1c0
+EBUILD vim-core-8.0.1298.ebuild 6638 BLAKE2B b57e18cf8bfb21288bba91782e5c0f61e361a62ad8a1a66fb3a278a6f2126dfc0944ee115bf44fabe80d98c79f0f7f75a533a7823dc01f579addec429d0dfa02 SHA512 46cde1a42d98f0459ea66a64657a6f88aa2e0a64ec2492ddbf0964938b566d3f7d9a4b03b640a21d9d1b364c6a0a3db53b1bf2c667ce9b18e5fcc4fd42147781
 EBUILD vim-core-8.0.1428.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
 EBUILD vim-core-9999.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
diff --git a/app-editors/vim-core/vim-core-8.0.1298.ebuild b/app-editors/vim-core/vim-core-8.0.1298.ebuild
index 21e2c3b16341..fee41423502b 100644
--- a/app-editors/vim-core/vim-core-8.0.1298.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.1298.ebuild
@@ -12,7 +12,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 arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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"
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 979429e07730..759cc9a1aea9 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -7,7 +7,7 @@ DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 EBUILD vim-8.0.0386.ebuild 10112 BLAKE2B be488042fead28b68b34d1a69e5243beca8815f298a01502bcf34d43f9845d760cd1f14eb4c2be5d73595fe20a53cad116a6009eab2a99c016f9c25280f45493 SHA512 7dd69bd0129c62720819eb65888c89b0e6670964d6558be11ad3a694a4d1d6c09e3d5c3c1f102d99fde71ac645cc6f026e4b2acfde9192f4b768dbaaf3a52d82
 EBUILD vim-8.0.1188.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065
-EBUILD vim-8.0.1298.ebuild 8773 BLAKE2B ff6a62bc76838be95d527aeba747157061b4afd64bd4c19b7542cdc632c43699b5413a268f5562eeb873724c69ed7a110e7d1e22217a2a0398f4eb73ac43257b SHA512 7231b00ed78b7008e06b2b85d743b61d5304b85a765b6e53b8c2e59bff562c45cb74694a0796de2c3dcafdc7a882c9e4a003767ddfa9c1842296a62f481d30c3
+EBUILD vim-8.0.1298.ebuild 8772 BLAKE2B 53c2fcb911fc27374cd00f4a1c5df9c30245540da78e4e3468d020fcd3149d0a0c57273eb1f4d38bd3f416604c1d29e08e49e8cf5a820f99bc28e82d1e999b6a SHA512 f200661012bc5505b0261aed18d360cfada37e93f84a30b74696c26175d7b369be9f0380c9b2db28324b4a8e0ae5fc888a328ae94a58e18d5112fc15b1d8cc5f
 EBUILD vim-8.0.1428.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065
 EBUILD vim-9999.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065
 MISC metadata.xml 849 BLAKE2B c0edeb64be8810f6aafa20ed67a4eec6a0961ff6af3b1390217fb185ceb03a405239dd1ebc4f1f76b1dfb3df3ef841796b0881eea8e8db810afdc828580d9b5f SHA512 a4369827eaaa72339f17b1c673aa5f71625b657afad9d2f6079ffc6fd23775aa8f6c52aca0cb193b4815bc6ca9918617c251767343f7044ab79b83b69038c58b
diff --git a/app-editors/vim/vim-8.0.1298.ebuild b/app-editors/vim/vim-8.0.1298.ebuild
index fa71bf4e6f50..3b1ca5011155 100644
--- a/app-editors/vim/vim-8.0.1298.ebuild
+++ b/app-editors/vim/vim-8.0.1298.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]] ; then
 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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"