gentoo resync : 28.04.2018

25 files changed, 43 insertions, 579 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 8ca05035ef07..2b48ef1cae76 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/editra/Manifest b/app-editors/editra/Manifest
index dad10ae2891f..83cea3d506be 100644
--- a/app-editors/editra/Manifest
+++ b/app-editors/editra/Manifest
@@ -1,4 +1,4 @@
 AUX editra-0.7.20-wx30.patch 2264 BLAKE2B a8244a8174d1b0bca8c8e4979623ebc9ea03838eff59e9c9b12c1c703c6c69b90ff3036a1bf68e2757f7d95fa706aef37df831fc0c0f01b9c1ffe9d570b14769 SHA512 c0befbe2fb2eead2c4fc066767b48938b0f2b17949dc42fd98128d63556268a12b73fb49f22a8e9abf524e4450bda2b2b4e0b4953bc7f3c7c32b6ba1e7eefe63
 DIST Editra-0.7.20.tar.gz 4072243 BLAKE2B 3a2d38888ea9d7a12a77d4adb57b7e5c926757791e8b48eedd8413b6712cbfb2c616c3cf26f3f49c3a7ac5acf37d373cff8d37c63e255a1d0a9ec1add3dcbbe6 SHA512 e568ce2a5f04300c33223bf7a0e6fbc52d0a51c3472afb9b613fe21cfbeba0b9b453d87837e52c7c48050fc266ff5ff194a42f797053f21f0a25cd5c4579febe
-EBUILD editra-0.7.20-r2.ebuild 1257 BLAKE2B 2e33a227859bb81665a85f76c4caafc98f5a6fb43fba9b45b940bacc1f47233747fe5efc00cf0c87d945ea4a38afdffa02dffad5902b128160d36089bb86814d SHA512 4af8d5670de238a49934567a5fd458fa745fcf99677b3771db6c4e7838207559daca4cbdcc492ec39fd9f60d2820eb414828b07693f578c9f27ca4ac4f413450
+EBUILD editra-0.7.20-r2.ebuild 1258 BLAKE2B c25df6f3bddc92f8dee6a0cb2c4fdf0d6b241769cb5e5c4c5f2beefe2f8646c7725b7b6bd385b5f9ad39aaacdc6196d762df0bf5a0b75ad23d187e36ce63fe06 SHA512 ea516785ccd2909bb9d784beb6a0dfe92a0aad9bb45d6ff0e9f214a129812a2a8c08ecd9181d19ddbe807b8fa80575ed85aeb04bc69b095973ced7551998185b
 MISC metadata.xml 261 BLAKE2B 6a1c213fc272c8d1e93e73a8aba2f3fffce3525a0b505f56a0ebc185d0000d2f472480842e2e588a59209047f3da0830cb0e59835ac738b548bd8a74dae3c176 SHA512 f7ad013dd5f01aaedd4528f98ba9a4b4b44d353502df3438a8b513dd2ee7af1e24328c34187e156370efb550c401b81175cccc7a7643ea6a5a83766d68a05221
diff --git a/app-editors/editra/editra-0.7.20-r2.ebuild b/app-editors/editra/editra-0.7.20-r2.ebuild
index 4b7c94e4f629..04cfc91b0dfe 100644
--- a/app-editors/editra/editra-0.7.20-r2.ebuild
+++ b/app-editors/editra/editra-0.7.20-r2.ebuild
@@ -9,7 +9,7 @@ inherit eutils distutils-r1 fdo-mime
 MY_PN=${PN/e/E}
 
 DESCRIPTION="Multi-platform text editor supporting over 50 programming languages"
-HOMEPAGE="http://editra.org https://pypi.org/project/Editra"
+HOMEPAGE="http://editra.org https://pypi.org/project/Editra/"
 SRC_URI="http://editra.org/uploads/src/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="wxWinLL-3.1"
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index 90609a574db0..e6f56d1386ea 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -2,6 +2,6 @@ AUX elvis-2.2.0-glibc-2.10.patch 1526 BLAKE2B 4c49a42ade8a5bfb4140362d7237fa1e21
 AUX elvis-2.2.0-interix.patch 297 BLAKE2B be5b6d3ab880254f2fc271b85289ec64f3dc907936a71fc122b5ec37d7377c3d169af3c26b488c2e4bbdaf4562f3237a8850a867c3e67f568cedcc8d1cb604c6 SHA512 7215150c74b96ea441898435c02f342c0fac2e579363be5a95684a49b84e020275b6e9124b8fd449559e1e3217f96901c2887214ee61a4ca8484598a7cd42442
 AUX ft2.3-symbol-collision-fix.patch 2396 BLAKE2B a890da27b23700d2f6def41ab0a567ab3af899c291d0a06fdba4c567a5169da01ba61a3e4490faaf91a3a74b3bf91750f1426aeecc02452eb1355093e14d973f SHA512 14a2880f9984615f9876973e5eaea54846547d2871b8c2f1417c968e5e92c01612c954d39026671cb29656c4d6fd93d65f1bd6fc6325471346e1f56e3e1b97a3
 DIST elvis-2.2_0.tar.gz 1439293 BLAKE2B c061370a3a9a9d24bcdba65f1d16b5b8d7dd6a5a9e777949c80862f8e9ce879dac6685f625c0fd86cae26efbbf58277d9626be2f4e513d1b1bed131cc60eb95d SHA512 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
-EBUILD elvis-2.2.0-r4.ebuild 2393 BLAKE2B 52c7524d584c5f324eaf674b2012a431c4292f4b3ab05855207000b583dca34f0551d45fe6e73fd6afc3ac2ace6742004e78ca69e5cc9aa61e8d0b3dd8328a76 SHA512 9f6b1cd9f8c34ccd3cd3abe5186b0ae375266e8d470d2fbd3cfe4f92690e3e313ab40624f43c5ee66ca8d313416e87d46d92e773a34c360be9abe40e9f4bbcbe
-EBUILD elvis-2.2.0-r5.ebuild 2403 BLAKE2B 79855629695f6b138ce7b206b110acbccf20aa0903914f6acde7fb5d02942d73cc6d32af2bc7c67310f729808707e4b4b4da3f098ce544bfbba414816ea788b0 SHA512 32dc4c7035b383b3a9e80cfe6dc5b249fb11c01992f1d4ed0b48daa5243f1c2e9e6207d67a79c6a838d8a64b4cb908783f93ac6a276cf19dbaca0d1a8760bf56
+EBUILD elvis-2.2.0-r6.ebuild 2396 BLAKE2B 71087c0bd2645274858e326a156564676b8d6a02d831a6f57df66131acd789268b08ff0251cf456bff056db10ac9a81ae62a802d31df995a2c31693b4077aa3a SHA512 3c2823dd77b31453b1e06f7741f21ab31ae3f80ea5b15b4771f6ee069a7d54c7bb65fd47028cd3782bda9c1fd3ae7f4d865542a51031bd13595850cf2ca86aca
+EBUILD elvis-2.2.0-r7.ebuild 2404 BLAKE2B cddb49ebd101377d79fcccfb16a5b7a890c6aa142c243132d3098de6798d6f2b6459a42416a76a77ed41d1186ddd9195e2f8faafbb80428bede79652080349ff SHA512 a407b19a0366335de2ae650a7a2d38f9abc6b10a2c5e0e69fc73fcf75ce7cdcb19d12112dec567c2274cec2e33a1998a138b49f8477a8f0f7e847a11b7b54bfc
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-editors/elvis/elvis-2.2.0-r4.ebuild b/app-editors/elvis/elvis-2.2.0-r6.ebuild
index 5f1ee0752233..2317c7acda26 100644
--- a/app-editors/elvis/elvis-2.2.0-r4.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,13 +16,14 @@ KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="X"
 
 RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
-	X? ( >=x11-proto/xproto-7.0.4
+	X? (
 		>=x11-libs/libX11-1.0.0
 		>=x11-libs/libXt-1.0.0
 		>=x11-libs/libXpm-3.5.4.2
 		>=x11-libs/libXft-2.1.8.2 )
 	app-eselect/eselect-vi"
 DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
 	virtual/pkgconfig"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/app-editors/elvis/elvis-2.2.0-r5.ebuild b/app-editors/elvis/elvis-2.2.0-r7.ebuild
index a17ff3472331..c69d4195dd1b 100644
--- a/app-editors/elvis/elvis-2.2.0-r5.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r7.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
@@ -20,7 +20,6 @@ RDEPEND="
 	sys-libs/ncurses:0=
 	app-eselect/eselect-vi
 	X? (
-		>=x11-proto/xproto-7.0.4
 		>=x11-libs/libX11-1.0.0
 		>=x11-libs/libXt-1.0.0
 		>=x11-libs/libXpm-3.5.4.2
@@ -29,6 +28,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
+	X? ( x11-base/xorg-proto )
 	virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7cf0c86012c7..4221e08c46a2 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,9 +9,8 @@ DIST emacs-25.3-patches-1.tar.xz 1252 BLAKE2B 33c3c8e32b85f548201d4988d3aaf94e64
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.1-rc1.tar.xz 44010228 BLAKE2B c7d8d19a8488a88f3eea4dbf4c545de75956b6a82735826d15b603568577fde8019d7655e936ab60bc61e397f3db074e26d5a1d58534714fcaef585fa63a7719 SHA512 bf5a9fac61f024406b050037505c14c83db95f24760c2e32aa8f7e53cc8c2781883af0c3ffe820b039a9444a10e7fdcae7635b7e3c383718de22d77e7ceabe83
 EBUILD emacs-18.59-r11.ebuild 4358 BLAKE2B d5db4c011da9c728092eeb75f8708c7ab3729497be75fec58553de3df47a12a54e0845c1a4bc5a07c1080a305d0fdf8033370c0c5692ca3ae7caa617637d8fea SHA512 9637184ba4c9f51da3eef13625b5de4a1af283ada88c2a4f6fe6f03447907ac37e05ae69abbef514bd0024f748f1cc458567f4480e0e23fd4db26905bfa0b4f9
-EBUILD emacs-23.4-r17.ebuild 11396 BLAKE2B 9214e1552f6f3d5e74b2449b158077a61073b9c0fbc1fe63280d4e1312d34936031d8d81b3266ad0fb826e4178388eb122aebc40406575195ffe07c9d3654b69 SHA512 2fc090ff6fef113b151c1fe601a277f5cde3b21814e825f7092839fa1563206b8487e4c81a724d9d870dcc0869cdef319e0e2d02a8b0172fe2b3fa078b34573f
-EBUILD emacs-24.5-r5.ebuild 11111 BLAKE2B 74098a7a8ce8a0db2d0b39ef6227f8474fcaf793b0e95bde02c8259bd319d0029fa43006096c826f4d81eb558035db487e3d38ddd14a8496f8824e791c4e1b44 SHA512 5659839366f07eaa3b6f39ed54a46201f4e2ffb9bc14e272255c03e5ed6f79aca7723b8733117943e1250344c895fcb28d3a8cb2cddcdf9a5157215b14bc7f0d
-EBUILD emacs-25.3-r1.ebuild 11640 BLAKE2B 16ac50fda38a906936b0abfb294e1f09d929948befbc6087c99f20f5b894b818c625df9fc274ded2d633fd7034fb9cb53a7111fcf38e18f48e43e3ce99a9363e SHA512 ea8f14799e8a87f4f55c8f9d9488e021319d107432d8cb2f8a63c31e9f11f4e44e497d2f42aa5cc0702001d733f94b9811bbca66a7d7af69320ca9b69514a316
-EBUILD emacs-25.3-r4.ebuild 11600 BLAKE2B c157df51b1b06745380dd3ae450002c7f2eb7ce29028b81bf289c03baf746fffa67c5dc3ffebfb00f916096306004828559c49bd0033f9c933f8fffdb823d550 SHA512 ed04e704027816136faf0820c6adb91c8fe247b9911e2a6ba816a8e56a0495c84fd89157a10b47b3322739f3584d506d8a85220533ce87987481132754045b89
+EBUILD emacs-23.4-r17.ebuild 11421 BLAKE2B 88c04aabc068027d0ef6d9a1199d22c90f7b400e9b88396d04e39d8d7981c2601fc08c0881f1cddd310b47a1dd8122f80f2288f9a30eb6f08b35f7b2591e7903 SHA512 d59446d471cc210bcfb20b0d8c0553eb8a47109c301fe6f63de2fa5ec93536e76684619ea6e19dd8543cb52918eaf21569711b6cf4b65dc22948e4171d2d09f0
+EBUILD emacs-24.5-r5.ebuild 11139 BLAKE2B c85b922bae742dc6ee475a937b000e0900d991379d65ade60e20a3de7a9adda271707945b9f543df7017c614a0f30cbaea5c57fd5b4fd7699bdc99f8b7cff468 SHA512 9539a8a4fb5032992cfa6d4a972a482e5015291895412faf4d2923137c271a665cad25a38a2cd3d43fa3535c62c82b4de5a45ae8ae72963ab90cdbf710d1bac5
+EBUILD emacs-25.3-r4.ebuild 11627 BLAKE2B 23edef4da772017396644284dc4753aee0d7aafe04edc5d771e89a1f00797203039d34762a2470b464badec775bf080a4aa0404a529eed3e4ecc752077ce98d2 SHA512 094abf9ed2747bd5c8b0d9120b72f6e6aa11a21a4a3c40d237fced802035f7057999995067915a5995b750faa4041bb93e805a8c2a41b9deabeeecad9cc144c9
 EBUILD emacs-26.1_rc1.ebuild 11961 BLAKE2B e11b2e6958b8586a38a217232e341a817df6cdcb64418462ba3f674f20f145c820bb60170c12b597b3785f4fe914764fcfe87fa94372b9239656626544ccb943 SHA512 34c5da5bd5e82839b7552aba929f8eed35c868a46d968b0e1189f6b3549819b60d012e373d19fa659461ef9a116bc911eceb138376405e31ba0ae314285e4179
-MISC metadata.xml 2817 BLAKE2B 75ddf0acfc4520b1426bfd99146df35b36f40cc4cb0df7bb773361b786da3857744415a1a8a94a060aa99762e88caaceaa89d5f069fbc9662fcfcce10880f6c1 SHA512 64c729882bcab6a7cfe36d0d5ba5228b15d15000383aa87b5528763fb291cfedd1cd896c406b6e3783677bb772f362de4a54e54c6f056b959f6efffb65325c90
+MISC metadata.xml 2741 BLAKE2B aa5276abe676055d9ce3a95dd3ab9208ca1b03676854a26e0309907c7d5aae466cd2746b43db6d2303bda2d1fd650191cf87c8cd983a040d66c9e57dfd59a830 SHA512 136a8328c80529ff045dd183770e629a6a0e9fc0b49258e994023636ec917aea1477be60898b86636071a94f9cccc6e80b06e173c15024cf3a794a2d0f968335
diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild
index 90eef32c372f..a2456d6cbd3b 100644
--- a/app-editors/emacs/emacs-23.4-r17.ebuild
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@@ -76,7 +76,10 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	alsa? ( virtual/pkgconfig )
 	dbus? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
+	X? (
+		virtual/pkgconfig
+		x11-base/xorg-proto
+	)
 	gzip-el? ( app-arch/gzip )"
 #	pax_kernel? ( sys-apps/attr )
 
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
index d4567f903d43..d1f8e3fe6d66 100644
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -85,7 +85,8 @@ RDEPEND="sys-libs/ncurses:0=
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
+	gzip-el? ( app-arch/gzip )
+	X? ( x11-base/xorg-proto )"
 #	pax_kernel? ( sys-apps/attr )
 
 RDEPEND="${RDEPEND}
diff --git a/app-editors/emacs/emacs-25.3-r1.ebuild b/app-editors/emacs/emacs-25.3-r1.ebuild
deleted file mode 100644
index be629ab7382d..000000000000
--- a/app-editors/emacs/emacs-25.3-r1.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common flag-o-matic multilib readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-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"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el 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 )"
-
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	eapply_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	#AT_M4DIR=m4 eautoreconf
-	#touch src/stamp-h.in || die
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			#if use xwidgets; then
-			#	myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
-			#else
-				myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-				myconf+=" --without-xwidgets"
-			#fi
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		#! use gtk && use xwidgets && ewarn \
-		#	"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--without-hesiod \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-25.3-r4.ebuild b/app-editors/emacs/emacs-25.3-r4.ebuild
index bcec3906b31a..fa65731efdb0 100644
--- a/app-editors/emacs/emacs-25.3-r4.ebuild
+++ b/app-editors/emacs/emacs-25.3-r4.ebuild
@@ -12,7 +12,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 imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
@@ -88,7 +88,8 @@ RDEPEND="sys-libs/ncurses:0=
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
+	gzip-el? ( app-arch/gzip )
+	X? ( x11-base/xorg-proto )"
 #	pax_kernel? ( sys-apps/attr )
 
 RDEPEND="${RDEPEND}
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index afec8cebd2ea..7ed552aba66d 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -40,7 +40,6 @@
     of the internal Lisp implementations</flag>
   <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg>
     instead of the internal movemail substitute</flag>
-  <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
   <flag name="source">Install C source files and make them available for
     find-function</flag>
   <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index 65b94d0f1fad..77ab9e74727c 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,10 +1,4 @@
 AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5833d485a421244228ef36601320ddcdad1e744e4a83fee2633154c4bd642053e09bf97ee79aab2b11a82df4afcb4a70823cb5df24b5232c9b0a8d6 SHA512 5f272a4c65b1eb58cc87732fbe82f2c6b925562e77b2280a8b9a0a8b0a41716567051ebd4f6ed32caa8ce7f14edff4e20666f6ad4e464cc8d308640efa4a3c19
 DIST focuswriter-1.6.10-src.tar.bz2 10202594 BLAKE2B d7b59dc2c37d87ed0d1e58358906a9fef6f14a339e12a50980d17cdbed043f604bb355edca956af61b5fcaa78f68eb35b54ef85fc08dfa00dfa747893d6c1200 SHA512 8c12481af77fa4353840f22a6aa54c5264041afc141d9746e097e42171a9f274663940fc0c5e5e2c91ef677190c682a195cb775199d4b8cc2b1ad040542e2e61
-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.10.ebuild 1093 BLAKE2B 7ea0feb52027aa668d78ae5b01eb42ff682911251311f627ace120c22f889e8239f126db26c9d49a181110d3b0a4f3c230194bd99e9657b7224bb679797342df SHA512 207a2a1bf4876f782c17096c94dfe360ca8c76ad77891582f6fffc56ad493ab7ec6894f27d1e19d697b11a51bed5a2456929824a383b62f5de7e5ca12844db23
-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-r1.ebuild 1093 BLAKE2B 7ea0feb52027aa668d78ae5b01eb42ff682911251311f627ace120c22f889e8239f126db26c9d49a181110d3b0a4f3c230194bd99e9657b7224bb679797342df SHA512 207a2a1bf4876f782c17096c94dfe360ca8c76ad77891582f6fffc56ad493ab7ec6894f27d1e19d697b11a51bed5a2456929824a383b62f5de7e5ca12844db23
+EBUILD focuswriter-1.6.10.ebuild 1091 BLAKE2B 48012e9467003fd8c88cc144cf6e587e1f8992b77bc69ea3e20c0f5bc271f6f4a45c944b8a8985eccb3e36db99d67c4efbd2a372fbae51be09df46083a01fe34 SHA512 175c404d257142889d797e67f6f47c7bb1756c253ecc41f96a79f26c604ef24595c1bfc5ae2739d0814938fb2c6240779da39cee0821b3aeab80c7b073c728d9
 MISC metadata.xml 392 BLAKE2B dcb98e8e1ba1c2a2aea89d380d6a2a1a1cfd5fd9773f133aa7603b88384c91911429832a7117026cea4c092c1c84dfe440a2c4da875ce56e1da7e8670aecf068 SHA512 beaf6206dfa83ffa8acbae3d5f8c5a9041974588a18de742fa049d4ff0b8d75bcb2f40ab081418cdd2987709566b678f7016b1be0acb02deeec480cd25ddf3cb
diff --git a/app-editors/focuswriter/focuswriter-1.6.10.ebuild b/app-editors/focuswriter/focuswriter-1.6.10.ebuild
index f61c59e9ba31..9aa7b84840d7 100644
--- a/app-editors/focuswriter/focuswriter-1.6.10.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # drop qtcore subslot when minimal Qt is 5.10
diff --git a/app-editors/focuswriter/focuswriter-1.6.7.ebuild b/app-editors/focuswriter/focuswriter-1.6.7.ebuild
deleted file mode 100644
index aee21c9571a5..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 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=""
-
-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/focuswriter/focuswriter-1.6.8.ebuild b/app-editors/focuswriter/focuswriter-1.6.8.ebuild
deleted file mode 100644
index 67fc1801283b..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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/focuswriter/focuswriter-1.6.9-r1.ebuild b/app-editors/focuswriter/focuswriter-1.6.9-r1.ebuild
deleted file mode 100644
index f61c59e9ba31..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.9-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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/nano/Manifest b/app-editors/nano/Manifest
index 68b8d259d7ef..96e2eef61152 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,9 +1,9 @@
 AUX nano-2.8.7-minimal_compile_fix.patch 1206 BLAKE2B 72265b226a23282baf1d16fe62637a3a6123342da9ddf9fa205d7eaafea710aa62fcafad1188cc1c08bd537be3ddb98403afbfd035fdac5712d6bf24bf2fa40e SHA512 1ebf43ca322c0cd49b7a3ffaad33057d4ac899c7a930569df124e54f713b28ece7e01aa625db91ece0126a07228256d188154bce464bd4c1a97945d686d9f0f3
 DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79
-DIST nano-2.9.4.tar.gz 2874037 BLAKE2B 493005cd3635fa7ad9508d6a24076e3a23b9038e5e4fbecf2a9ea51e03c861eaaf0fbe3e566075394523669350b1e396140f0bc6504953bb7c99690d47ef502f SHA512 dec4259668716a49d6dc403aabf4e2c0c0148247f9161e6a88c29c573026fcec00a15147b2e6d2c8c1d52fac227ab4d7b3f3552389af97b485da0b875976f0fd
 DIST nano-2.9.5.tar.gz 2889382 BLAKE2B fa9a020b133f0b1c669689e0831d2700d7509a01e7355ab7ee613a38b1c6c65e35e9572ad5c4ea4aae427c52ba841d7b5da826bb0afddf25f3d8add8ffa15302 SHA512 623a1d142f5aff62186314d84ea8461e10ab7eb2e11c8a57497736bc5ad432e39d48086d17eb80bdbf9b33adc41e9d77db5416281138993dbea795afd96dbfc0
+DIST nano-2.9.6.tar.gz 2892819 BLAKE2B 572fcd30b3640e1819d2d573c6aa755141b3990ab05fdf4928a8ade4dedd77ee4d8b81644a75d2c698fbc5512b1bffb7e7d449beac57700a77a1f7687ece4d58 SHA512 360802c3d772e8159e729803d5307575b348f779623e49401752984201b6b874df1582fe79ed6552a524db64ae6d8a1bfb449b525f7354cbd5cd9941432a2dff
 EBUILD nano-2.8.7.ebuild 2307 BLAKE2B b7ab4e20fcb2dcec5b6f2a198fbcb2a2619f9f29081521d1ce7a555be8bf44ef060ad9b8f3f229bf272bd5cf6c5f066e10d08f2596b5d3954279be71a4d09ad6 SHA512 693683af78bc48911cb50813cd8e02ded2546ce8efc79c5897c804c64479d889518d88f1cbcfa79e11409fd0f26543be270f2da451618d4b3756dd7d2bc7b4bc
-EBUILD nano-2.9.4.ebuild 2253 BLAKE2B c3b7d53fa6dafea37b151e5ee6296836d824a3f875da8250add163b862b12c8f037c383e2a258d0cba7e7667d53c001ed97c521d0b2920e9d6f968d9f8be9066 SHA512 52383eef617aa519b6084c88230d8cda018e447d3fcd032bc04aca1dad41c09f4a86203ce385accded5ea0c1d1cbb59f15f1736b9496c26d8e5b02a10e580ea8
 EBUILD nano-2.9.5.ebuild 2253 BLAKE2B c3b7d53fa6dafea37b151e5ee6296836d824a3f875da8250add163b862b12c8f037c383e2a258d0cba7e7667d53c001ed97c521d0b2920e9d6f968d9f8be9066 SHA512 52383eef617aa519b6084c88230d8cda018e447d3fcd032bc04aca1dad41c09f4a86203ce385accded5ea0c1d1cbb59f15f1736b9496c26d8e5b02a10e580ea8
-EBUILD nano-9999.ebuild 2253 BLAKE2B 0c5d1fa1a6cc54836bf07a83a4eec32d38217c4f5133d185d4e859219a236f73587d75fd2be1c03deace487032a35c59569e2df098af5b0ff0c88659916f74ed SHA512 8729d366c735abefbcd7d123599ef93edf0b3bad87507df4847751d4c117de6a2110484f509c4126b7417ccbcfc9bdda058960a4f7b888466e8f84bf9c5399e7
+EBUILD nano-2.9.6.ebuild 2242 BLAKE2B 958b7c5c9ff1509b981d3fa8ba495dbc8e4ae4dfa41866c9a0a79f89e1523220e8f702d41577deea3e75f027b48fa39605b3d450a217d4f68d2961758bc4f55d SHA512 c8bf04fa19e66e78db0fc3a467b5f075794af9b023b067265dd6852e3ef7034b3a6f62032af68d19befe998722a739c7fbe2c878d573b00d54be221418f57c52
+EBUILD nano-9999.ebuild 2242 BLAKE2B 958b7c5c9ff1509b981d3fa8ba495dbc8e4ae4dfa41866c9a0a79f89e1523220e8f702d41577deea3e75f027b48fa39605b3d450a217d4f68d2961758bc4f55d SHA512 c8bf04fa19e66e78db0fc3a467b5f075794af9b023b067265dd6852e3ef7034b3a6f62032af68d19befe998722a739c7fbe2c878d573b00d54be221418f57c52
 MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82
diff --git a/app-editors/nano/nano-2.9.4.ebuild b/app-editors/nano/nano-2.9.6.ebuild
index 74791e406856..2b29359919a7 100644
--- a/app-editors/nano/nano-2.9.4.ebuild
+++ b/app-editors/nano/nano-2.9.6.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
 	inherit git-r3 autotools
 else
-	MY_P=${PN}-${PV/_}
+	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
@@ -64,7 +64,7 @@ src_configure() {
 
 src_install() {
 	default
-	rm -rf "${D}"/trash
+	rm -rf "${ED%/}"/trash
 
 	dodoc doc/sample.nanorc
 	docinto html
@@ -78,6 +78,5 @@ src_install() {
 			"${ED%/}"/etc/nanorc || die
 	fi
 
-	dodir /usr/bin
 	dosym ../../bin/nano /usr/bin/nano
 }
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 0aed36a7b0ee..2b29359919a7 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
 	inherit git-r3 autotools
 else
-	MY_P=${PN}-${PV/_}
+	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
@@ -32,10 +32,10 @@ DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
 src_prepare() {
+	default
 	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf
 	fi
-	default
 }
 
 src_configure() {
@@ -64,7 +64,7 @@ src_configure() {
 
 src_install() {
 	default
-	rm -rf "${D}"/trash
+	rm -rf "${ED%/}"/trash
 
 	dodoc doc/sample.nanorc
 	docinto html
@@ -78,6 +78,5 @@ src_install() {
 			"${ED%/}"/etc/nanorc || die
 	fi
 
-	dodir /usr/bin
 	dosym ../../bin/nano /usr/bin/nano
 }
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index b099888db594..d5ecadf246c2 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -6,5 +6,5 @@ AUX qemacs-0.4.1_pre20170225-nostrip.patch 1771 BLAKE2B af8ad554ea5dbdcd8e7a3df3
 DIST qemacs-0.4.1_pre20150916.tar.xz 1136592 BLAKE2B aff8875b81bd51f77bebcb4dfe60ed0d4396a05af1f42e6b8765e15f9e04e00162924c3514a9ea1e8cb8c0b9ecd2a4112b9d7a46b7d156c032d37d381f2ae0f0 SHA512 e9775ff3dfef6d6b6b263029a620e6575f9f4718b94c0acfcddc8e5da8cd835e57dfbd5fbd948778135b609ae0588924fc9a727b2e763a25148aa27886a9f467
 DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99
 EBUILD qemacs-0.4.1_pre20150916.ebuild 1664 BLAKE2B 9bb83316a5059a92c0eb04a1c07336ac0976b11778f60b0898bc79ba1a3edc1eb722327b08ba3bf766b67cf5a5f33d3407cfe86329aca377a62234f69b083b8b SHA512 9ca5f4c41d4232051070547d8591235c1ac4d3e5dbba738d58b5668690935f9e106ce1a4921d7004cf4bbc7ef33f717b782a8246d7f402fc9c35a356baa720f9
-EBUILD qemacs-0.4.1_pre20170225.ebuild 1491 BLAKE2B c3a8ed051bc3f1bdfdae7480f0e66b226a0957c4f62052b54e51d372b88d945a00c105413c9236ae6bbb91bb3c6869058617dfb825531fd547afafb32c4388e8 SHA512 dd28c31b7d5367cdc33893a3955cc91db0d7f10e750083f81088e39aa37873659ab635c97983d271c083bf4abb815949f8d2c4cf0e2ac947d71f24902ef16724
+EBUILD qemacs-0.4.1_pre20170225.ebuild 1519 BLAKE2B 625375983bba8a8fe37511edbc3d4d07fb7fabc4bf5bf0ef9e87a4f816d7c4a6ad9cc71c24fecd9e37dc038a70c5f37fc04c08d1c4b01605f7fbe153139852fd SHA512 02d99ab6f3e2800694886d463ebcf1534b12fea705a3f5e0dc5a3d05cce43d2947edb04049979c91d55f8c2825327d3a10339078cc208d68b8a12bb691ed4907
 MISC metadata.xml 1937 BLAKE2B 1367de4b5e027102ce6a7720129bf21bd6d9556d748f0770d005ee0b9a4454f5ad0d27d0d25e8c7b97bc3c0bb796a78df636479d33bf6bd5acee36498e8a8a81 SHA512 a26f40107a0616980d3722685b1491eee4c606a685e78bbc23a62de6c9b67cf15ff3ac92cbc935a38d280844a0d15c21f92ee7bdbb28218f8ae664bbc526feac
diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
index ea7c0f5836cb..33bd0f7ba89a 100644
--- a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
+++ b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
@@ -23,7 +23,8 @@ RDEPEND="
 	png? ( >=media-libs/libpng-1.2:0= )"
 
 DEPEND="${RDEPEND}
-	>=app-text/texi2html-5"
+	>=app-text/texi2html-5
+	X? ( x11-base/xorg-proto )"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/app-editors/xvile/Manifest b/app-editors/xvile/Manifest
index e8236a78c283..0f21e46eb282 100644
--- a/app-editors/xvile/Manifest
+++ b/app-editors/xvile/Manifest
@@ -1,5 +1,5 @@
 DIST vile-9.8r.tgz 2322132 BLAKE2B ec477afbf927b527a484dd6ec2cf596a3f97ee1a523e7254aaaf88b98c1b353c82358a0e80408bcbe270ec6eb7b958fb8e9d517801705cf8bbcb4e58bea94026 SHA512 4f610c8c8f491d8d630d042166cbbdc12b89513d40d14dd70526d6cb5d7ebf603a99b19ce2fc42f7143d674e6d5155fcd305da297e03e46caa862ff40e2bbdd4
 DIST vile-9.8s.tgz 2328441 BLAKE2B 35b5cbec671347eb81503b70a2061395e3c8c904cd304acc83feda2baed71ede7936143ea554bb3bba0cda8056b1a6d76c5ee6473b244a8a05d113a8e613ead0 SHA512 06bfa64e5908aa31351068c5509e6fcc98bde202b814aa6abe5c449f841378c897df1fdbb8b20bdb5e71578238e1e9d11dac08e66159317276a01a9ac96ae9ab
-EBUILD xvile-9.8r.ebuild 864 BLAKE2B d283be2c9d2c6d3a4c6d12d8db3d1148be43ed0519e3e75b300cd1ef7f43310f5a38626755bc825e90b918638eea30e4079e91a90eba846902d88f6c3d40c931 SHA512 e2654a4ce00acfbabfb1f777e7dc25c12e49077679c66653540dc53db671d5185c21dc1d74f20ae8030f4afc9c0005daa8e8b4b2be31f0214dca8c64d6306fe5
-EBUILD xvile-9.8s.ebuild 870 BLAKE2B b706a875a59c8bb76e6d3f22e71ad821f0dadc699b1d9413b9a936ba2c913e08b18c87c3257a104a5ff7f380b1b00a75676420d7951ed40cdb71b0ec914e4999 SHA512 155c25dc0f6321551e147fb09ecdda405b3d1dd5782ed5bc19cf7f4a6916c30d0d2bf7003a3ed38248fafd4725eb3a62ef3ff94844d8a613b9459abe21580609
+EBUILD xvile-9.8r-r1.ebuild 859 BLAKE2B 67c299130e8df58ac8f07eada58b100acefda284ed4627a93aea5a3edc505cce23169fd07bad8a2e9810b0d242952e2e65235650243c6e97d32425610ffc0b5e SHA512 4381e53d174eb931594a429af0930ded4a0047b3c1c18f33a3f0c97c35b9e9cbe1468279fdf04493c2794551bd8465fd1b6e5fa574d289288ae55fdf23bbd72c
+EBUILD xvile-9.8s-r1.ebuild 865 BLAKE2B 48a6a17bff4906ecf82706cc027946e6b5b1e397f08d950b02e87e131ab93a2e3c0b4fee1f854a85c54dfe1d7f873e20d59bc2c09236224bc4bb032e2a0b7684 SHA512 59e9b0fc3160f0e5b36e22fb01ba31f84f6f907dcc2362ea65994e8cd83be7ebcd89d25f289d62a57ef902327147ea7e57756905635b65d7c877aed1e9b5bdc0
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-editors/xvile/xvile-9.8r.ebuild b/app-editors/xvile/xvile-9.8r-r1.ebuild
index 8748bca62a91..d2cd7608324f 100644
--- a/app-editors/xvile/xvile-9.8r.ebuild
+++ b/app-editors/xvile/xvile-9.8r-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
@@ -20,9 +20,9 @@ RDEPEND="perl? ( dev-lang/perl )
 	>=x11-libs/libICE-1.0.0
 	>=x11-libs/libSM-1.0.0
 	>=x11-libs/libXaw-1.0.1
-	>=x11-libs/libXpm-3.5.4.2
-	>=x11-proto/xproto-7.0.4"
+	>=x11-libs/libXpm-3.5.4.2"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	sys-devel/flex"
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-editors/xvile/xvile-9.8s.ebuild b/app-editors/xvile/xvile-9.8s-r1.ebuild
index 360881561dd8..8ea94b51724e 100644
--- a/app-editors/xvile/xvile-9.8s.ebuild
+++ b/app-editors/xvile/xvile-9.8s-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
@@ -20,9 +20,9 @@ RDEPEND="perl? ( dev-lang/perl )
 	>=x11-libs/libICE-1.0.0
 	>=x11-libs/libSM-1.0.0
 	>=x11-libs/libXaw-1.0.1
-	>=x11-libs/libXpm-3.5.4.2
-	>=x11-proto/xproto-7.0.4"
+	>=x11-libs/libXpm-3.5.4.2"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	sys-devel/flex"
 
 S=${WORKDIR}/${MY_P}