gentoo resync : 11.02.2018

41 files changed, 330 insertions, 87 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index d19eccc08851..47c3574ea6fe 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 73fed88056d1..4482e78b22c8 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -7,4 +7,4 @@ EBUILD bluefish-2.2.10.ebuild 2656 BLAKE2B 9a5a2acd3ff68de6d875f9bb3dd57b3147c52
 EBUILD bluefish-2.2.6.ebuild 2252 BLAKE2B 18bab1a552cc035911c54338261d99ba366a9157675dedf3ef4de8f6d82b04269e5d94b9a1c82f6b3b0c42b24958927474e1862b7d29c6dc8231872657c9e91a SHA512 de8c028ca5caef9bcbbc95fde54b38a79f548b2ec939364eb414ab29ce27e06b4e4dfba5a1757c83f196d65947ca50025cefebc76f844d6f8b5bf78d63f0e014
 EBUILD bluefish-2.2.8.ebuild 2496 BLAKE2B bef59c9120bb99b580c11b1800ecda4eef0e92ea8d93628b7588225389bff8b1b412fe8008abfcd097ca1a82edb0b8ebb1eb8b19aee3a51261932bbc17b2bef2 SHA512 000ed3a4c617d9620b05f2e763f36beda2204b4ce91ec7b710087f2ba480efbfd48cbaead3c2d9029d3b4ec1e9eb4eccf5113c5146aae3dd6846485998b5b2e3
 EBUILD bluefish-2.2.9.ebuild 2656 BLAKE2B 9a5a2acd3ff68de6d875f9bb3dd57b3147c52095f866ae4f408d988891530444290aa101d3efb4a680e233966057bea08e89a55c87cc3fba3e7995497c2b1796 SHA512 c93e74f176233278a380b637dab5378515a30eae921a9272caa4209235ee959e69cca1c477bf14ef11a034ca9e4c56f8e3afe4d895729b2fd4d89603d5a29de9
-MISC metadata.xml 798 BLAKE2B fc6cf73f6675483da0879b45fb7a834bbc8caff1eb597c89c8db383737daf2e9e4384d7ef15a2108a98d316b0784c73525373f0c974e16d0e0ebbac31a37e3db SHA512 f4c1796fa2fb953dc6dbfc4186a91558c4912ee9a6d85ed04b9afa6175afff5f0842b431957d9e90af3b8e0202b4db03a8d1f1f86b8bfdde70d7e911288e7c7a
+MISC metadata.xml 739 BLAKE2B 02261625526747d478ca05b00d4ce886e396d4705bb74dee4e109c5eabffaf986b646cda790ed00bdc159d7473630747c031c67e90fa3f5f5c70e84bb72e5529 SHA512 5e2e364110cd4f68645194a54576a55b59e993547a01924ace0f11181930a7147401c18d4b4c005f234c9d4c179fa80eda7a34ac9d345de9676503261a528f66
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
index 53a0d5107dcf..b5f6c997c211 100644
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@@ -4,9 +4,8 @@
 	<maintainer type="person">
 		<email>sdnick484@gmail.com</email>
 		<name>Nick Andrade</name>
-		<description>Active Maintainer, Assign bugs</description>
 	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 7882d6eed91b..bb6604944ff3 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,7 +1,7 @@
 DIST emacs-26.0.90.tar.xz 43908428 BLAKE2B 20858eb7b06b488451ebdffd7cedf28055f38cb45960c2b74c926204be1225cff297a8ce95a4cf535349fe73b24c9e5347fed3c3decf55492c82daca9fb470c2 SHA512 c263d1d1a12d8b21cc43ddcb46a28ce3a54d0ef09e240518f19bfdabf4c4ceebc3c2d1521aae9808cafdd3e731c93dd22b4f1e7e619e38076aa4ffdbaadea93b
 DIST emacs-26.0.91.tar.xz 43988932 BLAKE2B 05e5b9d51f92f2719ea22806f73b17903f5941c82a2e4e762b7664ed1b05f7324c0b020ded311dc4f22b7668684f59eaf3f3c2495f85977f3510698d7e0edd09 SHA512 4e20743299ed419c8ad7bea00c5389fb7c81f4e631165fe2b19c4bbd7c2b401416073282814f30bb96e5c3961724bfbb565781c50ee481a4f4c762ca6f480fba
-EBUILD emacs-vcs-26.0.90.ebuild 12493 BLAKE2B 8c026c0691dbdb7426ed5942986cc5356ba2b8fd486af3e1dfe4d43606cb6f1f69bdd168a5772b9fc1a6446124dc8d9694abe02c3c32f14afddf1b74cc3dfaf2 SHA512 a1bf9e7d9491a54132e56430fc2bd7e01c04bb0bc9377ad6976e8436343e2232874843ea1722cd49a91a6380cb004509b17e12452be5b2ef74d93daf6cafd9f6
-EBUILD emacs-vcs-26.0.91.ebuild 12493 BLAKE2B 4de1c2d011897acc603f906e10f8412542f8844df1f0ed10f8c70d13a086f5f6b6a00511883fb01f8d398244ec142150364b19d9e9dcf3a469edc1912512536a SHA512 72ca1d0df4de980246398c9500b4fb9ee7d84e3b5100e33f212dc7f93910ac309603243cc1d60379b604e23b6d0079682dfc1e2cf73482e241b80962389ca5ab
-EBUILD emacs-vcs-26.0.9999-r1.ebuild 12493 BLAKE2B 8c026c0691dbdb7426ed5942986cc5356ba2b8fd486af3e1dfe4d43606cb6f1f69bdd168a5772b9fc1a6446124dc8d9694abe02c3c32f14afddf1b74cc3dfaf2 SHA512 a1bf9e7d9491a54132e56430fc2bd7e01c04bb0bc9377ad6976e8436343e2232874843ea1722cd49a91a6380cb004509b17e12452be5b2ef74d93daf6cafd9f6
-EBUILD emacs-vcs-27.0.9999.ebuild 12491 BLAKE2B c2c9f4d17aeaa25f98410be4cb1f3de14d19ce02ba2bfe9dc5df7d72a4fce3397a3f91268b7f0223514b784415ba2e8ee103a62f6b399c3743c6a3f496f5f3c4 SHA512 e17454202752433ea2a2e5badcea478ea6a735ba5b7f7d836ae1ce0d91a6b43eb55c15adf98040ffe88e48a09f328424d5268b4bc2a321d519ed0122e7e74919
+EBUILD emacs-vcs-26.0.90.ebuild 12565 BLAKE2B 362a652887f83fbff0de302151434017fc14d5dc7161eaab3c8703b943f29398ebee329e6e4a6332232a18e02f4267d4c6e03fc566f6928529df10b0b1974020 SHA512 c5ecd590ab781be74f358f297bcbf352c8050e3959e1be1553d60749a1a3bd39fb2da97530684f1db5da87fd5406cd746146980cad19bacefebd969b9d43823b
+EBUILD emacs-vcs-26.0.91.ebuild 12565 BLAKE2B 362a652887f83fbff0de302151434017fc14d5dc7161eaab3c8703b943f29398ebee329e6e4a6332232a18e02f4267d4c6e03fc566f6928529df10b0b1974020 SHA512 c5ecd590ab781be74f358f297bcbf352c8050e3959e1be1553d60749a1a3bd39fb2da97530684f1db5da87fd5406cd746146980cad19bacefebd969b9d43823b
+EBUILD emacs-vcs-26.0.9999-r1.ebuild 12565 BLAKE2B 362a652887f83fbff0de302151434017fc14d5dc7161eaab3c8703b943f29398ebee329e6e4a6332232a18e02f4267d4c6e03fc566f6928529df10b0b1974020 SHA512 c5ecd590ab781be74f358f297bcbf352c8050e3959e1be1553d60749a1a3bd39fb2da97530684f1db5da87fd5406cd746146980cad19bacefebd969b9d43823b
+EBUILD emacs-vcs-27.0.9999.ebuild 12563 BLAKE2B 1e055c47031dbdb4a85eadb6dce9af654ae4db6fa2efe5c8b9d5b997c95a924cd14c311a0259202be313d6bb749591b7b5b961f1060e06bbd810c2d26dd11be3 SHA512 889477a06c2feced7647071592f3a06e871b29a36ece4f006f6c83e71082b931c26cac7294938bee54d88ebf8d817b65a81c6b04ccff9e479c7063cc325df060
 MISC metadata.xml 2949 BLAKE2B 06aca7f50e1e0a376363438665651ab1647b885f71fc258874a360f3309621283168b2b4f9d57f208c575af1681de899655893f16d691496c20929175b0684bb SHA512 8a349fcb7e9a915ceb37b766f9286ea701aac5aee65fca04357e7e734fd767b2f824525960fa6b860be9e52c2099396f05c2710ecebd020b5d42341849918a98
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
index 3f52621bd902..7aa4dd5eab52 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.90.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
@@ -82,7 +82,11 @@ RDEPEND="sys-libs/ncurses:0=
 			)
 		)
 		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+			)
 			!motif? (
 				Xaw3d? ( x11-libs/libXaw3d )
 				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
@@ -251,8 +255,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable the sandbox. For the unbelievers, see bug #131505
+	SANDBOX_ON=0 LD_PRELOAD="" emake
 }
 
 src_install () {
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
index d0810d80e22a..7aa4dd5eab52 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
@@ -82,7 +82,11 @@ RDEPEND="sys-libs/ncurses:0=
 			)
 		)
 		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+			)
 			!motif? (
 				Xaw3d? ( x11-libs/libXaw3d )
 				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
@@ -251,8 +255,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable the sandbox. For the unbelievers, see bug #131505
+	SANDBOX_ON=0 LD_PRELOAD="" emake
 }
 
 src_install () {
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
index 3f52621bd902..7aa4dd5eab52 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-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
@@ -82,7 +82,11 @@ RDEPEND="sys-libs/ncurses:0=
 			)
 		)
 		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+			)
 			!motif? (
 				Xaw3d? ( x11-libs/libXaw3d )
 				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
@@ -251,8 +255,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable the sandbox. For the unbelievers, see bug #131505
+	SANDBOX_ON=0 LD_PRELOAD="" emake
 }
 
 src_install () {
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index 7800af2c6eb4..e45d3a68bbe7 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.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
@@ -82,7 +82,11 @@ RDEPEND="sys-libs/ncurses:0=
 			)
 		)
 		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+			)
 			!motif? (
 				Xaw3d? ( x11-libs/libXaw3d )
 				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
@@ -251,8 +255,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable the sandbox. For the unbelievers, see bug #131505
+	SANDBOX_ON=0 LD_PRELOAD="" emake
 }
 
 src_install () {
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index a3baec563849..850cbee98442 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -6,8 +6,8 @@ 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-r16.ebuild 11264 BLAKE2B 5d6c8a786435acc3f0311951741b895ed426305444efe9f0c83166576f984c51266e42d8502f03338bdcfeeb9b3c3aa34068485beb6e10a8138eaf1315e734cc SHA512 fdff9e3bf6839e7caf6ecbd841ed6d332173aeb46550a652dea8975fe92d8b3174045170a9b8e8ce898e3853e8620b7c3d90c93ad76d2cd35014b3a0257f2f1a
-EBUILD emacs-24.5-r4.ebuild 11095 BLAKE2B bf769253d5791e01441f4f55fb3a00c0187b22c05ff8c7a8a9fae5a23fe9861fe44b0ffc23d4be6c623ed837451781a70f1e6af326c03858ddc0bffc09534b20 SHA512 ce02df6231626e4edceb9e2e693f2006446b62f09c553d1ed0c028f1cfa255a0d9abec16de717ac4c18f78511f087ebceab2bbcc11c6b452d7d0bcd43c87586a
-EBUILD emacs-25.3.ebuild 11361 BLAKE2B 44eca337c724e3a5de4925d451d225ee01b7bf69c6779997d758210d1974b642e3e6bfe294b093ccce2575be6132d8cdf2c9e99983671f7ca215d6eb5c4e228e SHA512 f8c2b572a91c6a287f7a94468bf568cf91b4d86650e53850b505261b4be40767b01679ae9711ece1642a696ce1228a4b3b3ebb80bf928895c044e3dd8e33ecfb
+EBUILD emacs-18.59-r11.ebuild 4236 BLAKE2B fed7eab492eda2b43052157f1acae73f5bfb5ce7442d31e998d911f2fc816644362291bb792cc69d4892905ce5dad59f1fe7f1f8be49840b788c218ae53ae074 SHA512 dcff2915f687ce61501c26aee208d7930a12792911bd0b9bd12b54a46f1167cbebd71c08e9cd50f37adaa6c77b509a57f9c0f1d7677e587137593c54e30f57e3
+EBUILD emacs-23.4-r16.ebuild 11340 BLAKE2B 828da59bc867f0a1d146ddbb3a0ebff1b6abdb9f7d2d06f207db73f125fcc60e4d214ab92a70a48f88927ede95dcf4e3f9287763af5467f258b30a8dd5c85991 SHA512 f9891249bcda86d06ee0ffe1c5514b92c5019b33bb96089a04b27aa17a55835d127dc96c060247e51d5239886ca92454f0c715cb0fc001911e3b9848f6849eca
+EBUILD emacs-24.5-r4.ebuild 11167 BLAKE2B 634f3a3d27636482c936131de3155c221463d4a5df9bb7333b772ece99e9955d91ce9dc1e3e98bd0b64a404f004f8a3ee45c074f6498a7a3ca856ab035cdb585 SHA512 c5ad345aace7622b00f8e0bbff7ef2138d8bb62d7e1ae05ecb22ca8acc236f19d04bb972f0ffe003bebc12536c15d0466912ed026f8cb02e5b0539c85f2ea2ab
+EBUILD emacs-25.3.ebuild 11433 BLAKE2B 5c50e04e2568305636bb08956ff9c4d29563fcd60ea257aa9591bb3e9c3c696525166b0e718e830b1b973cc9182e690e1ee3a26bf91caf5cc38871cfba29a368 SHA512 4e973ac3c9bda88676a2c5daf5a33cdb617a7e1d937a21f94711d47136213df1ce5d9449f34e65e30ca3adf2ea74e453a443167a469b8a5e17003163f136d36e
 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..19abd28b5a20 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
@@ -71,8 +71,7 @@ src_configure() {
 
 src_compile() {
 	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	export SANDBOX_ON=0
-	emake --jobs=1 \
+	SANDBOX_ON=0 LD_PRELOAD="" emake --jobs=1 \
 		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
 		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
 }
diff --git a/app-editors/emacs/emacs-23.4-r16.ebuild b/app-editors/emacs/emacs-23.4-r16.ebuild
index 230f36053ce5..00d4f14a53a5 100644
--- a/app-editors/emacs/emacs-23.4-r16.ebuild
+++ b/app-editors/emacs/emacs-23.4-r16.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
@@ -48,7 +48,11 @@ RDEPEND="sys-libs/ncurses:0=
 		)
 		gtk? ( x11-libs/gtk+:2 )
 		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+			)
 			!motif? (
 				Xaw3d? ( x11-libs/libXaw3d )
 				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
@@ -205,8 +209,9 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake CC="$(tc-getCC)" \
+	# Disable the sandbox. For the unbelievers, see bug #131505
+	SANDBOX_ON=0 LD_PRELOAD="" emake \
+		CC="$(tc-getCC)" \
 		AR="$(tc-getAR) cq" \
 		RANLIB="$(tc-getRANLIB)"
 }
diff --git a/app-editors/emacs/emacs-24.5-r4.ebuild b/app-editors/emacs/emacs-24.5-r4.ebuild
index 1dd73ddaf8c0..8360af8c48d8 100644
--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ b/app-editors/emacs/emacs-24.5-r4.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
@@ -58,7 +58,11 @@ RDEPEND="sys-libs/ncurses:0=
 			!gtk3? ( x11-libs/gtk+:2 )
 		)
 		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+			)
 			!motif? (
 				Xaw3d? ( x11-libs/libXaw3d )
 				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
@@ -206,8 +210,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable the sandbox. For the unbelievers, see bug #131505
+	SANDBOX_ON=0 LD_PRELOAD="" emake
 }
 
 src_install () {
diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild
index 6be101976949..286763c2e236 100644
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.3.ebuild
@@ -58,7 +58,11 @@ RDEPEND="sys-libs/ncurses:0=
 			!gtk3? ( x11-libs/gtk+:2 )
 		)
 		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+			)
 			!motif? (
 				Xaw3d? ( x11-libs/libXaw3d )
 				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
@@ -216,8 +220,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable the sandbox. For the unbelievers, see bug #131505
+	SANDBOX_ON=0 LD_PRELOAD="" emake
 }
 
 src_install () {
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index 11bdcfd96be7..c7e2c137afb9 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,6 +1,8 @@
 AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5833d485a421244228ef36601320ddcdad1e744e4a83fee2633154c4bd642053e09bf97ee79aab2b11a82df4afcb4a70823cb5df24b5232c9b0a8d6 SHA512 5f272a4c65b1eb58cc87732fbe82f2c6b925562e77b2280a8b9a0a8b0a41716567051ebd4f6ed32caa8ce7f14edff4e20666f6ad4e464cc8d308640efa4a3c19
 DIST focuswriter-1.6.7-src.tar.bz2 10196583 BLAKE2B 99c749271c785e69f07601575343669ed5be619e646be4ee38cc82242d353a84577842c1ff98f62b0adbbff1a733a0dce82593ac4ffa2eb61e611cea1b2657b5 SHA512 d33c66881b1065aa9812dae14a5fe2a2850ce1c50f4b38e028bcd3f5a4bb1fd489705b0272e3233f3db468b262daefbd906025126f792d04af41722cde2c7bf5
 DIST focuswriter-1.6.8-src.tar.bz2 10196595 BLAKE2B 1c726b948469960e1cc35dcf592acf48693035d2792449fdc336ac4bb03029d6d9eaac77c674347ac5e7a1a7ba7cd386de0d4034e7390dd80067b9522d85a08d SHA512 d10a559448f075110d9ba7fec487b9f125a4fcdce7dc1fcd2b21b94613a7d1126baa49623273bf0f56b1b7c2ef026a30c019653ba73e39b6fa78687c862e3402
+DIST focuswriter-1.6.9-src.tar.bz2 10202664 BLAKE2B 68525ca548513b9b88ca032c0f629681a592149672611891a1ddfe6a8574a233dfc7bcee64dfcae2255b3dce2cbd15907428f25a7ad27a4ebc5c535d3fb34d7b SHA512 dcebd2e1c16a9eb1d135befef58ba0a276dac8d84385d90db3a8c192f3ff05eb5b6ac11cef239c1c4b4998b396da908ad99d5c89c0eb1438d9eb654f2cc7afec
 EBUILD focuswriter-1.6.7.ebuild 1041 BLAKE2B 7e6a895ee6d4b04cdc9cc19086168a1c4f7f946b0550abd8a4d4fcf660f5f6e65c995f5a1861dfc589e8391cbbea353a7f462297b79c5e22f821a09802390da8 SHA512 71fe8650e73194be29014ea4bf881309f55a0f9bcffd70b016e52ea0d476e8008cfe7b71bf8bcfa016232e68d34c9ae41195d21b2b4459f4fabd4d39d01c0bc3
 EBUILD focuswriter-1.6.8.ebuild 1090 BLAKE2B 5668c59cc0fdd2db7330c8eb9f2c1fb78c234310cceb66d8cff9b85d5a0276813c6f8d69d4a11beff845b1131ac533bf880f6b5ebc2ea4b68a9e442b973fc1ab SHA512 931a967230ce054b9569d766ec3fc5650da7026b44000b7119c5ba72fb53dc3dec9f51f94eead1475844db57f31c90c253ef071c5c9207ae4970919eecd937a3
+EBUILD focuswriter-1.6.9.ebuild 1090 BLAKE2B 5668c59cc0fdd2db7330c8eb9f2c1fb78c234310cceb66d8cff9b85d5a0276813c6f8d69d4a11beff845b1131ac533bf880f6b5ebc2ea4b68a9e442b973fc1ab SHA512 931a967230ce054b9569d766ec3fc5650da7026b44000b7119c5ba72fb53dc3dec9f51f94eead1475844db57f31c90c253ef071c5c9207ae4970919eecd937a3
 MISC metadata.xml 392 BLAKE2B dcb98e8e1ba1c2a2aea89d380d6a2a1a1cfd5fd9773f133aa7603b88384c91911429832a7117026cea4c092c1c84dfe440a2c4da875ce56e1da7e8670aecf068 SHA512 beaf6206dfa83ffa8acbae3d5f8c5a9041974588a18de742fa049d4ff0b8d75bcb2f40ab081418cdd2987709566b678f7016b1be0acb02deeec480cd25ddf3cb
diff --git a/app-editors/focuswriter/focuswriter-1.6.9.ebuild b/app-editors/focuswriter/focuswriter-1.6.9.ebuild
new file mode 100644
index 000000000000..67fc1801283b
--- /dev/null
+++ b/app-editors/focuswriter/focuswriter-1.6.9.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils xdg-utils
+
+DESCRIPTION="A fullscreen and distraction-free word processor"
+HOMEPAGE="https://gottcode.org/focuswriter/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# drop qtcore subslot when minimal Qt is 5.10
+RDEPEND="
+	app-text/hunspell:=
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog CREDITS NEWS README )
+
+PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index da20b18d2512..516fad6bdf88 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
-MISC metadata.xml 790 BLAKE2B 5c83d6d8fb8136bb194f352328cd3c1d9faa928161154b57963237663de7559065a19f38afb56a42900b83d61e21e1b7841dcdfd0745e6540ebe948e3d0d83e1 SHA512 c3e81ab637b56023c42614b55d016e95560fd3cd963d0f13cc33a6a2a69eaa0a0529b130682095379f906b002864eae0d0935bbcdc6d09d0eb1f102ff0d38964
+MISC metadata.xml 696 BLAKE2B fc79a12f64bb7a8961b064fad0deffdaaa483b26cf2899594828396bad3c431bebfaa6cd4c1259b2e8ebff13cc569b4ba787065cd241007a78b5c391f9279149 SHA512 dc55d2a4588bb6d42e4e97c8a383ea5a8b22668ca59083cb3acb50b703c2f6478b6dd51c1af82f622cb4c9b5da8062d80c569212383e7a904023eb39d84f5f9f
diff --git a/app-editors/gummi/metadata.xml b/app-editors/gummi/metadata.xml
index 8cd6cf89dde8..c49d5d5f9d47 100644
--- a/app-editors/gummi/metadata.xml
+++ b/app-editors/gummi/metadata.xml
@@ -4,12 +4,10 @@
 	<maintainer type="person">
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
-		<description>Proxy maintainer.</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>christian.tietz@mailbox.org</email>
 		<name>Christian Tietz</name>
-		<description>Proxy maintainer.</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 4dfcc91fe804..d6819fe49f75 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,3 +1,5 @@
 DIST kile-2.9.91_p20171209.tar.gz 3624273 BLAKE2B d6e4798869b8f5be7a2a6b00b1b067957245373f560a7485334ce1f3f932670a0cb8ef0b551fde2eea1d54a6114e8405025dbd3daea587a2d30b74fe614d332e SHA512 b7e4a6e434057cf04e8712f543cdd74a40659843b1e2777d0a031b5a665e1de34e36ec9b3f5d9bd3bf9202f9dca8595fcee9a81ab4875bc4b6da3a2fb449b2c6
+DIST kile-2.9.91_p20180208.tar.gz 3635083 BLAKE2B 0579dac072a97f152009a4462759f40bfcdff4d4b6d463affcba7d71cda023f8c43d2173511bd268be22f2cc4412f091ec7ab70793e16781f5cf2023b1303db0 SHA512 24bc9221524f2213b0651d96273f35871a5fdf5c65edc4a5d72cb6e2635b1d23e55549ba60172a94691b7793d0a57e116cd94010be28e61231b8ee59b3f369dd
 EBUILD kile-2.9.91_p20171209.ebuild 1706 BLAKE2B ec74f5a929c6175221729fe36f1510134f2b08a66c9cc189a6f318d1f53b514028597b52ba049f8086a34cb503cba44a87489eee7311f6136314ee1c7b0ff2d4 SHA512 82aed7dc966deb239c17ddcd4b4b62a5a8f5e50c36d6fb544f4cec206732be514f69d59852fc8b0cdee3290ea22a981c1a7466a56a8954738d969096e176520a
+EBUILD kile-2.9.91_p20180208.ebuild 1708 BLAKE2B 4d47bcaedbc0587eed8267aff223ff7c6fc9908a23a4f15df603f96cc8abe1cf464b777c69131f658caad44fc218a9e1a65361a4ae12e9aaa7b70d044e59575a SHA512 03fdf7f5545ac7eaa20dd5b9e8d9e56238c295c42dc96324fd4fb1d00a0169768a204faed7e180340d37217c57b8bca68959941e19c10b410d26b327830884dc
 MISC metadata.xml 476 BLAKE2B a152c0446aad3c66df2574332dc89f6797a16db142daafc82c3845f159b68bfcb922615f5912429d9965141ede27945512e5af1f5811ccbfa761026cc105b4b3 SHA512 82eaa93d944622e571887200fc50166b34ad4098ca2612749e72fff4e80f9f3fa07736cb8cd171fe3258fcd18209f7e60b01c859ad3cf20e4e238eab9dc3e486
diff --git a/app-editors/kile/kile-2.9.91_p20180208.ebuild b/app-editors/kile/kile-2.9.91_p20180208.ebuild
new file mode 100644
index 000000000000..61b5aa39876b
--- /dev/null
+++ b/app-editors/kile/kile-2.9.91_p20180208.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=be912e1b8644053d80e5e37d3ccd07448670fb10
+KDE_HANDBOOK="forceoptional"
+inherit kde5 vcs-snapshot
+
+DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
+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"
+IUSE="+pdf +png"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep okular)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	pdf? ( app-text/poppler[qt5] )
+"
+RDEPEND="${DEPEND}
+	!app-editors/kile:4
+	$(add_kdeapps_dep konsole)
+	$(add_kdeapps_dep okular 'pdf?')
+	virtual/latex-base
+	virtual/tex-base
+	pdf? (
+		>=app-text/texlive-core-2014
+		app-text/ghostscript-gpl
+	)
+	png? (
+		app-text/dvipng
+		virtual/imagemagick-tools[png?]
+	)
+"
+
+DOCS=( kile-remote-control.txt )
+
+src_prepare() {
+	kde5_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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pdf Poppler)
+	)
+
+	kde5_src_configure
+}
diff --git a/app-editors/le/Manifest b/app-editors/le/Manifest
index ccf4d9f60c9e..b8f3d462853b 100644
--- a/app-editors/le/Manifest
+++ b/app-editors/le/Manifest
@@ -6,4 +6,4 @@ EBUILD le-1.14.3.ebuild 523 BLAKE2B f57bd51998eaea4f15b420f69f12c3fa3260db82e923
 EBUILD le-1.16.1.ebuild 482 BLAKE2B 83482fbf242c9301f48e26895be69296bdef286db5c52f661864c68539291deb87d404b3b45cd563aa2a7cba8717a7af59165011750b954573156410629fc20a SHA512 6de4d2214385b6d7cb42ff8c6ce6dbb1a976be5d211125d75ee2f758f546b3c14a206ff70925cc1e214797ebece6f6911a8a484276ad8c2a17b83222be44fbf0
 EBUILD le-1.16.3.ebuild 460 BLAKE2B fba82f3d371ef0005574250a1f4c0682b1301f766c507f1daeda45a078e3c248b0552beac2e2ccaea75b241f2e3232b8e3ea294963fd5157324d99254d2d777a SHA512 7c7acc1c43316f8d139ecc7dfa6894fba025e3627df71682b005e7764577e8fd5bcfeabeedac3982c190eb0002beaae05c6749e026c3beec24874e9a75d4a7c6
 EBUILD le-1.16.5.ebuild 493 BLAKE2B da878d578c071da03ab2695eb93d81b78eec0939aae91686358eb84d8a49e721797216a14f7ea7dc1ff5ec3a8587d8a6ba633d0f7c7df907cc638b7a74c98d50 SHA512 06ad3696987ea24032d0a09f617121e38f4487dd5554c78aceddea6b4c3dd66d9df835299a9b417543b62891275c9aee2fa8925710f2c9d0f75ff45ff4546aae
-MISC metadata.xml 439 BLAKE2B 485156d186e6f259115a8c03339b98568da4d4e07fd1df9905b6b3a8b12ab690e3cc2369ffabf3cb547a3ee68f493a430e6ecec21fcafe0d01378bb06b8d2a10 SHA512 935122ca8314a54d71f6566683f64dbc2be9ea9bc85bc75c6107b40d36dec8dc5e058eb410ef03fdf442a1dc4daf7ec6522a95b4513c907e07cef3921c5f786e
+MISC metadata.xml 372 BLAKE2B 87ce04f23c2c03caf708509901ae504cb952d4b69819e0f3cfcc5e3b149d82db976965c1bdbc31db66a481726264a2dfe355f3407938479c71be6111a96391f5 SHA512 366c7a4b144ab34cc9a6bd3328ce4c27f32fd9d638949361ee5e9db29cf3f564d3ad392f9cd59858d359e9050c76c0eb5afa12900834462daaba949675aa232b
diff --git a/app-editors/le/metadata.xml b/app-editors/le/metadata.xml
index 98d7f5606dfc..e0c7b195e250 100644
--- a/app-editors/le/metadata.xml
+++ b/app-editors/le/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>gentoo@schellstede.de</email>
 		<name>Gerold Schellstede</name>
-		<description>Proxy maintainer - assign bugs to him</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 6bfb9fe2c881..199b5baf57ba 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 1045 BLAKE2B e489742c9b9c71178d1e9847f3fb556a8f4018f76b82e3231313043e3ab8e0faebd2e1714ddf81b6e9816c7864ff98e26eae0a6c82fc301589a7e52b67220eb8 SHA512 14c1fd5ea918379aa77ec2e31ffec1967384ec7ccc5b0987c17e2c01b02909f6e75defe317009d86a46af545758d5ef5958aae956177d92a26151c72cc4bbb66
-EBUILD mg-20171014.ebuild 1052 BLAKE2B ec7abfd554d18939a3e16ad6d6ecc6be0a78d953d88d15e5ada0797f022ecdf86e621b55ce19ffdad1017bdb546cc2d092fc9d58dc886f2a5494c30ebec1313f SHA512 793e3e975a2a74f6160c7ecd1a9f0536b097671a32e772706aaae34865e14c5678cfad9625fa66ca9a987220316502bdbc7ae6d226d1e483342de7a5c04c3fe6
+EBUILD mg-20171014.ebuild 1049 BLAKE2B 4c97874da30dcf8b28f6797563156a9721bd7d6a80a8e163ecb1ea205340b2204dc41ec0ae2d7ffd833dc9de017a7d58f119e7e59a902f22da2f2f5fad187599 SHA512 33a6e4d961165cd734c8d5a7a1979bc6fbdb724d30c88adc0c16d22c70b27da33af41b0f96c27c26f17ce8074c7be85a1fa2200730d09bc57539499f19d461d8
 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 b1e3a3d101fc..eec2b0ae20ca 100644
--- a/app-editors/mg/mg-20171014.ebuild
+++ b/app-editors/mg/mg-20171014.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://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/pluma/Manifest b/app-editors/pluma/Manifest
index 0324bf819215..ba91b956655e 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,9 +1,9 @@
 DIST pluma-1.12.2.tar.xz 3397280 BLAKE2B 23af095549ff944b0936889deda6576717a6376aa2f2be8ed9b7d8ad70f8bb0524aff7314f9c335a42d80951c047c8008278144f45c2c5edb09a259b298c0024 SHA512 db2878161903868703514531ba214fc34dad1789885f18756e9192d6ba17950c8be03141ada72f8c386b515d8b0f9d58a0ee94a33fe3ffe00f360ea667c2b275
 DIST pluma-1.14.1.tar.xz 3415364 BLAKE2B 9449fc6b5e98d8ecb25f70df6c114c13cc32a8c0348ed2047eb874e85c7d448d3d7f0b4d7dd6e2fada3de847ded425651dc6d0ca92ce3c784fd32948735f3b25 SHA512 5d04e053ab2eb0f90e34d9af541004867c7317fd9386229c4e702e95a80420df16b20e4ae4c30bbee79fe904282f6134f7c361971be07cd6952612d975c88d11
 DIST pluma-1.16.2.tar.xz 3428472 BLAKE2B c3b543fb11678269fbbc2d049686b2a553aa1fede4ef1bab8abbc7fed316f27ba67cbb366908966b6c844f8ad0c4899499e52b4720378364555ef9156c80ae95 SHA512 bf91a7e4e1cfb92f9fd9a1d5b4ac9f0fd2704785b2da5d7a3aa360b4c217a57653d6f7bf509c156b8711bc5164e022c685331c93a139f55ea41431bc72e848fe
-DIST pluma-1.18.2.tar.xz 3348500 BLAKE2B 356e01e268f0a9447a08bc5daf8facb1b1249c96a041cc34a1311a4f96cf01ae53e08141f08ab14ff37bfda28adbf5cdb26a9b381ca7e87d739c7931bb551936 SHA512 285170531c92ad13fdd35286c06de62b75f0426a830c51f4f54799b4b5377d65b3e1fd1e1af3827462a356947e853e4203a4ed394a8b6137bbd87e289f490b6d
+DIST pluma-1.18.3.tar.xz 3355188 BLAKE2B d53f381aa9c74cad0df82ccc73aaab9f87347cb8e3886471a2531bdd4d49a84ee97a50f2333b2e375f9bc2a634c25dc69b36659dcb589ace716e523a9d0b4544 SHA512 62ad57a8d7626e34c15610e121869ee9b06a2498acb40ec0a60839ca0273d146bd59682d352c3e98d892460c444c5442d32673c2f63897bb8c3e9e595e771dc1
 EBUILD pluma-1.12.2-r1.ebuild 1957 BLAKE2B 439ee1e569e161b2227abc7dffcb3815582f4f2a597b4d1769f1d0d1d2308361156cbaba558bd8e760499f129dade20a987e66dc94a7caf3cf530f3ead64a997 SHA512 fc460f11527c2a5cdced694b8c59ede5931f2ecf452e7a862791fe93fa18b2c260a51d8f6fca17c58445a59357efe48a6431d5824c8c045fd719ebaca5730860
 EBUILD pluma-1.14.1.ebuild 1999 BLAKE2B 179b831656292280771e6d4244ff24f8a4cf3285e82ba021ec73a32e6047cc9db2ce3ee9da226fb70d674e9b183c07ed55fe6cdb151b891b9b00a4199e4c4ac9 SHA512 095ec46f710d2ad58819291e28a560a4fadcab2790142604d025c69bfd1842ae78f7dca3ff5098062b2bf63f2448b5e96d66a64504edee21e9ba43a84a4e4c7e
 EBUILD pluma-1.16.2.ebuild 1999 BLAKE2B e301396e062768616a2c775d8fe644340eaaa4b085f2e8faf697f0aade4494b86cb4d5b3ad7218caec0677458f43ff27d80aa1f64cc5c40b07296127f8479ca9 SHA512 3394730f3248e8eaae6703aa472a4916e68e3aa96cc01dbe77df11786a48b95ba8a6936948fd3e2d6b921d8465f3ad05e98226802bdc8a198fee1a9aa66b31b6
-EBUILD pluma-1.18.2.ebuild 1764 BLAKE2B bad2f6fada432458399f17e3de3c467ad99662c7ecfcf06217e19e39349f1e283b88f31955ebff44fb243d4ca24de6a0f4c9e5b9b15237a3ab9b2cbd920cfd46 SHA512 edfcedeebe9b8a8ac20531ed4a6ebda38d9cc2b93873de10c535de146c0ffb5a7004d0a79cb8de2031090c638f24c64042bcb9321adcf9a80c0fba48ca655c4d
+EBUILD pluma-1.18.3.ebuild 1764 BLAKE2B bad2f6fada432458399f17e3de3c467ad99662c7ecfcf06217e19e39349f1e283b88f31955ebff44fb243d4ca24de6a0f4c9e5b9b15237a3ab9b2cbd920cfd46 SHA512 edfcedeebe9b8a8ac20531ed4a6ebda38d9cc2b93873de10c535de146c0ffb5a7004d0a79cb8de2031090c638f24c64042bcb9321adcf9a80c0fba48ca655c4d
 MISC metadata.xml 410 BLAKE2B b9e15ebb574ba3482e7317f89fd1bd599a0ba5d42a27e0c0da34f86ed64830819f23fca50865cdba6081daea8313b82a58cf98fa46e3ccc61eb389222cd1bfd4 SHA512 0e79ae54838d841d9e4d65b82af5042223e07585808bcdbf9c26ae7b59cfc7b66d1bb24b39e1835ca75dd724d34854fd12d881b7edb20850fa434cf1db2b2e14
diff --git a/app-editors/pluma/pluma-1.18.2.ebuild b/app-editors/pluma/pluma-1.18.3.ebuild
index 07b75492fa3b..07b75492fa3b 100644
--- a/app-editors/pluma/pluma-1.18.2.ebuild
+++ b/app-editors/pluma/pluma-1.18.3.ebuild
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index 4a5b7e7faa99..44a7554e5727 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -2,4 +2,4 @@ AUX qhexedit2-0.8.4-fixtest.patch 479 BLAKE2B 1359815f0c072a4f8a036b8168796e22f8
 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 1824 BLAKE2B bf51b60fa58333b2fa727adadd3bb35b0215a77773b51d856dafc1cda3702834e074735dc5a908dadd41134d767e81e8ec6f7fb83cad2de139dd9023df890fb1 SHA512 610257b125661932965e7f6a2a4e6db53bb552382b0f34eca35729da9179d3668629d30e70f07a6c29b6aadcf45c123a28b05c066603079f6669f9ae6e52b5b4
-MISC metadata.xml 1188 BLAKE2B c77c4946d1d0b30cb98d1aa5043ffdd97511687eac48a014d5393e4fb9728ec5e56a2e7e8616369ac2b13bb12439b66f963d48aa31a9d4d84120d98b2cd23250 SHA512 399c8e332a7eebad8a7eccaa555eadd29b2e8cf2a3fc5423eee9bcdda472581d341a683eef186519eb07c88305a6943687569e2ba2343d4b2bfeaaf3767064cd
+MISC metadata.xml 1114 BLAKE2B c0703321180cf2ecb96008fe1e479d6b1f95dfd104626d5099f96663010c562400b3daf9442db2496359bc1637ef8b93a17954512261dcacd03f00fb08946152 SHA512 76912cf5ba235269d58a8e81c7e8d96bb76ff8274b37d220fbafbdf8bdcb7e6e6a76bdb64f1ba8c22ca7c00a9a45e1c96a7849ebed38bd949f5647fcd3d1f2b5
diff --git a/app-editors/qhexedit2/metadata.xml b/app-editors/qhexedit2/metadata.xml
index 3f610e098d98..67f1531f77a7 100644
--- a/app-editors/qhexedit2/metadata.xml
+++ b/app-editors/qhexedit2/metadata.xml
@@ -4,7 +4,6 @@
     <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>
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index e530c5fd743f..9146ac240684 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -5,4 +5,4 @@ DIST scite402.tgz 2424648 BLAKE2B 84a331865310058d26ca45a25b99d98a7c3374d0463024
 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 2698 BLAKE2B e647063457f5c841dc7160673c21b9948cecb0d385153d36468db40af2ef01e8184adb46f84cd3d6bf1dca46a9183db73949a778a808395005ed26e0a8b31445 SHA512 3eb0d670b8a34f87ca2f7e8d1415f72884f07e5bb5815091db4380386b882b961ccf4273a0d48a1376cd32d8374f706e502eee9ba79bef83517f0c9ec6e0ec0b
-MISC metadata.xml 506 BLAKE2B e8a058da2c1b073ad0b05670913a27878f3e9dbf8dc7e72187d4513c4b8c230d3b00413cd6b0388994ef453b950c88a18b0b509dd0c1b8bf65d6fb9f09002002 SHA512 1682078953211fb3ec2e86750fe62cbf8a8f309fa05452e640bd7ca70b13452d626b88eddf7f741e669e77d8676c4abe63e6e7036182bdc51a8bff57fa116b03
+MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/metadata.xml b/app-editors/scite/metadata.xml
index 2437a9147c11..860834e39909 100644
--- a/app-editors/scite/metadata.xml
+++ b/app-editors/scite/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>ervin.peters@ervnet.de</email>
 		<name>Ervin Peters</name>
-		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 8d1061f1239c..1637dbf0d17e 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -1,4 +1,5 @@
-DIST vis-0.3.tar.gz 334216 BLAKE2B 8cf89f1e3292beb5bf7bc9495e75b795225a4a29f4d949f212daf5dd42958f347b1400a0fd1bf00014b28cfbd424bb04152c35ef9025384a746e59143fc872bb SHA512 e1ca009bd7569f22dacf7464791f9f4499695d15d6e38e1be491d39e7ebe0530de643be5c1e7647e9beb7969a17efab6545d3e719fe8cf311562e89d636bba62
-EBUILD vis-0.3.ebuild 904 BLAKE2B c5e9b25d11f5a24b0e6813873ff9505ed75e1ef7c5b1504c293acb96d0fdcb2b68f966902bdafdcf82c84c9725c12890ddaf0e5aacffca12a7c01af9148ebc77 SHA512 eda1cf1e88cbe41746b0a5623afdabea7e4c8fe332744ad87cbb73ed2b9866bd5a6edd761c00a68282ff12c1e328802d435fe544d0f56bb0899a9d9e4d1f13bc
-EBUILD vis-9999.ebuild 881 BLAKE2B 37cac906c21238dbf05d90cb2ab8655dc513b59d061b9c632083baccbc7658c138fde8024e5ebfe5fcc95789d7f90a4e87bcc065cc940cfe09f8e51a2fc14608 SHA512 47c8bc9c096f9f738d560e89b75541ce31f8592bf5dd1f17c4350eca06633855bc24a4375c2af2648a3434303cb3f734e95f246a450bd2bf1bdf108a80ff435d
+DIST vis-0.4.tar.gz 381046 BLAKE2B 612d9f17c5ffb00be9e5c14da0d52257e55e53250cb9ba80750feaf5d90caa53aed0f02e32413a10f161e121019cf758902158ddeac09c2516d18779f4264cda SHA512 d8fcf667ecad7b32752d6c5dbd004544e1a9283775d54d93c24ce8f314b98154aed5c6014cc03223d8427c2b1e3fd0d4b348dfa12ce30236fddd93b34521ee5f
+DIST vis-test-0.2.tar.gz 97770 BLAKE2B 9f8e31eb70ab8f9ce089f66ef29520e8250e02de375f9f8f0e33722c6a392bc6e04e7122728826708b305fb439c2b39f7fe3e233d7be162930aa46bf31bdb005 SHA512 892effa08c80c75e78eeb993ba8a0ddc110cc6f654fa1bf970454c35c839e9467b0ab41578f49af1fba0514c61f887fa044b9d01ab58f4dd749582a9550a2c29
+EBUILD vis-0.4.ebuild 1517 BLAKE2B b337caa62c91c870ffa172995a1ad5332cbfb7384447f7c7d45e7329565128161da6ed3ae17596c6d3cb8bd4387a6070c3845868da02554a6947935da57b82e3 SHA512 3cf83463343ec55e19422488f98ebb6c48d9144a9f6d0f2970ac4d9bbad36ff277f10e48f850bf4a533a88a5eed85e021db00b895bc0fa30c05a54a819e00ddc
+EBUILD vis-9999.ebuild 1303 BLAKE2B 929cc3a3ee02777d1802dc646487ca33fe7896e3cd794693b2291451e7fee57be7f8c9627f2821daef411ecebd0e2569e383a570540c8301910bfe804ab3933c SHA512 64992a3c8dd0bc80115739bd441c89b089873d78edd273fd36164cf6449f66ee736970ea7dd24115a714489090b9c1605c9e0372e70b01a94aca0e918758228b
 MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/vis-0.3.ebuild b/app-editors/vis/vis-0.4.ebuild
index e6ef1b663060..7d45b495cee2 100644
--- a/app-editors/vis/vis-0.3.ebuild
+++ b/app-editors/vis/vis-0.4.ebuild
@@ -1,28 +1,50 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+MY_PTV=0.2
 
 DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
 HOMEPAGE="https://github.com/martanne/vis"
-SRC_URI="https://github.com/martanne/vis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/martanne/vis/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/martanne/vis-test/archive/v${MY_PTV}.tar.gz -> vis-test-${MY_PTV}.tar.gz )"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+ncurses selinux tre"
+IUSE="+ncurses selinux test tre"
 
 #Note: vis is reported to also work with NetBSD curses
 #TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings)
-DEPEND=" dev-libs/libtermkey
+DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
 	tre? ( dev-libs/tre:= )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	app-eselect/eselect-vi"
+
+src_prepare() {
+	if use test; then
+		rm -r test || die
+		mv "${WORKDIR}/vis-test-${MY_PTV}" test || die
+		if ! type -P vim &>/dev/null; then
+			sed -i 's/.*vim.*//' test/Makefile || die
+		fi
+	fi
+
+	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
+	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
+	sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die
+
+	default
+}
 
 src_configure() {
-	econf \
+	./configure \
+		--prefix="${EROOT}usr" \
+		--docdir="${EROOT}usr/share/doc/${PF}" \
 		$(use_enable ncurses curses) \
 		$(use_enable selinux) \
-		$(use_enable tre)
+		$(use_enable tre) || die
 }
 
 update_symlinks() {
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 55adf2006010..228e63e98cd8 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit git-r3
 
 DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
@@ -10,20 +10,35 @@ EGIT_REPO_URI="https://github.com/martanne/vis.git"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS=""
-IUSE="+ncurses selinux tre"
+IUSE="+ncurses selinux test tre"
 
 #Note: vis is reported to also work with NetBSD curses
 #TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings)
-DEPEND=" dev-libs/libtermkey
+DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
 	tre? ( dev-libs/tre:= )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	app-eselect/eselect-vi"
+
+src_prepare() {
+	if use test && ! type -P vim &>/dev/null; then
+		sed -i 's/.*vim.*//' "${S}/test/Makefile" || die
+	fi
+
+	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
+	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
+	sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die
+
+	default
+}
 
 src_configure() {
-	econf \
+	./configure \
+		--prefix="${EROOT}usr" \
+		--docdir="${EROOT}usr/share/doc/${PF}" \
 		$(use_enable ncurses curses) \
 		$(use_enable selinux) \
-		$(use_enable tre)
+		$(use_enable tre) || die
 }
 
 update_symlinks() {
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 9d8a711a4c98..4324daa970d2 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 6742 BLAKE2B 73211147c0bc411503b7db9ac74f9b3fae325257b1699b0fa7b3e8defed7248f1101a12db40ddbab136687c0b5a1bae1f6441039e512780559842ca02f867824 SHA512 8272bb9a7f410e0ef04c72c97606605667e37f77a2735e2049dc605169dd696b69351bf7682608f5cdd3ace8051b0fa64a82675aec296a5a07cece47f2546cc8
+EBUILD xemacs-21.4.24-r1.ebuild 6741 BLAKE2B dde46e6b0e1267f115070c9920a3953e1fcebdd86c333b0af1d0aac8117cd4ac3ba9fb02e79705ea253877e68df885f92fff7522be03a835c55f161b417d9c61 SHA512 9be9111922a885e6b30f6c01a6b0688292ac4805d1d1aa50212bbaa936740d7557f1fa34834e0ffd09cad3802ba0e5fcf7518f83a4a2c440b45b62eeada9df16
 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
+MISC metadata.xml 616 BLAKE2B e54bf1e7e4860e0de6e017e5456ebfbb392b33e8f768928f051f75b3e1c3431cdfeee8c4da5b8618b623585127cf2a5b2990f42d7b68dfe930db7c1bd15c09b3 SHA512 8c6e5e61099adf6af109681bf6ce31408ff468dec60403155e5998574dfd095b77156d669e8f54b09bfee5ba71346f4657e15b7d8c4cc34511696a5e97370522
diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index eb55cb7dabc8..435eda5f8675 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <maintainer type="project">
     <email>xemacs@gentoo.org</email>
-    <description>Primary Maintainer</description>
   </maintainer>
   <use>
     <flag name="athena">Chooses the MIT Athena widget set</flag>
diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 91886480debf..23a21614307c 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/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index e923bdd674c4..6e2da0954199 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,3 +1,3 @@
 DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d
 EBUILD xmlcopyeditor-1.2.1.3.ebuild 921 BLAKE2B 1011f90af104285a39642c5d8d04f8dcef32d7523f4fcd07f8c39b887aed86bd5547173aed2a700b528089df8b97e3bdc0f42f62d7ee00dfd927dfebc9418e76 SHA512 c226e815d601d6551bc97a85d731379fb627d64a49f0e8a6e3993b4667968604fa3882b7a94b75713f0ff4f417038f71ddd92a3f34e0c0abc824aa242cc0e3c2
-MISC metadata.xml 441 BLAKE2B 2f0b0e1a9348ae991fff65b6bcee51547b3cc48c5cc5a3475d3bf57d127f8b3d4972d5d845cb499c363e2c68fdfb158cacadcd08897ad2a8a91b7f17a10b73fa SHA512 c84691628454ff4f8b4111cf4516f8e134ae9960564b0bb2242d0cfc30632c1a68bcf5620cc75534854285b7ab1929a5f0da0743a1afb3be19ef78184c6ab450
+MISC metadata.xml 401 BLAKE2B 7b39797b8ec8c196ed399ea758cc76377046402d3a856912b0408e4f2c582705366165575a7ef07d5acbf7b46980c1bf7abd7af25c2517262653c4bf9a4a1e8e SHA512 8cf10a7e77ff0049cde34fe2205cae46907dc1e84e80bc3fe05de4bada4ded96cc78676606b538f3d9c2bcb5e2612bdc42c9c488dcbf76c3866ea2fa38044395
diff --git a/app-editors/xmlcopyeditor/metadata.xml b/app-editors/xmlcopyeditor/metadata.xml
index fdd4b7a4a7e6..5656d01381b3 100644
--- a/app-editors/xmlcopyeditor/metadata.xml
+++ b/app-editors/xmlcopyeditor/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>rhill@gentoo.org</email>
 		<name>Ryan Hill</name>
-		<description>Maintainer</description>
 	</maintainer>
 	<longdescription>
 	Fast, free, validating XML editor.
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index 68c3154bd01c..6a3d2e13632d 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -4,8 +4,8 @@ DIST zile-2.3.24.tar.gz 953962 BLAKE2B 242f0f9532a536d5ba36664031cf86eba753239c0
 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.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 909 BLAKE2B 687ae226a301dfe13eb40cf0b99e018df99a3ec4dbb097f61af853e44c08c73f80adfe5b12792a06baea69702eeccc01b41f848f2e939c98c454e6d2b3ff915f SHA512 d3e8d0a0ab0cf46f18149b6403c19ca50de798cf5ff7d4b21e2977b100c5d6183381f15f6328591d2a54df536b43460044b92fa84115ba01dc42f61f2baa14d8
-EBUILD zile-2.4.14.ebuild 909 BLAKE2B 687ae226a301dfe13eb40cf0b99e018df99a3ec4dbb097f61af853e44c08c73f80adfe5b12792a06baea69702eeccc01b41f848f2e939c98c454e6d2b3ff915f SHA512 d3e8d0a0ab0cf46f18149b6403c19ca50de798cf5ff7d4b21e2977b100c5d6183381f15f6328591d2a54df536b43460044b92fa84115ba01dc42f61f2baa14d8
+EBUILD zile-2.4.13.ebuild 1383 BLAKE2B fc340260a2e20cb5530c3910b08fa04396efb2c45b1cd6442d4aed60bc3f418aa4eeab1fbcdd90c12c1c73198cfd2acf2c23f2f4dea23c1367589cf8e5ea3be8 SHA512 d41edf9dbab4290f47b5301263a962e21c459d4b1740a95e04f58c5a3c273870c9b2a7f7c505ab8a8b760afe7edf8a84df3e33373aa0aa745f3e91fdba129a61
+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.3.24-r2.ebuild b/app-editors/zile/zile-2.3.24-r2.ebuild
index 49d18af56379..f60cd5b9ec32 100644
--- a/app-editors/zile/zile-2.3.24-r2.ebuild
+++ b/app-editors/zile/zile-2.3.24-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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"
@@ -12,14 +14,30 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test valgrind"
 
-RDEPEND="sys-libs/ncurses:0"
+RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	test? ( valgrind? ( dev-util/valgrind ) )"
 
 PATCHES=("${FILESDIR}"/${P}-{userhome,gets}.patch)
 
 src_configure() {
-	econf $(use test && use_with valgrind || echo "--without-valgrind")
+	# --without-emacs to suppress tests for GNU Emacs #630652
+	econf \
+		--without-emacs \
+		$(use test && use_with valgrind || echo "--without-valgrind") \
+		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 TERM=vt100 instead"
+		TERM=vt100 emake check
+	fi
 }
 
 src_install() {
diff --git a/app-editors/zile/zile-2.4.13.ebuild b/app-editors/zile/zile-2.4.13.ebuild
index 74d312cf2c51..9f1ac547e516 100644
--- a/app-editors/zile/zile-2.4.13.ebuild
+++ b/app-editors/zile/zile-2.4.13.ebuild
@@ -3,28 +3,45 @@
 
 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"
+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
+	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} \
-		$(use_enable acl)
+		--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() {
diff --git a/app-editors/zile/zile-2.4.14.ebuild b/app-editors/zile/zile-2.4.14.ebuild
index 74d312cf2c51..6b6774de68e1 100644
--- a/app-editors/zile/zile-2.4.14.ebuild
+++ b/app-editors/zile/zile-2.4.14.ebuild
@@ -3,6 +3,8 @@
 
 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"
@@ -13,18 +15,34 @@ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 IUSE="acl test"
 
 RDEPEND=">=dev-libs/boehm-gc-7.2:=
-	sys-libs/ncurses:0
+	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} \
-		$(use_enable acl)
+		--without-emacs \
+		--disable-valgrind-tests \
+		$(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() {