gentoo resync : 24.02.2018

20 files changed, 412 insertions, 45 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 45050fa6af92..1b8969111197 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 4824475af050..2af89be30056 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,7 +1,7 @@
 DIST emacs-26.0.90.tar.xz 43908428 BLAKE2B 20858eb7b06b488451ebdffd7cedf28055f38cb45960c2b74c926204be1225cff297a8ce95a4cf535349fe73b24c9e5347fed3c3decf55492c82daca9fb470c2 SHA512 c263d1d1a12d8b21cc43ddcb46a28ce3a54d0ef09e240518f19bfdabf4c4ceebc3c2d1521aae9808cafdd3e731c93dd22b4f1e7e619e38076aa4ffdbaadea93b
 DIST emacs-26.0.91.tar.xz 43988932 BLAKE2B 05e5b9d51f92f2719ea22806f73b17903f5941c82a2e4e762b7664ed1b05f7324c0b020ded311dc4f22b7668684f59eaf3f3c2495f85977f3510698d7e0edd09 SHA512 4e20743299ed419c8ad7bea00c5389fb7c81f4e631165fe2b19c4bbd7c2b401416073282814f30bb96e5c3961724bfbb565781c50ee481a4f4c762ca6f480fba
-EBUILD emacs-vcs-26.0.90.ebuild 12848 BLAKE2B f57b226409467bc5bddc3cb2770d195d5d65ddcd42af948dc67215f7988c666916ac1da5e1ae106888d116d8367e3758c868b9f8a637416926f2e1bddc9a5268 SHA512 7d0a502ec539ca07347dc3ea0fb9784bae85251954ea7470dcd7959f3f9cf4e374fd41b720cd63e4d209e36de0c39d7a0b4efaeea6955d270e3dfaeadefa37c1
-EBUILD emacs-vcs-26.0.91.ebuild 12848 BLAKE2B f57b226409467bc5bddc3cb2770d195d5d65ddcd42af948dc67215f7988c666916ac1da5e1ae106888d116d8367e3758c868b9f8a637416926f2e1bddc9a5268 SHA512 7d0a502ec539ca07347dc3ea0fb9784bae85251954ea7470dcd7959f3f9cf4e374fd41b720cd63e4d209e36de0c39d7a0b4efaeea6955d270e3dfaeadefa37c1
-EBUILD emacs-vcs-26.0.9999-r1.ebuild 12848 BLAKE2B f57b226409467bc5bddc3cb2770d195d5d65ddcd42af948dc67215f7988c666916ac1da5e1ae106888d116d8367e3758c868b9f8a637416926f2e1bddc9a5268 SHA512 7d0a502ec539ca07347dc3ea0fb9784bae85251954ea7470dcd7959f3f9cf4e374fd41b720cd63e4d209e36de0c39d7a0b4efaeea6955d270e3dfaeadefa37c1
-EBUILD emacs-vcs-27.0.9999.ebuild 12846 BLAKE2B 6e2bed8d56874d5feef6fb45f9863758e7948396442b2d20bfb716b84eab70c9339cecca562fb3907f9432da3ff4dd9c9b1ea16a7f90377eebddf016d8c108c2 SHA512 3f15c529e3373db897a345de9544e1c98fa896bfd756c2bc3042090b0d4fd5385cb2b3e0496b60284ac52a6fba96c030f05d3d7718d1edccefcc743b3cdf4b4d
+EBUILD emacs-vcs-26.0.90.ebuild 12914 BLAKE2B a0ae576a50ca15af22901f74331df340205511a453457dcd98843d3cfc6d73c7e34ca1b9dd6444b08b3c8c67abf43c2f2314acf9cd7dd9c8095ef14693b5603f SHA512 9ad62e7b78f0bab311662f537fb10195c06af1419bc73fbf3fd53cdf51a3b89b1f5d4de6510a10bd9b2dee037402e5ca04ba26c556a011c1633b1f43968deac8
+EBUILD emacs-vcs-26.0.91.ebuild 12914 BLAKE2B a0ae576a50ca15af22901f74331df340205511a453457dcd98843d3cfc6d73c7e34ca1b9dd6444b08b3c8c67abf43c2f2314acf9cd7dd9c8095ef14693b5603f SHA512 9ad62e7b78f0bab311662f537fb10195c06af1419bc73fbf3fd53cdf51a3b89b1f5d4de6510a10bd9b2dee037402e5ca04ba26c556a011c1633b1f43968deac8
+EBUILD emacs-vcs-26.0.9999-r1.ebuild 12914 BLAKE2B a0ae576a50ca15af22901f74331df340205511a453457dcd98843d3cfc6d73c7e34ca1b9dd6444b08b3c8c67abf43c2f2314acf9cd7dd9c8095ef14693b5603f SHA512 9ad62e7b78f0bab311662f537fb10195c06af1419bc73fbf3fd53cdf51a3b89b1f5d4de6510a10bd9b2dee037402e5ca04ba26c556a011c1633b1f43968deac8
+EBUILD emacs-vcs-27.0.9999.ebuild 12912 BLAKE2B c7fb96dba944729c174df10385eb70ecfc408cc5c784b17b8520f4b80a9b2aa4bd59296f4fe4a1fc10d0590ab5b8d7ebbc8a632723f28aa4119449fe07e16b72 SHA512 b2ea4b587dcfec377f9c717d04de35fcebc5f0fe6381e0a1424335c5975558289898f9978902bc4a8ff421130450491496f06a7f83cd914835d080946badd6a5
 MISC metadata.xml 2949 BLAKE2B 06aca7f50e1e0a376363438665651ab1647b885f71fc258874a360f3309621283168b2b4f9d57f208c575af1681de899655893f16d691496c20929175b0684bb SHA512 8a349fcb7e9a915ceb37b766f9286ea701aac5aee65fca04357e7e734fd767b2f824525960fa6b860be9e52c2099396f05c2710ecebd020b5d42341849918a98
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
index b251388e08bc..b77e6ec42e35 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
@@ -273,8 +273,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
 }
 
 src_install () {
@@ -321,7 +321,7 @@ src_install () {
 		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
 	fi
 
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
 	;;; ${PN}-${SLOT} site-lisp configuration
 	X
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
index b251388e08bc..b77e6ec42e35 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
@@ -273,8 +273,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
 }
 
 src_install () {
@@ -321,7 +321,7 @@ src_install () {
 		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
 	fi
 
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
 	;;; ${PN}-${SLOT} site-lisp configuration
 	X
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
index b251388e08bc..b77e6ec42e35 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
@@ -273,8 +273,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
 }
 
 src_install () {
@@ -321,7 +321,7 @@ src_install () {
 		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
 	fi
 
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
 	;;; ${PN}-${SLOT} site-lisp configuration
 	X
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index ef040e969456..75f4324cd896 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -273,8 +273,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
 }
 
 src_install () {
@@ -321,7 +321,7 @@ src_install () {
 		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
 	fi
 
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
 	;;; ${PN}-${SLOT} site-lisp configuration
 	X
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index bf715a63be81..dc1b0e131b6a 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -7,7 +7,8 @@ DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aa
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 EBUILD emacs-18.59-r11.ebuild 4230 BLAKE2B fc6f41ecbacf7318de3db12189406d00a2a652c8c10f638a667ba83214f6d7ebf8b78e79c1bb1d04b5ea861001e57ef1d6dd29411f9f660528170c119c55e461 SHA512 686d67d281bc9e39087e2d804e9f9db578293ebb52f9730ac971fa3b938e1310923e78b488e4a97d0e6432d10ee7bcf4338ee7190763a1e03792c4105923beaf
-EBUILD emacs-23.4-r17.ebuild 11553 BLAKE2B 2a547246425ca1bf5936d07a632a67e942b82163b061fd648631c3dd3cfe70c220b78cc0ffa899b28cc96c39070ce53ffa21dd872e440cae06a263fc486d4a84 SHA512 40cdfdb92d30b355e70d95dbba17f0995ac9209ed23c8a91f3b1e254c5312fa773c903487ee3be567855fcafbeb216f719086d65f90afe3b72bbddf417cb5e21
-EBUILD emacs-24.5-r5.ebuild 11382 BLAKE2B b20b12487f724d9bea33bf26fa23f8887695cd0029d8b020ad2b646d5e5f9dfceb783a631e7d6fa5a256131e08ef059b1fb1a61c2da048f740a369b52bb6c958 SHA512 3750356b1edc38009220da7d9327cf4f990ff34b84513185602baa964b9804392bb970f191a7fdc3a5bee49c81dd90b206ec31a7b53574c16e992873b317886e
-EBUILD emacs-25.3-r1.ebuild 11689 BLAKE2B c663335a2f562523e8c101c4654d6acb37a1e36162d9fde3cb7cb0b9950197bf75bc480298f43b15e290aae9cde19162707399c57af8539b676cba9ca11d1262 SHA512 37b1d591b767188f01950e011347737a2480e85e620d6fd08fada9c44a50087ff5bd2a6bbb4f462b80318c378a1e12edff13f1460454066213b27f15ee65c905
+EBUILD emacs-23.4-r17.ebuild 11562 BLAKE2B c889f8c12adca89b89e2a65fbb79c52d637c69451d2d710e5e8e2723997ddf805012db34a0f4b7a9a310a65e52a926c9d22f41e02ead8856a2133bdf520b41eb SHA512 35913b26e026a5ffc4860f10c697c3d19aaf1b33a30bfab54b51541bcb260358a6d6cfebee823926d398e984bc329541c98ff4c0e4e25b21b39cdba929fd1f0f
+EBUILD emacs-24.5-r5.ebuild 11281 BLAKE2B 151edad95ee162f2e1d1889f4d8c16ba7fdac2259415cc5c6a29f079b43058c3bb8537f55c9ce2265a38465bfc6c142ebedbddecae14fcc0ee9e934483ca521e SHA512 67d33ee622436ac5685273bf4a1f00502ed4dc5446498bcab0962e7004fc44fa57e617aade8d159d9d1d2153bf13870a1b8fc7d5d831123e29c8282577b77e2c
+EBUILD emacs-25.3-r1.ebuild 11696 BLAKE2B f490a7b26a57fc01633a87188cbb80f50c0d0622e837796fcff2fa6b27d70df2ef5c0893f89a03d93806beea7bcf405bdabed8e7180f05553dfd14c1ce94fdda SHA512 8b11ae6a8ba18998f1ec413dc4bfb2c1090461a56be8cba5b56ac9e849df06a1b4b9cbc520ec2ffd0c62ec83320e8c3886f477e023c03aa5ce60d74e85f002be
+EBUILD emacs-25.3-r3.ebuild 11763 BLAKE2B 5fe2522876709ba716b3d0f4f8444c62ee54338f4635ae957e049a1b22d4f037e59479fddb3e7ca89948712234df584ca5144326eac1a3a674c1453f9d59f86f SHA512 34d61b9fc189d1bb015317daaa93a454356c9e9fba7e24a2fe15eb23560f264d4020b66c5d5ae5bf8b947af4cec427a36bd302b08bdfac7e47694f6f7dc2b2e0
 MISC metadata.xml 2764 BLAKE2B 07a117a3c5b6b04f34c4e390de8af8dcda3d4068d5139607790282740bd71dc11f06138be0cfb2871b167f9dee4320b8bff6894c10ac40d5df8fc2a3cb2a4dcf SHA512 7e115d381271b2e3a6e8de9a0590f3f5c41318ae814c71b6c85be6a24f234179d691d7eb9e9f19c148716d1090d18abe2e874b8772d3987791f9612b0f2eeb59
diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild
index 09fda80f8ed3..0a3267bc8243 100644
--- a/app-editors/emacs/emacs-23.4-r17.ebuild
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@@ -27,8 +27,6 @@ RDEPEND="sys-libs/ncurses:0=
 	gpm? ( sys-libs/gpm )
 	dbus? ( sys-apps/dbus )
 	X? (
-		media-libs/fontconfig
-		media-libs/freetype
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -41,6 +39,8 @@ RDEPEND="sys-libs/ncurses: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? (
@@ -278,7 +278,7 @@ src_install () {
 		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
 	fi
 
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
 	;;; ${PN}-${SLOT} site-lisp configuration
 	X
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
index a60d29353474..4244c1f2ee53 100644
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -32,8 +32,6 @@ RDEPEND="sys-libs/ncurses:0=
 	ssl? ( net-libs/gnutls:0= )
 	zlib? ( sys-libs/zlib )
 	X? (
-		media-libs/fontconfig
-		media-libs/freetype
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -51,6 +49,8 @@ RDEPEND="sys-libs/ncurses: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
 			m17n-lib? (
@@ -272,7 +272,7 @@ src_install () {
 		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
 	fi
 
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
 	;;; ${PN}-${SLOT} site-lisp configuration
 	X
@@ -339,11 +339,6 @@ pkg_preinst() {
 
 pkg_postinst() {
 	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
 	readme.gentoo_print_elog
 
 	if use livecd; then
diff --git a/app-editors/emacs/emacs-25.3-r1.ebuild b/app-editors/emacs/emacs-25.3-r1.ebuild
index 0377eb678615..e7825108d036 100644
--- a/app-editors/emacs/emacs-25.3-r1.ebuild
+++ b/app-editors/emacs/emacs-25.3-r1.ebuild
@@ -284,7 +284,7 @@ src_install () {
 		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
 	fi
 
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
 	X
 	;;; ${PN}-${SLOT} site-lisp configuration
 	X
diff --git a/app-editors/emacs/emacs-25.3-r3.ebuild b/app-editors/emacs/emacs-25.3-r3.ebuild
new file mode 100644
index 000000000000..8267aedfe4d4
--- /dev/null
+++ b/app-editors/emacs/emacs-25.3-r3.ebuild
@@ -0,0 +1,371 @@
+# 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 hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
+REQUIRED_USE="?? ( aqua X )"
+
+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 )
+	hesiod? ( net-dns/hesiod )
+	!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/libXp
+				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 \
+		--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 hesiod) \
+		$(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() {
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
+}
+
+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/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index c7e2c137afb9..8cb96fe58730 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -4,5 +4,5 @@ DIST focuswriter-1.6.8-src.tar.bz2 10196595 BLAKE2B 1c726b948469960e1cc35dcf592a
 DIST focuswriter-1.6.9-src.tar.bz2 10202664 BLAKE2B 68525ca548513b9b88ca032c0f629681a592149672611891a1ddfe6a8574a233dfc7bcee64dfcae2255b3dce2cbd15907428f25a7ad27a4ebc5c535d3fb34d7b SHA512 dcebd2e1c16a9eb1d135befef58ba0a276dac8d84385d90db3a8c192f3ff05eb5b6ac11cef239c1c4b4998b396da908ad99d5c89c0eb1438d9eb654f2cc7afec
 EBUILD focuswriter-1.6.7.ebuild 1041 BLAKE2B 7e6a895ee6d4b04cdc9cc19086168a1c4f7f946b0550abd8a4d4fcf660f5f6e65c995f5a1861dfc589e8391cbbea353a7f462297b79c5e22f821a09802390da8 SHA512 71fe8650e73194be29014ea4bf881309f55a0f9bcffd70b016e52ea0d476e8008cfe7b71bf8bcfa016232e68d34c9ae41195d21b2b4459f4fabd4d39d01c0bc3
 EBUILD focuswriter-1.6.8.ebuild 1090 BLAKE2B 5668c59cc0fdd2db7330c8eb9f2c1fb78c234310cceb66d8cff9b85d5a0276813c6f8d69d4a11beff845b1131ac533bf880f6b5ebc2ea4b68a9e442b973fc1ab SHA512 931a967230ce054b9569d766ec3fc5650da7026b44000b7119c5ba72fb53dc3dec9f51f94eead1475844db57f31c90c253ef071c5c9207ae4970919eecd937a3
-EBUILD focuswriter-1.6.9.ebuild 1090 BLAKE2B 5668c59cc0fdd2db7330c8eb9f2c1fb78c234310cceb66d8cff9b85d5a0276813c6f8d69d4a11beff845b1131ac533bf880f6b5ebc2ea4b68a9e442b973fc1ab SHA512 931a967230ce054b9569d766ec3fc5650da7026b44000b7119c5ba72fb53dc3dec9f51f94eead1475844db57f31c90c253ef071c5c9207ae4970919eecd937a3
+EBUILD focuswriter-1.6.9-r1.ebuild 1093 BLAKE2B 7ea0feb52027aa668d78ae5b01eb42ff682911251311f627ace120c22f889e8239f126db26c9d49a181110d3b0a4f3c230194bd99e9657b7224bb679797342df SHA512 207a2a1bf4876f782c17096c94dfe360ca8c76ad77891582f6fffc56ad493ab7ec6894f27d1e19d697b11a51bed5a2456929824a383b62f5de7e5ca12844db23
 MISC metadata.xml 392 BLAKE2B dcb98e8e1ba1c2a2aea89d380d6a2a1a1cfd5fd9773f133aa7603b88384c91911429832a7117026cea4c092c1c84dfe440a2c4da875ce56e1da7e8670aecf068 SHA512 beaf6206dfa83ffa8acbae3d5f8c5a9041974588a18de742fa049d4ff0b8d75bcb2f40ab081418cdd2987709566b678f7016b1be0acb02deeec480cd25ddf3cb
diff --git a/app-editors/focuswriter/focuswriter-1.6.9.ebuild b/app-editors/focuswriter/focuswriter-1.6.9-r1.ebuild
index 67fc1801283b..f61c59e9ba31 100644
--- a/app-editors/focuswriter/focuswriter-1.6.9.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.6.9-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsingleapplication[qt5(+),X]
 	dev-qt/qtwidgets:5
 	sys-libs/zlib
 "
diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest
index 07fa67f00db2..9fc5b709f3db 100644
--- a/app-editors/juffed/Manifest
+++ b/app-editors/juffed/Manifest
@@ -1,5 +1,5 @@
 AUX FindQtSingleApplication.cmake 4004 BLAKE2B e6c047be5112811430258e527a6d0ac5217838c9acbdbf6edf49909f3858c6fedb1c3da0471d4301cb918683b6194207650f9c4d06735e62993da3720b263356 SHA512 5ba7845f12a0e425fdeda180faab8b6e53ed3ae0ae291e5a33878a5f955f9295ea7058f1cce43ee4292fd00a6b8ddc45c71d050210ed4b26e1d3f4472df04f9e
 AUX juffed-0.10_p20160323-qscintilla-2.10.patch 565 BLAKE2B 92ee287c1dd3321ba706ea01656037e87a27a5cb6f43695a043481a0c4231b5753d9b4af74f82f9d37f2b2c137871f52d37a310fa9f75188955e761a46279762 SHA512 6b3f70930a3f7f5a59687b8484d5356804cff478da63732e5af261de12ced6e93f71bc53b93b3e286bf54e0cae61090729ccc54b42b37e2f97ee5a9640c18bd3
 DIST juffed-0.10_p20160323.tar.gz 1617451 BLAKE2B 497a117d587fb1d6eb819bdc1cc403a660b808fa07d03fbfa74362c195aafc98733653fa5d7e28803df2bd4d8acb34a3c0d979395c1a6122631cee40d37e2239 SHA512 a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5
-EBUILD juffed-0.10_p20160323.ebuild 1348 BLAKE2B 26a037dcb98e1ddcc615342e1fc3f68cca69d918c18d4e1094dfec9c079fee14086d8f51bec18a933f31e81f53c35b20a9bfe1a537c25bc29d6401465ffbd88e SHA512 38a2c1ffdbabbef866bb3ddfc14b76f36122297d71ffa3d73cb6d89d49c1d14592ee975959476c8e2dd087a34fe89593a1a1a9947d92d49ba5e328b39ae92546
+EBUILD juffed-0.10_p20160323-r1.ebuild 1351 BLAKE2B eb99907a7cfbccf8402246003677f51167c2cae499a7fc615eac39952349ac711b73be853052bf1da5fb8876249f7809dfce7729dcf39fbe57b92d949b5c6a2e SHA512 0909c90c605b7daf5937a6822c04a730d1a93a0edcc9737b8d50e94dfb1262e391b289d74b51d6a8c3581e98977160740a0d99506b13c8bad77f1fd9144022c7
 MISC metadata.xml 323 BLAKE2B d45bb12a8240e1b12594d50a1284b69b365e15f7a857b34b0ee12f4c9af0d7681ba22bbc959e7133780f682f6ae6dad53f6ecb2eb7db65cf1b6f4a64c742cdb3 SHA512 43f71ede8fa11b874c187d61b6f1c3949c10bd632e5a98f4094463f785be8f719a2d2205f3f0b7645047398e026fe71b1ef79366d762ff12f257d0a239e84a4d
diff --git a/app-editors/juffed/juffed-0.10_p20160323.ebuild b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
index 15de97ca1b1d..e8118beedc92 100644
--- a/app-editors/juffed/juffed-0.10_p20160323.ebuild
+++ b/app-editors/juffed/juffed-0.10_p20160323-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,7 +20,7 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsingleapplication[qt5(+),X]
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 199b5baf57ba..ad001b37e114 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
 DIST mg-20170828.tar.gz 141028 BLAKE2B a0243ee05f86161f1a9448ec92c8cf14362a60dd3643ad49f79fdd6c2ffe56f51415321eb6f3d7b78c1ca6eab9cb91380cdb63f699359080011d6801feaedd04 SHA512 1ea16b1dd5e9e08abf9fcf0889130b4f39d36872bb64df85470a9ced1db87c0eecb18cc6e8c3c5a04f9049d58ef4492d5a88cf3502ec3351abccb7bddfb90c14
 DIST mg-20171014.tar.gz 141045 BLAKE2B a5b3bda6ff3b6416093069b471762687c2279737aa05b297ccd3077aff195cf52831566768613a81dcc977a27ac5ffd6e8a1874aa1010b6d90f4c678b6825cee SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56
-EBUILD mg-20170828.ebuild 1045 BLAKE2B e489742c9b9c71178d1e9847f3fb556a8f4018f76b82e3231313043e3ab8e0faebd2e1714ddf81b6e9816c7864ff98e26eae0a6c82fc301589a7e52b67220eb8 SHA512 14c1fd5ea918379aa77ec2e31ffec1967384ec7ccc5b0987c17e2c01b02909f6e75defe317009d86a46af545758d5ef5958aae956177d92a26151c72cc4bbb66
-EBUILD mg-20171014.ebuild 1049 BLAKE2B 4c97874da30dcf8b28f6797563156a9721bd7d6a80a8e163ecb1ea205340b2204dc41ec0ae2d7ffd833dc9de017a7d58f119e7e59a902f22da2f2f5fad187599 SHA512 33a6e4d961165cd734c8d5a7a1979bc6fbdb724d30c88adc0c16d22c70b27da33af41b0f96c27c26f17ce8074c7be85a1fa2200730d09bc57539499f19d461d8
+EBUILD mg-20170828.ebuild 1047 BLAKE2B ee8886aaabefaeb4005d711eb0520c4508407ff0d44c1b1a0094b025764242c9ff35df8808288b7b9df3a48120d0f00de880b454d1fb7176c0c570e5a3781e07 SHA512 e2f54dbdccc36ed6055b96c69246507c085fd88bb5bd136a05e8d2c364c0c887dc866405116fe1f28d63a03392c82da2abb2bee34db1075490cb3cbce24e92b0
+EBUILD mg-20171014.ebuild 1050 BLAKE2B b2d45a5b11748781551fa77f260d4d822bd753f7f13399298624ef9ee6fdf6abb2d9c1880d5b8458e0acc2e90312eb7f643c6001fa808a775830948e4213302a SHA512 bcb1553d343ed8cd8d7eddac0fe7f81cbd20a4fd268921e33c3d61fcad6054169db55f75a5856dbb2b5ba4b4c070832c1081fa465ad9a8e6a0c5bffcc7ceed96
 MISC metadata.xml 384 BLAKE2B 86ad99174028addfaef8bb9f143949161c8d1d81f2e946b3aa9088bd644b61ce97869d0a0b669abcff56e925fe8757d77f6123a2dfe340b8620db2ae84ba0b55 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf
diff --git a/app-editors/mg/mg-20170828.ebuild b/app-editors/mg/mg-20170828.ebuild
index 283cf4ff08ca..232a6b42a429 100644
--- a/app-editors/mg/mg-20170828.ebuild
+++ b/app-editors/mg/mg-20170828.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="http://homepage.boetes.org/software/mg/"
-SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
+HOMEPAGE="https://homepage.boetes.org/software/mg/"
+SRC_URI="https://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/app-editors/mg/mg-20171014.ebuild b/app-editors/mg/mg-20171014.ebuild
index eec2b0ae20ca..e9e5b543bd73 100644
--- a/app-editors/mg/mg-20171014.ebuild
+++ b/app-editors/mg/mg-20171014.ebuild
@@ -6,12 +6,12 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="http://homepage.boetes.org/software/mg/"
-SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
+HOMEPAGE="https://homepage.boetes.org/software/mg/"
+SRC_URI="https://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index 6a3d2e13632d..d5963d4ffc05 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -6,6 +6,6 @@ DIST zile-2.4.13.tar.gz 1296379 BLAKE2B 00dce642e6b452f66fd06e70a7f9e9047abb2c79
 DIST zile-2.4.14.tar.gz 1385314 BLAKE2B 43815e87bb037a8de42b00510ce8addd748fe2a639f78e736c7fe6220c972ce600a8db557dd592065bb27e1d35a5d3a42b6a4a8d5d76eefc4274a8ce27b1d9c2 SHA512 0dea56fd13a82015ec73de3139a4b2c27ad4c001ed535f1bae557ee49f9d8a188610a08160998d0a36b95fec42b46a019fd43634ef6502ebd27e162164de98cc
 EBUILD zile-2.3.24-r2.ebuild 1364 BLAKE2B 40fa024bc57b7c62136001d4885943d670f6c2f8f7f49ae283c846648ec58c863dc24d2509c08d6288093e74f1d6af6bdb4eaeabf0e959ce0afbfa796a1fb2d9 SHA512 6eb6bcb7a5364d2615a957da3c6ceaba32f646b7ba263e749a49937b054d6d409c178e8b78b17ae820e0e81aa3d6f0d8fb888a95185df690a9e666bb37558fa3
 EBUILD zile-2.4.11.ebuild 901 BLAKE2B e0ec9fa51062e9438d35aef6c8ccd18d5bb506719166c2a8198b331a8f0c94c034923e09a1becd65dcd8f09380e98cd061fcdf645dcc48883a13fffbe7e4ec03 SHA512 c0229948c5c9d813ae8a5530ce3de60a0eab82de587d985975a77933207e3034432dedb73f37b86fc824a1cbee747cb6b39b67e7c6571dfb04c6e240d31a58ad
-EBUILD zile-2.4.13.ebuild 1383 BLAKE2B fc340260a2e20cb5530c3910b08fa04396efb2c45b1cd6442d4aed60bc3f418aa4eeab1fbcdd90c12c1c73198cfd2acf2c23f2f4dea23c1367589cf8e5ea3be8 SHA512 d41edf9dbab4290f47b5301263a962e21c459d4b1740a95e04f58c5a3c273870c9b2a7f7c505ab8a8b760afe7edf8a84df3e33373aa0aa745f3e91fdba129a61
+EBUILD zile-2.4.13.ebuild 1382 BLAKE2B c96f6e6f6a0dc2931d71dd1d9ad660a81bb60130a0c97773969bacba0f9c371d2b4b78175c6894d8b9c35dace5400cfc8deea4675cd514643df17d0eef5e9625 SHA512 ebe9ce5c43d6cd4519b37143dd27c5d40ee02a51c4603946b491a2d8c4d56a2eb2540efb46c974b8d2dae7e5172c0aeaadb7b4612b9f67024e6769a7cd1eab77
 EBUILD zile-2.4.14.ebuild 1414 BLAKE2B 58877639a95bb2069cd4c62a98a5e970748c19891db3536f0a0cbf074bfaa51c520d6f4ecfde6486bbdc3e852c11d0c6fd02285d23063c4d9a93eaa9bee64d64 SHA512 421171734b26201e48a1b686023002ae34ea7fe498ffa1bf866f7b68ab9517ffe96ac6d827e68d2a51e768509422e62da57bb042af1504d76d243c8f7c30209d
 MISC metadata.xml 638 BLAKE2B 4830ef65d641a21c208c6e856daf949d8b931c1beef92f93e5428fae095e0c81e39ca93b9d9ec4cdafc74b689b1469e86d73f8a31fd3f775d728f1f973b1b743 SHA512 f2214ca22b8c80124f264991e70ad97047a5705dda78bc59573f1c80d3ee144343502bd7f610117af263611c11cb1c7c0b732fe44b6274272a50b7cf5d595ad1
diff --git a/app-editors/zile/zile-2.4.13.ebuild b/app-editors/zile/zile-2.4.13.ebuild
index 9f1ac547e516..2ee7ba440023 100644
--- a/app-editors/zile/zile-2.4.13.ebuild
+++ b/app-editors/zile/zile-2.4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="acl test"
 
 RDEPEND=">=dev-libs/boehm-gc-7.2:=