gentoo resync 08.09.2018

29 files changed, 124 insertions, 453 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 76c7c932daf0..2475a411ab15 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 5bb3ee3fa3ec..29980214ee5d 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,5 +1,7 @@
 DIST emacs-27.0.50_pre20180731.tar.xz 28569892 BLAKE2B 03988ee559f53ce54da2bc610bfb8cb9daab583610de419485c6cd76bd85d990ba18360b5cb12623c6a248471b5846620ce5c7deba03074c0bcdea4dc7db5e22 SHA512 35036de6748b0d63524172c4535676d330b917ca478c36aed227af4a04a82da2b32ed8e7d75e388f7182ebbe476775c48c1234a08eeea18561b43411a20dfb05
-EBUILD emacs-vcs-26.1.9999.ebuild 12931 BLAKE2B 0e6e6f204a9ba12f7f675bb2526cebf2887e116bb4a37629d13bb14ecb6e201559c8a536292fffe941445af4554f43e572c7986b50938a7925b6331d7db92ac2 SHA512 60cd0bc9a7151f679f0e62d3882ba7d41459bae6def341d5b7784e5b901106936d860cf9809a253c24201d5d90f3161f6aad216e8acc487e974260cc7ea2b53e
-EBUILD emacs-vcs-27.0.50_pre20180731.ebuild 12983 BLAKE2B 7c409cdc2ba32ab47c651a39faeb26fc51b2dd07db0977547a172db5ceaf48f7edfa35ae396f5284a0144454cd0a05edf0ed74c83b508d7c12d6361c92c5c854 SHA512 755d2f80109a01469f4510ba8094d49f91e55716286f4d685b4c08b86d640d04b24e59ba31e41d5021249d2fdfd1fcc34936bcded2c97497ff65954ef3f0b0d5
+DIST emacs-27.0.50_pre20180831.tar.xz 28668124 BLAKE2B fae74d9885889b042142f580e971c73c193306dca26b42dd87ac3d3d765312ce6695511d7d31a047d79803982f6345c4c319a3d83cea1313080170da97482fa2 SHA512 43b32d8943dc897dfc0c1fddb4261a196d3a604add5bcf87a93748125f15db2cac762d3550d6593b80e961ae35d543adc4d5937bac77970c658f93dba26f17e4
+EBUILD emacs-vcs-26.1.9999.ebuild 12962 BLAKE2B bce5a77debbee884361bfff779d89f6176fa7b22725a8bd631a4c253bab0dd998874d5cbbbc3493d9e5cf51bf96d9245e24b9c3bf81430babba55a1e0a75d44b SHA512 403ec1d674a3f5c42c5c92bc954359b62ae89b3cca5831f73482ec9f69d9c934c3f04690b9c444d3f8250210e6cd9681f31140c95954d134cdb402c710446cee
+EBUILD emacs-vcs-27.0.50_pre20180731.ebuild 13014 BLAKE2B 049af61869ac06ad151f958f607d7bf2d8218a80dc559b8b780f89bd8c2295c600af3418717fe1b34ed9d5131dafdb291772c7dc648813bac8eabb4bf1ebeafc SHA512 2a4de491be8eb1d1badc5efe2f22d078b3d47ca2190b6d2569c9a783c5b705184f2c6d2f3110b7a0c6dca51884fdc4d1d21e4cdc6feb19ea2c2b9d46a4ebfbf7
+EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 13050 BLAKE2B 9c43fc10140cf72d7bf9909775d3b81ecc346e9d8d02e7c4548748f5f808375adc22078ec85d2647d61a9c1dc02c4e34d29b26be739b315c87f5f4d751f24bfd SHA512 f7aee0a0e3d5c5071df9e1da1c8bf15dd94ab2fc7dbf802bbe44b6bc8cd3770fcc27c1b2139f015d9d2952f66906fbf4eb40fb1d366045c81d638c299d4370ad
 EBUILD emacs-vcs-27.0.9999.ebuild 13050 BLAKE2B 9c43fc10140cf72d7bf9909775d3b81ecc346e9d8d02e7c4548748f5f808375adc22078ec85d2647d61a9c1dc02c4e34d29b26be739b315c87f5f4d751f24bfd SHA512 f7aee0a0e3d5c5071df9e1da1c8bf15dd94ab2fc7dbf802bbe44b6bc8cd3770fcc27c1b2139f015d9d2952f66906fbf4eb40fb1d366045c81d638c299d4370ad
 MISC metadata.xml 2897 BLAKE2B 9913cc3b37864559eb273338b02dd202b51820d2614fee5e17f1fe8fa98c691374443d68f29cca5172034c15dfa321390e2624087b3cdb4779364b12711c2a8d SHA512 1764fb9b8da95a3c3469c896808fe4e29b6b0bcb8b9986ccfd4756e451005f2f1f47b0fdcd5243dac7e70aa83f67fef25ac5ebfecf20e5fbd3e5c93851ad7eba
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
index 4b2ebe730b27..f2a9bef0754a 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
@@ -67,7 +67,8 @@ RDEPEND="sys-libs/ncurses:0=
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=
+			<media-gfx/imagemagick-7:0= )
 		xft? (
 			media-libs/fontconfig
 			media-libs/freetype
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild
index 65e8e0a1bbaf..2702df13aa10 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild
@@ -68,7 +68,8 @@ RDEPEND="sys-libs/ncurses:0=
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=
+			<media-gfx/imagemagick-7:0= )
 		xft? (
 			media-libs/fontconfig
 			media-libs/freetype
diff --git a/app-editors/emacs/emacs-26.1.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
index 0e51ea34f5bc..2862235ef56e 100644
--- a/app-editors/emacs/emacs-26.1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
@@ -1,19 +1,36 @@
 # 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
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="master"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+else
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
+		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	# 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}"
+	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
+fi
 
 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="26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+SLOT="27"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
+RESTRICT="test"
 
 RDEPEND="sys-libs/ncurses:0=
 	>=app-eselect/eselect-emacs-1.16
@@ -21,8 +38,10 @@ RDEPEND="sys-libs/ncurses:0=
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( sys-apps/dbus )
+	gmp? ( dev-libs/gmp:0= )
 	gpm? ( sys-libs/gpm )
 	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	json? ( dev-libs/jansson )
 	kerberos? ( virtual/krb5 )
 	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
@@ -63,14 +82,13 @@ RDEPEND="sys-libs/ncurses:0=
 			)
 		)
 		gtk? (
-			xwidgets? (
-				net-libs/webkit-gtk:4=
+			gtk2? ( x11-libs/gtk+:2 )
+			!gtk2? (
 				x11-libs/gtk+:3
-				x11-libs/libXcomposite
-			)
-			!xwidgets? (
-				gtk3? ( x11-libs/gtk+:3 )
-				!gtk3? ( x11-libs/gtk+:2 )
+				xwidgets? (
+					net-libs/webkit-gtk:4=
+					x11-libs/libXcomposite
+				)
 			)
 		)
 		!gtk? (
@@ -96,31 +114,39 @@ RDEPEND="sys-libs/ncurses:0=
 	)"
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
 	X? ( x11-base/xorg-proto )"
+
+BDEPEND="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
 #	pax_kernel? ( sys-apps/attr )
 
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
+if [[ ${PV##*.} = 9999 ]]; then
+	DEPEND="${DEPEND}
+	sys-apps/texinfo"
+fi
 
 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 ../patch
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
 	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
+	AT_M4DIR=m4 eautoreconf
 }
 
 src_configure() {
@@ -148,6 +174,7 @@ src_configure() {
 	if use X; then
 		myconf+=" --with-x --without-ns"
 		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gmp libgmp)"
 		myconf+=" $(use_with gsettings)"
 		myconf+=" $(use_with toolkit-scroll-bars)"
 		myconf+=" $(use_with gif)"
@@ -185,11 +212,12 @@ src_configure() {
 				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"
+			if use gtk2; then
+				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
+				use xwidgets && ewarn \
+					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
 			else
-				myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-				myconf+=" --without-xwidgets"
+				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
 			fi
 			for f in motif Xaw3d athena; do
 				use ${f} && ewarn \
@@ -209,8 +237,12 @@ src_configure() {
 			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."
+		if ! use gtk; then
+			use gtk2 && ewarn \
+				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
+			use xwidgets && ewarn \
+				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+		fi
 	elif use aqua; then
 		einfo "Configuring to build with Nextstep (Cocoa) support"
 		myconf+=" --with-ns --disable-ns-self-contained"
@@ -233,6 +265,7 @@ src_configure() {
 		$(use_with dynamic-loading modules) \
 		$(use_with games gameuser ":gamestat") \
 		$(use_with gpm) \
+		$(use_with json) \
 		$(use_with kerberos) $(use_with kerberos kerberos5) \
 		$(use_with lcms lcms2) \
 		$(use_with libxml2 xml2) \
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index dc7ba9f404d7..5c7d6a7e476b 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -4,19 +4,20 @@ DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3
 DIST emacs-23.4-patches-21.tar.xz 19604 BLAKE2B 97327f2079c496c28122203d233a12199a3c11a8c4efb2107247a4ca4483b898467d73d19d4f0570ec7be2a49dc5f6bd1bc9ee0811f932e7deb6b1c4ca96e362 SHA512 135eda432de64200797456d594f7de811275a7adf792d10a1c3a51ca4bbbbaa3a2c682b9fd577c4d93fbce967ca08d4ac47eb45f031477c3e44c69c14d5d5b48
 DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
 DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aaf0b83eb6fa841ce4569bc58e2bd12802890c2a8496375280c0ce8fa56515918dfdcbc958f349bc2472104e37ad1fcd1 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5
+DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 3e097f9cdf96a8b0255ce69770f79259ac9bdddbf5aa77c381973e4348d0900ee6dc6ed4af26021811afbb14eff84bc2a370bc8e803d112476554d03b074ce66 SHA512 fe9f9c19ff760e61dcbf1828d4e9e2806c141b47372bdd736be8237183660a28e2ef86a97034d060e244ff81540a2503a1b47655ef84222fddacb3a87f0f34ae
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3-patches-1.tar.xz 1252 BLAKE2B 33c3c8e32b85f548201d4988d3aaf94e6440ab4727fced17aa26f00fd5665b755d3add254a764f579736bbfbc90716ff800e3ad5b8e7bd5d5c2370d31451e4b1 SHA512 09371a789a7c742b4e18f45a4c4e063a5392d0684899eb8be8c7415af9fe3c306083c62f18abc6a15c4fe76dd6ae3ac5c9b002c962971e59379cc187926a0c15
+DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf SHA512 f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.1-patches-1.tar.xz 1296 BLAKE2B 5e3cef3130b35a362d67f853686625d207e9af29ffb27753b6aa00327e30cc06b3cd7ed339b214b12fb00137654521c21e2252ecd83a79258bb9636406ab032c SHA512 6e4b0bdbf98d5130a6cd41fb0a8c3d641bf0b8d46f150d1f10f2d659e0418c14198d8990df13f3266437bb128f5fc7db8456458f5f547f2c12cc59da4fea3c8e
+DIST emacs-26.1-patches-2.tar.xz 2740 BLAKE2B 43a58137d6096fd6b49688192b65e97446cd31691b18c2e69c8980ff1d93caa66ff670f06456df91411fd74396deaa1899c7afb6c0a4bbc98d4c2d9bd7ed7d40 SHA512 31c1714d130a02692c65dd1371662100f9fbf33a8df30b8bad8fa688ab993e0a596101a4765a7859801d1f66e729c9fca748e70b9919e5b2a777d39fcbe92c21
 DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25d13ec5e0bee9ec6a65e80c52c870162b4671e80a82f8310784c802924609f2f87d504b1a97617c44d859566f SHA512 537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2
 EBUILD emacs-18.59-r12.ebuild 4412 BLAKE2B e560829c6de369456f7a77ddba9a6047addace03406ca36aa7778473d470484e7a675cd5eceabc491b86a5a7140ecaafdb86fab9db5974d0fd817f4b55d48a85 SHA512 11144b4d09773faf8ea2fe054695b5a045778c0cfdf0314c9eb8b0af34526eac1e0ac6f245955361e99807eadea9e8c0d40411907e14e2845ce2b91f0d404245
-EBUILD emacs-23.4-r17.ebuild 11512 BLAKE2B 1d6b6ccbfaf84d830c9f85aa39df64411efd6aa30cefd8ea37b80108f753fe3c0ff15f3130eb0de876f2e4fe1eb4e261974a33df39c16b376020ccf936160c00 SHA512 787a76e6b7c1a72bf937d158af9b8dd0a68f967102ce7e0326d49be13d4f2ac2aa4c7cacf50eff2ee5dae20a1672fc36b37545c2867b30401530d8a8dfd92c69
-EBUILD emacs-23.4-r18.ebuild 11533 BLAKE2B 54d8a963c952bcc5c4ed89a54fb853d9d420a9d016bfd32aada64f184d2a30d02fb51f0b9033767f8fe9f86997526e8910d9988491abe92c075d9d5bec0327c4 SHA512 ce41fcec3c1ca5ef9c938d802d0498432fbfc76f8ca51c36d91a07d44f9088be8c055d13015ae84ae2398521c473cd9f248a5f45c66c8e4a3c32df38847f5045
-EBUILD emacs-24.5-r5.ebuild 11230 BLAKE2B 5960990a169b448672e032531b3668584712fa03da774556aa145ccb46c7e9c8e4a127d5c9a4ace17db6fd6ab0f1d4e492ba512bc3effe8752e5689ae7ce91ac SHA512 9b95bf5bb6e0061c6fc2cb4031e0b6c0cd585b2a1feb62fa7a39d7ae0553eb6be122cbba9deb72a9f46c38f5f9d9de48cec8c5198f01f8b84ad78ed256350917
-EBUILD emacs-24.5-r6.ebuild 11342 BLAKE2B 25705a324ad162f3439c262ad8669ddc37af7a6c7061f9ed0126edb691c3c789ccf85cb0dc858b3bf5e371597217ff2d934ab0bdc11591bb64fdeaaea72c585a SHA512 7ce2c432dd8304fefa31a0096cc51429f05c320d6ef5161684b35353ca6a6042e2acf8c1856f6ca12b51df6b4ddc47b509b10fc31033fa5cd326db53fb48c75d
-EBUILD emacs-25.3-r4.ebuild 11722 BLAKE2B f41c4824843247675b15c6542936c3f82f72bed50011975ff73d066cd60279b96f3f0309ced4970088976b91afb5d35f3baa81128691e9d89d367862b77e2e62 SHA512 601dc23abf9060f1cfe11445f6a1da0999f8d094a6f2f3757583dd364611410553702333bd2683c6e8f55991572a7b8bf7cb16b55f19d9832d5be2587711c751
-EBUILD emacs-25.3-r5.ebuild 11634 BLAKE2B 4c930cb1f42998ec14d95789c4cd3812f924044c59aef1b3195b0df14db4ee2d328bd2de656fe19a1b42d5ec4422b239cc34bc655bebb236aa197f4d5a11b9a4 SHA512 b80f023d0376b011437f98d0b266a1f4d29ca3f5ba6ed0f42cb1b3a8a123d8256df9acb05c523fa10662b78513ef0e72ca8d7755d83348f5e64a8faf2303edd7
-EBUILD emacs-26.1-r1.ebuild 12148 BLAKE2B c3ca94e98414591f54280344c819c6a1c093b5a91a5424504826f80468a2e9cf79d45eb51b380e77e4ab3e654664f218bacbce0741c2441a9568c9de06135ba9 SHA512 dd3a80ada23f0170a4734664c48d267e7aca2a851a8c613d8d869583f324b34ff4469f7c6973326c90d52818ec0a8d2481318d089d15661d67a3b68e577e5230
-EBUILD emacs-26.1-r2.ebuild 12279 BLAKE2B d910ae48c13dac50dd98955a52086ceb7153249c67f2e68746558568b8a7b1132d73aabc41c03bf14a18f76e5542b3289e2ee4c9b25476c261e09456ff6c3de8 SHA512 80298698b73bd81d744ef1cc92cbe2a4c81e9c76718941baff277aad27a36bdd4fa359829b12f4bbdde594fd651c77e875d311d44fe6c80482e2bdb1bb630807
-EBUILD emacs-26.1.ebuild 11991 BLAKE2B bca7799d7a39c051fa9a2fde40c7a2450b5ddc52268c10de1b685092ed1a31c5005ec9d583e273df0167d91d4e43abb65d9e1c8cdaa01b0ed697abb38a11a06f SHA512 de52eeb18a19b06a86ca0c4c5fe744d115d49bcb1c9024f2f78eaebb820a69f7546bc4cd9b7bc03320608e1838934cb1b4cebd3f9a3635d53184165ed79448ad
+EBUILD emacs-23.4-r18.ebuild 11525 BLAKE2B 392ea4005890b48531149ce7a061a6b8154eeddd1abfd35ed98bdb8742cb0aee2c1e57690662d7842704c4402e43bfabccfeeceafc7f8c6e43d2946149c6da92 SHA512 12f3f575c67d5022782fa268bd0fbecc9b032f0b36209014dac73f90a63025d6586c4805c6214f061bbf2d527e1b8b7bf209641490ad8268fc86fdc450f54b8f
+EBUILD emacs-24.5-r5.ebuild 11261 BLAKE2B cee3de84ec6fe6b9a7592d090be1e0902c49d4f460633268e96547ea96f67d8cf590f0584780f057ed8fc0e79502e309bc3ad2105996ae5c7b315a03897cb16b SHA512 b0fba024fd12174d6fa55a87a7b5f3318adb23fff00d18508f3fb7cbbe1f4abb8bc565596b30321554c5619dacb56bc1c2eb13e09b046630852de690e06aa253
+EBUILD emacs-24.5-r7.ebuild 11342 BLAKE2B e8b0d454aa4661e838037ac264e29422267ba914964725c07746e50ed69e8cb03036557ae0d71e6772886ed8bc6e3b0525c82dcd90ae2bd3f517bf11a680e87c SHA512 2f97aafd89d1c54f5f0b0a097ce301579a146bd8baa8ba6b05774cbcd4430ac94f8bd10e4ef7396857ba0c32206060019e996e326e38e44932455cf303bf1d89
+EBUILD emacs-25.3-r4.ebuild 11753 BLAKE2B ab01076daf8c815a4bd7de83d652c8293219d9e4fb25002897527c0aaa87ac00c11f36a0c8a10e4e474629007950c67792ab3cd8e243cb046791fcba1fea19ff SHA512 dbae997b01fa892ce34dc554d1566e8c2a530c3246805b6028ebaf45cffdfb878e1fd98d827c0f6f3e37be52ae38b2929223161b234a5ed9e2dbfda6d786c191
+EBUILD emacs-25.3-r6.ebuild 11642 BLAKE2B b7ce973860dc3709e6731652ec5b5f82d91ce4fb042b2129123ac641a2b0fb253d61051aaf67a63d4af1d23905a83c5e4f24244ea1fe8c22cc42ae73c9e2ab49 SHA512 8c5ec55d78af9881245b918fd548d335e0499540ee2591eac0c95c8c44577f8ae794b0cc387f0d19931fc38e6a19132c439b62c5d0ca221dd8e4466657fdd289
+EBUILD emacs-26.1-r1.ebuild 12178 BLAKE2B 67c352031d6c9b0500b545c6a64796cbfe866551579c0d215dd0ec8c246f92725556bec842e385eef8cc8c17b4c76992fe9063b1671fef13f50328c3a916b3d4 SHA512 aac23c132588fd8d022e8bc9390c3f69642a8cfc96ebe5d961d18f7fd783b416e54e4e096c1f291184e612c6ee0942b3c588665ea0aa1525c22b7be8aa2e5d6d
+EBUILD emacs-26.1-r3.ebuild 12288 BLAKE2B 018250fd3949cd0651454731283d5dd451e86a5dc8067fab9c1aebb5e89654cf4e8988cfe953ed6c8d88a72fde12b7dbbe8cf082662ec630ed35f91822c7d5d4 SHA512 01ce42d36729559ffc3db8d1a2011716d109f97a18711cdb5faeb2f7a289ed05631d51d15df2de485482940916e936e2a1feb25b199ad75082307d5d166f4454
 MISC metadata.xml 2849 BLAKE2B 28cad6b703be952825ae288ee9218209a2f38992bc8381ef60a0f6b36f57971bd133ccff284f0bc20d03a15d89c71950c21a2c32b3f47bd80bb793f5e439e1e0 SHA512 0db4dc9edb2a6f9e917b4648b887ec12f016f77d3332e67bf8962a0ba592908e34108610083e76f4abe7cd2f52a07bb75e8b14089b1ca87c138e711c2d31ff9b
diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild
deleted file mode 100644
index 82d3ed24554a..000000000000
--- a/app-editors/emacs/emacs-23.4-r17.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOMAKE="none"
-
-inherit autotools 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.bz2
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-21.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="23"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-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
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	gpm? ( sys-libs/gpm )
-	dbus? ( sys-apps/dbus )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		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 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:2 )
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXext
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXext
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXext
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	X? (
-		virtual/pkgconfig
-		x11-base/xorg-proto
-	)
-	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 ../patch
-	eapply_user
-
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	mv configure.in configure.ac || die
-	eautoreconf
-	touch src/stamp-h.in || die
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -fstrict-aliasing -pie
-	append-flags $(test-flags -fno-strict-aliasing)
-	append-ldflags $(test-flags -no-pie)	#639568
-
-	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
-
-	# Don't trigger a floating point exception for NaNs on alpha
-	use alpha && append-flags -mieee
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf+=" --with-sound"
-	else
-		myconf+=" $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		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)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=gtk"
-			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
-	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
-
-	# According to configure, this option is only used for GNU/Linux
-	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
-	# out the location because $(get_libdir) does not necessarily return
-	# something that matches the host OS's libdir naming (e.g. RHEL).
-	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
-	crtdir=${crtdir%/*}
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-crt-dir="${crtdir}" \
-		--with-gameuser=":gamestat" \
-		--without-hesiod \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with gpm) \
-		$(use_with dbus) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake CC="$(tc-getCC)" \
-		AR="$(tc-getAR) cq" \
-		RANLIB="$(tc-getRANLIB)" \
-		RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-
-	# move man pages to the correct place
-	local m
-	mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
-		|| die "moving emacs man page failed"
-	for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
-		mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
-			|| die "moving ${m} man page failed"
-	done
-
-	# 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/{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
-
-	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}
-		doins -r src/{m,s}
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
-	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
-
-	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 a previous major version of Emacs, 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-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild
index dca287c47b0a..f662dbb65dbe 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
index ac413d6d5712..60507ed72e68 100644
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -46,7 +46,8 @@ RDEPEND="sys-libs/ncurses:0=
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=
+			<media-gfx/imagemagick-7:0= )
 		xft? (
 			media-libs/fontconfig
 			media-libs/freetype
diff --git a/app-editors/emacs/emacs-24.5-r6.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index 3f797276d196..84430156d636 100644
--- a/app-editors/emacs/emacs-24.5-r6.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
@@ -8,7 +8,7 @@ inherit autotools elisp-common eutils 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
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
diff --git a/app-editors/emacs/emacs-25.3-r4.ebuild b/app-editors/emacs/emacs-25.3-r4.ebuild
index dcfdb8953d9c..b5d95d7629e8 100644
--- a/app-editors/emacs/emacs-25.3-r4.ebuild
+++ b/app-editors/emacs/emacs-25.3-r4.ebuild
@@ -48,7 +48,8 @@ RDEPEND="sys-libs/ncurses:0=
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=
+			<media-gfx/imagemagick-7:0= )
 		xft? (
 			media-libs/fontconfig
 			media-libs/freetype
diff --git a/app-editors/emacs/emacs-25.3-r5.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index 4860c32fe92a..bbce550ba360 100644
--- a/app-editors/emacs/emacs-25.3-r5.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit elisp-common flag-o-matic multilib readme.gentoo-r1
+inherit autotools 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
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
@@ -112,8 +112,8 @@ src_prepare() {
 	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
+	AT_M4DIR=m4 eautoreconf
+	touch src/stamp-h.in || die
 }
 
 src_configure() {
diff --git a/app-editors/emacs/emacs-26.1-r1.ebuild b/app-editors/emacs/emacs-26.1-r1.ebuild
index 3f9fb156e1a1..9358e0b74a16 100644
--- a/app-editors/emacs/emacs-26.1-r1.ebuild
+++ b/app-editors/emacs/emacs-26.1-r1.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="26"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~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 ~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 lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
@@ -51,7 +51,8 @@ RDEPEND="sys-libs/ncurses:0=
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=
+			<media-gfx/imagemagick-7:0= )
 		xft? (
 			media-libs/fontconfig
 			media-libs/freetype
diff --git a/app-editors/emacs/emacs-26.1-r2.ebuild b/app-editors/emacs/emacs-26.1-r3.ebuild
index d2dd29112e54..54dac8fb3a75 100644
--- a/app-editors/emacs/emacs-26.1-r2.ebuild
+++ b/app-editors/emacs/emacs-26.1-r3.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit elisp-common flag-o-matic multilib readme.gentoo-r1
+inherit autotools 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
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
@@ -121,7 +121,7 @@ src_prepare() {
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
 		|| die "unable to sed ctags.1"
 
-	#AT_M4DIR=m4 eautoreconf
+	AT_M4DIR=m4 eautoreconf
 }
 
 src_configure() {
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index ccc13e70931e..3dc2f960906b 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -2,8 +2,8 @@ AUX nano-2.8.7-minimal_compile_fix.patch 1206 BLAKE2B 72265b226a23282baf1d16fe62
 DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79
 DIST nano-2.9.7.tar.gz 2913055 BLAKE2B 87e04c50a6485c961dddeb7e4fe4b3defda874eb91f373ae1357afdcafd4c207cdf789d72563fdfecb22eabb8dca29559d8fe8abdb0bd36ba1cae7fdf14b1447 SHA512 b62eda79d5d65e4d2020b22624aca06a891747e0e7eeb7b0698bfd9f90d7d1163240d123b7f727868aac09d815e9835f146f7f16e9cbdd5acd7f55311d4acbb7
 DIST nano-2.9.8.tar.gz 2905951 BLAKE2B 95b78c43a052be68956f5b9493c418c23a9db40b56f709b17217bce257333b69e78e8f8bec191b21df8aa408ce2d3c7d68bc82cf2f785df9b31929f4f41b4325 SHA512 dcc7b074b585135e34339648fc725f54964488813d49fac50cf88c11d7cfcb8514907dbc2631ce7664ab0241717e8c42833e3c037070c80c8e7bee68fc280a2d
-EBUILD nano-2.8.7.ebuild 2307 BLAKE2B b7ab4e20fcb2dcec5b6f2a198fbcb2a2619f9f29081521d1ce7a555be8bf44ef060ad9b8f3f229bf272bd5cf6c5f066e10d08f2596b5d3954279be71a4d09ad6 SHA512 693683af78bc48911cb50813cd8e02ded2546ce8efc79c5897c804c64479d889518d88f1cbcfa79e11409fd0f26543be270f2da451618d4b3756dd7d2bc7b4bc
-EBUILD nano-2.9.7.ebuild 2299 BLAKE2B aaa725911e05f7f73464981129764695c996b3961ce8641623b4805fac1eeba5bef6c2e627217494fe10ae13503eaeae33d9c6e9056a0c973726b3f0a3e8fc8c SHA512 89dc29c91548b5961e68d19faf79ede5981a6c71875949258c8f61cee43d9eb533915786d2853ba7518ccb5d4fc6a4bb847fe00191513c53bb74c5069a9ddc5f
-EBUILD nano-2.9.8.ebuild 2299 BLAKE2B aaa725911e05f7f73464981129764695c996b3961ce8641623b4805fac1eeba5bef6c2e627217494fe10ae13503eaeae33d9c6e9056a0c973726b3f0a3e8fc8c SHA512 89dc29c91548b5961e68d19faf79ede5981a6c71875949258c8f61cee43d9eb533915786d2853ba7518ccb5d4fc6a4bb847fe00191513c53bb74c5069a9ddc5f
-EBUILD nano-9999.ebuild 2299 BLAKE2B aaa725911e05f7f73464981129764695c996b3961ce8641623b4805fac1eeba5bef6c2e627217494fe10ae13503eaeae33d9c6e9056a0c973726b3f0a3e8fc8c SHA512 89dc29c91548b5961e68d19faf79ede5981a6c71875949258c8f61cee43d9eb533915786d2853ba7518ccb5d4fc6a4bb847fe00191513c53bb74c5069a9ddc5f
+EBUILD nano-2.8.7.ebuild 2296 BLAKE2B 0136026fb72a5b1978057e7f9ae7348bd3fd32f47c64316a5b65eb8c74689f8effc4011ef6c1e058cb22f05df001a80e9c7607cd616d8f731ab9f052239389da SHA512 bef42b685a5afb428083378cb084b9c8a0ce679ce4aedf59056eefa4976543babeab6b411f3c002d878fbc50c78fba1e91ef24cd20ae9cb62efd40b36a770305
+EBUILD nano-2.9.7.ebuild 2288 BLAKE2B 3f927891c8ecaead7d7a5372cd03babc0b90ade7ba4fe961c93e667fd5d01aac46c4ffefc80f608a96e724179c69f155edea60004d498631fc074d16eafcc7eb SHA512 ca6d15c6f962aab6cc1a67c67cf75320bbdc68404a83b83a5d85e0e469130c6ac6ff6c2f2e25fa4995619e3e8df2a07b506be50739cf784d8752764d44a11f2d
+EBUILD nano-2.9.8.ebuild 2288 BLAKE2B 3f927891c8ecaead7d7a5372cd03babc0b90ade7ba4fe961c93e667fd5d01aac46c4ffefc80f608a96e724179c69f155edea60004d498631fc074d16eafcc7eb SHA512 ca6d15c6f962aab6cc1a67c67cf75320bbdc68404a83b83a5d85e0e469130c6ac6ff6c2f2e25fa4995619e3e8df2a07b506be50739cf784d8752764d44a11f2d
+EBUILD nano-9999.ebuild 2288 BLAKE2B 3f927891c8ecaead7d7a5372cd03babc0b90ade7ba4fe961c93e667fd5d01aac46c4ffefc80f608a96e724179c69f155edea60004d498631fc074d16eafcc7eb SHA512 ca6d15c6f962aab6cc1a67c67cf75320bbdc68404a83b83a5d85e0e469130c6ac6ff6c2f2e25fa4995619e3e8df2a07b506be50739cf784d8752764d44a11f2d
 MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82
diff --git a/app-editors/nano/nano-2.8.7.ebuild b/app-editors/nano/nano-2.8.7.ebuild
index dfa5e6cfd21c..9c57e32be25e 100644
--- a/app-editors/nano/nano-2.8.7.ebuild
+++ b/app-editors/nano/nano-2.8.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-2.9.7.ebuild b/app-editors/nano/nano-2.9.7.ebuild
index a0bec925c03d..d19e8febb93e 100644
--- a/app-editors/nano/nano-2.9.7.ebuild
+++ b/app-editors/nano/nano-2.9.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-2.9.8.ebuild b/app-editors/nano/nano-2.9.8.ebuild
index a0bec925c03d..d19e8febb93e 100644
--- a/app-editors/nano/nano-2.9.8.ebuild
+++ b/app-editors/nano/nano-2.9.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index a0bec925c03d..d19e8febb93e 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 214fbf6f0757..73e26526b610 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,5 +1,5 @@
 DIST okteta-0.25.1.tar.xz 951952 BLAKE2B 180cb7426b85cc8598f774d50556fe26d95d11e7c8b5be542a38fd4fa1c0479b401e6be59e7ca86eabba805c2a5d2ea2d818960cb218d173fd87db23f9c5525f SHA512 67e594ee1674176cbf506ca1191ced748bf6aec268d57211e052552f9673c359ccb3fefd403b5cf63e04f63a4fd3b42b0d21ef8eefcbac999081d58505df2174
-DIST okteta-0.25.2.tar.xz 954124 BLAKE2B b880001d6351479accb2f5f2e00a2574337695642bf9082b030d1a56e828fa4cc8e4cf00c6781e12328a20fde004cddaad057b0dbce2fb34a243e24df48ee878 SHA512 78f905479dc5070754b53d8fb7374d162a64479303092ce3f391953a01332946d98151f181a6c9363c68dad7098b58909b4db53724fac9aa848606f9ff3b6511
+DIST okteta-0.25.3.tar.xz 950956 BLAKE2B d177db59b5327f4e75157c99fdac2191de9a7ef63433635ccf8f11ef4dc4ff201942c9f68383d720b18c26a9e7335bc1181ea4f0e36491b34b27e6c7dc469c9e SHA512 f27b0c2ca3c5f1ad838af847e08c53c8f8f3c386921bd2e0d5e833902659477196e6c6b72a428443e2be9013928c2151c1889ef33d59404815a34d81560ef2a7
 EBUILD okteta-0.25.1.ebuild 1603 BLAKE2B 0c64e8a1b0aa5e485fd86cf5a4f9b341b57e81f052f432373a3c3b3b32bba5c135d49c0e27b1de5a5fb2a120cb9d5bc1f283a12a398312aea0d96717fab31d5f SHA512 0b247aed642351f80e4b718c28e6ca7d231399a03fed884905014a7e001d1fc7213c5fc3b04233382cbdad6c1878796198ffaaad9b70975a198bb94bb58cf169
-EBUILD okteta-0.25.2.ebuild 1605 BLAKE2B 7c5a9e81733f75e9cd2ef29ce31a6c17cec9d8c49d90beeecb6407f73843b3a1a0009306dfd4e2e7d0d7620ccc1adbcbf6a1748a9e53b5858a7983c9c4617736 SHA512 82c9fc2dba9978f4671ab98d3b981377b94f5bb71c30050ff2a40e66852eda4f9fb2498289cbb402b0d2ad2d372c3d23d030c632a29cde25ae577588478782c7
+EBUILD okteta-0.25.3.ebuild 1605 BLAKE2B 7c5a9e81733f75e9cd2ef29ce31a6c17cec9d8c49d90beeecb6407f73843b3a1a0009306dfd4e2e7d0d7620ccc1adbcbf6a1748a9e53b5858a7983c9c4617736 SHA512 82c9fc2dba9978f4671ab98d3b981377b94f5bb71c30050ff2a40e66852eda4f9fb2498289cbb402b0d2ad2d372c3d23d030c632a29cde25ae577588478782c7
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.25.2.ebuild b/app-editors/okteta/okteta-0.25.3.ebuild
index 89727e9e83b1..89727e9e83b1 100644
--- a/app-editors/okteta/okteta-0.25.2.ebuild
+++ b/app-editors/okteta/okteta-0.25.3.ebuild
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index 8e2fb5667abd..f831bf0c2103 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -4,4 +4,4 @@ DIST qhexedit2-0.8.4.tar.gz 340766 BLAKE2B af24031fdd9f8d677f7e8ab8fd69667852dd9
 DIST qhexedit2-0.8.4_p20170719.tar.gz 342037 BLAKE2B 667a7c3e93ed3422f21da53b6811fca53b210cfaf2603cf2a61e377e68f295b5024a9fa73d444c1e50af274bdbc6faa62bc2ab4aad176a8b3a6d7540117c5a30 SHA512 3c412b9bbe4f84f6f445b6ad530fc51dc5422a0a5bb6184edc7df92595aa5215c345e2b16effae8de758b299c5f7f7d44cf54dd65a180941c30790194679baa8
 EBUILD qhexedit2-0.8.4.ebuild 1824 BLAKE2B bf51b60fa58333b2fa727adadd3bb35b0215a77773b51d856dafc1cda3702834e074735dc5a908dadd41134d767e81e8ec6f7fb83cad2de139dd9023df890fb1 SHA512 610257b125661932965e7f6a2a4e6db53bb552382b0f34eca35729da9179d3668629d30e70f07a6c29b6aadcf45c123a28b05c066603079f6669f9ae6e52b5b4
 EBUILD qhexedit2-0.8.4_p20170719.ebuild 1918 BLAKE2B e20d884970da32077ca574299b8efef94ad827290270521933d716e67be5dd90c317740d7870756bd4b56b9c06bf3b344e59304b7d909f3109f67f6f272ec14a SHA512 17f03387ad5f06dd448ce344759c67cbf33267b5f7c6c7637566c17d5b683c0d1f6dffb7de1320e41b7725b5b7f1b3bfa840b402777a6e4f5e76f8bd11621094
-MISC metadata.xml 1114 BLAKE2B c0703321180cf2ecb96008fe1e479d6b1f95dfd104626d5099f96663010c562400b3daf9442db2496359bc1637ef8b93a17954512261dcacd03f00fb08946152 SHA512 76912cf5ba235269d58a8e81c7e8d96bb76ff8274b37d220fbafbdf8bdcb7e6e6a76bdb64f1ba8c22ca7c00a9a45e1c96a7849ebed38bd949f5647fcd3d1f2b5
+MISC metadata.xml 1117 BLAKE2B 621185810a8a4056134580d1eb5c693d97eff4259b224e88562a5b72f6e41820f0e03e989baa3ae52ca88eae03466c1359ab75307a3bdb38049ac8fa5a77d59a SHA512 6736c1248f273abf02d648f1537f35196c70b3f4bade31f06edf437866c07924c11ade351ba1e6a7593b05349d3b0cecb38b9e5f7bdd01487cb3b7b5dc025534
diff --git a/app-editors/qhexedit2/metadata.xml b/app-editors/qhexedit2/metadata.xml
index 67f1531f77a7..ff7a03cc6afe 100644
--- a/app-editors/qhexedit2/metadata.xml
+++ b/app-editors/qhexedit2/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
-        <email>coyote@bks.tv</email>
+        <email>ktrace@yandex.ru</email>
         <name>Victor Kustov</name>
     </maintainer>
     <maintainer type="person">
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 29a828b7295d..7fab7d489a93 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -2,7 +2,7 @@ AUX scite.desktop 138 BLAKE2B f0cc28779504c505e8876fadaffc979939c48088e5cb5c1d0a
 DIST scite355.tgz 2302137 BLAKE2B 5b36c68a5447b7fd0dd2fce51fc09cec0ee4a86be10f4f32fa7bf47354c56424cbead6cdfe819c8014be75e843c867ccaa137c5f7e32c3f9b0dabb6b9a5a9cb3 SHA512 cdd9d3aa621f5d31632cfb9f71524255a4b47b70a654bf4bc8a25a76f8a2dbe098a48e0cd4587ced8ca8455be7e809973e212fcbcde5b62087aa0f9528f7f40d
 DIST scite365.tgz 2391190 BLAKE2B 0cd2b1b24bcd15815357125725b1453935dc944ca1ddbd77772923ceeb249b3182dc47cb1e1097a4e0942b3a5c7528d0e80fe2314ed9d3d2b7f4e960a0f17ff2 SHA512 193dcb1f8787a7c7d520ce62462e5c95e7b6bcaf79f4ab23f9885474fb0444dbc5a69a0d45eafc592e5fff2a2e746a9aba599799e847e3c74d3436eed26580a9
 DIST scite402.tgz 2424648 BLAKE2B 84a331865310058d26ca45a25b99d98a7c3374d0463024e31694e2ebbd519a20e8e368dc1dfabc2534e8f015fc95ca53382bc223476b882a7be543ffdc44ae2b SHA512 97898cbb8675d013dd91828792de1c71e3f013b21c59c5112ddc00e7ee35c2ba8cc29e2c3256b91171e052145a25cddfd0034505e3c185999c734504bb702283
-EBUILD scite-3.5.5.ebuild 2117 BLAKE2B 48fa97f73b6d7a0cac1b21c1bfd7e1e910f45903aa970be790601100e13c19de32326251d7466abe264be2697b3db02dff5d733b61e7cfa425fc541257e2b89a SHA512 c444c1c12b9345ff05d09ef630097aa44d8732575c9aa1d9cd5e451f4ee88d5365090107997c710e42bf9b5e3092a3a4fdb1b371c78c29191f03957d998c8dea
-EBUILD scite-3.6.5-r1.ebuild 2243 BLAKE2B c02cacfbe5f29e5169815975d57bbdbe8104954fa538b5302cfb1160490bc0a9501a4ed299923ef771c24244d0424fb0bb667f06a29823fe68f4baaacee0fe4b SHA512 37041041a39a8e052cb44b07693431def723707c923de7a304b682ba4c9c6501033640246fd46259c700be99aff1f49135b8dd600f3c188233fe66d9f7418b4c
-EBUILD scite-4.0.2.ebuild 2696 BLAKE2B fed94ee32e99973bc44f8362814626f81a378cd6fef156f520d3bd19db680c3690efe1c94c0334260b1890754d75c786093c726931e6087b7414e80ca10e2c01 SHA512 a33064e34b8d01c510a7063b4a6d133e63cb6e115cdcdadd8c8a68759e761804796040ac593bfe1b4ff677ef30a2cd74cc8239cd54bc007620c73fda74b5ba95
+EBUILD scite-3.5.5.ebuild 2106 BLAKE2B 0fbf6349ae99aa3e489dbb025cb78c22038ddb5c4e232f2ef1f89ec0a0615ed8b1c463a3afe9cc727500f4d4cbf5bfc4c2a53e5dc8677b8b46462a828838f6d9 SHA512 e1d459d71002b5f9a856e7b7ad4c9ad43bb0883f382d19dea28c43588e5ef495bca3dc769859781e26a65745dca5a252bbc81a657e261d64556366ceb60a60c1
+EBUILD scite-3.6.5-r1.ebuild 2232 BLAKE2B 1b98e140a18dfa4c3b45a0d2febfe841af872df2cb508ac7c5f38ba04a463c182209b0530837208b81754c6b5d4bc2bc5fb02d9aeb1bbff7c6e319f0f94b1987 SHA512 ee976179aef40711c27e4f6edec220e20a4fcf08f3edc430a83e6eedf2b1b56ab57c907c333d358cfeb6b08da29aafdba1211a10168ccc0ab6eadb0648b7a611
+EBUILD scite-4.0.2.ebuild 2685 BLAKE2B 4bc65707a1cb11601a2118547882acda73c5d44d7b5f4d4fbfcde0734aac363d63399f046689ea9e5d47a6456dc07aa757f9ff86a6e8a08f0afb6f52f90990cf SHA512 bd98bfcaf33289cea962500ac87505b541e3496c019e4b88f3562b380c8b06c54a93c5ff761319c404b8512fca673b14c2b966d2ac1253a3bb64a4fef7d9ccb8
 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-3.5.5.ebuild b/app-editors/scite/scite-3.5.5.ebuild
index 7e0335715573..6f65486b980f 100644
--- a/app-editors/scite/scite-3.5.5.ebuild
+++ b/app-editors/scite/scite-3.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="dev-libs/glib:2
diff --git a/app-editors/scite/scite-3.6.5-r1.ebuild b/app-editors/scite/scite-3.6.5-r1.ebuild
index 94ef7659ec7d..3e79ba6e66cd 100644
--- a/app-editors/scite/scite-3.6.5-r1.ebuild
+++ b/app-editors/scite/scite-3.6.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="dev-libs/glib:=
diff --git a/app-editors/scite/scite-4.0.2.ebuild b/app-editors/scite/scite-4.0.2.ebuild
index 8ef73fdbb392..3ba228e94d7a 100644
--- a/app-editors/scite/scite-4.0.2.ebuild
+++ b/app-editors/scite/scite-4.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="dev-libs/glib:=
diff --git a/app-editors/uemacs-pk/Manifest b/app-editors/uemacs-pk/Manifest
index 604ab48e233e..80c489dae481 100644
--- a/app-editors/uemacs-pk/Manifest
+++ b/app-editors/uemacs-pk/Manifest
@@ -1,6 +1,6 @@
 AUX uemacs-pk-4.0.15_p20110825-gentoo.patch 302 BLAKE2B b4e1e998b8befd15b0c6d9302a42f547848f346dab632a64688091b0e8180332935e3a72773247498314e82af31a904405c965dd7073bdb317f0d09944752f34 SHA512 6938e768e742ffcbd88469c58bba07325d0c2ae7d354bdba66fcc3f9d47d141a98923fce516a03a799032869461da301cbe8ce7f312196a51f69dddcbe5c069b
-DIST uemacs-4.0.15_p20141208.tar.xz 151500 BLAKE2B 18fed2319b7440583e4e5bb46b8f05a7fe3ec7ffc44c1c8d6311a760472a509a28bc8bbded02f1128d0d663bc78b6a9382173d203bad83a1d09503a992382d33 SHA512 a632c82275ee652412aec7d8f3549d80c5fd5bb1211675828ec4c58365bb7819927ff4e92f6fb7b5b9030b681062773ea19f1af345d4d3ddb652c3d68507bdbb
 DIST uemacs-4.0.15_p20180117.tar.xz 151600 BLAKE2B 76a6a3cd3d0abf720721c7c09687c1964958e6c1c05ad8db07e6e561d6714e436d31659d118af85d069ad77da2606b0ac86005824e2ac56db8040a0ea739aabf SHA512 aadf3f9e8ab3f2c9c7bccf305f7a37e75ac1c92c5c388ce35a10b24cedf886f7d9b0ce8b1196c2f96a0d874bd5af130edb3ecb1ccf571d8e8c00753564e38aa7
-EBUILD uemacs-pk-4.0.15_p20141208.ebuild 960 BLAKE2B 8ec0c49532a0e7fdafa19de4f53b0d1a872ae77979ef698bb49770f985f75c7f4963396877759929012a99ceb4194f0efba30ed3ae2f03be3c0192cc9affc4aa SHA512 576483dcbee259b580687c43cdf06da086627f65cfd28db1af092b363e03dd1ececd1feecf61b3a6163d4a1f8f20e0261a26fd1f1d4378dd394f377f002796fe
+DIST uemacs-4.0.15_p20180719.tar.xz 151748 BLAKE2B 66572d3b4eb54310b7468a43fa718faa78aae8070a8675018f8dccc38d2dcb8e93b41942f49ca28b7c8ee5d100b541ecebfa2adc9a84f121a178ade0903029b1 SHA512 0baa273d5f8df75976d01acbe69b2bca7ec803c8a40364ebded39d16874426874af7b7547774c211fbbb96c82fcb69aaf75f8fa5fd3e95422ee105e6be7f9564
 EBUILD uemacs-pk-4.0.15_p20180117.ebuild 937 BLAKE2B f1ff9da5a0484ab9e5fca3573859766afc30cedf46d35ab77dff19c8850072c4e591145dec35f9b790dd0c8ccaa1107712ac6be1ad25c1c1ddd2f48959f21283 SHA512 ce04f47cf3d809ff8ae2b92514d7c032be5630165c5d000cbebee9ff0fae2588ab881c0d3009941752a8187c690d41b6d08dcfdc9e49cfe10f030171432626f2
+EBUILD uemacs-pk-4.0.15_p20180719.ebuild 939 BLAKE2B f644eba55adc8e62e18ce70c752c2602fac7e57eb4c4da691920108fe36893a7cfa75c13cc513dc02489b602c05a62fab9ef72e9364caddd255ab0158c695e17 SHA512 bbc8b360646444153d25202ee90abd24cf5c766d1463d0336cc0fbaa99eb0c17e3d1a9d6e65621551b13b7d0cb63185e1d56106d3ffcc3f8cdbd0050ba66697f
 MISC metadata.xml 1038 BLAKE2B 78d5d45edaf021f6be2ecb46cfc2c8538a14f7589d16a1891481633e23c272f8d76905b27535baedb4af0be51b7e1e9a2ea1bc286dd79c6c06d7b6658a856df8 SHA512 303232f4886511f0731e699a8c29a1925f506a037cebc60669c02aa060b2d555bdb2378919f5d66e61859e18a3b2ede21204edc5fce37a9220ab9dcf2f23c1b0
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild
index fb2d7f37ef7a..0286f0e20430 100644
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="uEmacs/PK is an enhanced version of MicroEMACS"
 HOMEPAGE="https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary
@@ -13,17 +13,14 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
-RDEPEND="sys-libs/ncurses:0"
+RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 S="${WORKDIR}/uemacs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.15_p20110825-gentoo.patch
-}
+PATCHES=("${FILESDIR}"/${PN}-4.0.15_p20110825-gentoo.patch)
 
 src_compile() {
 	emake V=1 \