gentoo resync : 03.03.2019

19 files changed, 466 insertions, 339 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 506577844946..eae0cb0b43f7 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bvi/Manifest b/app-editors/bvi/Manifest
index d58c9d79e40e..f305b998e1d4 100644
--- a/app-editors/bvi/Manifest
+++ b/app-editors/bvi/Manifest
@@ -1,5 +1,3 @@
-AUX bvi-1.3.2-fix-buffer-overflow.patch 622 BLAKE2B 8f081bfea567a7781923b8e95af76495eaaa03c3c2e20450d38c64064467350eeee05668a28ae5bd2ad46f4b0ae013b8c5dba50d0c25be258f1286a46d40f6a9 SHA512 87549381d8c9ef76c4153917faabe2b814dab9ecfb59e9b0cf75be5d02b917fd88266ad5e846982c8d40b80b3304f7efc912bd13f83f48e7a411f663cb10a28d
-AUX bvi-1.3.2-tinfo.patch 1342 BLAKE2B 709237b9c353f8147a5592dae56eb1189fcc67e624f089b4da1c67632eca62109573975d66066b38324fc3fccbc1d317cad01f09986d26d90cd5556c9fbe2e87 SHA512 0ebb9dd499f1959eb760f84a15f2ebeb98b60a576459d05f1280ff48b94ac167d5e5a1dc5877f69198e1fc91e7d3a652a6e4a1fc49fb94395191cbadf07d7cc7
 DIST bvi-1.4.0.src.tar.gz 139202 BLAKE2B 151d86214aa93bb0a7f383c8de13b8a15fe2cfe7f5892dff52b80e362c049b49082abe846ffaf68ec69201bbffba2fdcc5d00f744756c49ecb26e16ab93bb13d SHA512 119cfc7350f81c324e77243f948cfb91cd9a3122fef307616e4756a99732f69131aed2a26ebe48048698b9c211a0214255f3e6605ad2cbf479a14a4a0f88923c
 EBUILD bvi-1.4.0.ebuild 476 BLAKE2B 8828fe7012383599a427032ec9d3fc89457e82cd7d6beaae56a9f2883c960c8c71e1ba6cbe57d4122f1440b2a650193f5bdde6e889358429e1ed90412bbedacc SHA512 642d892af5285215170595beb35aa9957fef14cf67230a8a79e03d1ac0bc92e836b84f7e2a30545f085376346b9571201fa7fec05acd37b8e8e0fea56f75f7db
 MISC metadata.xml 436 BLAKE2B ae30a6fe4365b8954c5ae093014aa1ed918f0d79f7a3f2a4a7a40992465b6b06ec22bcb9335dcde96328cd9c366a7dafbeed295089b286aae3ebeda06f77f09d SHA512 456ff0bd21bb62b2f6d98d9e50db4dd7d8924c48f19358aecf8b35f935478f59ce0fecbda47d8272f6785ef49e9eff5b82eb565a0dd0b0e928c091f86861e958
diff --git a/app-editors/bvi/files/bvi-1.3.2-fix-buffer-overflow.patch b/app-editors/bvi/files/bvi-1.3.2-fix-buffer-overflow.patch
deleted file mode 100644
index e3ebaa3d1295..000000000000
--- a/app-editors/bvi/files/bvi-1.3.2-fix-buffer-overflow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/edit.c b/edit.c
-index 328a0cd..3cf6572 100644
---- a/edit.c
-+++ b/edit.c
-@@ -42,7 +42,7 @@ char contru[][4] = {"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",
- 					"CAN", " EM", "SUB", "ESC", " FS", " GS", " RS", " US",
- 					"DEL" };
- char tmpbuf[10];
--char linbuf[256];
-+char linbuf[16384];
- 
- static  char    getcbuff[BUFFER];
- static  char    *getcnext = NULL;
-@@ -492,7 +492,7 @@ printline(mempos, scpos)
- 			*(string + print_pos) = '.';
- 	}
- 	*(string + Anzahl) = '\0';
--	strcat(linbuf, string);
-+	strncat(linbuf, string, sizeof(linbuf) - strlen(linbuf) - 1);
- 	mvaddstr(scpos, 0, linbuf);
- }
- 
diff --git a/app-editors/bvi/files/bvi-1.3.2-tinfo.patch b/app-editors/bvi/files/bvi-1.3.2-tinfo.patch
deleted file mode 100644
index b00c88811507..000000000000
--- a/app-editors/bvi/files/bvi-1.3.2-tinfo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 68076d8..81da696 100644
---- a/configure.in
-+++ b/configure.in
-@@ -58,17 +58,19 @@ AC_ARG_WITH(ncurses,
-   fi
- ])
- 
--AC_CHECK_HEADER(ncurses.h,
--    AC_CHECK_LIB(ncurses, initscr,
--        AC_DEFINE(HAVE_NCURSES_H) LIBS="${LIBS} -lncurses",
--        AC_CHECK_LIB(curses, initscr,
--        AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses",
--        AC_MSG_ERROR([bvi requires the curses library]))),
--    AC_CHECK_HEADER(curses.h,
--        AC_CHECK_LIB(curses, initscr,
--		AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses",
--		AC_MSG_ERROR([bvi requires the curses library])),
--		AC_MSG_ERROR([bvi requires the curses library])))
-+AC_CHECK_HEADER([ncurses.h],[
-+    AC_SEARCH_LIBS([initscr], [ncurses],[
-+            AC_DEFINE(HAVE_NCURSES_H)
-+	    AC_SEARCH_LIBS([tputs], [tinfo])], [
-+        AC_SEARCH_LIBS([initscr], [curses],[
-+                AC_DEFINE(HAVE_CURSES_H)
-+                AC_SEARCH_LIBS([tputs], [tinfo])],[
-+	    AC_MSG_ERROR([bvi requires the curses library])])])],[
-+    AC_CHECK_HEADER([curses.h],[
-+    	AC_SEARCH_LIBS([initscr], [curses], [
-+		AC_DEFINE(HAVE_CURSES_H)],[
-+		AC_MSG_ERROR([bvi requires the curses library])])],[
-+		AC_MSG_ERROR([bvi requires the curses library])])])
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- dnl AC_TYPE_SIZE_T
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 6d0546fe5ac7..7a7c11c2442c 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,9 +1,11 @@
 DIST emacs-26.1.90.tar.xz 43892340 BLAKE2B 8ee12a6f8d6dd1a8084864d53818cd9127a95b7da632db14c831d2f9d4848aa11bb8a9d92bf8bf0348ea4e2fa75de45408d284680255e5a2b9845ada1acbc7fc SHA512 b2e7e9c1015c221e8665426528703bfe336734b7830d731d5f3a7c50ce423b2a8bdada7f934e5f31dbe81b4f06623bddafe48e9da4727cb728564d569ff0b188
 DIST emacs-26.1.91.tar.xz 43892592 BLAKE2B dba455ddacdda6faef66bf3869e21da9f94eef81e0987a280634e5186e8c441ac841ad917059ad8d0b36722d308f166d24c5770505b71219cd6979547f8cea10 SHA512 2c09b8ae0e035d20c8dcebda8ca56167a374c465f7ad8e55f97fc10355cffe709b196efa38474580c5b3584263b676fa5b8d9fa1434d4fc77d7d9cc941260a4b
+DIST emacs-26.1.92.tar.xz 44387596 BLAKE2B d0581658f95c7408ba0d3e107a0622212e94f8930c355228a999d591dcea7ba533d4f3b288f63bc2a1ffb2aac197c053ec5c48f80810fe4e1c097ae75e20505d SHA512 c01be13055644f00094e096a9ec39dfaa4fc999718931d6003425ef74741ab0ca638a377e2903fbffc32c3e344fde5e93b2657a48600493fc25daa82a34fc4d2
 DIST emacs-27.0.50_pre20180831.tar.xz 28668124 BLAKE2B fae74d9885889b042142f580e971c73c193306dca26b42dd87ac3d3d765312ce6695511d7d31a047d79803982f6345c4c319a3d83cea1313080170da97482fa2 SHA512 43b32d8943dc897dfc0c1fddb4261a196d3a604add5bcf87a93748125f15db2cac762d3550d6593b80e961ae35d543adc4d5937bac77970c658f93dba26f17e4
 EBUILD emacs-vcs-26.1.90.ebuild 13001 BLAKE2B d433baf07357bbd5db2f0704e7effa3c62f4306f5ad95a801949da3fe7d5de15ec6d276324118ffece09fc51c279dacec5fc7943d9d912f2eba2591d0070e5ee SHA512 39634f8ad92db5115a360bf43bbafa230b3e94462d51a311b5a1ef49bf2f762b05fb9c35e36cd378c427d095aba18b446b2fcef668f903972b4ce72bda6acd44
 EBUILD emacs-vcs-26.1.91.ebuild 13001 BLAKE2B 173d3f2f54cd20a02668b4ca4326e1bdd832ff0997990caf9ea03295c3f40312b630390e95c4e35a2995d565868d8399820653acacf9f2c9121f3a0366c8bd11 SHA512 9886de945cd9eb305a0521664e3eb978713abaea7043304b84e4e2774c7f48ff1ed37117c13585eadaca25aa035fdc4cd53187d4c1e162e4023b246832f618d8
-EBUILD emacs-vcs-26.1.9999.ebuild 13017 BLAKE2B e7e174b5712fffdb63dd0861ed290c9217305122e54ae307a42ba9c01daf71273585bdb289ad1719e9fad5342386de0e7941b409ee7b1d2a525a7e589ebd86ce SHA512 edf01baf808072452b9544d569276c9fd49018458a1b57368c5477147dc597854bf327c81216905d798ad616fac57c4f0b6a7ad2fc415abc0c308b449d9767c7
+EBUILD emacs-vcs-26.1.92.ebuild 12893 BLAKE2B 94456e2c894fb8fa5d7a15508e9f29056cfef32422dad3c3f52ca2b0dbe939bad23c9c4acd40cc219e109cad2a3fae369e8bd5ae29a4eb992b72f7b2a58093ad SHA512 ff90d0d3d25385eb46403119fb8896d826d7235aed4a302ce9dce17e2291540ec59652aa500ad17a2aa91a02b42a9a27977f3923c84ec318b4eba735899f894f
+EBUILD emacs-vcs-26.1.9999.ebuild 12893 BLAKE2B 94456e2c894fb8fa5d7a15508e9f29056cfef32422dad3c3f52ca2b0dbe939bad23c9c4acd40cc219e109cad2a3fae369e8bd5ae29a4eb992b72f7b2a58093ad SHA512 ff90d0d3d25385eb46403119fb8896d826d7235aed4a302ce9dce17e2291540ec59652aa500ad17a2aa91a02b42a9a27977f3923c84ec318b4eba735899f894f
 EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 13050 BLAKE2B 9c43fc10140cf72d7bf9909775d3b81ecc346e9d8d02e7c4548748f5f808375adc22078ec85d2647d61a9c1dc02c4e34d29b26be739b315c87f5f4d751f24bfd SHA512 f7aee0a0e3d5c5071df9e1da1c8bf15dd94ab2fc7dbf802bbe44b6bc8cd3770fcc27c1b2139f015d9d2952f66906fbf4eb40fb1d366045c81d638c299d4370ad
-EBUILD emacs-vcs-27.0.9999.ebuild 13105 BLAKE2B 6dc87a2e7add4e493b8d8eae49855b548a29d94ce3e61747bc91cfd13317e6876fdf2d328c9b527d476ebe06a472df06dd717d18e0d818a77f542c1dd993a5a3 SHA512 c7bbff98a510320683f7f7b0be14c93a6e5c85379b96aa51fe45ea3311245a06ca7fddaad4a26b703a1c04fc1bc78b145168f0102e43fafd8e16bf099a45e5ac
+EBUILD emacs-vcs-27.0.9999.ebuild 12997 BLAKE2B 70ff0c9cfe3c3ffd7dd56e3a2f72104e600d4f3d4674816dc73031e308a9be682257eac4e8ccd7a49ab5e76233d0529cace43eb6ff609ed279d5f8b11519c831 SHA512 57246f31f263c58c0cca5967d5d4973b1340bd7a40f17b2d7036b473aeb9412710a03e6ab582ad85efc7b91914799e055e8782ec80957831f63a8fc01c65abb8
 MISC metadata.xml 2897 BLAKE2B 9913cc3b37864559eb273338b02dd202b51820d2614fee5e17f1fe8fa98c691374443d68f29cca5172034c15dfa321390e2624087b3cdb4779364b12711c2a8d SHA512 1764fb9b8da95a3c3469c896808fe4e29b6b0bcb8b9986ccfd4756e451005f2f1f47b0fdcd5243dac7e70aa83f67fef25ac5ebfecf20e5fbd3e5c93851ad7eba
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.92.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.92.ebuild
new file mode 100644
index 000000000000..4ae3b77727a6
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.92.ebuild
@@ -0,0 +1,408 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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="emacs-26"
+	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/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="26"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 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 )"
+
+RDEPEND="sys-libs/ncurses:0=
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	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=
+			<media-gfx/imagemagick-7: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? (
+			gtk2? ( x11-libs/gtk+:2 )
+			!gtk2? (
+				x11-libs/gtk+:3
+				xwidgets? (
+					net-libs/webkit-gtk:4=
+					x11-libs/libXcomposite
+				)
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+BDEPEND="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+#	pax_kernel? ( sys-apps/attr )
+
+if [[ ${PV##*.} = 9999 ]]; then
+	DEPEND="${DEPEND}
+	sys-apps/texinfo"
+fi
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+	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
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+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 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=gtk3 $(use_with 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
+		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"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gpm) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+src_install () {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	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}/usr/$(get_libdir)"
+	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
+	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
+			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-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
index 8c8c1e0e0c82..4ae3b77727a6 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,6 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 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 )"
-RESTRICT="test"
 
 RDEPEND="sys-libs/ncurses:0=
 	>=app-eselect/eselect-emacs-1.16
@@ -142,8 +141,7 @@ 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"
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
 
 	AT_M4DIR=m4 eautoreconf
 }
@@ -285,14 +283,12 @@ src_compile() {
 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"
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
 
 	# 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"
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
@@ -377,15 +373,14 @@ 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"
+		mv "${ED}"${infodir}/dir{.orig,} || die
 	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"
+				install-info --info-dir="${ED}"${infodir} "${f}" || die
 			fi
 		done
 	fi
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 5450edeeb08a..735fbb98de76 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -143,8 +143,7 @@ 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"
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
 
 	AT_M4DIR=m4 eautoreconf
 }
@@ -288,14 +287,12 @@ src_compile() {
 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"
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
 
 	# 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"
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
 	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
 
@@ -380,15 +377,14 @@ 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"
+		mv "${ED}"${infodir}/dir{.orig,} || die
 	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"
+				install-info --info-dir="${ED}"${infodir} "${f}" || die
 			fi
 		done
 	fi
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index 2648deb205ac..ac212dbd39d7 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -1,9 +1,4 @@
 AUX fte 604 BLAKE2B ccb21ce020421a68d33fb94185d3acc6ad26f6f8cd0c574c9ca611aa923180e5192b6271312575f7a64f329d3e25d2722b07425553cfa57e54ed55ec3668f0f1 SHA512 5f93df643282016c352db88cddd37c1b9f86d94654a7eff0089b9d349ad3f56ba4266cb2431ac3a418bd4b5aebf6d7ad04c26099061942fd3e90fc9fb938322b
-AUX fte-cpp14.patch 531 BLAKE2B 1a40bf7a6a71daab0a550d6de1fc2c653b4b5ce9108be9be12819e0b09829bdb06a961ef5e66792a51d25d1751dd0223e4b3ae3bd38aab82cea88ddf92ac921c SHA512 d6bfe5912f92e5d948d3de49085824d74ca51877b93cf8af7f2d4a6d162e6ea5ae11f96fc2b096875a9cd08476af88b07a7a1e352a97206876c15779e4bc36a5
-AUX fte-gcc34 1092 BLAKE2B f713cc9b727b2e133a55fcf01b2a22b9d27451deb7db803946160d6711bc088aba8850743a8ca93358107f8000894b92be93156cf22428cb8d7478dadd3cfe93 SHA512 390da870507786d74d67847d644c07d9c24789913117c46fcd8739f5ceb58345ac100a7cd1e2ef1183d09e76f923b73cd94fa523f5eaa3d6113a952240fd4800
-AUX fte-interix.patch 1041 BLAKE2B 55f18c0cc954181800e9efcdbf463d4ceaa63ff3ae8f9e062af824bafab5364ab079afae40361d0caba95cca7635c8d756f7317355092293bf901aac4076b031 SHA512 6f43c682b577b838675fe93c9e2b4c225e3c853d2db95f81f84d64508e78c6f957f1c8842343df2d9a6e7d01e5103a6cc2a1cd0cf414cee641b6b11c0d551b78
-AUX fte-new_keyword.patch 340 BLAKE2B a50987a59180352dfec174af7467f153c575442407dbd48b40c7a0c1d2e0260f09a42d55cab122489ea01fd98f4579722ddd39ebc0eecf50d720a464b410e25c SHA512 ab003f671919fb03429ab13adda5025554258e0799844b887cb786c2378e81025893998b0ef3b0b121d82422502d90f5dc8afa9855c1432c8d2f6597ea087c7a
-AUX fte-slang.patch 3567 BLAKE2B 3519a97a1f354ad8515df86ce8dbb8c9a66f531f8f8653c1ddc5d910a97ba794556b9840a5c0694710150e7fddd53dd6bb69e1a70fb40c2c33e0232b9719bf77 SHA512 3f9504d9b4d6de6e012f0aedf762dce51d1fbc79345f2f45f5303bc81194441396cbd7eadc9457e07814cb6d33b6db6ad1186de026b5b474f9419071e4b75d10
 DIST fte-20110708-common.zip 200007 BLAKE2B ce1ac0f2bd68b2bb7ef1d96a46bd9a481cd46f5cde00607c64f752d5e87f6edefd8a92c8210e1ac7629ef8bc5720a8a2d75bd61f292f344e211b88a2462989fa SHA512 0bb59a5b6b4a5ef6c1234dadd8922cd50a13ad1f0c06d6046b74a95592ad55f720b43bbc78a42cab63dfc68c5e073d44d5179bd6ed72f346563f43f3c5c146f1
 DIST fte-20110708-src.zip 504199 BLAKE2B 42bb3cc4ae9be4b64c0b161488d91d4a260a2e6a1574fccb0fc652359e34f7b6b881f170dfd85a8954f2b2fdbe4fecaaf2fc68cd5244f185dde36fe1a694004e SHA512 2d59fadcdd988ee85b87425c343341e1b768a7e9ef838c5f8a1f22c4adc5bf2cc37d547f36354ca1740bce07b33d5ae93d14e24001b9dbd3b1b267986564a089
 EBUILD fte-20110708-r1.ebuild 2650 BLAKE2B dd59d0f406114411a1e1c209874638c70c64a3009a25c7bcf9f66e030519ec5bcbb2b5cc7114ac0ee2ad04abb9e589c07d62ceb0bf007c90884ada1a8650ced5 SHA512 7806ebeb454e83cae2dff40f5bb30d942545f22e58ea3cc768dfb5bf944eed6ea1c91176d91a3e6e56df1c29bedbca9820cb9616efd53ef6673d878043569765
diff --git a/app-editors/fte/files/fte-cpp14.patch b/app-editors/fte/files/fte-cpp14.patch
deleted file mode 100644
index bea83b6a5ccd..000000000000
--- a/app-editors/fte/files/fte-cpp14.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix C++14 compilation errors. Add casting int literals to char in config
-generator to avoid narrowing conversions.
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=595048
-
---- a/src/mkdefcfg.pl
-+++ b/src/mkdefcfg.pl
-@@ -24,8 +24,8 @@
- 
-     @c = split(//, $buf);
-     for ($i = 0; $i < $len; $i++) {
--        $out .= sprintf("0x%02X", ord($c[$i]));
--        if ($n++ % 10) {
-+        $out .= sprintf("(char)0x%02X", ord($c[$i]));
-+        if ($n++ % 5) {
-             $out .= ", ";
-         } else {
-             $out .= ",\n";
diff --git a/app-editors/fte/files/fte-gcc34 b/app-editors/fte/files/fte-gcc34
deleted file mode 100644
index 51940e650657..000000000000
--- a/app-editors/fte/files/fte-gcc34
+++ /dev/null
@@ -1,38 +0,0 @@
---- fte/src/con_slang.cpp	2003-02-16 19:23:58.000000000 +0100
-+++ fte-gcc34/src/con_slang.cpp	2005-01-12 16:57:38.050369064 +0100
-@@ -246,7 +246,7 @@
-     SLsmg_write_nchars(slang_dchs, sizeof(slang_dchs));
- 
-     SLsmg_gotorc(0, 0);
--    SLsmg_read_raw(linebuf, sizeof(slang_dchs));
-+    SLsmg_read_raw((SLsmg_Char_Type*)linebuf, sizeof(slang_dchs));
-     for (i = 0; i < sizeof(slang_dchs); i++)
- 	raw_dchs[i] = (linebuf[i]) & 0xff;
- 
-@@ -368,7 +368,7 @@
-     ConQueryCursorPos(&CurX, &CurY);
-     while (H > 0) {
- 	SLsmg_gotorc(Y++, X);
--	SLsmg_write_raw(box, W);
-+	SLsmg_write_raw((SLsmg_Char_Type*)box, W);
- 	box += W;
- 	H--;
-     }
-@@ -386,7 +386,7 @@
-     ConQueryCursorPos(&CurX, &CurY);
-     while (H > 0) {
- 	SLsmg_gotorc(Y++, X);
--	SLsmg_read_raw(Cell, W);
-+	SLsmg_read_raw((SLsmg_Char_Type*)Cell, W);
- 	for (i = 0; i < W; i++)
- 	    if (Cell[i] & 0x8000) {
- 		ch = Cell[i] & 0xff;
-@@ -409,7 +409,7 @@
-     ConQueryCursorPos(&CurX, &CurY);
-     while (H > 0) {
- 	SLsmg_gotorc(Y++, X);
--	SLsmg_read_raw(box, W);
-+	SLsmg_read_raw((SLsmg_Char_Type*)box, W);
- 	box += W;
- 	H--;
-     }
diff --git a/app-editors/fte/files/fte-interix.patch b/app-editors/fte/files/fte-interix.patch
deleted file mode 100644
index 1df0a49f488a..000000000000
--- a/app-editors/fte/files/fte-interix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3554646&group_id=943&atid=100943
-
-diff -ru fte.orig/src/g_unix_pipe.cpp fte/src/g_unix_pipe.cpp
---- fte.orig/src/g_unix_pipe.cpp	2008-04-03 13:33:49 +0200
-+++ fte/src/g_unix_pipe.cpp	2008-04-03 13:34:20 +0200
-@@ -4,6 +4,10 @@
- #include <signal.h>
- #include <sys/wait.h>
- 
-+#ifdef __INTERIX
-+# include <sys/time.h>
-+#endif
-+
- #include "sysdep.h"
- #include "c_config.h"
- #include "console.h"
-diff -ru fte.orig/src/sysdep.h fte/src/sysdep.h
---- fte.orig/src/sysdep.h	2008-04-03 13:33:58 +0200
-+++ fte/src/sysdep.h	2008-04-03 13:30:43 +0200
-@@ -15,7 +15,7 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
--#if defined(AIX) || defined(SCO) || defined(NCR)
-+#if defined(AIX) || defined(SCO) || defined(NCR) || defined(__INTERIX)
- #include <strings.h>
- #endif
- #include <stdio.h>
-@@ -38,7 +38,8 @@
-     !defined(IRIX) && \
-     !defined(SCO) && \
-     !defined(SUNOS) && \
--    !defined(NCR)
-+    !defined(NCR) && \
-+	!defined(__INTERIX)
- #    error Target not supported.
- #endif
- 
diff --git a/app-editors/fte/files/fte-new_keyword.patch b/app-editors/fte/files/fte-new_keyword.patch
deleted file mode 100644
index c7b2a2b64554..000000000000
--- a/app-editors/fte/files/fte-new_keyword.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/con_linux.cpp.orig	2005-01-30 22:46:54.170485296 +0300
-+++ src/con_linux.cpp	2005-01-30 22:46:28.859333176 +0300
-@@ -50,7 +50,11 @@
- #include <linux/major.h>
- #include <linux/kdev_t.h>
- #include <linux/kd.h>
-+extern "C" {
-+#define new xnew
- #include <linux/keyboard.h>
-+#undef new
-+}
- #ifdef USE_GPM
- extern "C" {
- #include <gpm.h>
diff --git a/app-editors/fte/files/fte-slang.patch b/app-editors/fte/files/fte-slang.patch
deleted file mode 100644
index 50470bd6b7ef..000000000000
--- a/app-editors/fte/files/fte-slang.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -Nru /tmp/wgHyQebD7F/fte-0.50.0/src/con_slang.cpp /tmp/PQJo4szkUb/fte-0.50.0/src/con_slang.cpp
---- a/fte-0.50.0/src/con_slang.cpp	2005-12-28 16:53:24.000000000 +0100
-+++ b/fte-0.50.0/src/con_slang.cpp	2006-06-05 06:02:37.000000000 +0200
-@@ -99,12 +99,14 @@
-     '+'
- };
- 
--static char raw_dchs[sizeof(slang_dchs)];
-+static SLsmg_Char_Type raw_dchs[sizeof(slang_dchs)];
- 
--static unsigned char ftesl_get_dch(char raw)
-+static unsigned char ftesl_get_dch(SLsmg_Char_Type raw)
- {
-     for (int i = 0; i < (int) sizeof(slang_dchs); i++)
--	if (raw_dchs[i] == raw)
-+	if (raw_dchs[i].nchars == raw.nchars
-+	    && !memcmp(raw_dchs[i].wchars, raw.wchars,
-+		       raw.nchars * sizeof(*raw.wchars)))
- 	    return DCH_SLANG_C1 + i;
-     return DCH_SLANG_EOL;
- }
-@@ -215,7 +217,6 @@
- int ConInit(int /*XSize */ , int /*YSize */ )
- {
-     unsigned i;
--    unsigned short linebuf[sizeof(slang_dchs)];
- 
-     SLtt_get_terminfo();
- 
-@@ -246,9 +247,7 @@
-     SLsmg_write_nchars(slang_dchs, sizeof(slang_dchs));
- 
-     SLsmg_gotorc(0, 0);
--    SLsmg_read_raw((SLsmg_Char_Type*)linebuf, sizeof(slang_dchs));
--    for (i = 0; i < sizeof(slang_dchs); i++)
--	raw_dchs[i] = (linebuf[i]) & 0xff;
-+    SLsmg_read_raw(raw_dchs, sizeof(slang_dchs));
- 
-     SLsmg_set_char_set(0);
- 
-@@ -361,14 +360,14 @@
-     return 0;
- }
- 
--static int ConPutBoxRaw(int X, int Y, int W, int H, unsigned short *box)
-+static int ConPutBoxRaw(int X, int Y, int W, int H, SLsmg_Char_Type *box)
- {
-     int CurX, CurY;
- 
-     ConQueryCursorPos(&CurX, &CurY);
-     while (H > 0) {
- 	SLsmg_gotorc(Y++, X);
--	SLsmg_write_raw((SLsmg_Char_Type*)box, W);
-+	SLsmg_write_raw(box, W);
- 	box += W;
- 	H--;
-     }
-@@ -381,35 +380,51 @@
- int ConGetBox(int X, int Y, int W, int H, PCell Cell)
- {
-     int CurX, CurY, i;
--    char ch;
-+    SLsmg_Char_Type *linebuf;
-+
-+    linebuf = new SLsmg_Char_Type [W];
- 
-     ConQueryCursorPos(&CurX, &CurY);
-     while (H > 0) {
- 	SLsmg_gotorc(Y++, X);
--	SLsmg_read_raw((SLsmg_Char_Type*)Cell, W);
--	for (i = 0; i < W; i++)
--	    if (Cell[i] & 0x8000) {
--		ch = Cell[i] & 0xff;
--		Cell[i] &= 0x7f00;
--		Cell[i] |= ftesl_get_dch(ch);
--	    }
-+	SLsmg_read_raw(linebuf, W);
-+	for (i = 0; i < W; i++) {
-+	    if (linebuf[i].color & SLSMG_ACS_MASK)
-+		Cell[i] = ftesl_get_dch(linebuf[i]);
-+	    else
-+		/*
-+		 * FIXME: Handle UTF-8 -- way beyond a quick-and-dirty
-+		 * fix.  --MV
-+		 */
-+		Cell[i] = SLSMG_EXTRACT_CHAR(linebuf[i]);
-+	    /*
-+	     * FIXME: This preserves only 7 out of 15 bits of color.
-+	     * Fortunately, we're dealing with color handles rather than
-+	     * colors themselves -- S-Lang jumps through an extra hoop to
-+	     * map these to color data.  As long as we use less than 127
-+	     * different colors, things should be OK.  I think.  --MV
-+	     */
-+	    Cell[i] |= (linebuf[i].color & 0x7f) << 8;
-+	}
- 	Cell += W;
- 	H--;
-     }
-     ConSetCursorPos(CurX, CurY);
- 
-+    delete [] (linebuf);
-+
-     return 0;
- 
- }
- 
--static int ConGetBoxRaw(int X, int Y, int W, int H, unsigned short *box)
-+static int ConGetBoxRaw(int X, int Y, int W, int H, SLsmg_Char_Type *box)
- {
-     int CurX, CurY;
- 
-     ConQueryCursorPos(&CurX, &CurY);
-     while (H > 0) {
- 	SLsmg_gotorc(Y++, X);
--	SLsmg_read_raw((SLsmg_Char_Type*)box, W);
-+	SLsmg_read_raw(box, W);
- 	box += W;
- 	H--;
-     }
-@@ -451,9 +466,9 @@
- 
- int ConScroll(int Way, int X, int Y, int W, int H, TAttr Fill, int Count)
- {
--    unsigned short *box;
-+    SLsmg_Char_Type *box;
- 
--    box = new unsigned short [W * H];
-+    box = new SLsmg_Char_Type [W * H];
- 
-     TCell fill = (((unsigned) Fill) << 8) | ' ';
- 
diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
index 606a9bba1cec..22b30cd5a32a 100644
--- a/app-editors/notepadqq/Manifest
+++ b/app-editors/notepadqq/Manifest
@@ -1,7 +1,8 @@
+AUX notepadqq-1.4.8-qt-5.11-QDateTime.patch 682 BLAKE2B 34bf2eed6c5499f79caacdcb51e3ec1d09951bafb38f3a66308a33d5cc3724c36787aa7fed21bd1eb23b34517572d0898274d03b2963dd420fd7210a669f2b39 SHA512 a80234dfe6308ac223ce8e9a8117e06b93d1f13034c978a2024c938699864d4609e20a9f077c2bc988ccbf7cb957744068b65e93e5d53c0e5f98abe635e8184f
 AUX notepadqq-1.4.8-qt-5.11.patch 664 BLAKE2B 442012f9ad0046abf7ed6206d69db42b49b0f9d407ae99a4e7a6df0d5340dfadd664a3e8f97a90beb41014bba668174ca6090c9ad46dd090013ca3ffa07d03f5 SHA512 584e7f4c4032719c42eafcc9ff23031c7e980084aeac3044669a136be33ebc4fe0b6e6e61dbf1a70195953949ac05fae9150f97fb369bc9399ddae099a744549
 DIST notepadqq-1.2.0.tar.gz 2082931 BLAKE2B 41f81be45b5e36d58c2632fc9d03c6802b1a99f5ff9603682f3e1c6907143767f57034f053677d8edffae68a098ddf56d2b90e57fd9884442d80749a670f9d4a SHA512 4b6b3e646add4dc21b4d4ddecacefa59785e6525d52ecc17ca418ba14f38ef9024f48af6db3538d195327942971eb9ccf0b5567da58ba15facad332b47742717
 DIST notepadqq-1.4.8.tar.gz 4418925 BLAKE2B 91d993fd952609a7255c6541e97580b5dd01e6902cb6a84b77da7fbf8bc52a9a07ba85845d33e5801d539d8c560804b69947df965550dfb981e228330ea46ffd SHA512 fa1937b75a378fb81486a871a5b736f6ba216cd4b71f99e342e457de65ea034c2ee4d2c9f42754c4737671ccb1083fb1e6c946240ab2094042125430578141fa
-EBUILD notepadqq-1.2.0.ebuild 890 BLAKE2B 86363e195a2347add303903a1f9cf3930e0ad09549bc85d9b9dfe65a113c64cffac65a8b43b74458f6c9da6e80fee6252b0d3742f85384e0a5bb860cd92f3c95 SHA512 946d934e8d931a76bb5e958bfd7b46a2713229837a64059c9ea60e7ac790e777de41dc9f5e3cdb634d9ce424bf93942596ca7f16ec28ddc830cc868d85ab4078
-EBUILD notepadqq-1.4.8.ebuild 1051 BLAKE2B 54985b4b7040b5f3e424a5964862af89dd02c95f3ec37ed7a0b875cc0c613ee86c9b1197909376332aa8f7999eefc3280fbb4cd86e58f2d12c1b24df1703a6ef SHA512 670f79bcafc25bdb446bc01389407222a237594e8144a925fb6eb4be85cd4938bea673184b707bcdb7a5ae805547cfb064d4b520b200b89780e803248e99c4b2
-EBUILD notepadqq-9999.ebuild 1031 BLAKE2B 0a78f7bf57da204287bfcfc851937827020839bd8f44a3dacd4965de1b54f4b0811cc1e5057e0751cced0aa61cb7f113aed5a5dbaac87166221a1780b31a36ac SHA512 92cc2853f7324bbb185fce2db306c1ea557f26cb265b4795393b46862fe99646ebd7f65bb78ef4861e35e91ce4c2fd26bf24c222c70b8b0641fdb30a9edfdd62
+EBUILD notepadqq-1.2.0.ebuild 912 BLAKE2B 0d06d1b89f647f0ef9cd3d3faef6a3a15e02bf6f0b0b75fa9e687393c9813bfd2806ebef1bd94b75ab9391d22a00032e02493fb94cb6f4c0d549c9bff2862668 SHA512 c0e497538cdac45447ac12cf417be0f51d5a9b3af407e410529d66e9ed540aca513858ef81b733502bc463b6f2b5c650200adda77409e1bd8ab053a4236dba90
+EBUILD notepadqq-1.4.8.ebuild 1087 BLAKE2B 6fb6b740fd1b2424dd0397a8bea6a2d43725d20c787feea9331dbfa6b23d4328b6f072536ff1baf74ec3dcf19c586a40a6bd9dfc4c40ba957c7a17a2a3bcac12 SHA512 a3cf9675eb024f484278b9dc2166024f2b647d9d359af2dc3df1a0092617c7946eba2fba6effea6d2d6d4a96bf4e0af7cbef60adf40638e53d015b2c331f4b3a
+EBUILD notepadqq-9999.ebuild 1056 BLAKE2B cbf0476b6e53739fba402f439c8b77d312c68c5cab89beb7e13546d04e9c1bf9708217eb97c4d46cf5a27f59657bd3184a026f973df8d86729570fbb145e9a3a SHA512 6beecae8c53a76175ff08e2238223b226a68fb84af005a2d8272586031e41038eeed33ce154b13387367aeeae809388dc35bee31bc21ee4b365ae118be76a685
 MISC metadata.xml 345 BLAKE2B ae751443c2fd3565e979b52de96cb3804aa010a346fe4d404c2bf69f602a14d70e59af441caa25b5c8a2ed17fdc564539ee196366dc9ff290f7b756ec8121ddc SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033
diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch
new file mode 100644
index 000000000000..d0158c33527c
--- /dev/null
+++ b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch
@@ -0,0 +1,25 @@
+From 8d5dc3dfb279f8420457fbc04a3ff6fb5f3f8a21 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 26 Feb 2019 00:47:26 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (add missing QDateTime include)
+
+Downstream report: https://bugs.gentoo.org/668392
+---
+ src/ui/stats.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ui/stats.cpp b/src/ui/stats.cpp
+index 59837c9..e0f3cbd 100644
+--- a/src/ui/stats.cpp
++++ b/src/ui/stats.cpp
+@@ -3,6 +3,7 @@
+ #include <QNetworkAccessManager>
+ #include <QJsonDocument>
+ #include <QNetworkRequest>
++#include <QDateTime>
+ #include <QNetworkReply>
+ #include <QSysInfo>
+ #include <QTimer>
+-- 
+2.21.0
+
diff --git a/app-editors/notepadqq/notepadqq-1.2.0.ebuild b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
index cbebd28ae63f..ad4de06fd0d8 100644
--- a/app-editors/notepadqq/notepadqq-1.2.0.ebuild
+++ b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	dev-qt/linguist-tools:5
 	dev-qt/qtsvg:5
 "
 
diff --git a/app-editors/notepadqq/notepadqq-1.4.8.ebuild b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
index 0ce0b7273f52..810b3dd47740 100644
--- a/app-editors/notepadqq/notepadqq-1.4.8.ebuild
+++ b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,12 +27,12 @@ RDEPEND="
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
 	dev-qt/qtsvg:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+PATCHES=( "${FILESDIR}"/${P}-qt-5.11{,-QDateTime}.patch )
 
 src_prepare() {
 	default
diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild
index 8d386f10ca80..040e2d2a99b4 100644
--- a/app-editors/notepadqq/notepadqq-9999.ebuild
+++ b/app-editors/notepadqq/notepadqq-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils xdg-utils
 
@@ -30,6 +30,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	dev-qt/linguist-tools:5
 	dev-qt/qtsvg:5
 "