gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 20:56:41 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 20:56:41 +0100
commit: d87262dd706fec50cd150aab3e93883b6337466d (patch)
tree: 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-editors
parent: 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff)
647 files changed, 2234 insertions, 26601 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e2f31ab06431..d34212d94fc8 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/adie-1.7.54 b/app-editors/adie-1.7.54
new file mode 100644
index 000000000000..7f33a9777f41
--- /dev/null
+++ b/app-editors/adie-1.7.54
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=~x11-libs/fox-1.7.54 x11-libs/libICE x11-libs/libSM >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/reswrap >=sys-apps/sed-4
+DESCRIPTION=Text editor based on the FOX Toolkit
+EAPI=5
+HOMEPAGE=http://www.fox-toolkit.org/
+IUSE=debug doc profile
+KEYWORDS=~alpha amd64 hppa ppc ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=~x11-libs/fox-1.7.54 x11-libs/libICE x11-libs/libSM
+SLOT=0
+SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.54.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fox	7c70615c3c15c50eb1025055fef16df4	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e33e613327ce852b08c0a715df4cd99b
diff --git a/app-editors/adie/Manifest b/app-editors/adie/Manifest
deleted file mode 100644
index 2891c5775ad4..000000000000
--- a/app-editors/adie/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fox-1.7.54.tar.gz 5384000 BLAKE2B 8970872d1c626d7ac5b0f944e8ea26a29bb757e4c646116016eaa1eccc2c0328c5047438e87fb6c2deab0a65e2b34cc91e8458150329a3e574e93608694a2dec SHA512 cf14a09f9a6a812ac87839a5df8fd68f693e59050695e8da5dbfe018676f29bc263e4f9208dc06419068e4140b826a0dcf70a8925fec379edf3e4d0d0b693795
-EBUILD adie-1.7.54.ebuild 347 BLAKE2B 909982a7bb692feb5260227ad7970ec7e3ce22fedfd3fdb1b066fc737d95188031bcc1b72cc9616f08ca13360cc52d819427668947d4f0dd82366c890b570ef3 SHA512 5dd43892dfee84b23db51c8d7a62d6c01dc830afcda09e5a5d6017d08eb7d658065d0da46600673ed9cf7137d510e4f4f2fccfe398fc4fd9840420940d7a811b
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-editors/adie/adie-1.7.54.ebuild b/app-editors/adie/adie-1.7.54.ebuild
deleted file mode 100644
index 881aab887552..000000000000
--- a/app-editors/adie/adie-1.7.54.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fox
-
-DESCRIPTION="Text editor based on the FOX Toolkit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="~x11-libs/fox-${PV}
-	x11-libs/libICE
-	x11-libs/libSM"
-RDEPEND="${DEPEND}"
diff --git a/app-editors/adie/metadata.xml b/app-editors/adie/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/app-editors/adie/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/app-editors/aee-2.2.15b b/app-editors/aee-2.2.15b
new file mode 100644
index 000000000000..59d8bf5430e7
--- /dev/null
+++ b/app-editors/aee-2.2.15b
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=X? ( x11-libs/libX11 )
+DESCRIPTION=An easy to use text editor
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=X
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=Artistic
+RDEPEND=X? ( x11-libs/libX11 )
+SLOT=0
+SRC_URI=mirror://gentoo/aee-2.2.15b.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=2d0c5046915f0ac09912e1e85e0476c1
diff --git a/app-editors/aee-2.2.21 b/app-editors/aee-2.2.21
new file mode 100644
index 000000000000..b150d191b186
--- /dev/null
+++ b/app-editors/aee-2.2.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=X? ( x11-libs/libX11 )
+DESCRIPTION=An easy to use text editor
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=X
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=Artistic
+RDEPEND=X? ( x11-libs/libX11 )
+SLOT=0
+SRC_URI=mirror://gentoo/aee-2.2.21.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=fe2203c51a4c84d44dea377ff5c7ee6b
diff --git a/app-editors/aee/Manifest b/app-editors/aee/Manifest
deleted file mode 100644
index 4e159b21105e..000000000000
--- a/app-editors/aee/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX aee-2.2.15b-ae-location.patch 2656 BLAKE2B 249d858c5ca410b422d73f5932b13cc9a9ea007e1099e6a8e9f81e7f8a0ef6cb835ada70f14b1ae6178e761a661d783f42d77b2168be328635b51bfe61a9dc32 SHA512 1de3fa054e64f24cf45bf89dba133c60f24a79b8ce6abce7ad4ede595110cfda22121fa636f8d2c48866e68175008505299fc5e020d834e413eb34859711b313
-AUX aee-Wformat-security.patch 225 BLAKE2B 0e3846a9e616ed9cef7a9f2b01bf6f71f080d8817010e6befb89cbbda28fa3f8c85f47f9f6f3c06236da64d0110dd8d3426ee7c6fb646398467b493564d50fae SHA512 bc2647b6e29ed039dd683c15001f7ee992091221ee9851bd302c066ce7c49ca6bcf01ef5eb111b6d998804074855eea497284a579835e3d335d7bfe422dad190
-AUX aee-ae-location.patch 2755 BLAKE2B 8b75ee712b5f717c82a073c0e35ceccdc0ed27d6b9c8f64841d6c246cd6761b5d42d121e78374029b0c0252c479ca56ab072c7612d0ef758641cefb1d32459f9 SHA512 48ded083b407d1fb94764967358dc6c858421a3586e56fca1803980912b90404dcbfcadfc5a041b0959e2e10b3a5224751671ec067687b2e361eb2e27eb86cfa
-DIST aee-2.2.15b.tar.gz 184218 BLAKE2B f249c0974a971aa6a1bb38afb8675a3ace671d244c717add4ea2f724ac1d07bf1c57c5d27fb6f9f40f27b3055ba94cf959dd4b855181a83f4522c44124c0b994 SHA512 2810cd8f5148edb352fdaefbc823d417b9a83c8083644c8729be8595013ca8ba660bd72120db1e15915e454f5185d2d030c2f0c853b37eb83c213c1d581a640f
-DIST aee-2.2.21.tar.gz 186304 BLAKE2B 2d41678e07f6590023f428e042686c92377200826f86ebb28fe93ec1e5f07290de6eef765dbae91efcef01d32896127c044f20c204b50ed50894fd743cb1fc19 SHA512 c052ef97b18fa9900e9bf0c5894e05cbbf775d7de4ad4c14cb9e3e7758983c84e4768995a98398c05e30173464e6f7994e7f476522a314bc25dac5a84831155a
-EBUILD aee-2.2.15b.ebuild 1224 BLAKE2B 245976628269fd328d3923a0e302d42a2fc93168efc4c308749d4b95b6005dceec491d587aea9ab182b95cfd096470a8d1852f8096165e6da7526ac9b1742b1a SHA512 0a8047efc8c58561e49c186b96035c9c8b340194c7332efdc52fe6ba578f9960161d2500abb0a898176ad685b4267f0f8d287374307e5505794edfb13fc32247
-EBUILD aee-2.2.21.ebuild 1227 BLAKE2B 097ed3e56e30e7b73782dad3c195ce182c13acd3a4e765f6816d31b9dd4f0d47984edcb0c6c55f229e15d2ad4a036ff0bd41a4dd9cfbadd61633b60c582f394f SHA512 8d7f1abfaa36cc1cbd4e7bb170e1fd9e938956e050fb03b0452dc04e9aded3052c5db92b674f5f78ac990756ceda6ef42c9a675414543ffecff74a52b3f3d9fb
-MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/app-editors/aee/aee-2.2.15b.ebuild b/app-editors/aee/aee-2.2.15b.ebuild
deleted file mode 100644
index bbd9266d8086..000000000000
--- a/app-editors/aee/aee-2.2.15b.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy to use text editor"
-#HOMEPAGE="http://mahon.cwx.net/ http://www.users.uswest.net/~hmahon/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ae-location.patch
-	"${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
-
-src_prepare() {
-	sed -i \
-		-e "s/make -/\$(MAKE) -/g" \
-		-e "/^buildaee/s/$/ localaee/" \
-		-e "/^buildxae/s/$/ localxae/" \
-		Makefile
-
-	sed -i \
-		-e "s/\([\t ]\)cc /\1\\\\\$(CC) /" \
-		-e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \
-		-e "/other_cflag/s/ \${strip_option}//" \
-		create.mk.{aee,xae}
-
-	default
-}
-
-src_compile() {
-	local target="aee"
-	use X && target="both"
-
-	emake CC="$(tc-getCC)" ${target}
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/rae
-	doman ${PN}.1
-	einstalldocs
-
-	insinto /usr/share/${PN}
-	doins help.ae
-
-	if use X; then
-		dobin xae
-		dosym xae /usr/bin/rxae
-	fi
-}
diff --git a/app-editors/aee/aee-2.2.21.ebuild b/app-editors/aee/aee-2.2.21.ebuild
deleted file mode 100644
index 763b9cf91901..000000000000
--- a/app-editors/aee/aee-2.2.21.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy to use text editor"
-#HOMEPAGE="http://mahon.cwx.net/ http://www.users.uswest.net/~hmahon/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-ae-location.patch
-	"${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
-
-src_prepare() {
-	sed -i \
-		-e "s/make -/\$(MAKE) -/g" \
-		-e "/^buildaee/s/$/ localaee/" \
-		-e "/^buildxae/s/$/ localxae/" \
-		Makefile
-
-	sed -i \
-		-e "s/\([\t ]\)cc /\1\\\\\$(CC) /" \
-		-e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \
-		-e "/other_cflag/s/ \${strip_option}//" \
-		create.mk.{aee,xae}
-
-	default
-}
-
-src_compile() {
-	local target="aee"
-	use X && target="both"
-
-	emake CC="$(tc-getCC)" ${target}
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/rae
-	doman ${PN}.1
-	einstalldocs
-
-	insinto /usr/share/${PN}
-	doins help.ae
-
-	if use X; then
-		dobin xae
-		dosym xae /usr/bin/rxae
-	fi
-}
diff --git a/app-editors/aee/files/aee-2.2.15b-ae-location.patch b/app-editors/aee/files/aee-2.2.15b-ae-location.patch
deleted file mode 100644
index 4a17642b915d..000000000000
--- a/app-editors/aee/files/aee-2.2.15b-ae-location.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/aee.1
-+++ b/aee.1
-@@ -678,7 +678,7 @@
- .\"
- .SS Initializing aee From A File
- .PP 
--\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/local/lib\fR, 
-+\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/share/aee\fR, 
- .I .init.ae 
- in the user's home directory, then for \fI.init.ae\fR in the 
- current directory.  (This file may be created manually or by using the 
-@@ -960,7 +960,7 @@
- .PP
- On-line help is provided through the 'help' command or menu item.  This 
- command uses a file with help information.  By default the help file is 
--located in \fB/usr/local/lib/help.ae\fR, but this file may be located 
-+located in \fB/usr/share/aee/help.ae\fR, but this file may be located 
- in the user's home directory with the name \fB.help.ae\fR, or in the 
- current directory with the name \fBhelp.ae\fR.
- .\"
-@@ -1017,7 +1017,7 @@
- .\"
- .SH FILES
- .PP
--.I /usr/local/lib/init.ae
-+.I /usr/share/aee/init.ae
- .br
- .I $HOME/.aeeinfo
- .br
---- a/aee.c
-+++ b/aee.c
-@@ -2612,7 +2612,7 @@
- 
- char *init_name[4] = {
- 	"/usr/local/aee/init.ae", 
--	"/usr/local/lib/init.ae", 
-+	"/usr/share/aee/init.ae", 
- 	NULL, 
- 	".init.ae"
- 	};
---- a/aee.msg
-+++ b/aee.msg
-@@ -2,7 +2,7 @@
- $ 
- $set 1
- $quote "
--1 "/usr/local/lib/help.ae"
-+1 "/usr/share/aee/help.ae"
- 2 "main"
- 3 "modes menu"
- 4 "tabs to spaces        " 
---- a/help.ae
-+++ b/help.ae
-@@ -1058,11 +1058,11 @@
- 
- 	The file 'init.ae' may be used to set parameters and define keys to 
- perform certain functions within ae.  This file may reside in three 
--locations: /usr/local/lib/init.ae, .init.ae in your home directory, and 
-+locations: /usr/share/aee/init.ae, .init.ae in your home directory, and 
- .init.ae in the current working directory.
- 
-         First, aee checks for a system level initialization file, located in 
--/usr/local/lib.  Next the user's home directory is checked for a file named 
-+/usr/share/aee.  Next the user's home directory is checked for a file named 
- .init.ae, then the current directory.  The settings from each file are read, 
- so that the directives from the most recently read file will take precedence 
- over previously read files.  This allows, for example, the .init.ae file in 
---- a/help.c
-+++ b/help.c
-@@ -12,7 +12,7 @@
- 
- char *help_file_list[4] = {
- 	"/usr/local/aee/help.ae", 
--	"/usr/local/lib/help.ae", 
-+	"/usr/share/aee/help.ae", 
- 	"~/.help.ae", 
- 	"help.ae" 
- 	};
---- a/localize.c
-+++ b/localize.c
-@@ -64,7 +64,7 @@
- 	catalog = catopen("aee", 0);
- #endif /* NO_CATGETS */
- 
--	ae_help_file = catgetlocal( 1, "/usr/local/lib/help.ae");
-+	ae_help_file = catgetlocal( 1, "/usr/share/aee/help.ae");
- 	main_buffer_name = catgetlocal( 2, "main");
- 
- 
diff --git a/app-editors/aee/files/aee-Wformat-security.patch b/app-editors/aee/files/aee-Wformat-security.patch
deleted file mode 100644
index 7bc4c9c39fa1..000000000000
--- a/app-editors/aee/files/aee-Wformat-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/aee.c
-+++ b/aee.c
-@@ -2493,7 +2493,7 @@
- 	}
- 	if (shell_fork)
- 	{
--		printf(press_ret_to_cont_str);
-+		printf("%s", press_ret_to_cont_str);
- 		fflush(stdout);
- 		while (((in = getchar()) != '\n') && (in != '\r'))
- 			;
diff --git a/app-editors/aee/files/aee-ae-location.patch b/app-editors/aee/files/aee-ae-location.patch
deleted file mode 100644
index eb598cc7be38..000000000000
--- a/app-editors/aee/files/aee-ae-location.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/aee.1
-+++ b/aee.1
-@@ -680,7 +680,7 @@
- .\"
- .SS Initializing aee From A File
- .PP 
--\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/local/lib\fR, 
-+\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/share/aee\fR, 
- .I .init.ae 
- in the user's home directory, then for \fI.init.ae\fR in the 
- current directory.  (This file may be created manually or by using the 
-@@ -962,7 +962,7 @@
- .PP
- On-line help is provided through the 'help' command or menu item.  This 
- command uses a file with help information.  By default the help file is 
--located in \fB/usr/local/lib/help.ae\fR, but this file may be located 
-+located in \fB/usr/share/aee/help.ae\fR, but this file may be located 
- in the user's home directory with the name \fB.help.ae\fR, or in the 
- current directory with the name \fBhelp.ae\fR.
- .\"
-@@ -1019,7 +1019,7 @@
- .\"
- .SH FILES
- .PP
--.I /usr/local/lib/init.ae
-+.I /usr/share/aee/init.ae
- .br
- .I $HOME/.aeeinfo
- .br
---- a/aee.c
-+++ b/aee.c
-@@ -2628,7 +2628,7 @@
- 
- char *init_name[6] = {
- 	"/usr/local/aee/init.ae", 
--	"/usr/local/lib/init.ae", 
-+	"/usr/share/aee/init.ae", 
- 	NULL,                           /* to be ~/.init.ae */
- 	".init.ae",
- 	NULL,                           /* to be ~/.aeerc */
---- a/aee.msg
-+++ b/aee.msg
-@@ -2,7 +2,7 @@
- $ 
- $set 1
- $quote "
--1 "/usr/local/lib/help.ae"
-+1 "/usr/share/aee/help.ae"
- 2 "main"
- 3 "modes menu"
- 4 "tabs to spaces        " 
---- a/help.ae
-+++ b/help.ae
-@@ -1058,11 +1058,11 @@
- 
- 	The file 'init.ae' may be used to set parameters and define keys to 
- perform certain functions within ae.  This file may reside in three 
--locations: /usr/local/lib/init.ae, .init.ae in your home directory, and 
-+locations: /usr/share/aee/init.ae, .init.ae in your home directory, and 
- .init.ae in the current working directory.
- 
-         First, aee checks for a system level initialization file, located in 
--/usr/local/lib.  Next the user's home directory is checked for a file named 
-+/usr/share/aee.  Next the user's home directory is checked for a file named 
- .init.ae, then the current directory.  The settings from each file are read, 
- so that the directives from the most recently read file will take precedence 
- over previously read files.  This allows, for example, the .init.ae file in 
---- a/help.c
-+++ b/help.c
-@@ -12,7 +12,7 @@
- 
- char *help_file_list[4] = {
- 	"/usr/local/aee/help.ae", 
--	"/usr/local/lib/help.ae", 
-+	"/usr/share/aee/help.ae", 
- 	"~/.help.ae", 
- 	"help.ae" 
- 	};
---- a/localize.c
-+++ b/localize.c
-@@ -64,7 +64,7 @@
- 	catalog = catopen("aee", 0);
- #endif /* NO_CATGETS */
- 
--	ae_help_file = catgetlocal( 1, "/usr/local/lib/help.ae");
-+	ae_help_file = catgetlocal( 1, "/usr/share/aee/help.ae");
- 	main_buffer_name = catgetlocal( 2, "main");
- 
- 
diff --git a/app-editors/aee/metadata.xml b/app-editors/aee/metadata.xml
deleted file mode 100644
index 21dc8fdf43ff..000000000000
--- a/app-editors/aee/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>hattya@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-editors/amyedit-1.0-r2 b/app-editors/amyedit-1.0-r2
new file mode 100644
index 000000000000..c5b87a5453ba
--- /dev/null
+++ b/app-editors/amyedit-1.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=>=dev-cpp/gtkmm-2.6:2.4 >=dev-cpp/glibmm-2.14:2 >=dev-libs/libsigc++-2.2 x11-libs/gtksourceview:2.0 dev-cpp/gtksourceviewmm:2.0 app-text/aspell dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=AmyEdit is a LaTeX editor
+EAPI=5
+HOMEPAGE=http://amyedit.sf.net
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-cpp/gtkmm-2.6:2.4 >=dev-cpp/glibmm-2.14:2 >=dev-libs/libsigc++-2.2 x11-libs/gtksourceview:2.0 dev-cpp/gtksourceviewmm:2.0 app-text/aspell
+SLOT=0
+SRC_URI=mirror://sourceforge/amyedit/amyedit-1.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=102d47c69916076137b21e95b47b086c
diff --git a/app-editors/amyedit/Manifest b/app-editors/amyedit/Manifest
deleted file mode 100644
index 065cbbae9055..000000000000
--- a/app-editors/amyedit/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX amyedit-1.0-gcc45.patch 675 BLAKE2B 9df4b7bedfef1aefb8ac7965ed0a18a9a80d714c88ea34ce198b591203699f57a12e37cf30d7f8bc3fb94e818651a1fa4ba5d97c94e36404ca24e75aa0f7fff1 SHA512 5101dcd96f96f7f643001a03db4a7cb149568a689683c4faf13e82d948364b19fd0fff4bfbbd7efcab88392a5c0d51e0826ca8117b76032dc351f25694391b89
-AUX amyedit-1.0-keyfile.patch 2123 BLAKE2B 0993a38d306a58b2aa020ba010baab9dfb12bc16dcb3f01327ead7c01be229514dd591dea791d798e8de34f2e0869a3d5b49a76e578c3249afb8b0fea96bd325 SHA512 1fa4267c81d357294210cd3c1018a788cacc3e407cde8b566a9f3ff9bbfc69c54fa9cc80f4f21e377279f7c4886b39c6a53c9329ac28a85723f5c8fbe03b0cd1
-AUX amyedit-1.0-signal.patch 3142 BLAKE2B 3df4279c6fa734033604ca1fccfa9ae01b025f465b788bd29cc32f536c4b3d5b70468a9c916a0acb959959daa1967d151f67884846559fde0fb768039e856015 SHA512 b288592a941af8e7be3897f88dd51911560bb60e702a0a846eeca77b2d116b393e2a5bab278c2264a555e6b273a38ab972050db842d37fa958e3fc78e09d5b5c
-AUX amyedit-1.0-sourceviewmm2.patch 12144 BLAKE2B e2e85fda6e08341be23dd470b0f9bf7c60d3789443a4462ee20d8c3a1b02d0e6df96165840bd2432ccfc242c147562ad3029ac35a36c63dde5bcaf9c8aee96cc SHA512 4c17617635765050edb64676f61a9d801747a50b38b66d4bb2dcf528e6ba10e4375c72008b6f84d620d2ffabe647dec33a51fa1c950be1179456df4eb0db1070
-DIST amyedit-1.0.tar.bz2 297769 BLAKE2B 9b3640db7f56bc6e5481b46f760e682cedc860e9439a55edcd45b9f1ec0a8dbead3f8f1075c2613da9842a590b56375fde8b3d36c98c813d400960a4d98fdbda SHA512 dce101c5d356cd194703798002c29772b7b7339a97f683ba7459e983988f26722f800a2c36a0c36bdea70a35c8398bc55b5215b4c30779ca22b5f25bbfedbe09
-EBUILD amyedit-1.0-r2.ebuild 861 BLAKE2B 423658d7bd81b2eaba18eca9d4c5f4fec82ef09cb38c5a293f089a1f588c4819958629437290eec93ab2a886ac2b1742cd9d03abcc244be92746542326627add SHA512 6436e72583bc912ce254b6a3b00086974be68391f3e5c0b015357578b91412b7e2b89b532811969f0b7e304fe6327f24400243eb544df57c044e2625d01d494a
-MISC metadata.xml 336 BLAKE2B d268a52e6363ffccd9760188df301cde94def002e716452837b61e396192b1e934a671eaaf5cc4ae38e9e9b6946fb5ecf7350fb767a169a7a922d6cd116b4783 SHA512 93c12ff67fc6038a20615e27eaa2df0d9c02d4a9d15fa92e26ba4158872d60d9876e7caa3b0e970d90e86f5985f7f890f926ec6fc4420f06d53efec27db8e85e
diff --git a/app-editors/amyedit/amyedit-1.0-r2.ebuild b/app-editors/amyedit/amyedit-1.0-r2.ebuild
deleted file mode 100644
index 91c331ece325..000000000000
--- a/app-editors/amyedit/amyedit-1.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION=" AmyEdit is a LaTeX editor"
-HOMEPAGE="http://amyedit.sf.net"
-SRC_URI="mirror://sourceforge/amyedit/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-RDEPEND=">=dev-cpp/gtkmm-2.6:2.4
-	>=dev-cpp/glibmm-2.14:2
-	>=dev-libs/libsigc++-2.2
-	x11-libs/gtksourceview:2.0
-	dev-cpp/gtksourceviewmm:2.0
-	app-text/aspell"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-keyfile.patch"
-	epatch "${FILESDIR}/${P}-signal.patch"
-	epatch "${FILESDIR}/${P}-gcc45.patch"
-	epatch "${FILESDIR}/${P}-sourceviewmm2.patch"
-	rm -rf "${S}/src/gtksourceviewmm" || die
-	append-cxxflags -std=c++11
-	mv configure.in configure.ac || die
-	eautoreconf
-}
diff --git a/app-editors/amyedit/files/amyedit-1.0-gcc45.patch b/app-editors/amyedit/files/amyedit-1.0-gcc45.patch
deleted file mode 100644
index 16db9fd415f5..000000000000
--- a/app-editors/amyedit/files/amyedit-1.0-gcc45.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build with gcc 4.5
-https://bugs.gentoo.org/show_bug.cgi?id=321293
-
-Index: amyedit-1.0/src/Preferences.cc
-===================================================================
---- amyedit-1.0.orig/src/Preferences.cc
-+++ amyedit-1.0/src/Preferences.cc
-@@ -211,7 +211,7 @@ int Preferences::run()
- }
- 
- void Preferences::edit_latex_commands(){
--	EditLatexCommands::EditLatexCommands dialog(this);
-+	EditLatexCommands dialog(this);
- 	dialog.run();
- 	Amy::populate_text_list_model_from_list(previewoptionslist->get_model(), PrefStruct::instance()->get_keys("Commands"), true);
- 	previewoptionslist->select(PrefStruct::instance()->get<Glib::ustring>("General", "preview_combo"));
diff --git a/app-editors/amyedit/files/amyedit-1.0-keyfile.patch b/app-editors/amyedit/files/amyedit-1.0-keyfile.patch
deleted file mode 100644
index fb9f9ac908fc..000000000000
--- a/app-editors/amyedit/files/amyedit-1.0-keyfile.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ur amyedit-1.0/src/main.cc amyedit-1.0.new/src/main.cc
---- amyedit-1.0/src/main.cc	2006-03-14 06:08:32.000000000 +0700
-+++ amyedit-1.0.new/src/main.cc	2008-01-07 20:45:39.000000000 +0700
-@@ -54,7 +54,6 @@
- 
- #include "AmyEdit.hh"
- #include "gtksourceviewmm/init.hh"
--#include "gtkmm_extra/keyfile.h"
- #include "Utils.hh"
- 
- int main(int argc, char **argv)
-@@ -65,7 +64,6 @@
- 	
- 	Gtk::Main m(&argc, &argv);
- 	Gtk::SourceViewmm_init();
--	Glib::keyfile_init();
- 
- 	/* TODO This should probably be removed and created on demand */
- 	
-Only in amyedit-1.0.new/src: main.o
-Only in amyedit-1.0.new/src: Makefile
-diff -ur amyedit-1.0/src/Makefile.am amyedit-1.0.new/src/Makefile.am
---- amyedit-1.0/src/Makefile.am	2006-03-08 05:44:53.000000000 +0700
-+++ amyedit-1.0.new/src/Makefile.am	2008-01-07 20:41:46.000000000 +0700
-@@ -30,8 +30,7 @@
- 		gtksourceviewmm/sourcelanguage.cpp           \
- 		gtksourceviewmm/sourcelanguagesmanager.cpp   \
- 		gtksourceviewmm/sourceview.cpp               \
--		gtksourceviewmm/init.cc                      \
--		gtkmm_extra/keyfile.cc
-+		gtksourceviewmm/init.cc
- 
- headers =  \
- 		AboutDialog.hh               \
-@@ -54,15 +53,13 @@
- 		gtksourceviewmm/sourcelanguage.h            \
- 		gtksourceviewmm/sourcelanguagesmanager.h    \
- 		gtksourceviewmm/sourceview.h                \
--		gtksourceviewmm/init.hh                     \
--		gtkmm_extra/keyfile.h
-+		gtksourceviewmm/init.hh
- 
- privateheaders=  \
- 		gtksourceviewmm/private/sourcebuffer_p.h            \
- 		gtksourceviewmm/private/sourcelanguage_p.h          \
- 		gtksourceviewmm/private/sourcelanguagesmanager_p.h  \
- 		gtksourceviewmm/private/sourceview_p.h              \
--		gtkmm_extra/private/keyfile_p.h                     \
- 		Utils_p.hh
- 
- if PRECOMPILE_HEADERS
-diff -ur amyedit-1.0/src/PrefStruct.hh amyedit-1.0.new/src/PrefStruct.hh
---- amyedit-1.0/src/PrefStruct.hh	2006-03-09 06:54:41.000000000 +0700
-+++ amyedit-1.0.new/src/PrefStruct.hh	2008-01-07 20:46:32.000000000 +0700
-@@ -24,7 +24,6 @@
- 
- #include "Preferences.hh"
- #include <glibmm/ustring.h>
--#include <gtkmm_extra/keyfile.h>
- #include <iostream>
- 
- class PrefStruct 
diff --git a/app-editors/amyedit/files/amyedit-1.0-signal.patch b/app-editors/amyedit/files/amyedit-1.0-signal.patch
deleted file mode 100644
index d0f4df521cb6..000000000000
--- a/app-editors/amyedit/files/amyedit-1.0-signal.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Naur amyeditbroken/src/AmyEdit.cc amyedit-1.0/src/AmyEdit.cc
---- amyeditbroken/src/AmyEdit.cc	2006-03-13 22:13:08.000000000 +0100
-+++ amyedit-1.0/src/AmyEdit.cc	2008-07-12 05:07:43.965608312 +0200
-@@ -65,9 +65,9 @@
- 
- /* My Signals */
- // signals when there is a file available
--SigC::Signal1<void,bool> signal_file_open;
-+sigc::signal1<void,bool> signal_file_open;
- // signals an update to preferences
--SigC::Signal0<void> signal_preferences_update;
-+sigc::signal0<void> signal_preferences_update;
- /**************/
- 
- AmyEdit* AmyEdit::smInstance=NULL;
-diff -Naur amyeditbroken/src/EditTabs.cc amyedit-1.0/src/EditTabs.cc
---- amyeditbroken/src/EditTabs.cc	2006-03-13 22:25:53.000000000 +0100
-+++ amyedit-1.0/src/EditTabs.cc	2008-07-12 05:08:41.022094749 +0200
-@@ -76,7 +76,7 @@
- 	set_tab_pos(Gtk::POS_TOP);
- 	set_scrollable(true);
- 
--	extern SigC::Signal0<void> signal_preferences_update;
-+	extern sigc::signal0<void> signal_preferences_update;
- 
- 	signal_switch_page().connect(sigc::mem_fun(*this, &EditTabs::on_switching_page));
- 	signal_preferences_update.connect(sigc::mem_fun(*this, &EditTabs::on_preferences_update));
-@@ -414,7 +414,7 @@
- 
- bool EditTabs::CloseTab(int tab)
- {
--	extern SigC::Signal1<void,bool> signal_file_open;
-+	extern sigc::signal1<void,bool> signal_file_open;
- 
- 	if (tab<0)
- 		tab=get_current_page();
-@@ -686,8 +686,8 @@
- 
- void EditTabs::on_switching_page(GtkNotebookPage *page, guint number)
- {
--	extern SigC::Signal1<void, int> signal_line_set;
--	extern SigC::Signal1<void, bool> signal_file_open;
-+	extern sigc::signal1<void, int> signal_line_set;
-+	extern sigc::signal1<void, bool> signal_file_open;
- 	Page *curtab = get_current_tab();
- 
- 	if (curtab)
-@@ -735,7 +735,7 @@
- 
- 	on_preferences_update();
- 
--	extern SigC::Signal0<void> signal_preferences_update;
-+	extern sigc::signal0<void> signal_preferences_update;
- 	get_buffer()->signal_modified_changed().connect(sigc::mem_fun(*this, &EditTabs::Page::on_modified_changed));
- 	get_buffer()->signal_changed().connect(sigc::mem_fun(*this, &EditTabs::Page::on_changed));
- 	get_buffer()->signal_mark_set().connect(sigc::mem_fun(*this, &EditTabs::Page::on_mark_changed));
-@@ -815,7 +815,7 @@
- 
- void EditTabs::Page::on_changed()
- {
--	extern SigC::Signal1<void, int> signal_line_set;
-+	extern sigc::signal1<void, int> signal_line_set;
- 	signal_line_set(get_buffer()->get_insert()->get_iter().get_line());
- 
- }
-@@ -823,7 +823,7 @@
- void EditTabs::Page::on_mark_changed(Gtk::SourceBuffer::iterator iter, Glib::RefPtr<Gtk::SourceBuffer::Mark> mark){
- 	if (mark->get_name()=="insert")
- 	{
--		extern SigC::Signal1<void, int> signal_line_set;
-+		extern sigc::signal1<void, int> signal_line_set;
- 
- 		signal_line_set(get_buffer()->get_insert()->get_iter().get_line());
- 
-diff -Naur amyeditbroken/src/StatusBar.cc amyedit-1.0/src/StatusBar.cc
---- amyeditbroken/src/StatusBar.cc	2005-12-17 15:56:47.000000000 +0100
-+++ amyedit-1.0/src/StatusBar.cc	2008-07-12 05:09:14.020602906 +0200
-@@ -50,7 +50,7 @@
- #include "StatusBar.hh"
- #include "Utils.hh"
- 
--SigC::Signal1<void, int> signal_line_set;
-+sigc::signal1<void, int> signal_line_set;
- 
- StatusBar::StatusBar()
- {
diff --git a/app-editors/amyedit/files/amyedit-1.0-sourceviewmm2.patch b/app-editors/amyedit/files/amyedit-1.0-sourceviewmm2.patch
deleted file mode 100644
index 31b7882b3ba5..000000000000
--- a/app-editors/amyedit/files/amyedit-1.0-sourceviewmm2.patch
+++ /dev/null
@@ -1,331 +0,0 @@
-Index: amyedit-1.0/configure.in
-===================================================================
---- amyedit-1.0.orig/configure.in
-+++ amyedit-1.0/configure.in
-@@ -36,7 +36,7 @@ AC_ARG_ENABLE(precompiled-headers,
- AM_CONDITIONAL(PRECOMPILE_HEADERS, test x$enable_precompiled_headers = xyes)
- 
- AC_CHECK_LIB([aspell], [new_aspell_config])
--PKG_CHECK_MODULES(AMYEDIT, gtkmm-2.4 >= 2.6 gtksourceview-1.0)
-+PKG_CHECK_MODULES(AMYEDIT, gtkmm-2.4 >= 2.6 gtksourceview-2.0 gtksourceviewmm-2.0)
- AC_SUBST(AMYEDIT_CFLAGS)
- AC_SUBST(AMYEDIT_LIBS)
- 
-Index: amyedit-1.0/src/Makefile.am
-===================================================================
---- amyedit-1.0.orig/src/Makefile.am
-+++ amyedit-1.0/src/Makefile.am
-@@ -25,12 +25,7 @@ sources = \
- 		TextListViewComboBox.cc      \
- 		TextListViewListBox.cc       \
- 		Utils.cc                     \
--		main.cc                      \
--		gtksourceviewmm/sourcebuffer.cpp             \
--		gtksourceviewmm/sourcelanguage.cpp           \
--		gtksourceviewmm/sourcelanguagesmanager.cpp   \
--		gtksourceviewmm/sourceview.cpp               \
--		gtksourceviewmm/init.cc
-+		main.cc                      
- 
- headers =  \
- 		AboutDialog.hh               \
-@@ -48,18 +43,9 @@ headers =  \
- 		TextListModel.hh             \
- 		TextListViewComboBox.hh      \
- 		TextListViewListBox.hh    \
--		Utils.hh                     \
--		gtksourceviewmm/sourcebuffer.h              \
--		gtksourceviewmm/sourcelanguage.h            \
--		gtksourceviewmm/sourcelanguagesmanager.h    \
--		gtksourceviewmm/sourceview.h                \
--		gtksourceviewmm/init.hh
-+		Utils.hh                     
- 
- privateheaders=  \
--		gtksourceviewmm/private/sourcebuffer_p.h            \
--		gtksourceviewmm/private/sourcelanguage_p.h          \
--		gtksourceviewmm/private/sourcelanguagesmanager_p.h  \
--		gtksourceviewmm/private/sourceview_p.h              \
- 		Utils_p.hh
- 
- if PRECOMPILE_HEADERS
-Index: amyedit-1.0/src/EditTabs.cc
-===================================================================
---- amyedit-1.0.orig/src/EditTabs.cc
-+++ amyedit-1.0/src/EditTabs.cc
-@@ -57,8 +57,8 @@ Foundation, Inc., 59 Temple Place, Suite
- 
- #include <gtksourceview/gtksourcebuffer.h>
- #include <gtksourceviewmm/sourcelanguage.h>
--#include <gtksourceviewmm/sourcelanguagesmanager.h>
--#include <gtksourceview/gtksourcelanguagesmanager.h>
-+#include <gtksourceviewmm/sourcelanguagemanager.h>
-+#include <gtksourceview/gtksourcelanguagemanager.h>
- #include <gtksourceview/gtksourceiter.h>
- 
- #include <gtkmm/stock.h>
-@@ -161,7 +161,7 @@ void EditTabs::OpenTab(Glib::ustring fil
- 	{
- 		try 
- 		{
--			Glib::RefPtr<Gtk::SourceBuffer> buffer = is_buffer_open(filename);
-+			Glib::RefPtr<gtksourceview::SourceBuffer> buffer = is_buffer_open(filename);
- 			Page *newpage;	
- 
- 			if (buffer){
-@@ -553,16 +553,15 @@ Glib::ustring EditTabs::GetUntitledTabNa
- 
- void EditTabs::Undo()
- {
--	Glib::RefPtr<Gtk::SourceBuffer> buffer = get_current_view()->get_buffer();
-+	Glib::RefPtr<gtksourceview::SourceBuffer> buffer = Glib::RefPtr<gtksourceview::SourceBuffer>::cast_static(get_current_view()->get_buffer());
- 	if (buffer->can_undo ())
- 		buffer->undo ();
- 
- }
- 
--
- void EditTabs::Redo()
- {
--	Glib::RefPtr<Gtk::SourceBuffer> buffer = get_current_view()->get_buffer();
-+	Glib::RefPtr<gtksourceview::SourceBuffer> buffer = Glib::RefPtr<gtksourceview::SourceBuffer>::cast_static(get_current_view()->get_buffer());
- 	if (buffer->can_redo ())
- 		buffer->redo ();
- 
-@@ -625,10 +624,10 @@ void EditTabs::FindNext()
- 	Page *curtab = get_current_tab();
- 	if (curtab)
- 	{
--		Glib::RefPtr<Gtk::SourceBuffer::Mark> cursor=curtab->get_buffer()->get_insert();
--		Gtk::SourceBuffer::iterator start, end;
-+		Glib::RefPtr<gtksourceview::SourceBuffer::Mark> cursor=curtab->get_buffer()->get_insert();
-+		gtksourceview::SourceBuffer::iterator start, end;
- 		GtkTextIter climit;
--		Gtk::SourceBuffer::iterator limit(&climit);
-+		gtksourceview::SourceBuffer::iterator limit(&climit);
- 		FindDialog fdialog;
- 		int result;
- 		do
-@@ -648,7 +647,7 @@ void EditTabs::FindNext()
- 				if(gtk_source_iter_forward_search(cursor->get_iter().gobj(),fdialog.get_text().c_str(),fdialog.get_flags(),start.gobj(),end.gobj(),0))
- 				{
- 					curtab->get_buffer()->select_range(end, start);
--					(static_cast<Gtk::SourceView*>(curtab->get_child()))->scroll_to(end);
-+					(static_cast<gtksourceview::SourceView*>(curtab->get_child()))->scroll_to(end);
- 				}
- 				else
- 				{
-@@ -701,7 +700,7 @@ void EditTabs::on_switching_page(GtkNote
- 
- }
- 
--Glib::RefPtr <Gtk::SourceBuffer> EditTabs::is_buffer_open(Glib::ustring filename){
-+Glib::RefPtr <gtksourceview::SourceBuffer> EditTabs::is_buffer_open(Glib::ustring filename){
- 	int p = get_n_pages();
- 
- 	for (int x=0;x<p;x++){
-@@ -711,19 +710,19 @@ Glib::RefPtr <Gtk::SourceBuffer> EditTab
- 			return curtab->get_buffer();
- 	}
- 
--	return Glib::RefPtr <Gtk::SourceBuffer> (NULL);
-+	return Glib::RefPtr <gtksourceview::SourceBuffer> (NULL);
- 
- 
- }
- 
--EditTabs::Page::Page(EditTabs *parent, Glib::RefPtr<Gtk::SourceBuffer> buffer){
-+EditTabs::Page::Page(EditTabs *parent, Glib::RefPtr<gtksourceview::SourceBuffer> buffer){
- 
- 	/* Note to self! CLEAN THIS UP!!!! */
- 
- 	/* Page is actually a ScrollWindow thing */
- 	set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
- 
--	Gtk::SourceView *sourceview=Gtk::manage(new Gtk::SourceView());
-+	gtksourceview::SourceView *sourceview=Gtk::manage(new gtksourceview::SourceView());
- 
- 	if (buffer)
- 		sourceview->set_buffer(buffer);
-@@ -750,10 +749,10 @@ EditTabs::Page::Page(EditTabs *parent, G
- 	 * (ie buffer is null) */
- 
- 	if (!buffer){
--		Glib::ustring mime_type("text/x-tex");
-+		Glib::ustring mime_type("latex");
- 
--		Glib::RefPtr<Gtk::SourceLanguagesManager> lm = buffer->get_languages_manager();
--		Glib::RefPtr<Gtk::SourceLanguage> language = lm->get_language_from_mime_type(mime_type);
-+		Glib::RefPtr<gtksourceview::SourceLanguageManager> lm = gtksourceview::SourceLanguageManager::create();
-+		Glib::RefPtr<gtksourceview::SourceLanguage> language = lm->get_language(mime_type);
- 
- 
- 		if (language) 
-@@ -820,7 +819,7 @@ void EditTabs::Page::on_changed()
- 
- }
- 
--void EditTabs::Page::on_mark_changed(Gtk::SourceBuffer::iterator iter, Glib::RefPtr<Gtk::SourceBuffer::Mark> mark){
-+void EditTabs::Page::on_mark_changed(gtksourceview::SourceBuffer::iterator iter, Glib::RefPtr<gtksourceview::SourceBuffer::Mark> mark){
- 	if (mark->get_name()=="insert")
- 	{
- 		extern sigc::signal1<void, int> signal_line_set;
-@@ -835,14 +834,14 @@ EditTabs *EditTabs::Page::get_parent()
- 	return (static_cast<EditTabs*>(Gtk::Widget::get_parent()));
- }
- 
--Gtk::SourceView* EditTabs::Page::get_child()
-+gtksourceview::SourceView* EditTabs::Page::get_child()
- {
--	return (static_cast<Gtk::SourceView*>(Gtk::Bin::get_child()));
-+	return (static_cast<gtksourceview::SourceView*>(Gtk::Bin::get_child()));
- }
- 
--Glib::RefPtr<Gtk::SourceBuffer> EditTabs::Page::get_buffer()
-+Glib::RefPtr<gtksourceview::SourceBuffer> EditTabs::Page::get_buffer()
- {
--	return (get_child()->get_buffer());
-+	return Glib::RefPtr<gtksourceview::SourceBuffer>::cast_static(get_child()->get_buffer());
- }
- 
- EditTabs::Page *EditTabs::get_current_tab()
-@@ -850,9 +849,9 @@ EditTabs::Page *EditTabs::get_current_ta
- 	return (static_cast<EditTabs::Page*>(get_nth_page(get_current_page())));
- }
- 
--Gtk::SourceView *EditTabs::get_current_view()
-+gtksourceview::SourceView *EditTabs::get_current_view()
- {
--	return (static_cast<Gtk::SourceView*>(get_current_tab()->get_child()));
-+	return (static_cast<gtksourceview::SourceView*>(get_current_tab()->get_child()));
- }
- 
- 
-@@ -861,8 +860,8 @@ void EditTabs::Page::on_preferences_upda
- 	// For things that need to happen for all pages
- 	PrefStruct *prefs = PrefStruct::instance();
- 	
--	get_child()->set_tabs_width(prefs->get<int>("General", "tab_size"));
--	get_buffer()->set_highlight(prefs->get<bool>("General", "syntax_highlighting"));
-+	get_child()->set_tab_width(prefs->get<int>("General", "tab_size"));
-+	get_buffer()->set_highlight_syntax(prefs->get<bool>("General", "syntax_highlighting"));
- 
- }
- 
-Index: amyedit-1.0/src/EditTabs.hh
-===================================================================
---- amyedit-1.0.orig/src/EditTabs.hh
-+++ amyedit-1.0/src/EditTabs.hh
-@@ -63,11 +63,11 @@ class EditTabs: public Gtk::Notebook
- 		class Page:public Gtk::ScrolledWindow
- 		{
- 			public:
--				Page(EditTabs *parent, Glib::RefPtr<Gtk::SourceBuffer> buffer=Glib::RefPtr<Gtk::SourceBuffer>());
-+				Page(EditTabs *parent, Glib::RefPtr<gtksourceview::SourceBuffer> buffer=Glib::RefPtr<gtksourceview::SourceBuffer>());
- 				
- 				EditTabs *get_parent();
--				Gtk::SourceView *get_child();
--				Glib::RefPtr<Gtk::SourceBuffer> get_buffer();
-+				gtksourceview::SourceView *get_child();
-+				Glib::RefPtr<gtksourceview::SourceBuffer> get_buffer();
- 
- 				Glib::ustring filename;
- 				Gtk::Label *tablabel;
-@@ -77,8 +77,8 @@ class EditTabs: public Gtk::Notebook
- 				void on_close_me();
- 				void on_modified_changed();
- 				void on_changed();
--				void on_mark_changed(Gtk::SourceBuffer::iterator iter,
--				                     Glib::RefPtr<Gtk::SourceBuffer::Mark> mark);
-+				void on_mark_changed(gtksourceview::SourceBuffer::iterator iter,
-+				                     Glib::RefPtr<gtksourceview::SourceBuffer::Mark> mark);
- 				void on_preferences_update();
- 
- 		};
-@@ -89,13 +89,13 @@ class EditTabs: public Gtk::Notebook
- 		Glib::ustring GetRootFileName();
- 		Glib::ustring TabNameFromFile(Glib::ustring start);
- 		Glib::ustring GetUntitledTabName(Glib::ustring start);
--		Glib::RefPtr<Gtk::SourceBuffer> is_buffer_open(Glib::ustring filename);
-+		Glib::RefPtr<gtksourceview::SourceBuffer> is_buffer_open(Glib::ustring filename);
- 
- 		void on_switching_page(GtkNotebookPage *page, guint number);
- 	public:
- 		Page *get_current_tab();
- 	private:
--		Gtk::SourceView *get_current_view();
-+		gtksourceview::SourceView *get_current_view();
- 
- 		void on_preferences_update();
- 
-Index: amyedit-1.0/src/SpellDialog.cc
-===================================================================
---- amyedit-1.0.orig/src/SpellDialog.cc
-+++ amyedit-1.0/src/SpellDialog.cc
-@@ -267,9 +267,9 @@ int SpellDialog::checkDocument(){
- 	aspell_document_checker_reset(checker);
- 
- 	view = getCurrentPage()->get_child();
--	buffer = view->get_buffer();
-+	buffer = Glib::RefPtr<gtksourceview::SourceBuffer>::cast_static(view->get_buffer());
- 
--	buffer->set_check_brackets(false);
-+	buffer->set_highlight_matching_brackets(false);
- 
- 	/* areastart has left gravity, arearight has right gravity, as inserts only
- 	 * occur inside them, they should always mark the beginning and ends of the
-@@ -315,7 +315,7 @@ int SpellDialog::checkDocument(){
- 	buffer->delete_mark(areastart);
- 	buffer->delete_mark(areaend);
- 	
--	buffer->set_check_brackets(true);
-+	buffer->set_highlight_matching_brackets(true);
- 	return 0;	
- }
- 
-@@ -370,7 +370,7 @@ bool SpellDialog::changeWord(AspellToken
- 		/* Close Clicked */
- 		
- 		buffer->place_cursor(wordend);
--		buffer->set_check_brackets();
-+		buffer->set_highlight_matching_brackets();
- 		return false;
- 	}
- 
-Index: amyedit-1.0/src/SpellDialog.hh
-===================================================================
---- amyedit-1.0.orig/src/SpellDialog.hh
-+++ amyedit-1.0/src/SpellDialog.hh
-@@ -49,8 +49,8 @@ class SpellDialog : public Gtk::Dialog,
- 
- 		void on_preferences_update();
- 	
--		Gtk::SourceView* view;
--		Glib::RefPtr<Gtk::SourceBuffer> buffer;
-+		gtksourceview::SourceView* view;
-+		Glib::RefPtr<gtksourceview::SourceBuffer> buffer;
- 		Gtk::Entry misslabel;
- 		Gtk::Entry replaceentry;
- 		TextListViewListBox listbox;
-Index: amyedit-1.0/src/main.cc
-===================================================================
---- amyedit-1.0.orig/src/main.cc
-+++ amyedit-1.0/src/main.cc
-@@ -53,7 +53,7 @@
- #include <fstream>
- 
- #include "AmyEdit.hh"
--#include "gtksourceviewmm/init.hh"
-+#include "gtksourceviewmm/init.h"
- #include "Utils.hh"
- 
- int main(int argc, char **argv)
-@@ -63,7 +63,7 @@ int main(int argc, char **argv)
- 	textdomain (GETTEXT_PACKAGE);
- 	
- 	Gtk::Main m(&argc, &argv);
--	Gtk::SourceViewmm_init();
-+	gtksourceview::init();
- 
- 	/* TODO This should probably be removed and created on demand */
- 	
diff --git a/app-editors/amyedit/metadata.xml b/app-editors/amyedit/metadata.xml
deleted file mode 100644
index 130606723adb..000000000000
--- a/app-editors/amyedit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>tex@gentoo.org</email>
-    <name>Gentoo TeX Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">amyedit</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-editors/atom-1.23.3 b/app-editors/atom-1.23.3
new file mode 100644
index 000000000000..9717810543f0
--- /dev/null
+++ b/app-editors/atom-1.23.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=dev-util/electron-1.6.15:1.6 x11-libs/libxkbfile >=app-arch/rpm2targz-9.0.0.3g test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A hackable text editor for the 21st Century
+EAPI=6
+HOMEPAGE=https://atom.io
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=dev-util/electron-1.6.15:1.6 x11-libs/libxkbfile !sys-apps/apmd
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/atom/atom/releases/download/v1.23.3/atom.x86_64.rpm -> atom-bin-1.23.3.rpm https://github.com/atom/atom/archive/v1.23.3.tar.gz -> atom-1.23.3.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/nodejs/nan/archive/v2.6.2.tar.gz -> nodejs-nan-2.6.2.tar.gz https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz https://registry.npmjs.org/keytar/-/keytar-4.1.0.tgz -> atomdep-keytar-4.1.0.tar.gz https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.4.tgz -> atomdep-spellchecker-3.4.4.tar.gz https://registry.npmjs.org/superstring/-/superstring-2.2.16.tgz -> atomdep-superstring-2.2.16.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7ac6e9d77886ab62054a3255beecae63
diff --git a/app-editors/atom-1.24.0_beta3 b/app-editors/atom-1.24.0_beta3
new file mode 100644
index 000000000000..52c462a6d31b
--- /dev/null
+++ b/app-editors/atom-1.24.0_beta3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=dev-util/electron-1.6.15:1.6 x11-libs/libxkbfile >=app-arch/rpm2targz-9.0.0.3g test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A hackable text editor for the 21st Century
+EAPI=6
+HOMEPAGE=https://atom.io
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=dev-util/electron-1.6.15:1.6 x11-libs/libxkbfile !sys-apps/apmd
+REQUIRED_USE=python_targets_python2_7
+SLOT=beta
+SRC_URI=https://github.com/atom/atom/releases/download/v1.24.0-beta3/atom.x86_64.rpm -> atom-bin-1.24.0-beta3.rpm https://github.com/atom/atom/archive/v1.24.0-beta3.tar.gz -> atom-1.24.0-beta3.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/nodejs/nan/archive/v2.6.2.tar.gz -> nodejs-nan-2.6.2.tar.gz https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz https://registry.npmjs.org/keytar/-/keytar-4.1.0.tgz -> atomdep-keytar-4.1.0.tar.gz https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.4.tgz -> atomdep-spellchecker-3.4.4.tar.gz https://registry.npmjs.org/superstring/-/superstring-2.2.16.tgz -> atomdep-superstring-2.2.16.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=757958fa0c17df06e67bf9b1d7ab0c43
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest
deleted file mode 100644
index fc7deb0e208b..000000000000
--- a/app-editors/atom/Manifest
+++ /dev/null
@@ -1,32 +0,0 @@
-AUX apm-python.patch 388 BLAKE2B 1f3187b4219bb849ce87fd83dd19c335f9c163c63a8660b552235dda2a16b3247c56cc82c17eae7bd7b45516a8dbf345332fb0d22d57589cf7edcd4c448da27c SHA512 5d280b2a37c8f1b03156627c1622d0a5c76edda7523353b7b60e6ba563f090e6472eae318689bd964cc98503a963aa591d3ed37929f1df36f81ab893ad437f21
-AUX atom-apm-path-r2.patch 537 BLAKE2B 68f5a53be36f34a4953450f6ff466bb00256c028adf290b3bd8c63b966c06dbdc9fcb6a12c95172aabc9010f0b1a4c6522390a4ad6012a0f60e11a38a61373cd SHA512 1172c72c94d25538d63e04202f273b87f794431847d9b1138d4eb43d4578d47ca1ecf2636170a8648eef2afaf01a35114752ebecad2b9cd8c7d4ae04dcbc741d
-AUX atom-fix-app-restart-r1.patch 402 BLAKE2B 95c61f01f11751fd00cfee81c39daa10e06268f0cb4bf37787be89ce8965d765bc7f7f5fa36b226412c2183151481456661b09faa866e9a929856061f41e7b5f SHA512 6218175e2513f7afdbd6ed4875037929e375fdfd84683f84430e387bb8302aaf472845d74d46f75a79409b867a79b29f06ecfaea4a95ff48d229d080dc74f68f
-AUX atom-license-path-r1.patch 719 BLAKE2B 72fbead68a55b5c013f353320581aa431a188e6676b17967a4024de6302e651e0d28ba1efab7689d5dc62014e32d0e968821a6660a530cc5a5d500f2fb2f85e0 SHA512 2909f47f37d065afe5ef4fd86b8b1c01a1a4d4f9f03e7c762cfdb0f97b53ebec2eaa803b34273bf3401c5a0e1faf03ef10c3caf6f96000d1786883cd08d7b964
-AUX atom-marker-layer-r1.patch 418 BLAKE2B 4001c4e8bd64cf6389bb2f5550e5b243fb0fabb0627e76e70ba8c863a3d9be6b2412cfc6dffbb3911e450484d636dfc705f721ef16654aa7c435d5cb2ad0fc1e SHA512 c8bd34e4747626642a57596ef36c4ddbaee36273a213aa4439d0c64557084c7c5bdb25735ffc3c118533ce43dbf2ad638258c29b52a58a28e417163279ada925
-AUX atom-python.patch 168 BLAKE2B d836061d772d187b039b9c88f8755cfac5d236a2c694c34fbd0d5a1a79fd9792c33f52d3ba54d085d6a7f375f309c2d5b5f57be78ea426b1e13fe2d8aad8e71c SHA512 813e79528fd2e814d8e4c5d54cf4d59d2eb7f82683669b787604c713a165b8ea952fe31012c8cf0a208d3ecdb8fa7fdd70c9abd1090aeae549f9aaeb713be5ee
-AUX atom-unbundle-electron-r1.patch 1531 BLAKE2B 51f0072ad40e5d9268d9dbfc107201b8518a41a6272fe026fc612d121e109c7bcd5c6781b2340ebec4bff1e8030eead44018b825421bc1b094a95d072ebb2dfa SHA512 40f3f39720cd801f28d1d9e8e202d51848e7f5667f85c543caca623ad33b088b49cf6d5383dcd940448d4247991aaf1a33e868364830f000619856e39b4ec443
-AUX gyp-unbundle.py 3933 BLAKE2B 638bf2ad17c5e052c4b1972ac91a1d0d6b0d9d361cb0d04c3e732c892af54a30b099069ac4bfb0f8882ac3d049c25a53d698cc95aeb23a486d92284a1ac21376 SHA512 5de7aab9b2fcf135fac5429a2655acfb53ed40871ca51281be237393b0318b06339d20af196275bc48acac456eac61e884821da7abeefb9991bf2502d2835cfe
-AUX transpile-coffee-script.js 589 BLAKE2B 0fa75fef95437d8c2f3eb5619734b577f843bd11ca4cfe96174408315c6defb57352ea29a22b69d0d6f1e2d01f3515e65cde2793914c42c60a28e936046b0304 SHA512 383772d0a8df6ab3f4950dcda87eb21222d71463007e15cf54c768aedcdd06d4791bf92660c042542aaf2c6fe283ff33f8e6c60488907bd309c450712bb94496
-DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee
-DIST atom-1.23.3.tar.gz 9553983 BLAKE2B ed5f77a51fbbf7a5ba828f5c488b139067636865fef30c88926baf5855b89a7283a35de383cfc65a06391479ec70c067e8ddacd5132b46859b4d4c6ee5cf35e8 SHA512 879a6a209659b612efcef6d3cac9c218da033295b3cc915259e2d4ab51567627a2369b2b8630f6e8a4706aa7b4e0cfb7cc3a55b635f559c8a913cc19e702d524
-DIST atom-1.24.0-beta3.tar.gz 9550090 BLAKE2B e74923afb56573530a3297d7ce27197af478b2697f49e3d1d9d239e12281a43ab614f8bb9356451372723af7a2bb6cfe2dc21c2e672a321eeeeca6455dcedd9b SHA512 31dc4e9be108fdd5e770a21e94f1284f3e5aa3a8293bce542fbf5a449930bb4f9a3f2405653e27809ccb3d2395b9bf3e0e630b4b1d6c2f7995859b2af391c554
-DIST atom-bin-1.23.3.rpm 129956012 BLAKE2B eedb8a55955dbd30d85073e536435a6faa214e9f197acda4f3c7a46408ed5fdcff16141b28c519b1d1fc680d0a17f77d0f22ccb561eaea9665c7836ef282ab8d SHA512 f17b0edc33c537ced60360ff5daba44257ac2a85fdb8cf10e886133429093cbd99cd5835ea1ec451a2c1c485971dd5176585357b980d7dbab17f12ee0adacbe8
-DIST atom-bin-1.24.0-beta3.rpm 129894085 BLAKE2B 9c58bd91ed3d4c9eaf97de0b2ba168c1f4118890f40f8aa9c4f50a9fe24d614c1d52ce8d91f0efdfc8b7bb01891096d8e39a2e2f67faefdd6db33e0114288892 SHA512 a942732dfc975c44c3db11c8e43b88e6dbe247245947964704ee2ada79a8732da5a6f6cedd960556349844ca92333c3504541b300975bd4daad639abb3ce309b
-DIST atomdep-atom--nsfw-1.0.18.tar.gz 20870 BLAKE2B 2e90e2cc337b2d40805db44c48a6f9da2b4e749bd5d036bdeec78790286a0d0c7e4536a8d461480b91c45552ce1f6db06e6f70f975e52b2ec90146714c4a0fb9 SHA512 61c78a57d6b75fada687843bf0dca2f1a4d16a8546769789047a202fc831535ee206112962fc4680c7d37b4da3d611f6b5a153e1b6ab919e51759906288b09ff
-DIST atomdep-cached-run-in-this-context-0.4.1.tar.gz 2388 BLAKE2B 9cf59f69c3433a9982c1dedf58c03eef5e1ccf1275f92ed192a2de601f38caceea5926e9b3a8571e2124b83e49c99a14f262db39a44732e1ff6550d6cd46d500 SHA512 942db40139b0beda616a25628772e515ce92ceca3e9a5288b10920e68c35149c52677a975e6e30f278ec64f06ae341fa1fa00702b339b2fb8f7af1cf9685efe5
-DIST atomdep-ctags-3.0.0.tar.gz 12864 BLAKE2B 561a64734f67cd7943f2d6f972e4d1ec55913934357e7a0d3077c2910f938071b090f55880788ebeab5d7fcaa3009c8984a9045dc83089c46d276152653eb156 SHA512 af1d3764cc3a6bb781a9a2357eeb8503886fc14481c3dbe4a899d3c672fea9325524aed3a4c1c87965bc4cce2fbae20b56b32690849afc1fcb751cd5462adbcc
-DIST atomdep-fs-admin-0.1.6.tar.gz 5539 BLAKE2B 9ee1857152cca343673a270c1044ad33a3ddbfb5b8389f2e0449e99348d0bdd4aaaa7e4c07bfb8871ae840f1a69cd90074a769f80fa3cc7f914050bc6f45b29c SHA512 2474523d5441ad882000633a929bcdbc5771b859a80f16a69c15504ff240a59b558e2edb1ca6e12ce91ad58da935243f3950a16e664529c59da70b9912903ae7
-DIST atomdep-git-utils-5.1.0.tar.gz 4141959 BLAKE2B 7504a4ba57b093da659ed0ba7319863636d7f9f1e9a6a4bbd4b6c6fcf9922c9ca32398b44550e4a94d519471ca5cf249976426583f998186398c147c6cce5636 SHA512 1f9c38646b25a526c0399d538e58864c552d65802402df82f8303a936374121db40f61195ea3254e56e31dd9d25b847b325264911f62d6beddfc24931a9367bf
-DIST atomdep-keyboard-layout-2.0.13.tar.gz 17881 BLAKE2B e86a399be545a43768a53d5d9279dae1bc4d87fd99af87a10861f2e3367d6786e3631f8dc77671b08b06e30290f2c97833402e3732a010ae31c7c1c02d9d6afd SHA512 5b155cddb0484edb47a334b21183eccabe6b376290b97b4469732541f4231337b526b90bc37d321ff6dc367d481b1e3c6feb5d39dc9ba67abef8914b53615a66
-DIST atomdep-keytar-4.1.0.tar.gz 8564 BLAKE2B 69b745c6afd22dd4ffd5694205294f4cc7985b9ae5df51e5c7671cee296a2d28732ccd453417eeb60cc66fdfd39247ee90205808fdbfbea8b5585029c22d4d76 SHA512 2f72aa89232da558ad96e838bae23e2b95cb9def52015105584f120902214221f4200fc24dba27e6fe69ad52ca2b429e9f9e28d8ef15f4771e29a829c09ba6f9
-DIST atomdep-nsfw-1.0.16.tar.gz 43214 BLAKE2B 261539bebfe494aad0b372f1837a87c7c2a410bb591df523ea25bd5acd008f7eb0e8460a218fd4ee70d98bc26dd166472e9ea0aea265971cf2e904da913dda88 SHA512 0060d7fb5016454aaaf7df438d973b9a389a6e5f7a166c5d402cf8ef8bcda724501c3bfbd44e37e9e6c38d5f1decaeb48c571aad9145dec38ba0c94073b9702a
-DIST atomdep-nslog-3.0.0.tar.gz 2270 BLAKE2B 3258b7e7d7f94a89b0e5a21bfedfbe71bbfe3d776871aaeb3443ce6a7759860abfef2b8af823dab009183b5378c1ed06c7b2729df9acc09d3c5ea6a5f47ff160 SHA512 6a0ce8970ae12fdefd0935916e5501bb89e366fb66b05fffade884f3adf4add4b135eb4f0f208684e28424fdb9858ee8193eb1f3db1f7eac3cb49bdb5d1a4bb1
-DIST atomdep-oniguruma-6.2.1.tar.gz 586350 BLAKE2B 65574ef004c98cced7a9f5917845015ccd84b2383a85d889365da5c73313114454458b441bf6588eaee2a17150d674b7754ccc0bbb2d68ae3d98f7d5ca63530e SHA512 faa46dc4c1b8d7e75ab54512de9a823c5b958a7ccb43333375b33e16de47a464ea2a9ba9996596a8359d423a3e8c9d63cc92a5162b3f9d44b4485304073b41f1
-DIST atomdep-pathwatcher-8.0.1.tar.gz 18357 BLAKE2B 8e2b86da307757c352d0cab5eff64cc31e6745bf10a982f6ef11a0fd92eeeadf5b438aaaaa00e679100600691e59ff7aa7badf33e62c33a2497b5573cf7b4711 SHA512 34df8fecf456753f1977517018e5ff78b143f2d36e1417435bfcac2f9b9f8bd045a8080e7d0ad5d2930c63fa110c539911447863c46e757a4bb8f8c4f5bda999
-DIST atomdep-scrollbar-style-3.2.0.tar.gz 3498 BLAKE2B 2d1a88f2764b5a51da92e41f5dd5424a4ffbc13ec9b2e826236097ff7ebb0babd22b4e4cd00873e786aa52d901eedce49bd102ad6398eda614734bdd78b8b4e3 SHA512 9f5fcc2bcb13cb81e95a52aa6db0c99ffd67c9cd48a9faf0223587359f4082c3e867cb384497dc6be3e8230b4cd035e910a7048d431e81a28dfded0bc572da18
-DIST atomdep-spellchecker-3.4.4.tar.gz 481892 BLAKE2B 3bae26ffffbaffdbac6f082c6f33ea4f5127583663e1df3ed8d98cebed2ce11ea0d9965615e369383695df6ad55aa996e8968e6616415d359ffae640a679f47b SHA512 974b3ce9866ce7e3f30137856ea0f4b1348c105edb833a94620c6b53cfa7052c37575f6dcd160a322fa10c61babfc32c916786d9d44ad10efdb2ab3578620ac1
-DIST atomdep-superstring-2.2.16.tar.gz 795922 BLAKE2B 58f66a51f20f11bd6d4335c945c5af2418ab5e210af989f9480e319a55cf273d63c97db2c5a32e8196dc06c14bbb552ea1e34d2e8910807f8e2d04925c953b41 SHA512 1ea105483032a5f6fb3b752dce33cef7498a9d597cdef35efb00ef26dba95c84dda863452eaa954d38c9c22510397aedfeed2ed44874560fdca4151d87d49e5c
-DIST nodejs-nan-2.6.2.tar.gz 161949 BLAKE2B f74e8d56e67ae03e60e0be7752ed9527bd8499c01f7df8899f3eb6735b1286633753e8bf595781b6d3d1446df20483fc0377bd745be10c6bae0ad66426751b79 SHA512 d1b5ed12e90accfa117cb73b9432897631ed2dd6045f93fa8b53237a13cec0ec467b14c035e9e4d4a5c6588949c1c80b0eef48a46d5c9c0a1f81ef400da031c3
-EBUILD atom-1.23.3.ebuild 14818 BLAKE2B 1e1d81e555efdc6e0ac073ece2b4c2d0128b3aee89c09656e9a58e00979b883d6d22facc55e51f34e38609412f6661780e54035fc312c797c69ed737190dfee0 SHA512 23a70450f5223b3e2f4b8a63240efdf5a6f1337aeee386c5848224f3963211621fde3fa071208d99c1d06def823c6001e496a6ac21e5cc399a80d2a29e91ad3f
-EBUILD atom-1.24.0_beta3.ebuild 14821 BLAKE2B 7d50260f0e4fa4ddf0486d694fb23c87ed049bffd4fdc424c30be7fc7fcb014298d2db907b999329d54af7f1b0481931981c11c318e9a79d6bb9b0b218273a83 SHA512 afa15e00d2446ab6f9104840641588977c0a9b1094c0df66fd00ec39514aed614c09f3c072a5d373fe8ed8e1d3efa01c48665e5e0f4d4ad8e3c257e0d2a1fc2a
-MISC metadata.xml 531 BLAKE2B 75dc8465fe585ee047f3e702b40d1e951759c67b28e63cbba370813e34c5213748529022dd3ecc8477bedcee3657f87ce162bde4984a3d4afbe2b2a200cc1060 SHA512 ba84d0e101f6d53dbd6abb0e441d426bfd04f890331bd5357c18d7a34eea903897a06d725f45d50d95a645018f5ba6b519be07b7dd1ba6cbcfb30bbf1602ff12
diff --git a/app-editors/atom/atom-1.23.3.ebuild b/app-editors/atom/atom-1.23.3.ebuild
deleted file mode 100644
index 14043a200d4f..000000000000
--- a/app-editors/atom/atom-1.23.3.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
-#       atom overlay.  If you would like to make changes, please consider
-#       modifying the ebuild template and submitting a PR to
-#       https://github.com/elprans/atom-overlay.
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 multiprocessing rpm virtualx xdg-utils
-
-DESCRIPTION="A hackable text editor for the 21st Century"
-HOMEPAGE="https://atom.io"
-MY_PV="${PV//_/-}"
-
-ELECTRON_V=1.6.15
-ELECTRON_SLOT=1.6
-
-ASAR_V=0.13.0
-# All binary packages depend on this
-NAN_V=2.6.2
-
-ATOM__NSFW_V=1.0.18
-CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
-CTAGS_V=3.0.0
-FS_ADMIN_V=0.1.6
-GIT_UTILS_V=5.1.0
-KEYBOARD_LAYOUT_V=2.0.13
-KEYTAR_V=4.1.0
-NSFW_V=1.0.16
-NSLOG_V=3.0.0
-ONIGURUMA_V=6.2.1
-PATHWATCHER_V=8.0.1
-SCROLLBAR_STYLE_V=3.2.0
-SPELLCHECKER_V=3.4.4
-SUPERSTRING_V=2.2.16
-
-# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
-SRC_URI="
-	https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
-	https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
-	https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
-	https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz
-	https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz
-	https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz
-	https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz
-	https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz
-	https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz
-	https://registry.npmjs.org/keytar/-/keytar-4.1.0.tgz -> atomdep-keytar-4.1.0.tar.gz
-	https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz
-	https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz
-	https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz
-	https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz
-	https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz
-	https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.4.tgz -> atomdep-spellchecker-3.4.4.tar.gz
-	https://registry.npmjs.org/superstring/-/superstring-2.2.16.tgz -> atomdep-superstring-2.2.16.tar.gz
-"
-
-BINMODS=(
-	atom--nsfw
-	cached-run-in-this-context
-	ctags
-	fs-admin
-	git-utils
-	keyboard-layout
-	keytar
-	nsfw
-	nslog
-	oniguruma
-	pathwatcher
-	scrollbar-style
-	spellchecker
-	superstring
-)
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=app-text/hunspell-1.3.3:=
-	>=dev-libs/libgit2-0.23:=[ssh]
-	>=dev-libs/libpcre2-10.22:=[jit,pcre16]
-	>=gnome-base/libgnome-keyring-3.12:=
-	>=dev-libs/oniguruma-6.6.0:=
-	>=dev-util/ctags-5.8
-	>=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
-	x11-libs/libxkbfile"
-RDEPEND="
-	${DEPEND}
-	!sys-apps/apmd
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
-BUILD_DIR="${S}/out"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local a
-
-	for a in ${A} ; do
-		case ${a} in
-		*.rpm) srcrpm_unpack "${a}" ;;
-		*) _unpack "${a}" ;;
-		esac
-	done
-
-	mkdir "${BIN_S}" || die
-	mv "${WORKDIR}/usr" "${BIN_S}" || die
-}
-
-src_prepare() {
-	local install_dir="$(get_install_dir)"
-	local suffix="$(get_install_suffix)"
-	local nan_s="${WORKDIR}/nodejs-nan-${NAN_V}"
-	local patch
-	local binmod
-	local _s
-
-	mkdir "${BUILD_DIR}" || die
-	cp -a "${BIN_S}/$(get_atom_rpmdir)/resources/app" \
-		"${BUILD_DIR}/app" || die
-
-	# Add source files omitted from the upstream binary distribution,
-	# and which we want to include in ours.
-	cp -a -t "${BUILD_DIR}/app" "${S}/spec" || die
-
-	# Unpack app.asar
-	if [ -e "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" ]; then
-		easar extract "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" \
-			"${BUILD_DIR}/app"
-	fi
-
-	cd "${BUILD_DIR}/app" || die
-
-	eapply "${FILESDIR}/atom-python.patch"
-	eapply "${FILESDIR}/apm-python.patch"
-	eapply "${FILESDIR}/atom-unbundle-electron-r1.patch"
-	eapply "${FILESDIR}/atom-apm-path-r2.patch"
-	eapply "${FILESDIR}/atom-license-path-r1.patch"
-	eapply "${FILESDIR}/atom-fix-app-restart-r1.patch"
-	eapply "${FILESDIR}/atom-marker-layer-r1.patch"
-
-	sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${EROOT%/}${install_dir}/app.asar|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|^#!/bin/bash|#!${EROOT%/}/bin/bash|g" \
-		./atom.sh \
-		|| die
-
-	local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)\n\
-			   export ELECTRON_NO_ASAR=1"
-	sed -i -e \
-		"s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
-			apm/bin/apm || die
-
-	sed -i -e \
-		"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
-			apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
-
-	sed -i -e \
-		"s|atomCommand = 'atom';|atomCommand = '${EROOT%/}/usr/bin/atom${suffix}'|g" \
-			apm/lib/test.js || die
-
-	rm apm/bin/node || die
-
-	sed -i -e "s|/$(get_atom_rpmdir)/atom|${EROOT%/}/usr/bin/atom${suffix}|g" \
-		"${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
-
-	for binmod in ${BINMODS[@]}; do
-		_s="${WORKDIR}/$(package_dir ${binmod})"
-		cd "${_s}" || die
-		if _have_patches_for "${binmod}"; then
-			for patch in "${FILESDIR}"/${binmod}-*.patch; do
-				eapply "${patch}"
-			done
-		fi
-	done
-
-	cd "${BUILD_DIR}/app" || die
-
-	# Unbundle bundled libs from modules
-
-	_s="${WORKDIR}/$(package_dir git-utils)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "git;libgit2;git2" \
-		"${_s}/binding.gyp" || die
-
-	_s="${WORKDIR}/$(package_dir oniguruma)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "onig_scanner;oniguruma;onig" \
-		"${_s}/binding.gyp" || die
-
-	_s="${WORKDIR}/$(package_dir spellchecker)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "spellchecker;hunspell;hunspell" \
-		"${_s}/binding.gyp" || die
-
-	_s="${WORKDIR}/$(package_dir superstring)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle \
-		"superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
-			-DPCRE2_CODE_UNIT_WIDTH=16" \
-		"${_s}/binding.gyp" || die
-
-	for binmod in ${BINMODS[@]}; do
-		_s="${WORKDIR}/$(package_dir ${binmod})"
-		mkdir -p "${_s}/node_modules" || die
-		ln -s "${nan_s}" "${_s}/node_modules/nan" || die
-	done
-
-	sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
-		"${BUILD_DIR}/app/src/config-schema.js" || die
-
-	sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
-		"${BUILD_DIR}/app/src/config-schema.js" || die
-
-	eapply_user
-}
-
-src_configure() {
-	local binmod
-
-	for binmod in ${BINMODS[@]}; do
-		einfo "Configuring ${binmod}..."
-		cd "${WORKDIR}/$(package_dir ${binmod})" || die
-		enodegyp_atom configure
-	done
-}
-
-src_compile() {
-	local binmod
-	local x
-	local ctags_d="node_modules/symbols-view/vendor"
-	local jobs=$(makeopts_jobs)
-	local gypopts
-
-	# Transpile any yet untranspiled files.
-	ecoffeescript "${BUILD_DIR}/app/spec/*.coffee"
-
-	gypopts="--verbose"
-
-	if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-		gypopts+=" --jobs ${jobs}"
-	fi
-
-	mkdir -p "${BUILD_DIR}/modules/" || die
-
-	for binmod in ${BINMODS[@]}; do
-		einfo "Building ${binmod}..."
-		cd "${WORKDIR}/$(package_dir ${binmod})" || die
-		enodegyp_atom ${gypopts} build
-		x=${binmod##node-}
-		mkdir -p "${BUILD_DIR}/modules/${x}" || die
-		cp build/Release/*.node "${BUILD_DIR}/modules/${x}" || die
-	done
-
-	# Put compiled binary modules in place
-	_fix_binmods "${BUILD_DIR}/app" "apm"
-	_fix_binmods "${BUILD_DIR}/app" "node_modules"
-
-	# Remove non-Linux vendored ctags binaries
-	rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
-	   "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
-
-	# Re-pack app.asar
-	# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
-	cd "${BUILD_DIR}" || die
-	x="--unpack={*.node,ctags-config,ctags-linux,**/spec/fixtures/**,**/node_modules/spellchecker/**,**/resources/atom.png}"
-	xd="--unpack-dir=apm"
-	easar pack "${x}" "${xd}" "app" "app.asar"
-
-	rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
-
-	# Replace vendored ctags with a symlink to system ctags
-	rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-	ln -s "${EROOT%/}/usr/bin/ctags" \
-		"${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-}
-
-src_test() {
-	local electron="$(get_electron_dir)/electron"
-	local app="${BUILD_DIR}/app.asar"
-
-	virtx "${electron}" --app="${app}" --test "${app}/spec"
-}
-
-src_install() {
-	local install_dir="$(get_install_dir)"
-	local suffix="$(get_install_suffix)"
-
-	insinto "${install_dir}"
-
-	doins "${BUILD_DIR}/app.asar"
-	doins -r "${BUILD_DIR}/app.asar.unpacked"
-
-	insinto "${install_dir}/app"
-	doins -r "${BUILD_DIR}/app/apm"
-
-	insinto "/usr/share/applications/"
-	newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
-		"atom${suffix}.desktop"
-
-	insinto "/usr/share/icons/"
-	doins -r "${BIN_S}/usr/share/icons/hicolor"
-
-	exeinto "${install_dir}"
-	newexe "${BUILD_DIR}/app/atom.sh" atom
-	insinto "/usr/share/licenses/${PN}${suffix}"
-	doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
-	dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
-	dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
-
-	_fix_executables "${install_dir}/app/apm/bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/.bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
-
-# Helpers
-# -------
-
-# Return the installation suffix appropriate for the slot.
-get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-# Return the upstream app name appropriate for $PV.
-get_atom_appname() {
-	if [[ "${PV}" == *beta* ]]; then
-		echo -n "atom-beta"
-	else
-		echo -n "atom"
-	fi
-}
-
-# Return the app installation path inside the upstream archive.
-get_atom_rpmdir() {
-	echo -n "usr/share/$(get_atom_appname)"
-}
-
-# Return the installation target directory.
-get_install_dir() {
-	echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
-}
-
-# Return the Electron installation directory.
-get_electron_dir() {
-	echo -n "${EROOT%/}/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
-}
-
-# Return the directory containing appropriate Node headers
-# for the required version of Electron.
-get_electron_nodedir() {
-	echo -n "${EROOT%/}/usr/include/electron-${ELECTRON_SLOT}/node/"
-}
-
-# Run JavaScript using Electron's version of Node.
-enode_electron() {
-	"$(get_electron_dir)"/node $@
-}
-
-# Run node-gyp using Electron's version of Node.
-enodegyp_atom() {
-	local apmpath="$(get_atom_rpmdir)/resources/app/apm"
-	local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
-
-	PATH="$(get_electron_dir):${PATH}" \
-		enode_electron "${nodegyp}" \
-			--nodedir="$(get_electron_nodedir)" $@ || die
-}
-
-# Coffee Script wrapper.
-ecoffeescript() {
-	local cscript="${FILESDIR}/transpile-coffee-script.js"
-
-	# Disable shell glob expansion, as we want the coffee script
-	# transpiler to do that instead.
-	set -f
-	echo "ecoffeescript" $@
-	ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
-	NODE_PATH="${BUILD_DIR}/app/node_modules" \
-		enode_electron "${cscript}" $@ || die
-	set +f
-}
-
-# asar wrapper.
-easar() {
-	local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
-	echo "asar" $@
-	enode_electron "${asar}" $@ || die
-}
-
-# Return a $WORKDIR directory for a given package name.
-package_dir() {
-	local binmod="${1//-/_}"
-	local binmod_v="${binmod^^}_V"
-	echo -n ${1}-${!binmod_v}
-}
-
-# Check if there are patches for a given package.
-_have_patches_for() {
-	local _patches="${1}-*.patch" _find
-	_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
-	test -n "$_find"
-}
-
-# Tarballs on registry.npmjs.org are wildly inconsistent,
-# and violate the convention of having ${P} as the top directory name.
-# This helper detects and fixes that.
-_unpack() {
-	local a="${1}"
-	local b="${a%.tar.gz}"
-	local p="${b#atomdep-}"
-	local dir="$(tar -tzf "${DISTDIR}/${a}" | head -1 | cut -f1 -d'/')"
-
-	unpack "${a}"
-
-	if [[ "${dir}" != "${p}" ]]; then
-		# Set the correct name for the unpacked directory.
-		mv "${WORKDIR}/${dir}" "${WORKDIR}/${p}" || die
-	fi
-}
-
-# Check if the binary node module is actually a valid dependency.
-# Sometimes the upstream removes a dependency from package.json but
-# forgets to remove the module from node_modules.
-_is_valid_binmod() {
-	local mod
-
-	for mod in "${BINMODS[@]}"; do
-		if [[ "${mod}" == "${1}" ]]; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-# Replace binary node modules with the newly compiled versions thereof.
-_fix_binmods() {
-	local _dir="${2}"
-	local _prefix="${1}"
-	local path
-	local relpath
-	local modpath
-	local mod
-	local f
-	local d
-	local cruft
-
-	(find "${_prefix}/${_dir}" -name '*.node' -print || die) \
-	| while IFS= read -r path; do
-		f=$(basename "${path}")
-		d=$(dirname "${path}")
-	    relpath=${path#${_prefix}}
-		relpath=${relpath##/}
-		relpath=${relpath#W${_dir}}
-		modpath=$(dirname ${relpath})
-		modpath=${modpath%build/Release}
-		mod=$(basename ${modpath})
-
-		_is_valid_binmod "${mod}" || continue
-
-		# must copy here as symlinks will cause the module loading to fail
-		cp -f "${BUILD_DIR}/modules/${mod}/${f}" "${path}" || die
-		cruft=$(find "${d}" -name '*.a' -print)
-		if [[ -n "${cruft}" ]]; then
-			rm ${cruft} || die
-		fi
-	done
-}
-
-# Fix script permissions and shebangs to point to the correct version
-# of Node.
-_fix_executables() {
-	local _dir="${1}"
-	local _node_sb="#!$(get_electron_dir)"/node
-
-	(find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
-	| while IFS= read -r f; do
-		IFS= read -r shebang < "${f}"
-
-		if [[ ${shebang} == '#!'* ]]; then
-			fperms +x "${f#${ED}}"
-			if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
-				einfo "Fixing node shebang in ${f#${ED}}"
-				sed --follow-symlinks -i \
-					-e "1s:${shebang}$:${_node_sb}:" "${f}" || die
-			fi
-		fi
-	done || die
-}
diff --git a/app-editors/atom/atom-1.24.0_beta3.ebuild b/app-editors/atom/atom-1.24.0_beta3.ebuild
deleted file mode 100644
index be1bdba86e3e..000000000000
--- a/app-editors/atom/atom-1.24.0_beta3.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
-#       atom overlay.  If you would like to make changes, please consider
-#       modifying the ebuild template and submitting a PR to
-#       https://github.com/elprans/atom-overlay.
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 multiprocessing rpm virtualx xdg-utils
-
-DESCRIPTION="A hackable text editor for the 21st Century"
-HOMEPAGE="https://atom.io"
-MY_PV="${PV//_/-}"
-
-ELECTRON_V=1.6.15
-ELECTRON_SLOT=1.6
-
-ASAR_V=0.13.0
-# All binary packages depend on this
-NAN_V=2.6.2
-
-ATOM__NSFW_V=1.0.18
-CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
-CTAGS_V=3.0.0
-FS_ADMIN_V=0.1.6
-GIT_UTILS_V=5.1.0
-KEYBOARD_LAYOUT_V=2.0.13
-KEYTAR_V=4.1.0
-NSFW_V=1.0.16
-NSLOG_V=3.0.0
-ONIGURUMA_V=6.2.1
-PATHWATCHER_V=8.0.1
-SCROLLBAR_STYLE_V=3.2.0
-SPELLCHECKER_V=3.4.4
-SUPERSTRING_V=2.2.16
-
-# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
-SRC_URI="
-	https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
-	https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
-	https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
-	https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz
-	https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz
-	https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz
-	https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz
-	https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz
-	https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz
-	https://registry.npmjs.org/keytar/-/keytar-4.1.0.tgz -> atomdep-keytar-4.1.0.tar.gz
-	https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz
-	https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz
-	https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz
-	https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz
-	https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz
-	https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.4.tgz -> atomdep-spellchecker-3.4.4.tar.gz
-	https://registry.npmjs.org/superstring/-/superstring-2.2.16.tgz -> atomdep-superstring-2.2.16.tar.gz
-"
-
-BINMODS=(
-	atom--nsfw
-	cached-run-in-this-context
-	ctags
-	fs-admin
-	git-utils
-	keyboard-layout
-	keytar
-	nsfw
-	nslog
-	oniguruma
-	pathwatcher
-	scrollbar-style
-	spellchecker
-	superstring
-)
-
-LICENSE="MIT"
-SLOT="beta"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=app-text/hunspell-1.3.3:=
-	>=dev-libs/libgit2-0.23:=[ssh]
-	>=dev-libs/libpcre2-10.22:=[jit,pcre16]
-	>=gnome-base/libgnome-keyring-3.12:=
-	>=dev-libs/oniguruma-6.6.0:=
-	>=dev-util/ctags-5.8
-	>=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
-	x11-libs/libxkbfile"
-RDEPEND="
-	${DEPEND}
-	!sys-apps/apmd
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
-BUILD_DIR="${S}/out"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local a
-
-	for a in ${A} ; do
-		case ${a} in
-		*.rpm) srcrpm_unpack "${a}" ;;
-		*) _unpack "${a}" ;;
-		esac
-	done
-
-	mkdir "${BIN_S}" || die
-	mv "${WORKDIR}/usr" "${BIN_S}" || die
-}
-
-src_prepare() {
-	local install_dir="$(get_install_dir)"
-	local suffix="$(get_install_suffix)"
-	local nan_s="${WORKDIR}/nodejs-nan-${NAN_V}"
-	local patch
-	local binmod
-	local _s
-
-	mkdir "${BUILD_DIR}" || die
-	cp -a "${BIN_S}/$(get_atom_rpmdir)/resources/app" \
-		"${BUILD_DIR}/app" || die
-
-	# Add source files omitted from the upstream binary distribution,
-	# and which we want to include in ours.
-	cp -a -t "${BUILD_DIR}/app" "${S}/spec" || die
-
-	# Unpack app.asar
-	if [ -e "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" ]; then
-		easar extract "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" \
-			"${BUILD_DIR}/app"
-	fi
-
-	cd "${BUILD_DIR}/app" || die
-
-	eapply "${FILESDIR}/atom-python.patch"
-	eapply "${FILESDIR}/apm-python.patch"
-	eapply "${FILESDIR}/atom-unbundle-electron-r1.patch"
-	eapply "${FILESDIR}/atom-apm-path-r2.patch"
-	eapply "${FILESDIR}/atom-license-path-r1.patch"
-	eapply "${FILESDIR}/atom-fix-app-restart-r1.patch"
-	eapply "${FILESDIR}/atom-marker-layer-r1.patch"
-
-	sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${EROOT%/}${install_dir}/app.asar|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
-		./atom.sh \
-		|| die
-
-	sed -i -e "s|^#!/bin/bash|#!${EROOT%/}/bin/bash|g" \
-		./atom.sh \
-		|| die
-
-	local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)\n\
-			   export ELECTRON_NO_ASAR=1"
-	sed -i -e \
-		"s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
-			apm/bin/apm || die
-
-	sed -i -e \
-		"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
-			apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
-
-	sed -i -e \
-		"s|atomCommand = 'atom';|atomCommand = '${EROOT%/}/usr/bin/atom${suffix}'|g" \
-			apm/lib/test.js || die
-
-	rm apm/bin/node || die
-
-	sed -i -e "s|/$(get_atom_rpmdir)/atom|${EROOT%/}/usr/bin/atom${suffix}|g" \
-		"${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
-
-	for binmod in ${BINMODS[@]}; do
-		_s="${WORKDIR}/$(package_dir ${binmod})"
-		cd "${_s}" || die
-		if _have_patches_for "${binmod}"; then
-			for patch in "${FILESDIR}"/${binmod}-*.patch; do
-				eapply "${patch}"
-			done
-		fi
-	done
-
-	cd "${BUILD_DIR}/app" || die
-
-	# Unbundle bundled libs from modules
-
-	_s="${WORKDIR}/$(package_dir git-utils)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "git;libgit2;git2" \
-		"${_s}/binding.gyp" || die
-
-	_s="${WORKDIR}/$(package_dir oniguruma)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "onig_scanner;oniguruma;onig" \
-		"${_s}/binding.gyp" || die
-
-	_s="${WORKDIR}/$(package_dir spellchecker)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle "spellchecker;hunspell;hunspell" \
-		"${_s}/binding.gyp" || die
-
-	_s="${WORKDIR}/$(package_dir superstring)"
-	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-		--inplace --unbundle \
-		"superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
-			-DPCRE2_CODE_UNIT_WIDTH=16" \
-		"${_s}/binding.gyp" || die
-
-	for binmod in ${BINMODS[@]}; do
-		_s="${WORKDIR}/$(package_dir ${binmod})"
-		mkdir -p "${_s}/node_modules" || die
-		ln -s "${nan_s}" "${_s}/node_modules/nan" || die
-	done
-
-	sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
-		"${BUILD_DIR}/app/src/config-schema.js" || die
-
-	sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
-		"${BUILD_DIR}/app/src/config-schema.js" || die
-
-	eapply_user
-}
-
-src_configure() {
-	local binmod
-
-	for binmod in ${BINMODS[@]}; do
-		einfo "Configuring ${binmod}..."
-		cd "${WORKDIR}/$(package_dir ${binmod})" || die
-		enodegyp_atom configure
-	done
-}
-
-src_compile() {
-	local binmod
-	local x
-	local ctags_d="node_modules/symbols-view/vendor"
-	local jobs=$(makeopts_jobs)
-	local gypopts
-
-	# Transpile any yet untranspiled files.
-	ecoffeescript "${BUILD_DIR}/app/spec/*.coffee"
-
-	gypopts="--verbose"
-
-	if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-		gypopts+=" --jobs ${jobs}"
-	fi
-
-	mkdir -p "${BUILD_DIR}/modules/" || die
-
-	for binmod in ${BINMODS[@]}; do
-		einfo "Building ${binmod}..."
-		cd "${WORKDIR}/$(package_dir ${binmod})" || die
-		enodegyp_atom ${gypopts} build
-		x=${binmod##node-}
-		mkdir -p "${BUILD_DIR}/modules/${x}" || die
-		cp build/Release/*.node "${BUILD_DIR}/modules/${x}" || die
-	done
-
-	# Put compiled binary modules in place
-	_fix_binmods "${BUILD_DIR}/app" "apm"
-	_fix_binmods "${BUILD_DIR}/app" "node_modules"
-
-	# Remove non-Linux vendored ctags binaries
-	rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
-	   "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
-
-	# Re-pack app.asar
-	# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
-	cd "${BUILD_DIR}" || die
-	x="--unpack={*.node,ctags-config,ctags-linux,**/spec/fixtures/**,**/node_modules/spellchecker/**,**/resources/atom.png}"
-	xd="--unpack-dir=apm"
-	easar pack "${x}" "${xd}" "app" "app.asar"
-
-	rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
-
-	# Replace vendored ctags with a symlink to system ctags
-	rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-	ln -s "${EROOT%/}/usr/bin/ctags" \
-		"${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-}
-
-src_test() {
-	local electron="$(get_electron_dir)/electron"
-	local app="${BUILD_DIR}/app.asar"
-
-	virtx "${electron}" --app="${app}" --test "${app}/spec"
-}
-
-src_install() {
-	local install_dir="$(get_install_dir)"
-	local suffix="$(get_install_suffix)"
-
-	insinto "${install_dir}"
-
-	doins "${BUILD_DIR}/app.asar"
-	doins -r "${BUILD_DIR}/app.asar.unpacked"
-
-	insinto "${install_dir}/app"
-	doins -r "${BUILD_DIR}/app/apm"
-
-	insinto "/usr/share/applications/"
-	newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
-		"atom${suffix}.desktop"
-
-	insinto "/usr/share/icons/"
-	doins -r "${BIN_S}/usr/share/icons/hicolor"
-
-	exeinto "${install_dir}"
-	newexe "${BUILD_DIR}/app/atom.sh" atom
-	insinto "/usr/share/licenses/${PN}${suffix}"
-	doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
-	dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
-	dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
-
-	_fix_executables "${install_dir}/app/apm/bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/.bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
-	_fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
-
-# Helpers
-# -------
-
-# Return the installation suffix appropriate for the slot.
-get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-# Return the upstream app name appropriate for $PV.
-get_atom_appname() {
-	if [[ "${PV}" == *beta* ]]; then
-		echo -n "atom-beta"
-	else
-		echo -n "atom"
-	fi
-}
-
-# Return the app installation path inside the upstream archive.
-get_atom_rpmdir() {
-	echo -n "usr/share/$(get_atom_appname)"
-}
-
-# Return the installation target directory.
-get_install_dir() {
-	echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
-}
-
-# Return the Electron installation directory.
-get_electron_dir() {
-	echo -n "${EROOT%/}/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
-}
-
-# Return the directory containing appropriate Node headers
-# for the required version of Electron.
-get_electron_nodedir() {
-	echo -n "${EROOT%/}/usr/include/electron-${ELECTRON_SLOT}/node/"
-}
-
-# Run JavaScript using Electron's version of Node.
-enode_electron() {
-	"$(get_electron_dir)"/node $@
-}
-
-# Run node-gyp using Electron's version of Node.
-enodegyp_atom() {
-	local apmpath="$(get_atom_rpmdir)/resources/app/apm"
-	local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
-
-	PATH="$(get_electron_dir):${PATH}" \
-		enode_electron "${nodegyp}" \
-			--nodedir="$(get_electron_nodedir)" $@ || die
-}
-
-# Coffee Script wrapper.
-ecoffeescript() {
-	local cscript="${FILESDIR}/transpile-coffee-script.js"
-
-	# Disable shell glob expansion, as we want the coffee script
-	# transpiler to do that instead.
-	set -f
-	echo "ecoffeescript" $@
-	ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
-	NODE_PATH="${BUILD_DIR}/app/node_modules" \
-		enode_electron "${cscript}" $@ || die
-	set +f
-}
-
-# asar wrapper.
-easar() {
-	local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
-	echo "asar" $@
-	enode_electron "${asar}" $@ || die
-}
-
-# Return a $WORKDIR directory for a given package name.
-package_dir() {
-	local binmod="${1//-/_}"
-	local binmod_v="${binmod^^}_V"
-	echo -n ${1}-${!binmod_v}
-}
-
-# Check if there are patches for a given package.
-_have_patches_for() {
-	local _patches="${1}-*.patch" _find
-	_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
-	test -n "$_find"
-}
-
-# Tarballs on registry.npmjs.org are wildly inconsistent,
-# and violate the convention of having ${P} as the top directory name.
-# This helper detects and fixes that.
-_unpack() {
-	local a="${1}"
-	local b="${a%.tar.gz}"
-	local p="${b#atomdep-}"
-	local dir="$(tar -tzf "${DISTDIR}/${a}" | head -1 | cut -f1 -d'/')"
-
-	unpack "${a}"
-
-	if [[ "${dir}" != "${p}" ]]; then
-		# Set the correct name for the unpacked directory.
-		mv "${WORKDIR}/${dir}" "${WORKDIR}/${p}" || die
-	fi
-}
-
-# Check if the binary node module is actually a valid dependency.
-# Sometimes the upstream removes a dependency from package.json but
-# forgets to remove the module from node_modules.
-_is_valid_binmod() {
-	local mod
-
-	for mod in "${BINMODS[@]}"; do
-		if [[ "${mod}" == "${1}" ]]; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-# Replace binary node modules with the newly compiled versions thereof.
-_fix_binmods() {
-	local _dir="${2}"
-	local _prefix="${1}"
-	local path
-	local relpath
-	local modpath
-	local mod
-	local f
-	local d
-	local cruft
-
-	(find "${_prefix}/${_dir}" -name '*.node' -print || die) \
-	| while IFS= read -r path; do
-		f=$(basename "${path}")
-		d=$(dirname "${path}")
-	    relpath=${path#${_prefix}}
-		relpath=${relpath##/}
-		relpath=${relpath#W${_dir}}
-		modpath=$(dirname ${relpath})
-		modpath=${modpath%build/Release}
-		mod=$(basename ${modpath})
-
-		_is_valid_binmod "${mod}" || continue
-
-		# must copy here as symlinks will cause the module loading to fail
-		cp -f "${BUILD_DIR}/modules/${mod}/${f}" "${path}" || die
-		cruft=$(find "${d}" -name '*.a' -print)
-		if [[ -n "${cruft}" ]]; then
-			rm ${cruft} || die
-		fi
-	done
-}
-
-# Fix script permissions and shebangs to point to the correct version
-# of Node.
-_fix_executables() {
-	local _dir="${1}"
-	local _node_sb="#!$(get_electron_dir)"/node
-
-	(find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
-	| while IFS= read -r f; do
-		IFS= read -r shebang < "${f}"
-
-		if [[ ${shebang} == '#!'* ]]; then
-			fperms +x "${f#${ED}}"
-			if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
-				einfo "Fixing node shebang in ${f#${ED}}"
-				sed --follow-symlinks -i \
-					-e "1s:${shebang}$:${_node_sb}:" "${f}" || die
-			fi
-		fi
-	done || die
-}
diff --git a/app-editors/atom/files/apm-python.patch b/app-editors/atom/files/apm-python.patch
deleted file mode 100644
index 0467beaf10ee..000000000000
--- a/app-editors/atom/files/apm-python.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/apm/bin/python-interceptor.sh b/apm/bin/python-interceptor.sh
-index 7ce1965..12cc72f 100755
---- a/apm/bin/python-interceptor.sh
-+++ b/apm/bin/python-interceptor.sh
-@@ -34,9 +34,9 @@ case $1 in
-       ARGS+=("--format=safemake.py")
-     fi
- 
--    exec python "${ARGS[@]}"
-+    exec python2 "${ARGS[@]}"
-     ;;
-   *)
--    exec python "$@"
-+    exec python2 "$@"
-     ;;
- esac
diff --git a/app-editors/atom/files/atom-apm-path-r2.patch b/app-editors/atom/files/atom-apm-path-r2.patch
deleted file mode 100644
index 12234b6bab13..000000000000
--- a/app-editors/atom/files/atom-apm-path-r2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/config-schema.js b/src/config-schema.js
-index 39f0585..24ee2de 100644
---- a/src/config-schema.js
-+++ b/src/config-schema.js
-@@ -5,6 +5,11 @@ const configSchema = {
-   core: {
-     type: 'object',
-     properties: {
-+      apmPath: {
-+        type: 'string',
-+        "default": '{{ATOM_PREFIX}}/usr/bin/apm{{ATOM_SUFFIX}}',
-+        description: 'Path to apm executable.'
-+      },
-       ignoredNames: {
-         type: 'array',
-         default: ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db', 'desktop.ini'],
diff --git a/app-editors/atom/files/atom-fix-app-restart-r1.patch b/app-editors/atom/files/atom-fix-app-restart-r1.patch
deleted file mode 100644
index f984d7841be9..000000000000
--- a/app-editors/atom/files/atom-fix-app-restart-r1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/atom-application.js.orig b/atom-application.js
-index 92d985f..9a120e6 100644
---- a/src/main-process/atom-application.js
-+++ b/src/main-process/atom-application.js
-@@ -1178,6 +1178,7 @@
-     AtomApplication.prototype.restart = function() {
-       var args;
-       args = [];
-+      args.push("--app=" + this.resourcePath);
-       if (this.safeMode) {
-         args.push("--safe");
-       }
diff --git a/app-editors/atom/files/atom-license-path-r1.patch b/app-editors/atom/files/atom-license-path-r1.patch
deleted file mode 100644
index c8d6ab9784f0..000000000000
--- a/app-editors/atom/files/atom-license-path-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/main-process/atom-application.js
-+++ b/src/main-process/atom-application.js
-@@ -406,7 +406,7 @@
-       this.openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap');
-       this.openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets');
-       this.openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet');
--      this.openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'));
-+      this.openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md');
-       this.disposable.add(ipcHelpers.on(app, 'before-quit', (function(_this) {
-         return function(event) {
-           if (!_this.quitting) {
diff --git a/app-editors/atom/files/atom-marker-layer-r1.patch b/app-editors/atom/files/atom-marker-layer-r1.patch
deleted file mode 100644
index 1dcdecbd4eba..000000000000
--- a/app-editors/atom/files/atom-marker-layer-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/node_modules/text-buffer/lib/marker-layer.js
---- b/node_modules/text-buffer/lib/marker-layer.js
-@@ -192,7 +192,7 @@
-         return function(markerId) {
-           var marker;
-           marker = _this.markersById[markerId];
--          if (!marker.matchesParams(params)) {
-+          if (marker == null || !marker.matchesParams(params)) {
-             return;
-           }
-           return result.push(marker);
diff --git a/app-editors/atom/files/atom-python.patch b/app-editors/atom/files/atom-python.patch
deleted file mode 100644
index 57a475ecce02..000000000000
--- a/app-editors/atom/files/atom-python.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/atom.sh
-+++ b/atom.sh
-@@ -92,6 +92,7 @@
-   fi
- 
-   ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
-+  export PYTHON=python2
-   mkdir -p "$ATOM_HOME"
- 
-   : ${TMPDIR:=/tmp}
diff --git a/app-editors/atom/files/atom-unbundle-electron-r1.patch b/app-editors/atom/files/atom-unbundle-electron-r1.patch
deleted file mode 100644
index 85c0c64ab794..000000000000
--- a/app-editors/atom/files/atom-unbundle-electron-r1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ea6d1be3558d7610ccc82b3a44dd30657a686639 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Thu, 27 Jul 2017 13:18:54 -0400
-Subject: [PATCH] Unbundle electron
-
----
- atom.sh | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/atom.sh b/atom.sh
-index 6b0e94430..ea8e0dc2e 100755
---- a/atom.sh
-+++ b/atom.sh
-@@ -102,11 +102,10 @@ elif [ $OS == 'Linux' ]; then
-   SCRIPT=$(readlink -f "$0")
-   USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
- 
--  if [ -n "$BETA_VERSION" ]; then
--    ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
--  else
--    ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
--  fi
-+  export NPM_CONFIG_NODEDIR="{{NPM_CONFIG_NODEDIR}}"
-+  export ATOM_RESOURCE_PATH="{{ATOM_RESOURCE_PATH}}"
-+  export LOCAL_GIT_DIRECTORY="{{ATOM_PREFIX}}/usr"
-+  ATOM_PATH="{{ATOM_PATH}}"
- 
-   ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
-   mkdir -p "$ATOM_HOME"
-@@ -116,11 +115,11 @@ elif [ $OS == 'Linux' ]; then
-   [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
- 
-   if [ $EXPECT_OUTPUT ]; then
--    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+    "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-     exit $?
-   else
-     (
--    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-+    nohup "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-     if [ $? -ne 0 ]; then
-       cat "$ATOM_HOME/nohup.out"
-       exit $?
--- 
-2.13.3
diff --git a/app-editors/atom/files/gyp-unbundle.py b/app-editors/atom/files/gyp-unbundle.py
deleted file mode 100644
index 370221380b64..000000000000
--- a/app-editors/atom/files/gyp-unbundle.py
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/env python2
-
-from __future__ import print_function
-
-
-import argparse
-import pprint
-import sys
-
-
-def die(msg):
-    print(msg, file=sys.stderr)
-    sys.exit(1)
-
-
-def do_unbundle(gypdata, targets):
-    gyptargets = {t['target_name']: t for t in gypdata['targets']}
-    dropped_deps = set()
-
-    def _unbundle_in_block(gypblock):
-        gypdeps = gypblock.get('dependencies') or {}
-
-        for dep, (libs, defines) in unbundlings.items():
-            if dep not in gypdeps:
-                continue
-
-            gypdeps.remove(dep)
-
-            try:
-                ls = gyptarget['link_settings']
-            except KeyError:
-                ls = gyptarget['link_settings'] = {}
-
-            try:
-                gyplibs = ls['libraries']
-            except KeyError:
-                gyplibs = ls['libraries'] = []
-
-            gyplibs.extend('-l{}'.format(lib) for lib in libs)
-
-            if defines:
-                try:
-                    dd = gyptarget['defines']
-                except KeyError:
-                    dd = gyptarget['defines'] = []
-
-                dd.extend(defines)
-
-            dropped_deps.add(dep)
-
-        gypconds = gypblock.get('conditions') or []
-        for cond in gypconds:
-            condblocks = cond[1:]
-            for condblock in condblocks:
-                _unbundle_in_block(condblock)
-
-    for target, unbundlings in targets.items():
-        if target not in gyptargets:
-            die('There is no {} target in gyp file'.format(target))
-
-        gyptarget = gyptargets[target]
-
-        _unbundle_in_block(gyptarget)
-
-    for gyptarget in gypdata['targets']:
-        if gyptarget['target_name'] in dropped_deps:
-            if gyptarget.get('dependencies'):
-                dropped_deps.update(gyptarget.get('dependencies'))
-
-    new_targets = []
-    for gyptarget in gypdata['targets']:
-        if gyptarget['target_name'] not in dropped_deps:
-            new_targets.append(gyptarget)
-
-    gypdata['targets'] = new_targets
-
-    gypconds = gypdata.get('conditions')
-    if gypconds:
-        for cond in gypconds:
-            condblocks = cond[1:]
-            for condblock in condblocks:
-                new_targets = []
-                blocktargets = condblock.get('targets')
-                if blocktargets:
-                    for blocktarget in blocktargets:
-                        if blocktarget['target_name'] not in dropped_deps:
-                            new_targets.append(blocktarget)
-                    condblock['targets'] = new_targets
-
-
-def main():
-    parser = argparse.ArgumentParser(description='Unbundle libs in gyp files')
-    parser.add_argument('gypfile', type=str, help='input gyp file')
-    parser.add_argument(
-        '--unbundle', type=str, action='append',
-        help='unbundle rule in the format '
-             '<target>;<dep>;<lib>[;lib][;-DMACRO]')
-    parser.add_argument(
-        '-i', '--inplace', action='store_true',
-        help='modify gyp file in-place')
-
-    args = parser.parse_args()
-
-    targets = {}
-
-    for unbundle in args.unbundle:
-        rule = list(filter(None, (i.strip() for i in unbundle.split(';'))))
-        if len(rule) < 3:
-            die('Invalid unbundle rule: {!r}'.format(unbundle))
-        target, dep = rule[:2]
-
-        defines = []
-        libs = []
-
-        for item in rule[2:]:
-            if item.startswith('-D'):
-                defines.append(item[2:])
-            else:
-                libs.append(item)
-
-        try:
-            target_unbundlings = targets[target]
-        except KeyError:
-            target_unbundlings = targets[target] = {}
-
-        target_unbundlings[dep] = libs, defines
-
-    with open(args.gypfile, 'rt') as f:
-        gypdata = eval(f.read())
-
-    do_unbundle(gypdata, targets)
-
-    if args.inplace:
-        with open(args.gypfile, 'wt') as f:
-            pprint.pprint(gypdata, stream=f)
-    else:
-        pprint.pprint(gypdata)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/app-editors/atom/files/transpile-coffee-script.js b/app-editors/atom/files/transpile-coffee-script.js
deleted file mode 100644
index c32e09cad92d..000000000000
--- a/app-editors/atom/files/transpile-coffee-script.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict'
-
-const CompileCache = require(process.env.ATOM_SRC_ROOT + '/src/compile-cache')
-const fs = require('fs')
-const glob = require('glob')
-const path = require('path')
-
-module.exports = function () {
-  let paths = new Set()
-
-  for (let pattern of process.argv.slice(2)) {
-    for (let path of glob.sync(pattern, {nodir: true})) {
-      paths.add(path)
-    }
-  }
-
-  for (let path of paths) {
-    let jsPath = coffeePath.replace(/coffee$/g, 'js')
-    fs.writeFileSync(
-      jsPath, CompileCache.addPathToCache(coffeePath, process.env.ATOM_HOME))
-    fs.unlinkSync(coffeePath)
-  }
-}
diff --git a/app-editors/atom/metadata.xml b/app-editors/atom/metadata.xml
deleted file mode 100644
index 8278b52b9728..000000000000
--- a/app-editors/atom/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>elvis@magic.io</email>
-		<name>Elvis Pranskevichus</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>cynede@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">atom/node-spellchecker</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/beaver-0.4.1 b/app-editors/beaver-0.4.1
new file mode 100644
index 000000000000..1e1632c17788
--- /dev/null
+++ b/app-editors/beaver-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.14:2 >=x11-libs/gtk+-2.10:2 doc? ( app-doc/doxygen ) virtual/pkgconfig dev-util/intltool sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=Beaver is an Early AdVanced EditoR
+EAPI=5
+HOMEPAGE=http://beaver-editor.sourceforge.net/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.14:2 >=x11-libs/gtk+-2.10:2
+SLOT=0
+SRC_URI=mirror://sourceforge/beaver-editor/beaver-0.4.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7d5dada028f278c3678360117ec246c1
diff --git a/app-editors/beaver/Manifest b/app-editors/beaver/Manifest
deleted file mode 100644
index 6a791192ad3e..000000000000
--- a/app-editors/beaver/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX beaver-0.4.1-desktop-file-validate.patch 541 BLAKE2B 3847326cc887bee9f3bff580fb15de09375a44180941551b67b8a8be66396c32c6e671b7bea724cd9c318a6fd6fb5851944422b64f6229e663501e1da331fb1d SHA512 17a1f673f3b7b9e283cb1d8ea33b387cf78f1a2623f2a8ae114960504db6c90afec980035ec5627584f144ec516f65b1c2a52880f0ad6114dbabff02031ba6d5
-DIST beaver-0.4.1.tar.bz2 436321 BLAKE2B 034829d795b5a0502a2df1e675e01d34cc62efbc482959e2d3e0ecf9eeddf1d8450e92ee9c2f98af3e2778ad4c14fac926291ca935ec79822f8f552a9579363e SHA512 3000bed3aa2a67d6c38a68a7782a9d5423bcec0b8420272b0f0dade604c094a7b52058b43222af38d56313f0aa27998028c984f69340bf28eeaa8b8a93548a1e
-EBUILD beaver-0.4.1.ebuild 926 BLAKE2B ae78dd9f1370ef0d161a5f11d2bfceaaec26a7d3cd86630cc366867522f0c62a5d26ed4780106796a76c42330381882dc6a3125e69dc1d52eb8257bdde5a792e SHA512 9ebbe07c0cbb89a13da8661d0f0d2860d5c158cbb39daefabe9690290998afc29ae4eecbc1c7d376db7ba0954a757ae02f50fa083ec4530f37bbad89a270b60a
-MISC metadata.xml 359 BLAKE2B d0b8402f3a7a6f77f7c79733394a2bf595320b8f51a65432fd545975b72e9d94ecd5845b8f9f446b3519f6ee2d44c111dadfe6d86cd78bee0f1ba4c3bd7da31c SHA512 7fec5e4168c877d16d8d744244e0aa3cfef4d6d219dc3485caeb21802de8aab2a00188572393b885ef7f8f7ed72b3bad3f5622ecf057347ce6969fb1d3fc5759
diff --git a/app-editors/beaver/beaver-0.4.1.ebuild b/app-editors/beaver/beaver-0.4.1.ebuild
deleted file mode 100644
index 88eebb1e378a..000000000000
--- a/app-editors/beaver/beaver-0.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils
-
-DESCRIPTION="Beaver is an Early AdVanced EditoR"
-HOMEPAGE="http://beaver-editor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/beaver-editor/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	>=x11-libs/gtk+-2.10:2"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.4.1-desktop-file-validate.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable debug)
-}
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_install() {
-	default
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-editors/beaver/files/beaver-0.4.1-desktop-file-validate.patch b/app-editors/beaver/files/beaver-0.4.1-desktop-file-validate.patch
deleted file mode 100644
index b820826e14d6..000000000000
--- a/app-editors/beaver/files/beaver-0.4.1-desktop-file-validate.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- data/beaver.desktop
-+++ data/beaver.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Beaver
- GenericName=Programmer's Text Editor
- Comment=Beaver's an Early AdVanced EditoR
-@@ -9,4 +8,4 @@
- MimeType=text/plain;application/x-shellscript;text/x-c;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;
- StartupNotify=false
- Type=Application
--Categories=Application;Development;TextEditor;GTK;
-+Categories=Development;Utility;TextEditor;GTK;
diff --git a/app-editors/beaver/metadata.xml b/app-editors/beaver/metadata.xml
deleted file mode 100644
index 086adea88901..000000000000
--- a/app-editors/beaver/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">beaver-editor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/bluefish-2.2.10 b/app-editors/bluefish-2.2.10
new file mode 100644
index 000000000000..a51ad34437ae
--- /dev/null
+++ b/app-editors/bluefish-2.2.10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=sys-libs/zlib !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 gucharmap? ( gnome-extra/gucharmap:2.90 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant ) dev-libs/libxml2:2 >=dev-libs/glib-2.24:2 virtual/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=A GTK HTML editor for the experienced web designer or programmer
+EAPI=6
+HOMEPAGE=http://bluefish.openoffice.nl/
+IUSE=+gtk3 gucharmap nls python spell python_targets_python2_7
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 gucharmap? ( gnome-extra/gucharmap:2.90 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.10.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c53f00b3eab0173ce6f5eaf6e1b4b500
diff --git a/app-editors/bluefish-2.2.6 b/app-editors/bluefish-2.2.6
new file mode 100644
index 000000000000..b5089ce2b8d6
--- /dev/null
+++ b/app-editors/bluefish-2.2.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm preinst setup
+DEPEND=x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant ) >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 virtual/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool ) >=sys-apps/sed-4
+DESCRIPTION=A GTK HTML editor for the experienced web designer or programmer
+EAPI=5
+HOMEPAGE=http://bluefish.openoffice.nl/
+IUSE=nls python spell python_targets_python2_7
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.6.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=77b5eefabf665f5ab3e2df65dde7d365
diff --git a/app-editors/bluefish-2.2.8 b/app-editors/bluefish-2.2.8
new file mode 100644
index 000000000000..130b094808f3
--- /dev/null
+++ b/app-editors/bluefish-2.2.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=sys-libs/zlib gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) gucharmap? ( gnome-extra/gucharmap:2.90 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant ) dev-libs/libxml2:2 >=dev-libs/glib-2.24:2 virtual/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool ) >=sys-apps/sed-4
+DESCRIPTION=A GTK HTML editor for the experienced web designer or programmer
+EAPI=6
+HOMEPAGE=http://bluefish.openoffice.nl/
+IUSE=gtk2 +gtk3 gucharmap nls python spell python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) gucharmap? ( gnome-extra/gucharmap:2.90 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant )
+REQUIRED_USE=gtk2? ( !gtk3 !gucharmap ) gtk3? ( !gtk2 ) python? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.8.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=38ee37494f66c2374c140566464dd635
diff --git a/app-editors/bluefish-2.2.9 b/app-editors/bluefish-2.2.9
new file mode 100644
index 000000000000..6a08aa447c2f
--- /dev/null
+++ b/app-editors/bluefish-2.2.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=sys-libs/zlib !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 gucharmap? ( gnome-extra/gucharmap:2.90 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant ) dev-libs/libxml2:2 >=dev-libs/glib-2.24:2 virtual/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=A GTK HTML editor for the experienced web designer or programmer
+EAPI=6
+HOMEPAGE=http://bluefish.openoffice.nl/
+IUSE=+gtk3 gucharmap nls python spell python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 gucharmap? ( gnome-extra/gucharmap:2.90 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.9.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4444a27a3158c9ef837efe0418591d10
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
deleted file mode 100644
index 90c68997bd7c..000000000000
--- a/app-editors/bluefish/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889
-DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5970c72584b683779f5bcaf921a8925c6275c647125f73990e99a0175e3c92c0cc286590fbd08e938c6fd1d8c32cef SHA512 ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb
-DIST bluefish-2.2.6.tar.bz2 3793018 BLAKE2B f77b5e21a3289ebd2c9e3986476dca30e42ff489240adccba91a5aaa4a2e35282fb2b0a38137d249747e0496f410cd51159cdd7dc4e3b46a6affcb68d9b58099 SHA512 39dee296ec6bbe1a946f9fb1c54e7143363da4bb6ce52aee14c9bef906d2eb82e5e58f78680810357c0bfcb11c21f982756a9199fec2f454c2816005a4d9d83e
-DIST bluefish-2.2.8.tar.bz2 4097769 BLAKE2B f0e38841dde2e620fa2ea7390891f2c09f349d9861aeeef9b919dbdc67d7be15dd28852736590e99f0cd167feee3089df929e261e8a244f1301e130a3bad451b SHA512 0450909feb2370c1c84a214744f103bfe891086ba5f3ccc85060b4e134ee2161c3fde641720a3544a4d71c25f120a35925517cee4ffce6e2f07c778baa2cc5c1
-DIST bluefish-2.2.9.tar.bz2 4082978 BLAKE2B a99db5acc2bce79aefccdf676a9ce965f682e99531790f20d6c67ad7f43c566009793efc4f3369aa425fc764dcf05f2a83b0260bf6531845cac2c707009c7967 SHA512 ef644b37907d308b908d508ad00069e48343cd240ca7703a20b4498eda73be1a97a6c07598f6e51d4fb1c0f2a380c86a274ccbbe046da01db6c4641e41e268ae
-EBUILD bluefish-2.2.10.ebuild 2763 BLAKE2B 2b122e7bc7e3759e37b9e64ff4a618f5fff15d1931bf33ae4408c870758c61c99f28c7303ce0d3ea8f12a658f85bc4fff28422beb499ef764905121dec0a7bbf SHA512 29663a481073d4d158e0c529479464019d4edc5bb0d639f2755d439bb30e86c36d0935a4ae9f9694c737e9b96a326893f55df6358aa47325d19b70a8f644e61d
-EBUILD bluefish-2.2.6.ebuild 2340 BLAKE2B ffa844212337201b9a851f31b6b47f0e53a79df5624b1045074e729610af1d7a03752bfd6fe1f9559c6ddf557d3d8b3c33dd619aaa2569059322eeff9d9ff1b1 SHA512 d0ff8dd70461bcfe97888ad97bcf8fb4cf8cec932eeb0ca79614ac612ab04623cc928b988bce0f9c301482371d21ceaf093b9e70e2f854a824b18c3655503dba
-EBUILD bluefish-2.2.8.ebuild 2605 BLAKE2B 25c8fcd77c7b717e2625e5c59f20b443e710b92e44d0ac1b59416e410b5bff6b38cf444be6b4ef8249717dc5bc36189a300d17730cd9924918e3a31214bd2154 SHA512 3c096bbbdd8b77c18f5b92246f6d4ac6548c0499148c3562e9a308a45da602f236c1595a1534c8141f5d123c2c3d277eb6f9ff634a60054e852aaf9a7a7df065
-EBUILD bluefish-2.2.9.ebuild 2765 BLAKE2B 038b937c439b635d8e8e601b623613e59fa71bc513759ff46b4e5d3a9d9f5dce7f2712b94c3f62de8ca1bbc5ef91393941753db4b88f1d57b9dfcbe39af4672f SHA512 5b000ec5b127aca8d743fa0bed7e2360c6e0f9422600ff62d2d18b51bcd54eda306830916b43754bc3a227271e0b3ffcc975eca69e9b80ea7e03ed83661aac00
-MISC metadata.xml 542 BLAKE2B 0680cbbd32a85e3c53e10b4605e820d5eabc79761ef70bd41a5fe3cfb2a25a19251696c5b2e35f729e38c481728635cfbf8253ef07f15c656f8b164df905d3ef SHA512 7449eb863eecc8ed11167409f150847c628077e328f13481db6206498d15c7c6e148e7c309ed40eaf781f401147b7a757e8216324b2c01ea65202e39bf57fe5f
diff --git a/app-editors/bluefish/bluefish-2.2.10.ebuild b/app-editors/bluefish/bluefish-2.2.10.ebuild
deleted file mode 100644
index 1b0c1d0173a7..000000000000
--- a/app-editors/bluefish/bluefish-2.2.10.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2-utils python-single-r1 xdg-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-SLOT="0"
-IUSE="+gtk3 gucharmap nls python spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/zlib
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? (
-		x11-libs/gtk+:3
-		gucharmap? ( gnome-extra/gucharmap:2.90 )
-	)
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-libs/glib-2.24:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	if ! use gtk3 && use gucharmap ; then
-		ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled."
-		ewarn "Disabling charmap plugin."
-	fi
-
-	use python && python-single-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.9-charmap_configure.patch"
-)
-
-# eautoreconf seems to no longer kill translation files.
-src_prepare() {
-	default
-	eautoreconf
-	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_with !gtk3 gtk2) \
-		$(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/bluefish-2.2.6.ebuild b/app-editors/bluefish/bluefish-2.2.6.ebuild
deleted file mode 100644
index 2e47961b2f0c..000000000000
--- a/app-editors/bluefish/bluefish-2.2.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2-utils python-single-r1 xdg-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-SLOT="0"
-IUSE="nls python spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	gnome-extra/gucharmap:2.90
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	>=dev-libs/glib-2.16:2
-	dev-libs/libxml2:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-# Never eautoreconf this package as gettext breaks completely (no translations
-# even if it compiles afterwards)!
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/bluefish-2.2.8.ebuild b/app-editors/bluefish/bluefish-2.2.8.ebuild
deleted file mode 100644
index 2ffd0fb8bb4f..000000000000
--- a/app-editors/bluefish/bluefish-2.2.8.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2-utils python-single-r1 xdg-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="gtk2 +gtk3 gucharmap nls python spell"
-
-RDEPEND="
-	sys-libs/zlib
-	gtk2? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	gucharmap? ( gnome-extra/gucharmap:2.90 )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-libs/glib-2.24:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-REQUIRED_USE="
-	gtk2? ( !gtk3 !gucharmap )
-	gtk3? ( !gtk2 )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-# Never eautoreconf this package as gettext breaks completely (no translations
-# even if it compiles afterwards)!
-
-src_prepare() {
-	default
-	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_with gtk2 ) \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/bluefish-2.2.9.ebuild b/app-editors/bluefish/bluefish-2.2.9.ebuild
deleted file mode 100644
index 2e9a485511db..000000000000
--- a/app-editors/bluefish/bluefish-2.2.9.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2-utils python-single-r1 xdg-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="+gtk3 gucharmap nls python spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/zlib
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? (
-		x11-libs/gtk+:3
-		gucharmap? ( gnome-extra/gucharmap:2.90 )
-	)
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-libs/glib-2.24:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	if ! use gtk3 && use gucharmap ; then
-		ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled."
-		ewarn "Disabling charmap plugin."
-	fi
-
-	use python && python-single-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.9-charmap_configure.patch"
-)
-
-# eautoreconf seems to no longer kill translation files.
-src_prepare() {
-	default
-	eautoreconf
-	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_with !gtk3 gtk2) \
-		$(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/files/bluefish-2.2.9-charmap_configure.patch b/app-editors/bluefish/files/bluefish-2.2.9-charmap_configure.patch
deleted file mode 100644
index 0e97e38c59f5..000000000000
--- a/app-editors/bluefish/files/bluefish-2.2.9-charmap_configure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- bluefish-2.2.9/configure.ac
-+++ bluefish-2.2.9/configure.ac
-@@ -504,7 +504,15 @@
- 	AC_MSG_RESULT([no])
- fi
- 
-+AC_ARG_WITH(
-+	[charmap],
-+	AC_HELP_STRING(
-+		[--with-charmap],
-+		[Build the charmap plugin if gucharmap is available @<:@default=yes@:>@]
-+	)
-+)
- 
-+if test "x$with_charmap" != "xno"; then
- # optionally build the charmap plugin if gucharmap is available
- AC_MSG_NOTICE([checking for optional libgucharmap development files])
- if test "x$with_gtk3" != "xno"; then
-@@ -544,6 +552,10 @@
- 		)]
- 	)
- fi
-+else
-+	build_charmap_plugin=no
-+	AC_MSG_WARN([Disabling the building of the charmap plugin.])
-+fi
- AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xyes"])
- 
- AC_SEARCH_LIBS([log10], [m])
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
deleted file mode 100644
index 7e95699afd85..000000000000
--- a/app-editors/bluefish/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<use>
-	<flag name="gtk2">Enable GTK2 instead of GTK3 even if GTK3 is available</flag>
-	<flag name="gtk3">Enable GTK3 interface (default)</flag>
-	<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
-	<flag name="python">Enable Python integration for zen-coding plugin</flag>
-	<flag name="spell">Enable spell checking capabilities via enchant library</flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/bvi-1.3.2-r2 b/app-editors/bvi-1.3.2-r2
new file mode 100644
index 000000000000..aaa5e2c13925
--- /dev/null
+++ b/app-editors/bvi-1.3.2-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=display-oriented editor for binary files, based on the vi texteditor
+EAPI=4
+HOMEPAGE=http://bvi.sourceforge.net/
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses
+SLOT=0
+SRC_URI=mirror://sourceforge/bvi/bvi-1.3.2.src.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e4ef61b3cf286e4ce89b159dd9701433
diff --git a/app-editors/bvi-1.4.0_alpha b/app-editors/bvi-1.4.0_alpha
new file mode 100644
index 000000000000..171cc0756150
--- /dev/null
+++ b/app-editors/bvi-1.4.0_alpha
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses
+DESCRIPTION=display-oriented editor for binary files, based on the vi texteditor
+EAPI=4
+HOMEPAGE=http://bvi.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses
+SLOT=0
+SRC_URI=mirror://sourceforge/bvi/bvi-1.4.0alpha.src.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2d1b2ac8a2cda627932b5c9c50ebb4a8
diff --git a/app-editors/bvi/Manifest b/app-editors/bvi/Manifest
deleted file mode 100644
index 4e6e015cc9e3..000000000000
--- a/app-editors/bvi/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-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.3.2.src.tar.gz 170444 BLAKE2B 5726fe730b6751a768247581cfd4dce0a40a9ce8e8852c977b62ddd72bd8d8db7b66535a7c711b6837e10d63ee7aca9b5bdb6ba3ea0288d823e684fcabbd79b2 SHA512 eb8a01602751b61c471207124c90346375ccf34ba85e661143f6da8f113f48070d132e98213484bd16d0b6b4c8d0fa27776d36f18cac21336076ca35bcfcb58c
-DIST bvi-1.4.0alpha.src.tar.gz 128821 BLAKE2B b285e9aee5c510205684296afd975fdf4f392d9743561aa8c80c69785eb1b431886fb8664adcb1393b514e77b2e3df562d7c253427364891c36e1c56d4313975 SHA512 75cf0ff27809e2c4213da72b022e012003d6ef272d734d0c18f03d5cb49bc891b4d3d40a9e6bfff226906062fcd3e319a7503d09409fa2023f5ba1d434e66217
-EBUILD bvi-1.3.2-r2.ebuild 1165 BLAKE2B 217ca4311f9982e69b93a95466f6469f19ad2770e5697331f3928eaae731e286401e3e1e42883840f7d602fb3918634dca3feb3b12aa0e2a0d45e6a046b16c4b SHA512 cac249798af37841330e91e49d74d6badb65d8df69aa0512721bd3d47c8961e2c0a940efed31569863767485917d9ce3c42ee888a244a60a229920241b987002
-EBUILD bvi-1.4.0_alpha.ebuild 1058 BLAKE2B fe2efcc9311f8b1945710f5b7c1705f909b8a5eea9b6f29acc65a845a175f3bf17214c32539941318e1bb877066b8cd91c0716d220b865984a14336663eb07a2 SHA512 065cad807372427e57158a12ec5ca095dd7a63a54db8e3a79a607766f79edd05e589b82606261d963eebdac37c3dfb87404bfc4b09106e299d435ef925b3b9cf
-MISC metadata.xml 212 BLAKE2B 0d954f27d3e4eee78d51082e8466a4e81b7ec1963e72b1ee613219df33a75debd7df85cf94226bebaf76f39f37ea84441abc6144dd703db2e9766bd582356e30 SHA512 79e460fd0f3b1b82105557fd8070ecbab50e70ee4c65d5ae289fc31808ef0dd947bfb33483c31b812100ec48864af8551250f739f54ceac2876dee264c4e56c5
diff --git a/app-editors/bvi/bvi-1.3.2-r2.ebuild b/app-editors/bvi/bvi-1.3.2-r2.ebuild
deleted file mode 100644
index 1f7611c79ba0..000000000000
--- a/app-editors/bvi/bvi-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit multilib eutils autotools-utils
-
-DESCRIPTION="display-oriented editor for binary files, based on the vi texteditor"
-HOMEPAGE="http://bvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bvi/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-fix-buffer-overflow.patch"
-		"${FILESDIR}/${P}-tinfo.patch"
-		)
-	sed -i -e 's:ncurses/term.h:term.h:g' bmore.h || die "sed failed in bmore.h"
-	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
-		Makefile.in || die "sed failed in Makefile.in"
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(--with-ncurses="${EPREFIX}"/usr)
-	autotools-utils_src_configure
-
-}
-
-src_install() {
-	autotools-utils_src_install
-	rm -rf "${ED}"/usr/$(get_libdir)/bmore.help
-	dodoc README CHANGES CREDITS bmore.help
-	dohtml -r html/*
-}
diff --git a/app-editors/bvi/bvi-1.4.0_alpha.ebuild b/app-editors/bvi/bvi-1.4.0_alpha.ebuild
deleted file mode 100644
index 6c63395f9c09..000000000000
--- a/app-editors/bvi/bvi-1.4.0_alpha.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit multilib eutils versionator
-
-MY_P=$(replace_version_separator 4 '' ${P})
-
-DESCRIPTION="display-oriented editor for binary files, based on the vi texteditor"
-HOMEPAGE="http://bvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bvi/$(replace_version_separator 4 '' ${P}).src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/$MY_P"
-
-src_prepare() {
-	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
-		Makefile.in || die "sed failed in Makefile.in"
-
-	epatch_user
-}
-
-src_configure() {
-	econf --with-ncurses="${EPREFIX}"/usr
-
-	sed -i -e 's:ncurses/term.h:term.h:g' bmore.h || die "sed failed in bmore.h"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	rm -rf "${D}"/usr/$(get_libdir)/bmore.help
-	dodoc README CHANGES CREDITS bmore.help
-}
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/bvi/metadata.xml b/app-editors/bvi/metadata.xml
deleted file mode 100644
index 02e1ad7c6d7e..000000000000
--- a/app-editors/bvi/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="sourceforge">bvi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/curses-hexedit-0.9.7 b/app-editors/curses-hexedit-0.9.7
new file mode 100644
index 000000000000..55190485618e
--- /dev/null
+++ b/app-editors/curses-hexedit-0.9.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/ncurses:= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=full screen curses hex editor (with insert/delete support)
+EAPI=5
+HOMEPAGE=http://www.rogoyski.com/adam/programs/hexedit/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=sys-libs/ncurses:=
+SLOT=0
+SRC_URI=http://www.rogoyski.com/adam/programs/hexedit/hexedit-0.9.7.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3c7ebd42b1e3dca2edc7a5eb033b6744
diff --git a/app-editors/curses-hexedit/Manifest b/app-editors/curses-hexedit/Manifest
deleted file mode 100644
index 4eb5683967d2..000000000000
--- a/app-editors/curses-hexedit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX curses-hexedit-0.9.7-ncurses-pkg-config.patch 964 BLAKE2B aa433c31a1838cd9fd5d179f628aa2f4c9ffa44bc9eecd1c52c03b6b7a1837235259ad9c689bc6b574c56b0181c1a8ee556c46064b49b70a7393ce9ed99cbef1 SHA512 33efc29f64b9556e761f84d425b1e3c6207c06ecdac0499c9ce4fc1fe9023dbb06245987e8d4f23a6149607d033d1b6a22bf2e7cb5904f83a258cf0e91e56cda
-DIST hexedit-0.9.7.tar.gz 165110 BLAKE2B 8adcb2aa8265ef01c475fcefc97c987da26107871ac87e6154b13257cf30283d5be96fb87d67b6b24d79cf0fdcca7c2bfcd1ef642e9bc1655141cada27fd9aab SHA512 b11b28538900f6e66a9efcca14cd8c2a312c29cea98c6ea5018cd3423e12876a9a4d0bf6dc4f94e7cb02e8bc8d3a406e6bccca7fa7dcbab2e4b717ee2fd826da
-EBUILD curses-hexedit-0.9.7.ebuild 726 BLAKE2B 683d121d255e5e4c8ffb1a0325dae1ee9354c6126c2db79c90e13af0c3b0cd71ef8908f777cf95a8ba619f2ec1425d58a2f738ae504b47d38bbf7b983098635e SHA512 7f4631bacfdb9c2a3a3f8910c27caee77ab087de74a585c7527fd72d779700493bb73cb19eb8979dd3727394dfd2c73c36d50853f7c5587cdf36a11b3ac7356f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/curses-hexedit/curses-hexedit-0.9.7.ebuild b/app-editors/curses-hexedit/curses-hexedit-0.9.7.ebuild
deleted file mode 100644
index 7eddb2375aaf..000000000000
--- a/app-editors/curses-hexedit/curses-hexedit-0.9.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# There's already a "hexedit" package in the tree, so name this one differently
-
-EAPI="5"
-
-inherit toolchain-funcs eutils autotools
-
-MY_P=${P/curses-}
-DESCRIPTION="full screen curses hex editor (with insert/delete support)"
-HOMEPAGE="http://www.rogoyski.com/adam/programs/hexedit/"
-SRC_URI="http://www.rogoyski.com/adam/programs/hexedit/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ncurses-pkg-config.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --program-prefix=curses-
-}
diff --git a/app-editors/curses-hexedit/files/curses-hexedit-0.9.7-ncurses-pkg-config.patch b/app-editors/curses-hexedit/files/curses-hexedit-0.9.7-ncurses-pkg-config.patch
deleted file mode 100644
index 94d6263589cf..000000000000
--- a/app-editors/curses-hexedit/files/curses-hexedit-0.9.7-ncurses-pkg-config.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-use pkg-config to locate ncurses rather than a library search
-
---- a/configure.in
-+++ b/configure.in
-@@ -19,14 +19,9 @@
- AC_HEADER_STDC
- AC_PROG_GCC_TRADITIONAL
- 
--AC_CHECK_HEADERS(ncurses.h)
--if test "$ac_cv_header_ncurses_h" = "no"; then
--  AC_CHECK_HEADERS(curses.h)
--  if test "$ac_cv_header_curses_h" = "no"; then
--    echo "*** Cannot find Curses headers, probably not installed"
--    echo "*** Hexedit will not run without the curses library"
--  fi
--fi
-+PKG_CHECK_MODULES(NCURSES, ncurses)
-+CFLAGS="$CFLAGS $NCURSES_CFLAGS -DHAVE_NCURSES_H=1"
-+LIBS="$LIBS $NCURSES_LIBS"
- 
- AC_CHECK_HEADERS(fcntl.h getopt.h limits.h sys/ioctl.h unistd.h)
- AC_HEADER_DIRENT
-@@ -96,11 +91,4 @@ else
-   fi
- fi
- 
--AC_CHECK_LIB(ncurses, newwin, ,
--    AC_CHECK_LIB(curses, newwin), ,
--    echo "Hexedit requires the curses library"
--    echo "Ncurses is freely available: ftp://ftp.gnu.org/pub/gnu/"
--    exit 1)
--
--
- AC_OUTPUT(Makefile docs/Makefile gnu/Makefile src/Makefile)
diff --git a/app-editors/curses-hexedit/metadata.xml b/app-editors/curses-hexedit/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-editors/curses-hexedit/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-editors/dav-0.8.5-r1 b/app-editors/dav-0.8.5-r1
new file mode 100644
index 000000000000..096ca7ec9fc6
--- /dev/null
+++ b/app-editors/dav-0.8.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure prepare
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
+DESCRIPTION=A minimal console text editor
+EAPI=5
+HOMEPAGE=http://dav-text.sourceforge.net/
+KEYWORDS=alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=http://dav-text.sourceforge.net/files/dav-0.8.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d7bd03385f5c48271717845fa5f018a2
diff --git a/app-editors/dav-0.8.5-r2 b/app-editors/dav-0.8.5-r2
new file mode 100644
index 000000000000..cc62ac40b965
--- /dev/null
+++ b/app-editors/dav-0.8.5-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
+DESCRIPTION=A minimal console text editor
+EAPI=6
+HOMEPAGE=http://dav-text.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=http://dav-text.sourceforge.net/files/dav-0.8.5.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7fbe41d5f7d765e2dd309114ffd67676
diff --git a/app-editors/dav/Manifest b/app-editors/dav/Manifest
deleted file mode 100644
index 79f937c9918e..000000000000
--- a/app-editors/dav/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX dav-0.8.5-asneeded.patch 318 BLAKE2B 1556f43aa48931c2687defc85d0b23b7a6519ff1f5c5ac0ce7f1cb0b7a67e19b75af0b97cf72ec5a6665aca386b8f44a0a44446623666bb16e76abae752b2ed3 SHA512 06ad6057354af941512e6c77f59cd9c30a7192c01fdce65d5d66e15fb99476429092f0587130162b78f22ca72354af8925735733c142a889a478c8a07384138f
-AUX dav-0.8.5-davrc-buffer-overflow.patch 246 BLAKE2B ef18f5ad8107e981c60f3bd3191cea342fb466cc9232294a88a29f6c2db37ce6ed846a66bf78722291540e0f813d7ce6ae939979352d370931fb5a43e12d5913 SHA512 36c8e336adc3cdb053af61ea53bf497073d197e67957f2ad011f7199c1518deb08f5fcfffa4ff14c49139f6bab01303332c8c15e5944245696dbc62dceff116c
-AUX fix-Wformat-security-warnings.patch 1179 BLAKE2B 524644da22ea8623c3bbdaa9c83ca74a87124cc896dec0f90221cf854d14744d1bc1a86e76a5ff3543fb2e2fc743d76db70bb7be3fe30e22508a374f6f122b83 SHA512 c5665be995e718a460b6c75ae3843104721a58c2d4a5321659d8527034f413d433fdd1140b14d6a8587f298a2e4935f8a07579071e5aa5d6fa49e125da5e4895
-DIST dav-0.8.5.tar.gz 22824 BLAKE2B 969458aa6b914f9cd624554690a88f4c2999dcc6e89db38d13d9ba98db7881a34ce1575ccbdf74b3ecca34345f2ec639cfc805a350e31f856f7d086cf23752de SHA512 cdedff875df392e8525399b40d45cdf4e984b1b014f03d9f5cd5be270eebe0003fcf48e9738f6ac2789138973970bb9fe6d0b8babd20c1df61e193f84ee066b3
-EBUILD dav-0.8.5-r1.ebuild 880 BLAKE2B f3d671be06467efb4d791933855bea1f9e61631a2bfb2ecf77e7ef586c25e274abbc9ff69c28ba30321fdeeb34ffd14618ac95b2e24fc9353255b8c682af6fbf SHA512 d97f7b44ebe9536ac7be593e872cc6937e71c050235769a774fc2fdc681ab2ade2a716b98464f41e18ab9bb4f8c0d23f1c9d9f9cd8ddb08918075751ca284d92
-EBUILD dav-0.8.5-r2.ebuild 908 BLAKE2B b9c9ac48a570321892701333b18ff43a1f1f45cd58ca50c711925585841ab326a0d1bc5e47bfa64c9dd586362c41b4354599d6a2a80555c593385e2a37b2963e SHA512 3f3977945cd1fe80c9e862246cb1e9184e2d65eec63b7db912d2d32e298d7dc5dbb13c99ab0dad37e3cb2d2ce7fe8f5ad3cef3ac2eee152acc7bf2201973c139
-MISC metadata.xml 245 BLAKE2B 0994c9d498383d2c458a3135ca07a8637acc6a2a89547ca1e245bf6354e61cc761e17d1eb33beaaab8c0c30997bbfc5772565212d7f58faf6cbfdaaf082025e8 SHA512 c42813db6849d65a3316be196bafc9fb991f6d78eb75f07e4202ba512c11ba1c6ea4082742df51fc83a06a520bd3297bd6f7404a48fbfee969937d10cd777a18
diff --git a/app-editors/dav/dav-0.8.5-r1.ebuild b/app-editors/dav/dav-0.8.5-r1.ebuild
deleted file mode 100644
index 5483b1ddd029..000000000000
--- a/app-editors/dav/dav-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A minimal console text editor"
-HOMEPAGE="http://dav-text.sourceforge.net/"
-
-# The maintainer does not keep sourceforge's mirrors up-to-date,
-# so we point to the website's store of files.
-SRC_URI="http://dav-text.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-davrc-buffer-overflow.patch
-}
-
-# Makefile only
-src_configure() { :; }
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS} $( $(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-DOCS=( README )
diff --git a/app-editors/dav/dav-0.8.5-r2.ebuild b/app-editors/dav/dav-0.8.5-r2.ebuild
deleted file mode 100644
index 01ee84f4222c..000000000000
--- a/app-editors/dav/dav-0.8.5-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A minimal console text editor"
-HOMEPAGE="http://dav-text.sourceforge.net/"
-
-# The maintainer does not keep sourceforge's mirrors up-to-date,
-# so we point to the website's store of files.
-SRC_URI="http://dav-text.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-asneeded.patch"
-	"${FILESDIR}/${P}-davrc-buffer-overflow.patch"
-	"${FILESDIR}/fix-Wformat-security-warnings.patch"
-)
-
-# Makefile only
-src_configure() { :; }
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS} $( $(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-DOCS=( README )
diff --git a/app-editors/dav/files/dav-0.8.5-asneeded.patch b/app-editors/dav/files/dav-0.8.5-asneeded.patch
deleted file mode 100644
index 75a43c67f43d..000000000000
--- a/app-editors/dav/files/dav-0.8.5-asneeded.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r a/Makefile b/Makefile
---- a/Makefile	2004-02-22 02:04:07.000000000 +0100
-+++ b/Makefile	2008-12-30 19:31:19.000000000 +0100
-@@ -12,7 +12,7 @@
- LDFLAGS=-lncurses -O3 -Wall
- 
- dav: $(OBJECTS) 
--	$(CC) $(LDFLAGS) $(OBJECTS) -o dav
-+	$(CC) $(OBJECTS) $(LDFLAGS) -o dav
- 
- install:
- 	mkdir -p $(DESTDIR)/usr/bin
diff --git a/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch b/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
deleted file mode 100644
index a32e78ebc818..000000000000
--- a/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dav-0.8.5.orig/main.c	2011-01-29 14:16:53.537725568 -0500
-+++ dav-0.8.5/main.c	2011-01-29 14:20:45.139125094 -0500
-@@ -327,7 +327,7 @@
- void loadSettings()
- {
-   int l;
--  char s[80];
-+  char s[200];
-   char home[80];
-   char *r;
-   char *c;
diff --git a/app-editors/dav/files/fix-Wformat-security-warnings.patch b/app-editors/dav/files/fix-Wformat-security-warnings.patch
deleted file mode 100644
index fe1733360551..000000000000
--- a/app-editors/dav/files/fix-Wformat-security-warnings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8e57c21b3b707c2a81695384688c46faa1d51da8 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 10 Aug 2016 15:52:30 -0400
-Subject: [PATCH 1/1] fileIO.c: add format strings to sprintf calls.
-
-Two calls to sprintf() in fileIO.c were missing the trivial format
-string "%s". This caused warnings with -Wformat-security, and build
-failures with -Werror=format-security. Those two calls are now fixed.
-
-Gentoo-Bug: 521016
----
- fileIO.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fileIO.c b/fileIO.c
-index a6c535a..1916a46 100644
---- a/fileIO.c
-+++ b/fileIO.c
-@@ -92,7 +92,7 @@ char *doSave(char *filename) {
-         n++;
-         choices = realloc(choices, n*sizeof(char *));
-         choices[n-1] = malloc(256);
--        sprintf(choices[n-1], d->d_name);
-+        sprintf(choices[n-1], "%s", d->d_name);
-       }
-       closedir(dir);
-       
-@@ -178,7 +178,7 @@ void load(char *filename)
-       n++;
-       choices = realloc(choices, n*sizeof(char *));
-       choices[n-1] = malloc(256);
--      sprintf(choices[n-1], d->d_name);
-+      sprintf(choices[n-1], "%s", d->d_name);
-     }
-     closedir(dir);
-     
--- 
-2.7.3
-
diff --git a/app-editors/dav/metadata.xml b/app-editors/dav/metadata.xml
deleted file mode 100644
index d9948d999a74..000000000000
--- a/app-editors/dav/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">dav-text</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/dhex-0.68 b/app-editors/dhex-0.68
new file mode 100644
index 000000000000..9888fbe97261
--- /dev/null
+++ b/app-editors/dhex-0.68
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:=
+DESCRIPTION=ncurses-based hex-editor with diff mode
+EAPI=5
+HOMEPAGE=http://www.dettus.net/dhex/
+KEYWORDS=amd64 ~arm ~mips x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=
+SLOT=0
+SRC_URI=http://www.dettus.net/dhex/dhex_0.68.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e4d44d644111097858ec37ad2b420e31
diff --git a/app-editors/dhex/Manifest b/app-editors/dhex/Manifest
deleted file mode 100644
index b8afb33208e1..000000000000
--- a/app-editors/dhex/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dhex-0.63-Makefile.patch 651 BLAKE2B 094e99a7bd7d8c09c5fbbecb85070505a0fe8ffb1bf83a1ec03f2a875cad316e6723ee969652389b962f3def7c2257af592682eb1b39b00fc2e6db2205a6d86e SHA512 80a938e81aef1e7450410138ebb445541f9707a59add8dc25aa7ac7f0154d17d1adc4de1c4d72f2e933b9882cce545b9d13650e8e653f26cc38ee65ec7c6a685
-DIST dhex_0.68.tar.gz 58602 BLAKE2B c29d5af598b731bc415e2626e945253641ea61c8a744deaeee3f7a2e7b1636ccfb3f8b7696efd33d36fab59d59da408ff4f59b44a88a36a4d7afc27542326c9e SHA512 9397ec0574652022387f4108613f839b9262841c436079249fb325011b0a0e3c5bbd32d323f37b0f30e643f7060c1275337710c237ab68fb0c3f8096651a2421
-EBUILD dhex-0.68.ebuild 716 BLAKE2B da44d04df93d839d0e2a09d6dbe637c9bbf2386b027c0a1c64f86b1b35c55e83b30dc226d7b711770ff7e0e4ae707216cdbc7741e1f09f5135d916aa0d2cba20 SHA512 038f4083ad3578eab56f87fbc042de67d6be67f8c8bbf0e2c20134ab9f90f64e43bdced4fb5a25f308c1e0d5565bed6227a6eeee71bdc710b7d17e4c11c147da
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/dhex/dhex-0.68.ebuild b/app-editors/dhex/dhex-0.68.ebuild
deleted file mode 100644
index bce05d75ad52..000000000000
--- a/app-editors/dhex/dhex-0.68.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="ncurses-based hex-editor with diff mode"
-HOMEPAGE="http://www.dettus.net/dhex/"
-SRC_URI="http://www.dettus.net/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:="
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.63-Makefile.patch
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin dhex
-	dodoc README.txt
-	doman dhex.1 dhex_markers.5 dhex_searchlog.5 dhexrc.5
-}
diff --git a/app-editors/dhex/files/dhex-0.63-Makefile.patch b/app-editors/dhex/files/dhex-0.63-Makefile.patch
deleted file mode 100644
index f99c9ff1bf2d..000000000000
--- a/app-editors/dhex/files/dhex-0.63-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN dhex_0.63.orig/Makefile dhex_0.63/Makefile
---- dhex_0.63.orig/Makefile	2011-01-29 00:19:37.000000000 +0100
-+++ dhex_0.63/Makefile	2011-01-30 17:13:51.000000000 +0100
-@@ -1,11 +1,4 @@
--CC=		gcc
--LDFLAGS=	-L/usr/lib	-L/usr/local/lib  	-L/usr/lib/ncurses	-L/usr/local/lib/ncurses
--CPPFLAGS=	-I/usr/include	-I/usr/local/include	-I/usr/include/ncurses	-I/usr/local/include/ncurses
--CFLAGS=		-O3 -Wall -std=c99 
--#CFLAGS+= -ffunction-sections -fdata-sections
--#LDFLAGS+= --gc-sections 
- LIBS=		-lncurses
--DESTDIR=	/usr/local/
- 
- OFILES=buffers.o input.o output.o machine_type.o main.o menu.o ui.o hexcalc.o search.o gpl.o configfile.o markers.o
- 
diff --git a/app-editors/dhex/metadata.xml b/app-editors/dhex/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-editors/dhex/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-editors/diakonos-0.9.4 b/app-editors/diakonos-0.9.4
new file mode 100644
index 000000000000..7ad1969822a7
--- /dev/null
+++ b/app-editors/diakonos-0.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/curses[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/curses[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+DESCRIPTION=A Linux editor for the masses
+EAPI=5
+HOMEPAGE=http://diakonos.pist0s.ca
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/curses[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/curses[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=http://diakonos.pist0s.ca/archives/diakonos-0.9.4.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fa09b4329b6fef4466dfaf1855a33701
diff --git a/app-editors/diakonos/Manifest b/app-editors/diakonos/Manifest
deleted file mode 100644
index b75e182d3f90..000000000000
--- a/app-editors/diakonos/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST diakonos-0.9.4.tar.bz2 102282 BLAKE2B f8625d87924815e816c2f5a07e5c1d35df4df6126531caf5c98a9fdcb20eb9543c028363344a3c20f2f8a0335fa9d071b168640d9bd4738b1d51737bcc548c12 SHA512 8aab6173c40b9a182853977ed7631c391a10d3339918fa96866da8c9fa8e36e40f1c5093465c734a9ce36a69c5d994d6b2d1c0306f1e57bff708fd7a64a62db7
-EBUILD diakonos-0.9.4.ebuild 747 BLAKE2B 191b6778cc0e6193580c7541fcee0fc14bba213633c243c7e037c262a7f2b81e196e0d5aec93a958c688259f0597f2c75a6abced1c770f66bc5bd302b3f249f7 SHA512 b0ae8c8793b7e4621f7a1826e0d7b65859aabd7c84f563cc45577dae732e643fbb317541f95793868b9b865896679dd80f50a7929666fcaa40946692ea34123d
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/diakonos/diakonos-0.9.4.ebuild b/app-editors/diakonos/diakonos-0.9.4.ebuild
deleted file mode 100644
index f4bc35185127..000000000000
--- a/app-editors/diakonos/diakonos-0.9.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-inherit ruby-ng
-
-DESCRIPTION="A Linux editor for the masses"
-HOMEPAGE="http://diakonos.pist0s.ca"
-SRC_URI="http://diakonos.pist0s.ca/archives/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/curses"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/bacon )"
-
-each_ruby_install() {
-	${RUBY} install.rb --dest-dir "${D}" --doc-dir /usr/share/doc/${P} || die "install failed"
-}
-
-all_ruby_install() {
-	if use doc; then
-		rake docs || die
-		dodoc -r doc/*
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -S bacon -Ilib spec/*.rb spec/*/*.rb || die
-}
diff --git a/app-editors/diakonos/metadata.xml b/app-editors/diakonos/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-editors/diakonos/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-editors/e3-2.8 b/app-editors/e3-2.8
new file mode 100644
index 000000000000..9896cf9283c6
--- /dev/null
+++ b/app-editors/e3-2.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=dev-lang/nasm-2.09.04
+DESCRIPTION=Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings
+EAPI=5
+HOMEPAGE=https://sites.google.com/site/e3editor/
+KEYWORDS=-* amd64 x86
+LICENSE=GPL-2+
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://sites.google.com/site/e3editor/Home/e3-2.8.tgz
+_md5_=aaa2c418b0e8754cf20af3b0e02d7e94
diff --git a/app-editors/e3/Manifest b/app-editors/e3/Manifest
deleted file mode 100644
index b62b8966233d..000000000000
--- a/app-editors/e3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST e3-2.8.tgz 119939 BLAKE2B b0882a359126d392a3e24971b1f2e39572bbbe0d95f388a4b75e8cc3e4424e798ddc381c9489ca65452668884abbacc2c27c33b6c7f230a6eb4d44986313a42c SHA512 f3443ac558203b6921458761174ebc060936ae9f8a834670044152b9af52e0919075ac8110ba47b4b6f4e8261afa917e9fe49492b8d40d38d69987353ddd5189
-EBUILD e3-2.8.ebuild 759 BLAKE2B b59b4cbdf6b7c5752957dd1db03b77321ef1d89b600278abe5a841efe37794038c4aa783189fca0464d7a0f7c8671c292ed42c41232bd541d8d486cfdc72693e SHA512 d76af36d27aee6a1aff25d85c89dee78c223009caee6d8b5f57e66f6b5818aae97324203391ba91e03c5cf72bcc8c658d024660bffaf0b874a9ab68b34e49799
-MISC metadata.xml 918 BLAKE2B a0bd5163da7fe48664cc720d60b08c11af32234b0b265a8e2cca6d980a3af3b29ad223fdd5a81886ea3b528875fadd0520650a463894040b2f48ad00eabdf8c6 SHA512 9e8d5b6557a492d39c79c06507ea3ee670729e315cee2456e595d53f88178801b629595ac8903ac70878a63e85b46e934c761d70fef328fdfddc78e0c7416f4d
diff --git a/app-editors/e3/e3-2.8.ebuild b/app-editors/e3/e3-2.8.ebuild
deleted file mode 100644
index 3cb12476d34d..000000000000
--- a/app-editors/e3/e3-2.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings"
-HOMEPAGE="https://sites.google.com/site/e3editor/"
-SRC_URI="https://sites.google.com/site/e3editor/Home/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-RESTRICT="strip"
-
-DEPEND=">=dev-lang/nasm-2.09.04"
-RDEPEND=""
-
-src_prepare() {
-	sed -i 's/-D$(EXMODE)//' Makefile || die
-}
-
-src_compile() {
-	emake -- $(usex amd64 64 32)
-}
-
-src_install() {
-	dobin e3
-	dosym e3 /usr/bin/e3em
-	dosym e3 /usr/bin/e3ne
-	dosym e3 /usr/bin/e3pi
-	dosym e3 /usr/bin/e3vi
-	dosym e3 /usr/bin/e3ws
-
-	newman e3.man e3.1
-	dohtml e3.html
-	dodoc ChangeLog README README_OLD
-}
diff --git a/app-editors/e3/metadata.xml b/app-editors/e3/metadata.xml
deleted file mode 100644
index e38b0be62252..000000000000
--- a/app-editors/e3/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-  e3 is a full-screen, user-friendly text editor with an interface similar to
-  that of either WordStar, Emacs, Pico, Nedit, or vi. It's heavily optimized
-  for size and independent of libc or any other libraries, making it useful
-  for mini-Linux distributions and rescue disks. The assembler version
-  supports Linux, FreeBSD, OpenBSD, NetBSD, Win9x, QNX, Atheos, BeOS, ELKS,
-  and DOS. There is also a separately distributed version written in C which
-  supports some other Unix versions and CygWin. It is also possible to use
-  regular expressions by using child processes like sed. e3 has a built in
-  arithmetic calculator.
-</longdescription>
-</pkgmetadata>
diff --git a/app-editors/editra-0.7.20-r2 b/app-editors/editra-0.7.20-r2
new file mode 100644
index 000000000000..209890a450ca
--- /dev/null
+++ b/app-editors/editra-0.7.20-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Multi-platform text editor supporting over 50 programming languages
+EAPI=6
+HOMEPAGE=http://editra.org https://pypi.org/project/Editra/
+IUSE=spell python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=wxWinLL-3.1
+RDEPEND=dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] spell? ( dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://editra.org/uploads/src/Editra-0.7.20.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f49f78075f06733e8b530fa4dfb2ab7b
diff --git a/app-editors/editra/Manifest b/app-editors/editra/Manifest
deleted file mode 100644
index 83cea3d506be..000000000000
--- a/app-editors/editra/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX editra-0.7.20-wx30.patch 2264 BLAKE2B a8244a8174d1b0bca8c8e4979623ebc9ea03838eff59e9c9b12c1c703c6c69b90ff3036a1bf68e2757f7d95fa706aef37df831fc0c0f01b9c1ffe9d570b14769 SHA512 c0befbe2fb2eead2c4fc066767b48938b0f2b17949dc42fd98128d63556268a12b73fb49f22a8e9abf524e4450bda2b2b4e0b4953bc7f3c7c32b6ba1e7eefe63
-DIST Editra-0.7.20.tar.gz 4072243 BLAKE2B 3a2d38888ea9d7a12a77d4adb57b7e5c926757791e8b48eedd8413b6712cbfb2c616c3cf26f3f49c3a7ac5acf37d373cff8d37c63e255a1d0a9ec1add3dcbbe6 SHA512 e568ce2a5f04300c33223bf7a0e6fbc52d0a51c3472afb9b613fe21cfbeba0b9b453d87837e52c7c48050fc266ff5ff194a42f797053f21f0a25cd5c4579febe
-EBUILD editra-0.7.20-r2.ebuild 1258 BLAKE2B c25df6f3bddc92f8dee6a0cb2c4fdf0d6b241769cb5e5c4c5f2beefe2f8646c7725b7b6bd385b5f9ad39aaacdc6196d762df0bf5a0b75ad23d187e36ce63fe06 SHA512 ea516785ccd2909bb9d784beb6a0dfe92a0aad9bb45d6ff0e9f214a129812a2a8c08ecd9181d19ddbe807b8fa80575ed85aeb04bc69b095973ced7551998185b
-MISC metadata.xml 261 BLAKE2B 6a1c213fc272c8d1e93e73a8aba2f3fffce3525a0b505f56a0ebc185d0000d2f472480842e2e588a59209047f3da0830cb0e59835ac738b548bd8a74dae3c176 SHA512 f7ad013dd5f01aaedd4528f98ba9a4b4b44d353502df3438a8b513dd2ee7af1e24328c34187e156370efb550c401b81175cccc7a7643ea6a5a83766d68a05221
diff --git a/app-editors/editra/editra-0.7.20-r2.ebuild b/app-editors/editra/editra-0.7.20-r2.ebuild
deleted file mode 100644
index 04cfc91b0dfe..000000000000
--- a/app-editors/editra/editra-0.7.20-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1 fdo-mime
-
-MY_PN=${PN/e/E}
-
-DESCRIPTION="Multi-platform text editor supporting over 50 programming languages"
-HOMEPAGE="http://editra.org https://pypi.org/project/Editra/"
-SRC_URI="http://editra.org/uploads/src/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="spell"
-
-DEPEND="
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-0.6[${PYTHON_USEDEP}]"
-# setuptools is RDEPEND because it's used by the runtime for installing plugins
-RDEPEND="${DEPEND}
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${P}-wx30.patch" )
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-python_compile() {
-	# https://code.google.com/p/editra/issues/detail?id=481
-	distutils-r1_python_compile --no-clean
-}
-
-python_install() {
-	distutils-r1_python_install --no-clean
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "${S}"/pixmaps/editra.png
-	make_desktop_entry editra Editra editra "Utility;TextEditor"
-	dodoc FAQ THANKS
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-editors/editra/files/editra-0.7.20-wx30.patch b/app-editors/editra/files/editra-0.7.20-wx30.patch
deleted file mode 100644
index e5e7b7f918d6..000000000000
--- a/app-editors/editra/files/editra-0.7.20-wx30.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Updates for better wxPython 3.0 compatibility
-Author: Olly Betts <olly@survex.com>
-Bug-Debian: https://bugs.debian.org/758947
-Forwarded: no
-Last-Update: 2014-08-30
-
---- editra-0.7.20+dfsg.1.orig/src/ed_main.py
-+++ editra-0.7.20+dfsg.1/src/ed_main.py
-@@ -432,7 +432,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
- 
-             dlg = wx.FileDialog(self, _("Editra: Open"), fdir, "",
-                                 ''.join(syntax.GenFileFilters()),
--                                wx.OPEN | wx.MULTIPLE | wx.CHANGE_DIR)
-+                                wx.FD_OPEN | wx.FD_MULTIPLE | wx.FD_CHANGE_DIR)
-             dlg.SetFilterIndex(_PGET('FFILTER', 'int', 0))
- 
-             if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
-@@ -680,7 +680,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
-                             os.path.dirname(sdir),
-                             title.lstrip(u"*"),
-                             u''.join(syntax.GenFileFilters()),
--                            wx.SAVE | wx.OVERWRITE_PROMPT)
-+                            wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
- 
-         if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
-             path = dlg.GetPath()
-@@ -713,7 +713,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
-             dlg = wx.FileDialog(self, _("Where to Save Profile?"), \
-                                CONFIG['PROFILE_DIR'], "default.ppb", \
-                                _("Profile") + " (*.ppb)|*.ppb",
--                                wx.SAVE | wx.OVERWRITE_PROMPT)
-+                                wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
- 
-             if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
-                 profiler.TheProfile.Write(dlg.GetPath())
-@@ -732,7 +732,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
-         if evt.Id == ID_LOAD_PROFILE:
-             dlg = wx.FileDialog(self, _("Load a Custom Profile"),
-                                 CONFIG['PROFILE_DIR'], "default.ppb",
--                                _("Profile") + " (*.ppb)|*.ppb", wx.OPEN)
-+                                _("Profile") + " (*.ppb)|*.ppb", wx.FD_OPEN)
- 
-             if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
-                 profiler.TheProfile.Load(dlg.GetPath())
diff --git a/app-editors/editra/metadata.xml b/app-editors/editra/metadata.xml
deleted file mode 100644
index 0c7ee856e108..000000000000
--- a/app-editors/editra/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>wxwidgets@gentoo.org</email>
-		<name>Gentoo wxWidgets Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-editors/ee-1.5.2 b/app-editors/ee-1.5.2
new file mode 100644
index 000000000000..a80203e9ac4f
--- /dev/null
+++ b/app-editors/ee-1.5.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=An easy to use text editor. A subset of aee
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD-2
+RDEPEND=!app-editors/ersatz-emacs
+SLOT=0
+SRC_URI=mirror://gentoo/ee-1.5.2.src.tgz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8827b95bccebfc5dbe2088694f149f2e
diff --git a/app-editors/ee/Manifest b/app-editors/ee/Manifest
deleted file mode 100644
index c4e3dbe166d1..000000000000
--- a/app-editors/ee/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX ee-Wformat-security.patch 675 BLAKE2B 2fc022761f61081616565ab2161094aa40b6b13345063ddc59621878dd35153b24bc3bedc03cf7187d48434c34b331c6201c3577dce96d10983c3c4e3102aff2 SHA512 d6b8dc118c3381da71ea7d10673af52d8d36575480a274d5e0f30645e86b082d5381ee7682fcf9b253b621ba9138a350b132875ecdc9b2fb5ed75bd111ce5304
-AUX ee-init-location.patch 1280 BLAKE2B ad20c44a30c9b817af997966d191640860def4a7f1dd63678f4befc8390ce22f254d802b4c75998ad874551ef90aff727273b6abde60f28f92412a9ce6507cbc SHA512 69732f151f7d8e9779c6826c89e92e9e4b5a8ab1580b8de562897a322e61514e3225eaecb9e2bf9fdf7063a126382ea9ba9ff7c233b2bebd8d4062b61b20375a
-AUX ee-signal.patch 222 BLAKE2B a514c6d060fde8c71d7a0dbb22d1d6843c9195500e5b675cda79645785a965f20144d26e558daf4f2acb6dd81d735ee4929991ea40d7bf88e091769951b20830 SHA512 9ce2f028d131b2ca47070002603b40c6841e8c69448cf419128cbf9519df928249de0fa7d1c9e906ea2a0368e8b6f9603ab26e8d0d352cc647e2ca9c5a93213c
-DIST ee-1.5.2.src.tgz 69651 BLAKE2B 2d79b889ad5c97d4f2e134acec235f8f1dfbf0c697936de326be448e0bb193f06cbaeadf5a99050fc47f0526bbeb571522513f363695190c1801c62aee1594f2 SHA512 9ca0e82d65971b0bce38e09c365b6eb8b81ca6ff5b244107ae254322e47e841e7f5345bf242a0a9dd66b731d46cead6f442016b9e070a1298e1a5319b1d7b97a
-EBUILD ee-1.5.2.ebuild 1127 BLAKE2B d4071be3623f1790e3e0c68672bfd16526f4e0809cc16b3e10ab4e8980a662c93c9601aa7d338c49ec4de9e68f6323f87743bbfd2d199472e7c628ecfcdefe33 SHA512 b1d70ea533e12104f926d7cd8320a86f11bbc5fa5b066c1512d977b8b8111f7e644231d41f1213a8aa3845bfa4a8548b872e575c590384a47867f29bdc657b3e
-MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/app-editors/ee/ee-1.5.2.ebuild b/app-editors/ee/ee-1.5.2.ebuild
deleted file mode 100644
index fc1aec479af4..000000000000
--- a/app-editors/ee/ee-1.5.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy to use text editor. A subset of aee"
-#HOMEPAGE="http://mahon.cwx.net/ http://www.users.uswest.net/~hmahon/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.src.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="!app-editors/ersatz-emacs"
-S="${WORKDIR}/easyedit-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-init-location.patch
-	"${FILESDIR}"/${PN}-signal.patch
-	"${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
-
-src_prepare() {
-	sed -i \
-		-e "s/make -/\$(MAKE) -/g" \
-		-e "/^buildee/s/$/ localmake/" \
-		Makefile
-
-	sed -i \
-		-e "s/\tcc /\t\\\\\$(CC) /" \
-		-e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \
-		-e "/other_cflag/s/ *-s//" \
-		create.make
-
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	einstalldocs
-	keepdir /usr/share/${PN}
-}
diff --git a/app-editors/ee/files/ee-Wformat-security.patch b/app-editors/ee/files/ee-Wformat-security.patch
deleted file mode 100644
index 6db64188347a..000000000000
--- a/app-editors/ee/files/ee-Wformat-security.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/ee.c
-+++ b/ee.c
-@@ -2105,11 +2105,11 @@
- 		}
- 		else if (!strcmp("-?", buff))
- 		{
--			fprintf(stderr, usage0, arguments[0]);
--			fprintf(stderr, usage1);
--			fprintf(stderr, usage2);
--			fprintf(stderr, usage3);
--			fprintf(stderr, usage4);
-+			fprintf(stderr, "%s", usage0, arguments[0]);
-+			fprintf(stderr, "%s", usage1);
-+			fprintf(stderr, "%s", usage2);
-+			fprintf(stderr, "%s", usage3);
-+			fprintf(stderr, "%s", usage4);
- 			exit(1);
- 		}
- 		else if ((*buff == '+') && (start_at_line == NULL))
-@@ -3243,7 +3243,7 @@
- 	}
- 	if (shell_fork)
- 	{
--		printf(continue_msg);
-+		printf("%s", continue_msg);
- 		fflush(stdout);
- 		while ((in = getchar()) != '\n')
- 			;
diff --git a/app-editors/ee/files/ee-init-location.patch b/app-editors/ee/files/ee-init-location.patch
deleted file mode 100644
index 5ac1e47ae962..000000000000
--- a/app-editors/ee/files/ee-init-location.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/ee.1
-+++ b/ee.1
-@@ -406,7 +406,7 @@
- .PP
- Since different users have different preferences, \fIee\fR allows some 
- slight configurability.  There are three possible locations for an 
--initialization file for ee:  the file \fI/usr/local/lib/init.ee\fR, the 
-+initialization file for ee:  the file \fI/usr/share/ee/init.ee\fR, the 
- file \fI.init.ee\fR in the user's home directory, or the file \fI.init.ee\fR 
- in the current directory (if different from the home 
- directory).  This allows system administrators to set some preferences for 
-@@ -414,7 +414,7 @@
- and the user to customize settings for particular directories (like one 
- for correspondence, and a different directory for programming).
- .PP
--The file \fI\/usr/local/lib/init.ee\fR is read first, then 
-+The file \fI\/usr/share/ee/init.ee\fR is read first, then 
- \fI$HOME/.init.ee\fR, then \fI.init.ee\fR, with the settings specified by the 
- most recent file read taking precedence.
- .PP
-@@ -521,7 +521,7 @@
- may be too slow for slower systems.
- .SH FILES
- .PP
--.I /usr/local/lib/init.ee
-+.I /usr/share/ee/init.ee
- .br
- .I $HOME/.init.ee
- .br
---- a/ee.c
-+++ b/ee.c
-@@ -4124,7 +4124,7 @@
- }
- 
- unsigned char *init_name[3] = {
--	"/usr/local/lib/init.ee", 
-+	"/usr/share/ee/init.ee", 
- 	NULL, 
- 	".init.ee"
- 	};
diff --git a/app-editors/ee/files/ee-signal.patch b/app-editors/ee/files/ee-signal.patch
deleted file mode 100644
index 41cfa4013068..000000000000
--- a/app-editors/ee/files/ee-signal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ee.c
-+++ b/ee.c
-@@ -552,7 +552,7 @@
- {
- 	int counter;
- 
--	for (counter = 1; counter < SIGUNUSED; counter++)
-+	for (counter = 1; counter < SIGSYS; counter++)
- 		signal(counter, SIG_IGN);
- 
- 	signal(SIGCHLD, SIG_DFL);
diff --git a/app-editors/ee/metadata.xml b/app-editors/ee/metadata.xml
deleted file mode 100644
index 21dc8fdf43ff..000000000000
--- a/app-editors/ee/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>hattya@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-editors/efte-1.1-r1 b/app-editors/efte-1.1-r1
new file mode 100644
index 000000000000..6f9c1efe187c
--- /dev/null
+++ b/app-editors/efte-1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-libs/ncurses:0= gpm? ( sys-libs/gpm ) X? ( x11-libs/libX11 x11-libs/libXpm x11-libs/libXdmcp x11-libs/libXau media-fonts/font-misc-misc ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A fast text editor supporting folding, syntax highlighting, etc.
+EAPI=6
+HOMEPAGE=https://github.com/lanurmi/efte
+IUSE=gpm X
+KEYWORDS=amd64 x86
+LICENSE=|| ( GPL-2 Artistic )
+RDEPEND=sys-libs/ncurses:0= gpm? ( sys-libs/gpm ) X? ( x11-libs/libX11 x11-libs/libXpm x11-libs/libXdmcp x11-libs/libXau media-fonts/font-misc-misc )
+SLOT=0
+SRC_URI=mirror://sourceforge/efte/efte-1.1.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eabdf26f0b710ba9e5c686438a01ef11
diff --git a/app-editors/efte/Manifest b/app-editors/efte/Manifest
deleted file mode 100644
index 95c8b16ee267..000000000000
--- a/app-editors/efte/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX efte-1.1-desktopfile.patch 619 BLAKE2B 54b0c42d032acbd9588005ee83863f08899fd48a012fd232b9a71ea8b80246341b116f49c45db570be3839fcfc4f6b2526a728e60ca9b0c8aed59a36d5457faf SHA512 e48df45d0daa6264503c94a7d2d6c886b6101f5d258fbc3a3825377f25b601b3f8869a4337330ea325a44086db20b2c2906f3556b5e066b1f399afe3aadcdc98
-AUX efte-1.1-flags.patch 657 BLAKE2B 2e38c0635739a6bb1ad679e97e571d04868bad3b950e63bb9770e134016be2c4982860204b8863979fc91374929762c442ebf5dd955dea0f522c13f25e415f49 SHA512 7721010873e2030428f2c855d35b18ce6c6ab2d884c25e1611045e8d3209cb0baf94a7d90661de6ea86d084e9b73cf4b8ac724308f94263adbad12db2507a870
-DIST efte-1.1.tar.bz2 429919 BLAKE2B 67a9d40e0aaebf024f7889324da6eaa96efe2abbc290f7f4397410f1a2975baf70c527eb238bcbc2b9b0bc8ab3dcdd1611c219f3429588f06f9ec220a56426cb SHA512 4dbfcaaadc56996d1b4659db2a82ec5132cf45b6f65ef545274769aa47f44ba27a8af1488ed57e5ffec2d9f5f1d1ef4cb9ee97514414796f176c2272a6bb6661
-EBUILD efte-1.1-r1.ebuild 1041 BLAKE2B d00aa6eee809552f859047054453081f7988a3dda7e6a04a4e85ef8919fc4dd7af0d818ca4a838ed49bce2b9965ed1b5256b7ae6c0b851f6f3511395247c8edc SHA512 9a4dca0de314dd4615e28b50a0fb8bbfad62500c67349092cf2a58b0300bcbf78baa0ec940029dfa506da1d65746102ffb004fa1f8035f6c69cc3f3958b0579e
-MISC metadata.xml 241 BLAKE2B 735c46492d75e210ca0d6e814fdb2a7d96fe8901cdadcd168ccbb8720374cde0159e4a5edcfe6ef0ee78ca2b2f0e677e8d1a3a585e4d847f3098b519f61cfc8b SHA512 e2cf99ff1a4a6d577eb0fdd2a097cbfd71e60d860d6294d59ef4ec596eba2c85a50ed4f50944356637e145f0d3b38d0da90d87bcdf1f51eb76e93345cadbee52
diff --git a/app-editors/efte/efte-1.1-r1.ebuild b/app-editors/efte/efte-1.1-r1.ebuild
deleted file mode 100644
index b62580bce0a6..000000000000
--- a/app-editors/efte/efte-1.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="A fast text editor supporting folding, syntax highlighting, etc."
-HOMEPAGE="https://github.com/lanurmi/efte"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 Artistic )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gpm X"
-
-RDEPEND="sys-libs/ncurses:0=
-	gpm? ( sys-libs/gpm )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXpm
-		x11-libs/libXdmcp
-		x11-libs/libXau
-		media-fonts/font-misc-misc
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-flags.patch
-	"${FILESDIR}"/${P}-desktopfile.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_GPM=$(usex gpm)
-		-DBUILD_X=$(usex X )
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm -f "${D}"/usr/share/doc/${PN}/{COPYING,Artistic}
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/efte/files/efte-1.1-desktopfile.patch b/app-editors/efte/files/efte-1.1-desktopfile.patch
deleted file mode 100644
index 79cfc1c0ab34..000000000000
--- a/app-editors/efte/files/efte-1.1-desktopfile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- efte-1.1/packaging/shared/efte.desktop
-+++ efte-1.1/packaging/shared/efte.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Name=eFTE
--Version=1.1
- GenericName=Text Editor
- GenericName[cz]=Textový editor
- GenericName[de]=Texteditor
-@@ -29,7 +28,7 @@
- Comment[sv]=Snabb, utbyggbar textredigerare för programmerare
- MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
- Exec=efte %f
--Icon=efte
-+Icon=efte48x48
- Type=Application
- Terminal=false
- Categories=Development;TextEditor;
diff --git a/app-editors/efte/files/efte-1.1-flags.patch b/app-editors/efte/files/efte-1.1-flags.patch
deleted file mode 100644
index 10c17cff322c..000000000000
--- a/app-editors/efte/files/efte-1.1-flags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Jan  4 20:17:34 UTC 2013
-Subject: respect system CXXFLAGS
-
---- efte-1.1/src/CMakeLists.txt
-+++ efte-1.1/src/CMakeLists.txt
-@@ -86,7 +86,7 @@
- ENDIF( UNIX AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
- 
- IF( CMAKE_COMPILER_IS_GNUCC )
--  SET( CMAKE_CXX_FLAGS "-pedantic -Wall -Wno-long-long -Wpointer-arith -Wconversion -Wwrite-strings -Winline -fno-rtti -fno-exceptions" )
-+  SET( CMAKE_CXX_FLAGS "-pedantic -Wall -Wno-long-long -Wpointer-arith -Wconversion -Wwrite-strings -Winline -fno-rtti -fno-exceptions ${CMAKE_CXX_FLAGS}" )
- ENDIF( CMAKE_COMPILER_IS_GNUCC )
- 
- IF( CMAKE_SYSTEM_NAME MATCHES "HP/UX" )
diff --git a/app-editors/efte/metadata.xml b/app-editors/efte/metadata.xml
deleted file mode 100644
index 81d7428b8621..000000000000
--- a/app-editors/efte/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">efte</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/elvis-2.2.0-r6 b/app-editors/elvis-2.2.0-r6
new file mode 100644
index 000000000000..16a847759438
--- /dev/null
+++ b/app-editors/elvis-2.2.0-r6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=sys-libs/ncurses-5.7-r7:0= X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) app-eselect/eselect-vi X? ( x11-base/xorg-proto ) virtual/pkgconfig
+DESCRIPTION=A vi/ex clone
+EAPI=5
+HOMEPAGE=ftp://ftp.cs.pdx.edu/pub/elvis/
+IUSE=X
+KEYWORDS=amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris
+LICENSE=Artistic
+RDEPEND=>=sys-libs/ncurses-5.7-r7:0= X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) app-eselect/eselect-vi
+SLOT=0
+SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ff2cc91fc4991810ff1f5ea93c09592b
diff --git a/app-editors/elvis-2.2.0-r7 b/app-editors/elvis-2.2.0-r7
new file mode 100644
index 000000000000..97efe5796cd2
--- /dev/null
+++ b/app-editors/elvis-2.2.0-r7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) X? ( x11-base/xorg-proto ) virtual/pkgconfig
+DESCRIPTION=A vi/ex clone
+EAPI=6
+HOMEPAGE=http://elvis.the-little-red-haired-girl.org
+IUSE=X
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris
+LICENSE=Artistic
+RDEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 )
+SLOT=0
+SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=12a65562c8e99fe728b5f2dbc52d9c3c
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
deleted file mode 100644
index e6f56d1386ea..000000000000
--- a/app-editors/elvis/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX elvis-2.2.0-glibc-2.10.patch 1526 BLAKE2B 4c49a42ade8a5bfb4140362d7237fa1e21bf231cc1ebfc038b24181ed5e6f522463ca1111835f90e82e1975484be1637e299257a04f36f16585e0498133d6282 SHA512 2658fc5a6758a0ecab2320a01fcb708d595e304e94609f642e324d6d77a58a13e20560041fdb890f0f91443c5a3c53ccd1eb8f6a7bc47c70f8e910da107b071c
-AUX elvis-2.2.0-interix.patch 297 BLAKE2B be5b6d3ab880254f2fc271b85289ec64f3dc907936a71fc122b5ec37d7377c3d169af3c26b488c2e4bbdaf4562f3237a8850a867c3e67f568cedcc8d1cb604c6 SHA512 7215150c74b96ea441898435c02f342c0fac2e579363be5a95684a49b84e020275b6e9124b8fd449559e1e3217f96901c2887214ee61a4ca8484598a7cd42442
-AUX ft2.3-symbol-collision-fix.patch 2396 BLAKE2B a890da27b23700d2f6def41ab0a567ab3af899c291d0a06fdba4c567a5169da01ba61a3e4490faaf91a3a74b3bf91750f1426aeecc02452eb1355093e14d973f SHA512 14a2880f9984615f9876973e5eaea54846547d2871b8c2f1417c968e5e92c01612c954d39026671cb29656c4d6fd93d65f1bd6fc6325471346e1f56e3e1b97a3
-DIST elvis-2.2_0.tar.gz 1439293 BLAKE2B c061370a3a9a9d24bcdba65f1d16b5b8d7dd6a5a9e777949c80862f8e9ce879dac6685f625c0fd86cae26efbbf58277d9626be2f4e513d1b1bed131cc60eb95d SHA512 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
-EBUILD elvis-2.2.0-r6.ebuild 2396 BLAKE2B 71087c0bd2645274858e326a156564676b8d6a02d831a6f57df66131acd789268b08ff0251cf456bff056db10ac9a81ae62a802d31df995a2c31693b4077aa3a SHA512 3c2823dd77b31453b1e06f7741f21ab31ae3f80ea5b15b4771f6ee069a7d54c7bb65fd47028cd3782bda9c1fd3ae7f4d865542a51031bd13595850cf2ca86aca
-EBUILD elvis-2.2.0-r7.ebuild 2404 BLAKE2B cddb49ebd101377d79fcccfb16a5b7a890c6aa142c243132d3098de6798d6f2b6459a42416a76a77ed41d1186ddd9195e2f8faafbb80428bede79652080349ff SHA512 a407b19a0366335de2ae650a7a2d38f9abc6b10a2c5e0e69fc73fcf75ce7cdcb19d12112dec567c2274cec2e33a1998a138b49f8477a8f0f7e847a11b7b54bfc
-MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-editors/elvis/elvis-2.2.0-r6.ebuild b/app-editors/elvis/elvis-2.2.0-r6.ebuild
deleted file mode 100644
index 2317c7acda26..000000000000
--- a/app-editors/elvis/elvis-2.2.0-r6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator toolchain-funcs
-
-MY_PV=$(replace_version_separator 2 '_')
-
-DESCRIPTION="A vi/ex clone"
-HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
-SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
-	X? (
-		>=x11-libs/libX11-1.0.0
-		>=x11-libs/libXt-1.0.0
-		>=x11-libs/libXpm-3.5.4.2
-		>=x11-libs/libXft-2.1.8.2 )
-	app-eselect/eselect-vi"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/ft2.3-symbol-collision-fix.patch \
-		"${FILESDIR}"/${P}-glibc-2.10.patch \
-		"${FILESDIR}"/${P}-interix.patch
-}
-
-src_configure() {
-	./configure \
-		--libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${EPREFIX}"/usr/share/elvis \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_with X x) \
-		|| die
-
-	# Some Makefile fixups (must happen after configure)
-	# Use our CFLAGS
-	sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed"
-
-	# We'll install the man-pages ourselves
-	sed -i -e '/^	sh instman.sh/d' Makefile || die "sed 2 failed"
-
-	# Don't try to write to /etc
-	sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed"
-
-	# Use LDFLAGS
-	sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \
-		die "sed 4 failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	dodir /usr/share/elvis
-	dodir /usr/share/doc/${PF}
-	dodir /etc
-	emake install \
-		PREFIX="${ED}"/usr \
-		BINDIR="${ED}"/usr/bin \
-		DATADIR="${ED}"/usr/share/elvis \
-		DOCDIR="${ED}"/usr/share/doc/${PF}
-
-	# Install the man-pages
-	mv doc/elvis.man doc/elvis.1
-	mv doc/elvtags.man doc/elvtags.1
-	mv doc/ref.man doc/ref.1
-	doman doc/*.1
-
-	# Fixup some READMEs
-	sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \
-		|| die 'sed /etc/elvis/README failed'
-	sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \
-		|| die 'sed /usr/share/elvis/README failed'
-}
-
-pkg_postinst() {
-	einfo "Setting /usr/bin/vi symlink"
-	eselect vi set "${PN}"
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update
-}
diff --git a/app-editors/elvis/elvis-2.2.0-r7.ebuild b/app-editors/elvis/elvis-2.2.0-r7.ebuild
deleted file mode 100644
index c69d4195dd1b..000000000000
--- a/app-editors/elvis/elvis-2.2.0-r7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator toolchain-funcs
-
-MY_PV=$(replace_version_separator 2 '_')
-
-DESCRIPTION="A vi/ex clone"
-HOMEPAGE="http://elvis.the-little-red-haired-girl.org"
-SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="X"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	app-eselect/eselect-vi
-	X? (
-		>=x11-libs/libX11-1.0.0
-		>=x11-libs/libXt-1.0.0
-		>=x11-libs/libXpm-3.5.4.2
-		>=x11-libs/libXft-2.1.8.2
-	)"
-
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/ft2.3-symbol-collision-fix.patch
-	"${FILESDIR}"/${P}-glibc-2.10.patch
-	"${FILESDIR}"/${P}-interix.patch
-)
-
-src_configure() {
-	./configure \
-		--libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${EPREFIX}"/usr/share/elvis \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_with X x) \
-		|| die
-
-	# Some Makefile fixups (must happen after configure)
-	# Use our CFLAGS
-	sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed"
-
-	# We'll install the man-pages ourselves
-	sed -i -e '/^	sh instman.sh/d' Makefile || die "sed 2 failed"
-
-	# Don't try to write to /etc
-	sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed"
-
-	# Use LDFLAGS
-	sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \
-		die "sed 4 failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	dodir /usr/share/elvis
-	dodir /usr/share/doc/${PF}
-	dodir /etc
-
-	emake install \
-		PREFIX="${ED}"/usr \
-		BINDIR="${ED}"/usr/bin \
-		DATADIR="${ED}"/usr/share/elvis \
-		DOCDIR="${ED}"/usr/share/doc/${PF}
-
-	# Install the man-pages
-	mv doc/elvis.man doc/elvis.1 || die
-	mv doc/elvtags.man doc/elvtags.1 || die
-	mv doc/ref.man doc/ref.1 || die
-	doman doc/*.1
-
-	# Fixup some READMEs
-	sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \
-		|| die 'sed /etc/elvis/README failed'
-	sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \
-		|| die 'sed /usr/share/elvis/README failed'
-}
-
-pkg_postinst() {
-	einfo "Setting /usr/bin/vi symlink"
-	eselect vi set "${PN}"
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update
-}
diff --git a/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch b/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch
deleted file mode 100644
index 1a3d1affb303..000000000000
--- a/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur elvis-2.2_0.orig/ref.c elvis-2.2_0/ref.c
---- elvis-2.2_0.orig/ref.c	2003-10-21 05:32:25.000000000 +0300
-+++ elvis-2.2_0/ref.c	2009-08-05 21:28:30.000000000 +0300
-@@ -42,7 +42,7 @@
- 
- #if USE_PROTOTYPES
- static void usage(char *argv0);
--static char *getline(FILE *fp);
-+static char *get_line(FILE *fp);
- static void store(char *line, char **list);
- static LINECLS classify(char *line, LINECLS prev);
- static void lookup(TAG *tag);
-@@ -171,7 +171,7 @@
- /* This function reads a single line, and replaces the terminating newline with
-  * a '\0' byte.  The string will be in a static buffer.  Returns NULL at EOF.
-  */
--static char *getline(fp)
-+static char *get_line(fp)
- 	FILE	*fp;
- {
- 	int	ch;
-@@ -348,7 +348,7 @@
- 	}
- 
- 	/* for each line... */
--	for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++)
-+	for (lnum = 1, lc = LC_COMPLETE; (line = get_line(fp)) != NULL; lnum++)
- 	{
- 		/* is this the tag definition? */
- 		if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, len))
-@@ -377,7 +377,7 @@
- 			{
- 				if (strchr(line, '(') != NULL)
- 				{
--					while ((line = getline(fp)) != NULL
-+					while ((line = get_line(fp)) != NULL
- 					    && *line
- 					    && ((*line != '#' && *line != '{')
- 						|| line[strlen(line) - 1] == '\\'))
-@@ -387,7 +387,7 @@
- 				}
- 				else if ((lc = classify(line, lc)) == LC_PARTIAL)
- 				{
--					while ((line = getline(fp)) != NULL
-+					while ((line = get_line(fp)) != NULL
- 					    && (lc = classify(line, lc)) == LC_PARTIAL)
- 					{
- 						puts(line);
diff --git a/app-editors/elvis/files/elvis-2.2.0-interix.patch b/app-editors/elvis/files/elvis-2.2.0-interix.patch
deleted file mode 100644
index e16024374716..000000000000
--- a/app-editors/elvis/files/elvis-2.2.0-interix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru -x '*.Po' -x '*.Plo' elvis-2.2_0.orig/osunix/osblock.c elvis-2.2_0/osunix/osblock.c
---- elvis-2.2_0.orig/osunix/osblock.c	2008-04-03 12:00:26 +0200
-+++ elvis-2.2_0/osunix/osblock.c	2008-04-03 12:01:53 +0200
-@@ -293,5 +293,7 @@
- 		return;
- #endif
- 
-+#ifndef __INTERIX
- 	sync();
-+#endif
- }
diff --git a/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch b/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch
deleted file mode 100644
index aac099e56ef7..000000000000
--- a/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -ur elvis-2.2_0-orig/guix11/tags elvis-2.2_0/guix11/tags
---- elvis-2.2_0-orig/guix11/tags	2003-10-20 19:32:26.000000000 -0700
-+++ elvis-2.2_0/guix11/tags	2007-08-17 12:56:28.000000000 -0700
-@@ -31,7 +31,7 @@
- DEFAULT_TOOLFG	guix11.c	40;"	d	ln:40	file:
- DEFAULT_XENCODING	guix11.c	48;"	d	ln:48	file:
- FT_DEFAULT	xdialog.h	10;"	ln:10	enum:X_FIELDTYPE
--FT_FILE	xdialog.h	10;"	ln:10	enum:X_FIELDTYPE
-+FT_FILEC	xdialog.h	10;"	ln:10	enum:X_FIELDTYPE
- FT_LOCKED	xdialog.h	10;"	ln:10	enum:X_FIELDTYPE
- FT_NUMBER	xdialog.h	10;"	ln:10	enum:X_FIELDTYPE
- FT_ONEOF	xdialog.h	10;"	ln:10	enum:X_FIELDTYPE
-diff -ur elvis-2.2_0-orig/guix11/xdialog.c elvis-2.2_0/guix11/xdialog.c
---- elvis-2.2_0-orig/guix11/xdialog.c	2003-10-20 19:32:26.000000000 -0700
-+++ elvis-2.2_0/guix11/xdialog.c	2007-08-17 12:56:28.000000000 -0700
-@@ -387,7 +387,7 @@
- 			  case 'o': ft = FT_ONEOF, limit = scan;	break;
- 			  case 'n': ft = FT_NUMBER, limit = scan;	break;
- 			  case 's': ft = FT_STRING;			break;
--			  case 'f': ft = FT_FILE;			break;
-+			  case 'f': ft = FT_FILEC;			break;
- 			  case 'l': ft = FT_LOCKED;			break;
- 			}
- 
-@@ -556,7 +556,7 @@
- 			break;
- 
- 		  case FT_STRING:
--		  case FT_FILE:
-+		  case FT_FILEC:
- 			button = addbutton(dia, "<", 'l', ELVCTRL('L'));
- 			button->y = dia->y0 + dia->rowh * i;
- 			button->x = dia->x0 + 3;
-@@ -1111,7 +1111,7 @@
- 			newvalue = keystring(dia, key);
- 			break;
- 
--		  case FT_FILE:
-+		  case FT_FILEC:
- #ifdef FEATURE_COMPLETE
- 			if (key == '\t')
- 			{
-@@ -1179,7 +1179,7 @@
- 	switch (dia->field[row].ft)
- 	{
- 	  case FT_STRING:
--	  case FT_FILE:
-+	  case FT_FILEC:
- 	  case FT_NUMBER:
- 	  case FT_LOCKED:
- 		drawtext(dia, row);
-@@ -1207,7 +1207,7 @@
- 			break;
- 
- 		  case FT_STRING:
--		  case FT_FILE:
-+		  case FT_FILEC:
- 			if (button->shape == 'l')
- 				if (row == dia->current
- 				    ? dia->shift > 0
-diff -ur elvis-2.2_0-orig/guix11/xdialog.h elvis-2.2_0/guix11/xdialog.h
---- elvis-2.2_0-orig/guix11/xdialog.h	2003-10-20 19:32:26.000000000 -0700
-+++ elvis-2.2_0/guix11/xdialog.h	2007-08-17 12:56:28.000000000 -0700
-@@ -5,7 +5,7 @@
- 	FT_ONEOF,	/* one of a preset list; includes boolean */
- 	FT_NUMBER,	/* numeric field */
- 	FT_STRING,	/* string field */
--	FT_FILE,	/* string field where <Tab> does filename completion */
-+	FT_FILEC,	/* string field where <Tab> does filename completion */
- 	FT_LOCKED	/* non-editable field */
- } X_FIELDTYPE;
- typedef struct
-
diff --git a/app-editors/elvis/metadata.xml b/app-editors/elvis/metadata.xml
deleted file mode 100644
index f1abc6411341..000000000000
--- a/app-editors/elvis/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>vim@gentoo.org</email>
-	<name>Gentoo Vim Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-editors/emacs-18.59-r11 b/app-editors/emacs-18.59-r11
new file mode 100644
index 000000000000..bd9f252ed067
--- /dev/null
+++ b/app-editors/emacs-18.59-r11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-eselect/eselect-emacs-1.16 sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) virtual/pkgconfig
+DESCRIPTION=The extensible self-documenting text editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=abi_x86_x32
+KEYWORDS=amd64 x86
+LICENSE=GPL-1+ GPL-2+ BSD
+RDEPEND=>=app-eselect/eselect-emacs-1.16 sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) )
+SLOT=18
+SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz ftp://ftp.splode.com/pub/users/friedman/emacs/emacs-18.59-linux22x-elf-glibc21.diff.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-10.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2a8494a80bcfadb52b4261131afb77f8
diff --git a/app-editors/emacs-18.59-r12 b/app-editors/emacs-18.59-r12
new file mode 100644
index 000000000000..6b154f049b99
--- /dev/null
+++ b/app-editors/emacs-18.59-r12
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-eselect/eselect-emacs-1.16 sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto x11-misc/xbitmaps )
+DESCRIPTION=The extensible self-documenting text editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=abi_x86_x32 X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-1+ GPL-2+ BSD HPND
+RDEPEND=>=app-eselect/eselect-emacs-1.16 sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) X? ( x11-libs/libX11 )
+SLOT=18
+SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz ftp://ftp.splode.com/pub/users/friedman/emacs/emacs-18.59-linux22x-elf-glibc21.diff.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-11.tar.xz
+_eclasses_=eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e000d9a2933b97ca470e150d4c63332c
diff --git a/app-editors/emacs-23.4-r17 b/app-editors/emacs-23.4-r17
new file mode 100644
index 000000000000..397eee3aabaf
--- /dev/null
+++ b/app-editors/emacs-23.4-r17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=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 ) ) ) ) ) alsa? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig ) X? ( virtual/pkgconfig x11-base/xorg-proto ) gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/emacs/
+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
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+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 ) ) ) ) ) !<app-editors/emacs-vcs-23.4
+REQUIRED_USE=?? ( aqua X )
+SLOT=23
+SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-21.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=91097fccfb5eb5a76afbd7c27a5df747
diff --git a/app-editors/emacs-24.5-r5 b/app-editors/emacs-24.5-r5
new file mode 100644
index 000000000000..144ec25d30e3
--- /dev/null
+++ b/app-editors/emacs-24.5-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr 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 m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
+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
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr 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 m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !<app-editors/emacs-vcs-24.5
+REQUIRED_USE=?? ( aqua X )
+SLOT=24
+SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-4.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c243c28e3f39d537efb1fa97102a66d2
diff --git a/app-editors/emacs-25.3-r4 b/app-editors/emacs-25.3-r4
new file mode 100644
index 000000000000..01f51a7fb467
--- /dev/null
+++ b/app-editors/emacs-25.3-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) X? ( x11-base/xorg-proto )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !<app-editors/emacs-vcs-25.3
+REQUIRED_USE=?? ( aqua X )
+SLOT=25
+SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=24f59f9e988a8ae4ce8e6837e3448d68
diff --git a/app-editors/emacs-26.1 b/app-editors/emacs-26.1
new file mode 100644
index 000000000000..20843a192354
--- /dev/null
+++ b/app-editors/emacs-26.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=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= ) 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? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) X? ( x11-base/xorg-proto )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/emacs/
+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
+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
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+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= ) 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? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !<app-editors/emacs-vcs-26.1
+REQUIRED_USE=?? ( aqua X )
+SLOT=26
+SRC_URI=mirror://gnu/emacs/emacs-26.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f12a795c75d0fd2267a8efe9969341e8
diff --git a/app-editors/emacs-26.1-r1 b/app-editors/emacs-26.1-r1
new file mode 100644
index 000000000000..0675fd35f98f
--- /dev/null
+++ b/app-editors/emacs-26.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=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= ) 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? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+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
+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
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+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= ) 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? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !<app-editors/emacs-vcs-26.1
+REQUIRED_USE=?? ( aqua X )
+SLOT=26
+SRC_URI=mirror://gnu/emacs/emacs-26.1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-26.1-patches-1.tar.xz
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9c504bbea66c84d8cf667d8146453514
diff --git a/app-editors/emacs-vcs-26.1.9999 b/app-editors/emacs-vcs-26.1.9999
new file mode 100644
index 000000000000..b5688d8b0a85
--- /dev/null
+++ b/app-editors/emacs-vcs-26.1.9999
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=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= ) 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? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto ) sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+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
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+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= ) 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? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) )
+REQUIRED_USE=?? ( aqua X )
+SLOT=26
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=291363fa34c5d34b1e71b724e2c3dc92
diff --git a/app-editors/emacs-vcs-27.0.9999 b/app-editors/emacs-vcs-27.0.9999
new file mode 100644
index 000000000000..8e06cd7bfa7d
--- /dev/null
+++ b/app-editors/emacs-vcs-27.0.9999
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=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= ) 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? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto ) sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+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
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+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= ) 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? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) )
+REQUIRED_USE=?? ( aqua X )
+SLOT=27
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=76f99ee124c836a56998c2414a0ffa6f
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
deleted file mode 100644
index 49612f4ef9bf..000000000000
--- a/app-editors/emacs-vcs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD emacs-vcs-26.1.9999.ebuild 12790 BLAKE2B b241bfb349fd889b8f3bd083dcbd2e907e1370ec9b7c4f9662008cf08eea42e330380b744c2fba4cd98210b29fde0e760bdf06256f24ba362a4cca4c68a13d89 SHA512 683d53948f6f9e75c9771866971d601ea5364a8a377b639bc0e753def9a80d9b7259c02e7162a8c4e8c512e8cf7164672c43280b3120d6745df9450e91decdd5
-EBUILD emacs-vcs-27.0.9999.ebuild 12788 BLAKE2B f3620bf7836f4dee2f4b0165cbf42589411d61167292beec6fbce7748eebfd75d2eabd94287a223a7e455bae971ad23a1afeaf75a6c86401edf4fcc9e9e363df SHA512 f1ca9064125f2566472f3f638b835da13153aa3d5bd070c23e415397c331f9db87ebf493828d888d1abb89330bccf8cfcd26fb6ca9c6cb1f81531b8f96118e57
-MISC metadata.xml 2799 BLAKE2B 0b1f8190aa0a7884ce80e712caafa063e053e5b100bbf56ca97156e1b99cc32bd22caa20297ca0249b50b3991444b05d33c49051eabad56f20e799fd6c5e7d54 SHA512 cc0a8ac18f7366e0384528b963c9f2de4c6faabca3cfdf4abd92456feb70454c95df125ec0648806614ac0daaabf198acad0bd349295bf7b01b159db96fbece4
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
deleted file mode 100644
index abc0aef998ed..000000000000
--- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 +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 )"
-
-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= )
-		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? (
-			xwidgets? (
-				net-libs/webkit-gtk:4=
-				x11-libs/gtk+:3
-				x11-libs/libXcomposite
-			)
-			!xwidgets? (
-				gtk3? ( x11-libs/gtk+:3 )
-				!gtk3? ( x11-libs/gtk+:2 )
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	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 "unable to sed ctags.1"
-
-	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 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
-
-	econf \
-		--program-suffix="-${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 "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}/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 "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-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
deleted file mode 100644
index 542cd77830f4..000000000000
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="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/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="27"
-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 )"
-
-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= )
-		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? (
-			xwidgets? (
-				net-libs/webkit-gtk:4=
-				x11-libs/gtk+:3
-				x11-libs/libXcomposite
-			)
-			!xwidgets? (
-				gtk3? ( x11-libs/gtk+:3 )
-				!gtk3? ( x11-libs/gtk+:2 )
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	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 "unable to sed ctags.1"
-
-	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 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
-
-	econf \
-		--program-suffix="-${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 "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}/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 "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-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
deleted file mode 100644
index b252d0165140..000000000000
--- a/app-editors/emacs-vcs/metadata.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<longdescription>
-  GNU Emacs is an extensible, customizable text editor - and more. At its core
-  is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
-  with extensions to support text editing. The features of GNU Emacs include:
-   * Content-sensitive editing modes, including syntax coloring, for a variety
-     of file types including plain text, source code, and HTML.
-   * Complete built-in documentation, including a tutorial for new users.
-   * Full Unicode support for nearly all human languages and their scripts.
-   * Highly customizable, using Emacs Lisp code or a graphical interface.
-   * A large number of extensions that add other functionality, including a
-     project planner, mail and news reader, debugger interface, calendar, and
-     more. Many of these extensions are distributed with GNU Emacs; others are
-     available separately.
-</longdescription>
-<use>
-  <flag name="athena">Enable the MIT Athena widget set
-    (<pkg>x11-libs/libXaw</pkg>)</flag>
-  <flag name="dynamic-loading">Enable loading of dynamic libraries at
-    runtime</flag>
-  <flag name="games">Support shared score files for games</flag>
-  <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system
-    font name</flag>
-  <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file
-    notification</flag>
-  <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
-    system font name</flag>
-  <flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2
-    (<pkg>x11-libs/gtk+</pkg>)</flag>
-  <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
-  <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
-    processing</flag>
-  <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
-    of the internal Lisp implementations</flag>
-  <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg>
-    instead of the internal movemail substitute</flag>
-  <flag name="source">Install C source files and make them available for
-    find-function</flag>
-  <flag name="threads">Add elisp threading support</flag>
-  <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in
-    preference to Emacs' own scrollbars</flag>
-  <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
-    This option has an effect only on architectures where "long" and
-    "long long" types have different size.</flag>
-  <flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers
-    (requires GTK3)</flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
deleted file mode 100644
index 948837697b88..000000000000
--- a/app-editors/emacs/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 BLAKE2B 0106fe8053b4f65f384d451ca85138991a57afaca16b32035585055bb877c039af826859fa58c4660ec80664d3bfb0ee7a757ad76381c150ebcb22cb333a98d6 SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6
-DIST emacs-18.59-patches-10.tar.xz 21496 BLAKE2B bfa0202511a9e41d3278c63f43f174cca4ba95f42675796d85139fc43654ca3b9bc56a8c547029eaae967df66ec1e520d3bcdc67c4d53261fea70def6641574c SHA512 c0255d9d02e047cc2173cebb916677e268d8f5043c9dd08041b78019df208cdd02eb8eb49256acde7a3d5b004a7227ee9a1220d7b1e24580bdb5a5258216fc39
-DIST emacs-18.59-patches-11.tar.xz 22032 BLAKE2B cfdb85aeefa7a71dfd0719de893e9ea3f7118baa0b8c5aa97b3800c1a5743e77d63c35ab1e4afb13c284f5c6dda522d1e2e37f8bfd9bbba052e543af7401565b SHA512 cac3f2efc8b3f18cdf43474453acc406c5b469ecc11955f8216083a4deced887aea4a73221aa36f0bc6b7480788606f969ee1df15a8932ee771fdf790e98c00c
-DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
-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.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
-DIST emacs-25.3-patches-1.tar.xz 1252 BLAKE2B 33c3c8e32b85f548201d4988d3aaf94e6440ab4727fced17aa26f00fd5665b755d3add254a764f579736bbfbc90716ff800e3ad5b8e7bd5d5c2370d31451e4b1 SHA512 09371a789a7c742b4e18f45a4c4e063a5392d0684899eb8be8c7415af9fe3c306083c62f18abc6a15c4fe76dd6ae3ac5c9b002c962971e59379cc187926a0c15
-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.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25d13ec5e0bee9ec6a65e80c52c870162b4671e80a82f8310784c802924609f2f87d504b1a97617c44d859566f SHA512 537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2
-EBUILD emacs-18.59-r11.ebuild 4358 BLAKE2B d5db4c011da9c728092eeb75f8708c7ab3729497be75fec58553de3df47a12a54e0845c1a4bc5a07c1080a305d0fdf8033370c0c5692ca3ae7caa617637d8fea SHA512 9637184ba4c9f51da3eef13625b5de4a1af283ada88c2a4f6fe6f03447907ac37e05ae69abbef514bd0024f748f1cc458567f4480e0e23fd4db26905bfa0b4f9
-EBUILD emacs-18.59-r12.ebuild 4414 BLAKE2B 73ac8bfad69df23c494194c3df2933ae5e9bfe57c3516ddaf2df9160a3316b1a85bee4a69ad0e7a81bd8c1ed4e7636eda79a24aa9df0d1a322fed28a73f58dc7 SHA512 ec790db2ce8a9fc73e222c9cd78113b59717c378690a56bf5632b581f924bb640a507a1185dede45fc0598f66a954b61af38ab56c3a9717bde5ac75ed1d2eb3d
-EBUILD emacs-23.4-r17.ebuild 11518 BLAKE2B 1b44754cac7d35ac41597c68f2e7f8716d8c647e217141ee80943619220a599fc73cc5abec00b6e056f11d792e4a4a843c48f2b1cae863173888bbbeedecb3f2 SHA512 100b5565754d44904d18ce6cf90da7fea48f51223bce30f0d946283a93f526dbde01e142b10aaab74ab02bd3124f96eef8d251887de99619c20610f540663bfc
-EBUILD emacs-24.5-r5.ebuild 11236 BLAKE2B 841894ba951ae0eac88feebba0f421ec9f9d7c20d0bd0834d270987f948cea1a8016c54f04a869099365969c0889a4ea5f086510fb2d05a5c2f40376fec54617 SHA512 046f7e6c2baf11db3bec94906f33a71dbe25eaf72fbc16f212768490e0a463739c4f66390cf47fa224a6ae27302c24377b3d563fe9e72d0df72b07cf5930c8f4
-EBUILD emacs-25.3-r4.ebuild 11727 BLAKE2B 5f4b8c4ab165378be40a8601cd1eca6ce59236cdf275ac93fa7965cf5461b78fe5528034c066a35c81b7884096a54b4b134a0382cbcb2da0de094c28c054291f SHA512 a181e11cdf7cbb3731bfec5d77904a4473908a043d228a664a9592ff4c01db5ec8bb322459646febb3e697a2e883ceeee3f7e2a5d8f1c5b1ccd4968467b63e16
-EBUILD emacs-26.1-r1.ebuild 12160 BLAKE2B 18c8991f5ceca5b8c5c93e345beee16d98630ea3d25eb5aed005d454b3293180963ad230f274347e50a971e46817cc17589042dfbc1dee622086e3f68aecf1e7 SHA512 56fe3cb8557a97f198af2dd2594d9f214481870c850f7db8b348d0c8c11173fef517dead5f4dcb0455924d3057993fb81fc9424de9919cc222b80d4175ea1498
-EBUILD emacs-26.1.ebuild 11997 BLAKE2B d6c4e7936d79816231d36c87a10e71c75705b9095b08d1cd8e5b267909997ac5f6dcee7cdc0bcccbcfe344f768461799292a3ca498baba7fe56b382053a63769 SHA512 31134efc2349c475dd4e6d02ca865c87a90dcad9804bbe41a90036de51b819b015d72769b9783d0fd3bdb937ba04496ee95da4b75430ca6ef5b661e0fa8b0a40
-MISC metadata.xml 2741 BLAKE2B aa5276abe676055d9ce3a95dd3ab9208ca1b03676854a26e0309907c7d5aae466cd2746b43db6d2303bda2d1fd650191cf87c8cd983a040d66c9e57dfd59a830 SHA512 136a8328c80529ff045dd183770e629a6a0e9fc0b49258e994023636ec917aea1477be60898b86636071a94f9cccc6e80b06e173c15024cf3a794a2d0f968335
diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
deleted file mode 100644
index 91fad29d2a69..000000000000
--- a/app-editors/emacs/emacs-18.59-r11.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-DESCRIPTION="The extensible self-documenting text editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
-	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-10.tar.xz"
-
-LICENSE="GPL-1+ GPL-2+ BSD" #HPND
-SLOT="18"
-KEYWORDS="amd64 x86"
-IUSE="abi_x86_x32"
-
-RDEPEND=">=app-eselect/eselect-emacs-1.16
-	sys-libs/ncurses:0=
-	amd64? (
-		abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] )
-		!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] )
-	)"
-#	X? ( x11-libs/libX11[-xcb] )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch"
-
-src_prepare() {
-	default
-
-	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	sed -i -e 's:\./temacs.*dump:SANDBOX_ON=0 LD_PRELOAD= env &:' \
-		src/ymakefile || die
-}
-
-src_configure() {
-	# autoconf? What's autoconf? We are living in 1992. ;-)
-	local arch
-	case ${ARCH} in
-		amd64)
-			if use abi_x86_x32; then
-				arch=x86-x32
-				multilib_toolchain_setup x32
-			else
-				arch=intel386
-				multilib_toolchain_setup x86
-			fi
-			;;
-		x86) arch=intel386 ;;
-		*) die "Architecture ${ARCH} not yet supported" ;;
-	esac
-	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
-	#use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
-	sed -e "${cmd}" src/config.h-dist >src/config.h || die
-
-	cat <<-END >src/paths.h
-		#define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
-		#define PATH_EXEC "/usr/share/emacs/${PV}/etc"
-		#define PATH_LOCK "/var/lib/emacs/lock/"
-		#define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
-	END
-
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		-e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
-		src/s-linux.h || die
-
-	# -O3 and -finline-functions cause segmentation faults at run time.
-	# -Wno-implicit will quieten GCC 5; feel free to submit a patch
-	# adding all those missing prototypes.
-	strip-flags
-	filter-flags -finline-functions -fpie
-	append-flags -Wno-implicit
-	append-ldflags $(test-flags -no-pie)	#639562
-	replace-flags -O[3-9] -O2
-}
-
-src_compile() {
-	addpredict /var/lib/emacs/lock
-	emake --jobs=1 \
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
-		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	local basedir="/usr/share/emacs/${PV}" i
-
-	dodir ${basedir}
-	dodir /usr/share/man/man1
-	emake --jobs=1 \
-		LIBDIR="${D}"${basedir} \
-		BINDIR="${D}"/usr/bin \
-		MANDIR="${D}"/usr/share/man/man1 \
-		install
-
-	rmdir "${D}"${basedir}/lock || die
-	find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
-		-o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
-	fperms -R go-w ${basedir}
-
-	# remove duplicate DOC file
-	rm "${D}"${basedir}/etc/DOC || die
-
-	# move executables to the correct place
-	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
-	for i in etags ctags emacsclient; do
-		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
-		rm "${D}"${basedir}/etc/${i} || die
-	done
-
-	dodir /usr/libexec/emacs/${PV}
-	for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
-		yow env server
-	do
-		mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
-		dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
-	done
-	for i in test-distrib make-docfile; do
-		rm "${D}"${basedir}/etc/${i} || die
-	done
-
-	# move man page
-	mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die
-
-	# move Info files
-	dodir /usr/share/info
-	mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
-	dosym ../../info/emacs-${SLOT} "${basedir}"/info
-	docompress -x /usr/share/info
-
-	# move Info dir to avoid collisions with the dir file generated by portage
-	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
-	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
-
-	dodir /var/lib/emacs
-	diropts -m0777
-	keepdir /var/lib/emacs/lock
-
-	dodoc README PROBLEMS
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d "${D}"/usr/share/info ]]; then
-		mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-18.59-r12.ebuild b/app-editors/emacs/emacs-18.59-r12.ebuild
deleted file mode 100644
index 48dbd0a516e3..000000000000
--- a/app-editors/emacs/emacs-18.59-r12.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic multilib
-
-DESCRIPTION="The extensible self-documenting text editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
-	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-11.tar.xz"
-
-LICENSE="GPL-1+ GPL-2+ BSD HPND"
-SLOT="18"
-KEYWORDS="~amd64 ~x86"
-IUSE="abi_x86_x32 X"
-
-RDEPEND=">=app-eselect/eselect-emacs-1.16
-	sys-libs/ncurses:0=
-	amd64? (
-		abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] )
-		!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] )
-	)
-	X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}
-	X? (
-		x11-base/xorg-proto
-		x11-misc/xbitmaps
-	)"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch"
-
-src_prepare() {
-	default
-
-	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	sed -i -e 's:\./temacs.*dump:SANDBOX_ON=0 LD_PRELOAD= env &:' \
-		src/ymakefile || die
-}
-
-src_configure() {
-	# autoconf? What's autoconf? We are living in 1992. ;-)
-	local arch
-	case ${ARCH} in
-		amd64)
-			if use abi_x86_x32; then
-				arch=x86-x32
-				multilib_toolchain_setup x32
-			else
-				arch=intel386
-				multilib_toolchain_setup x86
-			fi
-			;;
-		x86) arch=intel386 ;;
-		*) die "Architecture ${ARCH} not yet supported" ;;
-	esac
-	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
-	use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
-	sed -e "${cmd}" src/config.h-dist >src/config.h || die
-
-	cat <<-END >src/paths.h
-		#define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
-		#define PATH_EXEC "/usr/share/emacs/${PV}/etc"
-		#define PATH_LOCK "/var/lib/emacs/lock/"
-		#define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
-	END
-
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		-e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
-		src/s-linux.h || die
-
-	# -O3 and -finline-functions cause segmentation faults at run time.
-	# -Wno-implicit will quieten GCC 5; feel free to submit a patch
-	# adding all those missing prototypes.
-	strip-flags
-	filter-flags -finline-functions -fpie
-	append-flags -Wno-implicit
-	append-ldflags $(test-flags -no-pie)	#639562
-	replace-flags -O[3-9] -O2
-}
-
-src_compile() {
-	addpredict /var/lib/emacs/lock
-	emake --jobs=1 \
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
-		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	local basedir="/usr/share/emacs/${PV}" i
-
-	dodir ${basedir}
-	dodir /usr/share/man/man1
-	emake --jobs=1 \
-		LIBDIR="${D}"${basedir} \
-		BINDIR="${D}"/usr/bin \
-		MANDIR="${D}"/usr/share/man/man1 \
-		install
-
-	rmdir "${D}"${basedir}/lock || die
-	find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
-		-o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
-	fperms -R go-w ${basedir}
-
-	# remove duplicate DOC file
-	rm "${D}"${basedir}/etc/DOC || die
-
-	# move executables to the correct place
-	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
-	for i in etags ctags emacsclient; do
-		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
-		rm "${D}"${basedir}/etc/${i} || die
-	done
-
-	dodir /usr/libexec/emacs/${PV}
-	for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
-		yow env server
-	do
-		mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
-		dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
-	done
-	for i in test-distrib make-docfile; do
-		rm "${D}"${basedir}/etc/${i} || die
-	done
-
-	# move man page
-	mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die
-
-	# move Info files
-	dodir /usr/share/info
-	mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
-	dosym ../../info/emacs-${SLOT} "${basedir}"/info
-	docompress -x /usr/share/info
-
-	# move Info dir to avoid collisions with the dir file generated by portage
-	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
-	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
-
-	dodir /var/lib/emacs
-	diropts -m0777
-	keepdir /var/lib/emacs/lock
-
-	dodoc README PROBLEMS
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d "${D}"/usr/share/info ]]; then
-		mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-}
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 99eac1719fdd..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 ~s390 ~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-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
deleted file mode 100644
index d06860523d92..000000000000
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-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"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		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
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	X? ( x11-base/xorg-proto )"
-#	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
-
-	# 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
-	append-ldflags $(test-flags -no-pie)	#639570
-
-	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; 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 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
-
-		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
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			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
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--without-hesiod \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# 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 "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/{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
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-25.3-r4.ebuild b/app-editors/emacs/emacs-25.3-r4.ebuild
deleted file mode 100644
index 6911c651218c..000000000000
--- a/app-editors/emacs/emacs-25.3-r4.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common flag-o-matic multilib readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	X? ( x11-base/xorg-proto )"
-#	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
-
-	# 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
-
-	# Don't trigger a floating point exception for NaNs on alpha
-	use alpha && append-flags -mieee
-
-	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
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--without-hesiod \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# 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 "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-26.1-r1.ebuild b/app-editors/emacs/emacs-26.1-r1.ebuild
deleted file mode 100644
index 97b7b1294852..000000000000
--- a/app-editors/emacs/emacs-26.1-r1.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos 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= )
-		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? (
-			xwidgets? (
-				net-libs/webkit-gtk:4=
-				x11-libs/gtk+:3
-				x11-libs/libXcomposite
-			)
-			!xwidgets? (
-				gtk3? ( x11-libs/gtk+:3 )
-				!gtk3? ( x11-libs/gtk+:2 )
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	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}"
-
-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
-
-	# 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
-}
-
-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
-
-	# Don't trigger a floating point exception for NaNs on alpha
-	use alpha && append-flags -mieee
-
-	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
-
-	econf \
-		--program-suffix="-${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 "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}/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 "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-26.1.ebuild b/app-editors/emacs/emacs-26.1.ebuild
deleted file mode 100644
index 09b6c8355e7b..000000000000
--- a/app-editors/emacs/emacs-26.1.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common flag-o-matic multilib readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos 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= )
-		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? (
-			xwidgets? (
-				net-libs/webkit-gtk:4=
-				x11-libs/gtk+:3
-				x11-libs/libXcomposite
-			)
-			!xwidgets? (
-				gtk3? ( x11-libs/gtk+:3 )
-				!gtk3? ( x11-libs/gtk+:2 )
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	X? ( x11-base/xorg-proto )"
-#	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
-
-	# 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
-}
-
-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
-
-	econf \
-		--program-suffix="-${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 "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}/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 "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/metadata.xml b/app-editors/emacs/metadata.xml
deleted file mode 100644
index 7ed552aba66d..000000000000
--- a/app-editors/emacs/metadata.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<longdescription>
-  GNU Emacs is an extensible, customizable text editor - and more. At its core
-  is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
-  with extensions to support text editing. The features of GNU Emacs include:
-   * Content-sensitive editing modes, including syntax coloring, for a variety
-     of file types including plain text, source code, and HTML.
-   * Complete built-in documentation, including a tutorial for new users.
-   * Full Unicode support for nearly all human languages and their scripts.
-   * Highly customizable, using Emacs Lisp code or a graphical interface.
-   * A large number of extensions that add other functionality, including a
-     project planner, mail and news reader, debugger interface, calendar, and
-     more. Many of these extensions are distributed with GNU Emacs; others are
-     available separately.
-</longdescription>
-<use>
-  <flag name="athena">Enable the MIT Athena widget set
-    (<pkg>x11-libs/libXaw</pkg>)</flag>
-  <flag name="dynamic-loading">Enable loading of dynamic libraries at
-    runtime</flag>
-  <flag name="games">Support shared score files for games</flag>
-  <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system
-    font name</flag>
-  <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file
-    notification</flag>
-  <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
-    system font name</flag>
-  <flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2
-    (<pkg>x11-libs/gtk+</pkg>)</flag>
-  <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
-  <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
-    processing</flag>
-  <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
-    of the internal Lisp implementations</flag>
-  <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg>
-    instead of the internal movemail substitute</flag>
-  <flag name="source">Install C source files and make them available for
-    find-function</flag>
-  <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in
-    preference to Emacs' own scrollbars</flag>
-  <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
-    This option has an effect only on architectures where "long" and
-    "long long" types have different size.</flag>
-  <flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers
-    (requires GTK3)</flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/emact-2.56.0 b/app-editors/emact-2.56.0
new file mode 100644
index 000000000000..752d3676db00
--- /dev/null
+++ b/app-editors/emact-2.56.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses X? ( x11-libs/libX11 )
+DESCRIPTION=EmACT, a fork of Conroy's MicroEmacs
+EAPI=4
+HOMEPAGE=http://www.eligis.com/emacs/
+IUSE=X
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ BSD
+RDEPEND=sys-libs/ncurses X? ( x11-libs/libX11 )
+SLOT=0
+SRC_URI=mirror://sourceforge/emact/emact-2.56.0.tar.gz
+_md5_=108216aafe151999e4d6700cea01c1f3
diff --git a/app-editors/emact-2.58.0 b/app-editors/emact-2.58.0
new file mode 100644
index 000000000000..62414bfe808d
--- /dev/null
+++ b/app-editors/emact-2.58.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=EmACT, a fork of Conroy's MicroEmacs
+EAPI=6
+HOMEPAGE=http://www.eligis.com/emacs/
+IUSE=X
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ BSD
+RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 )
+SLOT=0
+SRC_URI=mirror://sourceforge/emact/emact-2.58.0.tar.gz
+_md5_=01cc6104871d4e78f76e7e32c5a0ebce
diff --git a/app-editors/emact/Manifest b/app-editors/emact/Manifest
deleted file mode 100644
index a21237fe622a..000000000000
--- a/app-editors/emact/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST emact-2.56.0.tar.gz 578640 BLAKE2B 2bdf0a88003c0cbd28153737eac588dbb068ed99a1166dc66a5fac33f91d2b3c7e058518733c6eddbfeb3291f3ad89dd4a6bfc4b11ccda0963a314a5fbf4e2b0 SHA512 96fce3bf3e00e84abd9de0778a02cfd284689073391e6f9eb3bb4a54e8899ae32d9e8acd45d0f1d575e36f171ca148fc574c9ecc71615df9a9907ee1d30bb99d
-DIST emact-2.58.0.tar.gz 581248 BLAKE2B 9be43cfc37973d683c5c824bf2f2d60d0ffab2791c46a4082f04d83fc705713d5806608e5802e786be4ced4b008842c5c6dca60b7a30c5483b29736ccc21ffe5 SHA512 43108d0bc1989ba6e11f12e86ad5fa4e0b06dc2cc11f54a8b1ca548bb91d2d201f62ffda5e8c11ff75a724229ca1a2ae3e2f439ebc62e1fe3f484f811a88a2c2
-EBUILD emact-2.56.0.ebuild 605 BLAKE2B aaff4cc4d961a4886aed31adc6a367783b344aba442c569ac4e573e3fdcbb71db1caf08d2f6a2d02993db42ca8e86fc6fc0494a20b995abf78d604c2fb990aac SHA512 c1b0ba7d6eafe7e177e412eb7310aff4ca2244c28099e05d38ec668346d3e518cd79b271e9204cfcbe0e9d654a2302105c8288a7b9eacfa4fde395c11737874b
-EBUILD emact-2.58.0.ebuild 535 BLAKE2B aad06c8aa38848e686baf904753ad0c69dc845bba57ef6d14c879994c304e066c022c4efe8cd62a2bef2ddc52ac627e21a66f7f3d0bbb90dab2c6a4f486d62a4 SHA512 2825597c48b337f3a1a22c8f085203018f288805006177f054d94339394b0af1370129fb6e7aa31775e60b29032f52374541ae0d6bf5420fec5e4e0572687a15
-MISC metadata.xml 1356 BLAKE2B 6038a2811fe4103bcba606fe464c1ca1ddf0765f064507d84aaeaf92f92de0c51ca4d75a88a32576a50631f694ad2e84d842602c50f03a2e9ac9ee4b8a0a12e4 SHA512 f376c46dc531f259dda9842b817c5eb040c4c2f9ee811e728770b660e4af1b8d588081e34bd3149c88fbbfbb976cc6cdb3013a8c8a5ae488a198a9c3ac10d75d
diff --git a/app-editors/emact/emact-2.56.0.ebuild b/app-editors/emact/emact-2.56.0.ebuild
deleted file mode 100644
index 5ac2733b21f4..000000000000
--- a/app-editors/emact/emact-2.56.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="EmACT, a fork of Conroy's MicroEmacs"
-HOMEPAGE="http://www.eligis.com/emacs/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-DEPEND="sys-libs/ncurses
-	X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# files in the tarball have all mode bits set to zero ...
-	chmod +x configure || die
-}
-
-src_configure() {
-	econf $(use_with X x)
-}
-
-src_install() {
-	emake INSTALL="${D}"/usr install
-	#dodoc README
-}
diff --git a/app-editors/emact/emact-2.58.0.ebuild b/app-editors/emact/emact-2.58.0.ebuild
deleted file mode 100644
index 6e0ffca331b0..000000000000
--- a/app-editors/emact/emact-2.58.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="EmACT, a fork of Conroy's MicroEmacs"
-HOMEPAGE="http://www.eligis.com/emacs/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-RDEPEND="sys-libs/ncurses:0=
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_configure() {
-	econf $(use_with X x)
-}
-
-src_install() {
-	emake INSTALL="${ED%/}"/usr install
-	#dodoc README
-}
diff --git a/app-editors/emact/metadata.xml b/app-editors/emact/metadata.xml
deleted file mode 100644
index d94e6b286818..000000000000
--- a/app-editors/emact/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-  This product is an original development made to provide an emacs-like editor
-  on the PC for the purpose of writing Lisp code with the same features found
-  on other Lisp development systems. In 1985, with about 512 Ko of memory, it
-  was obvious that Gosling, GNU or other emacs written in Lisp were too big to
-  run on M$-DOG. So I decided to write my own editor that closely works like
-  those I used on VAX Unix at that time. I started with Conroy's MicroEMACS.
-
-  After a great amount of time, made essentially after hours, EmACT is now
-  a pretty good clone of GNU Emacs. It has all the features that programmers
-  enjoy, like parentheses matching, auto-indent for Lisp, C, C++, compile
-  mode, tags and even a Lisp interpreter which is not however compatible with
-  GNU MockLisp. It can be ported to all UN*X systems (terminal and X-Window)
-  and it runs of course on all Intel based system in text or graphic mode
-  (MSDOS, OS/2, Windows 3.x, Windows NT/2000/XP and Windows 95/98/Me).
-</longdescription>
-<upstream>
-  <remote-id type="sourceforge">emact</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/app-editors/ersatz-emacs-20060515 b/app-editors/ersatz-emacs-20060515
new file mode 100644
index 000000000000..7743e084979c
--- /dev/null
+++ b/app-editors/ersatz-emacs-20060515
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=!app-editors/ee sys-libs/ncurses virtual/pkgconfig
+DESCRIPTION=A very minimal imitation of the famous GNU Emacs editor
+EAPI=4
+HOMEPAGE=http://hunter.apana.org.au/~cjb/Code/
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+RDEPEND=!app-editors/ee sys-libs/ncurses
+SLOT=0
+SRC_URI=mirror://gentoo/ersatz-emacs-20060515.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3d3877005d022c66bd8f288c1b055020
diff --git a/app-editors/ersatz-emacs/Manifest b/app-editors/ersatz-emacs/Manifest
deleted file mode 100644
index 985ba333d8f7..000000000000
--- a/app-editors/ersatz-emacs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ersatz-emacs-20060515-gentoo.patch 971 BLAKE2B 2730f247c341bb89e8f0c1eadb5730098091cd01a5b1ceaef76fdd516c2cdbfb532ce25312e0ab71ba404bfca83e6a30d90982842dcce13e45d70859c9862cae SHA512 dd9264a80f80eeb06a1c194d9f9df02c2b53fc143ec676e9c9489b57d337fe2b42240029026acc932f05b11ca78464033a5571990dca1cae716932d3c9a300fe
-DIST ersatz-emacs-20060515.tar.gz 45581 BLAKE2B 641cad2f5a873b0c70743a6f60ffc31615bb8789d5c6a100a67aaa82c59e7a83d35023eb596303ef0160e3ff561c89e5814b685a7a650aa4625326e86ec4fdf3 SHA512 c30ede63ebb44076762aa430a73c73d3fa3bcd0e3d0016162aab31347257124479f464a1003012f7418e807abfd3c613c81f5196ccf65b0cb3f939b7ad5c989d
-EBUILD ersatz-emacs-20060515.ebuild 998 BLAKE2B 8f2d0f17c67743b133976585a46c2bf759e84863d6be4e490aa8268d953b9a740b9ca3b763d9591c1cd238ab2a20efde978fcef837bcdeb6d43a0121ff983f78 SHA512 fb40ee9f53105526538b353bcbffa9f3c8b361f9da27289f127b6eff53f78f860577f633172e975338df6d781d85d6b629a4051cc2328bd0ba1a6f7e28099406
-MISC metadata.xml 610 BLAKE2B c7dc603c9e9ac838bd21b3e6f513f1e3f79370f9eedcc0f6973c812526c342408e1eac696d5b0c9fe3a5f8c20911af7f7bc9cc4260f443f2ec0cd80d60dbf724 SHA512 a48b4e5215cdd4a33802ef3fcf3324f43bd3c8ec8d70ba6be8e295c8dda35c4e4df400a04afbf4193c595c7dd4d23aeee38cb80585e498b1b77907aaedb56926
diff --git a/app-editors/ersatz-emacs/ersatz-emacs-20060515.ebuild b/app-editors/ersatz-emacs/ersatz-emacs-20060515.ebuild
deleted file mode 100644
index 2b147efbad2e..000000000000
--- a/app-editors/ersatz-emacs/ersatz-emacs-20060515.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A very minimal imitation of the famous GNU Emacs editor"
-HOMEPAGE="http://hunter.apana.org.au/~cjb/Code/"
-# taken from http://hunter.apana.org.au/~cjb/Code/ersatz.tar.gz
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="!app-editors/ee
-	sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	sed -i -e "s%/usr/local/share/%/usr/share/doc/${PF}/%" ee.1 \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -Wall" \
-		LFLAGS="${LDFLAGS} $("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_install() {
-	# Note: /usr/bin/ee is "easy edit" on FreeBSD, so if this
-	# is ever keyworded *-fbsd the binary has to be renamed.
-	dobin ee
-	doman ee.1
-	dodoc ChangeLog ERSATZ.keys README
-}
diff --git a/app-editors/ersatz-emacs/files/ersatz-emacs-20060515-gentoo.patch b/app-editors/ersatz-emacs/files/ersatz-emacs-20060515-gentoo.patch
deleted file mode 100644
index 67c40e789241..000000000000
--- a/app-editors/ersatz-emacs/files/ersatz-emacs-20060515-gentoo.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- display.c
-+++ display.c
-@@ -5,6 +5,7 @@
-  * hints that are left in the windows by the commands
-  */
- 
-+#include <stdlib.h>
- #include <string.h>
- #include "estruct.h"
- #include "edef.h"
-@@ -100,7 +101,6 @@
- void vtinit ()
- {
-   VIDEO *vp;
--  char *malloc ();
-   int i;
- 
-   (*term.t_open) ();
---- line.c
-+++ line.c
-@@ -47,7 +47,6 @@
- {
-   LINE *lp;
-   int size;
--  char *malloc ();
- 
-   size = (used + NBLOCK - 1) & ~(NBLOCK - 1);
-   if (size == 0)	       /* Assume that an empty */
-@@ -469,8 +468,6 @@
-  */
- int kinsert (int c)
- {
--  char *realloc ();
--  char *malloc ();
-   char *nbufp;
- 
-   if (kused == ksize)
---- tcap.c
-+++ tcap.c
-@@ -2,6 +2,7 @@
- 
- #define	termdef	1		/* don't define "term" external */
- 
-+#include <stdlib.h>
- #include <stdio.h>		/* puts(3), snprintf(3) */
- #include "estruct.h"
- #include "edef.h"
---- termio.c
-+++ termio.c
-@@ -5,6 +5,7 @@
-  */
- 
- #undef CTRL
-+#include <stdlib.h>
- #include <termios.h>
- #include <unistd.h>
- #include <signal.h>
diff --git a/app-editors/ersatz-emacs/metadata.xml b/app-editors/ersatz-emacs/metadata.xml
deleted file mode 100644
index 047063ba435e..000000000000
--- a/app-editors/ersatz-emacs/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-  Ersatz Emacs is a very minimal imitation of the famous GNU Emacs editor.
-  Unlike most popular Emacs derivatives, Ersatz strives to use as little
-  system resources as possible and be simple enough for the casual programmer
-  to understand, yet still include all the functionality required for most
-  text editing jobs.
-</longdescription>
-</pkgmetadata>
diff --git a/app-editors/fe-1.8 b/app-editors/fe-1.8
new file mode 100644
index 000000000000..1330a1a3ea8b
--- /dev/null
+++ b/app-editors/fe-1.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses sendmail? ( virtual/mta )
+DESCRIPTION=A small and easy to use folding editor
+EAPI=4
+HOMEPAGE=http://www.moria.de/~michael/fe/
+IUSE=sendmail
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses sendmail? ( virtual/mta )
+SLOT=0
+SRC_URI=http://www.moria.de/~michael/fe/fe-1.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=abe5bc7d27b4cc6ad1e61c9b73d0943e
diff --git a/app-editors/fe-1.9 b/app-editors/fe-1.9
new file mode 100644
index 000000000000..0c00cb62d6cc
--- /dev/null
+++ b/app-editors/fe-1.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses sendmail? ( virtual/mta )
+DESCRIPTION=A small and easy to use folding editor
+EAPI=4
+HOMEPAGE=http://www.moria.de/~michael/fe/
+IUSE=sendmail
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses sendmail? ( virtual/mta )
+SLOT=0
+SRC_URI=http://www.moria.de/~michael/fe/fe-1.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8e1d34fe4f39616858f4a2f3395038a6
diff --git a/app-editors/fe/Manifest b/app-editors/fe/Manifest
deleted file mode 100644
index c9a6bf70938d..000000000000
--- a/app-editors/fe/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX fe-1.8-makefile.patch 495 BLAKE2B 311e9864c5dd2a1e7fdee4e394c85194f3a2526bb137d3c681d95a564be64672aa3cb45138b218f53cb381784882a44f2da671392184b2a7850df3a7730571c6 SHA512 1e88c66f37d5cfc90b8561cc8bb99a460003b79ca312e2a5a7ad5ebb44bbea86deb4aab115c3dbe7775edfb162d7417e4581a9854b1cc7e9efd8a91502c12cab
-DIST fe-1.8.tar.gz 169151 BLAKE2B 82ce56137ac462982e314e20f027f3e325b5810b778efe5503624728b48a4e06f6e60c668e35ca8bb70d2bfd07f4d6083d487ac83f382e760451e26a9721ac4e SHA512 c00f23769193b8b74867da32e7424ecb7f807a0186c8f91cd007f83a543777e1ca70909ee17a54ac8e7da743cd3fcb6b0e8cdd6d2fefbfb6766122ade125893b
-DIST fe-1.9.tar.gz 178678 BLAKE2B 144d8edf2f6bf38f75b7e5593d0fb9d9e3fc4a7e91d974f49fa5f7974ee1e077dbdee4ee25931b34691032c0d4e676ab6b03e4de646947a4ea133876213285d9 SHA512 38121a21c1539ff8ad4f61b92ddfd0582c100f1bc1c5524faf7a60a162c5f8a0b2d1528da7719e522e9b75a527166223c2636f78c9f516abbb33434a9f6e6251
-EBUILD fe-1.8.ebuild 689 BLAKE2B 0e7bf18ef97dd05512b4b5693287ad754812105417dfa4345417f81093e7a9bcb068518ca58f61a36d5757f4afe7a8c227a4579f652f393ffcefa273af293f65 SHA512 e4272214d6a2876f4eeb46b20ac24a186f2f187fe62705f388bc905ce249013d457e82e168e3fbfd23a9b212aeb2021dc1ffbafb9b5c6467a75ed7ed89079285
-EBUILD fe-1.9.ebuild 694 BLAKE2B b97c8855f82cf71d6f84358c07f3a3f4e24023db119fc357a01b36ca604b5634330333dae1d2a047107564f6406395a4e78fbd18a7aba40a23aae64d6649ad3f SHA512 987ee3a593b521916c12c40823840d593766c31bf4bcb47d5f082092d3a95078915d8180b6a482c6afc0c014faf88c79076823153f42a64a5aa6789f24243767
-MISC metadata.xml 1259 BLAKE2B e393bad45601c7e357aa4c4e5e6ede35cdd6758a1cc251cfc3acca0e8526ffb696c0ca484b312be14d23a05d8996ce7fb3bee37fe7a8c9bc72d5c507c26729df SHA512 6539d808d3cd85bab1985dbfb69ddbd01166a4e6dcf66d0f138d1ff1e52d9b7342ff3b468e031f9372308533296e28eb978b00954624890a897b5f41c222f701
diff --git a/app-editors/fe/fe-1.8.ebuild b/app-editors/fe/fe-1.8.ebuild
deleted file mode 100644
index 5567eebdbb07..000000000000
--- a/app-editors/fe/fe-1.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A small and easy to use folding editor"
-HOMEPAGE="http://www.moria.de/~michael/fe/"
-SRC_URI="http://www.moria.de/~michael/fe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="sendmail"
-
-DEPEND="sys-libs/ncurses
-	sendmail? ( virtual/mta )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_configure() {
-	econf $(use_enable sendmail)
-}
-
-src_install() {
-	emake \
-		prefix="${D}"/usr \
-		datadir="${D}"/usr/share \
-		MANDIR="${D}"/usr/share/man \
-		install
-
-	dodoc NEWS README
-	dohtml fe.html
-}
diff --git a/app-editors/fe/fe-1.9.ebuild b/app-editors/fe/fe-1.9.ebuild
deleted file mode 100644
index 084a8edd52c2..000000000000
--- a/app-editors/fe/fe-1.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A small and easy to use folding editor"
-HOMEPAGE="http://www.moria.de/~michael/fe/"
-SRC_URI="http://www.moria.de/~michael/fe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="sendmail"
-
-DEPEND="sys-libs/ncurses
-	sendmail? ( virtual/mta )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8-makefile.patch"
-}
-
-src_configure() {
-	econf $(use_enable sendmail)
-}
-
-src_install() {
-	emake \
-		prefix="${D}"/usr \
-		datadir="${D}"/usr/share \
-		MANDIR="${D}"/usr/share/man \
-		install
-
-	dodoc NEWS README
-	dohtml fe.html
-}
diff --git a/app-editors/fe/files/fe-1.8-makefile.patch b/app-editors/fe/files/fe-1.8-makefile.patch
deleted file mode 100644
index 73f7e09020da..000000000000
--- a/app-editors/fe/files/fe-1.8-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur fe-1.8-orig/Makefile.in fe-1.8/Makefile.in
---- fe-1.8-orig/Makefile.in	2007-08-31 20:47:09.000000000 +0200
-+++ fe-1.8/Makefile.in	2011-08-27 21:07:43.000000000 +0200
-@@ -40,10 +40,10 @@
- 
- install:	all
- 		$(INSTALL) -m 755 -d $(BINDIR)
--		$(INSTALL_PROGRAM) -s fe $(BINDIR)/fe
-+		$(INSTALL_PROGRAM) fe $(BINDIR)/fe
- 		$(INSTALL) -m 755 -d $(MANDIR)/man1
- 		$(INSTALL_DATA) fe.1 $(MANDIR)/man1/fe.1
--		make install-po
-+		$(MAKE) install-po
- 
- .c.o:
- 		$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
diff --git a/app-editors/fe/metadata.xml b/app-editors/fe/metadata.xml
deleted file mode 100644
index 5020c7020a74..000000000000
--- a/app-editors/fe/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-  Fe is a small and easy to use folding editor.
-
-  Fe allows to fold arbitrary text regions; it is not bound to syntactic
-  units. Unlike Origami, folds are not attributed with a trailing comment,
-  instead you can put folds before or after any text in the line, as you like.
-
-  Fe has no configuration or extension language and requires no setup. Its
-  user interface is emacs-like and it has menues for the very most important
-  functions to help beginners. Further there is a reference card. It offers:
-
-   * Regions and Emacs-like kill ring
-   * Incremental search
-   * Keyboard macros
-   * Editing binary files
-   * Multiple windows and views
-   * Compose function for Latin 1 characters
-
-  In case you can't stand the emacs interface and want ultimate flexibility,
-  fe can easily be modified, because it is structured as an editor library
-  with a user interface frontend, all written in C.
-</longdescription>
-<use>
-  <flag name="sendmail">Send mail after editor abend</flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/focuswriter-1.6.10 b/app-editors/focuswriter-1.6.10
new file mode 100644
index 000000000000..f24b971d1f76
--- /dev/null
+++ b/app-editors/focuswriter-1.6.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=app-text/hunspell:= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 sys-libs/zlib dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A fullscreen and distraction-free word processor
+EAPI=6
+HOMEPAGE=https://gottcode.org/focuswriter/
+KEYWORDS=amd64 x86
+LICENSE=LGPL-3 GPL-3
+RDEPEND=app-text/hunspell:= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 sys-libs/zlib
+SLOT=0
+SRC_URI=https://gottcode.org/focuswriter/focuswriter-1.6.10-src.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f58c3b04ab7c8dac769e96e9a7fcf78
diff --git a/app-editors/focuswriter-1.6.13 b/app-editors/focuswriter-1.6.13
new file mode 100644
index 000000000000..f38af967bf87
--- /dev/null
+++ b/app-editors/focuswriter-1.6.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=app-text/hunspell:= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 sys-libs/zlib dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A fullscreen and distraction-free word processor
+EAPI=6
+HOMEPAGE=https://gottcode.org/focuswriter/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3 GPL-3
+RDEPEND=app-text/hunspell:= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 sys-libs/zlib
+SLOT=0
+SRC_URI=https://gottcode.org/focuswriter/focuswriter-1.6.13-src.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9fd6c7967edc2c7ce0780a8810b9d697
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
deleted file mode 100644
index fc15747bfd24..000000000000
--- a/app-editors/focuswriter/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5833d485a421244228ef36601320ddcdad1e744e4a83fee2633154c4bd642053e09bf97ee79aab2b11a82df4afcb4a70823cb5df24b5232c9b0a8d6 SHA512 5f272a4c65b1eb58cc87732fbe82f2c6b925562e77b2280a8b9a0a8b0a41716567051ebd4f6ed32caa8ce7f14edff4e20666f6ad4e464cc8d308640efa4a3c19
-DIST focuswriter-1.6.10-src.tar.bz2 10202594 BLAKE2B d7b59dc2c37d87ed0d1e58358906a9fef6f14a339e12a50980d17cdbed043f604bb355edca956af61b5fcaa78f68eb35b54ef85fc08dfa00dfa747893d6c1200 SHA512 8c12481af77fa4353840f22a6aa54c5264041afc141d9746e097e42171a9f274663940fc0c5e5e2c91ef677190c682a195cb775199d4b8cc2b1ad040542e2e61
-DIST focuswriter-1.6.13-src.tar.bz2 10342493 BLAKE2B 11086bf7d35cc392169e7b6de57ea0b65c919bef0d845946893641f705ba0522bdef7244f4035104188d3fdf0dd3b6ad30ed6bf347b5ce8c422d7eea6c6dc714 SHA512 d78719d5a1e25afec8035759d0ebff17728e856fe346d4d8fefd38a15eea3476eb1c6e2aca30955ac148fadd4701a9c4a83399baffe93239a18b93854fab9858
-EBUILD focuswriter-1.6.10.ebuild 1091 BLAKE2B 48012e9467003fd8c88cc144cf6e587e1f8992b77bc69ea3e20c0f5bc271f6f4a45c944b8a8985eccb3e36db99d67c4efbd2a372fbae51be09df46083a01fe34 SHA512 175c404d257142889d797e67f6f47c7bb1756c253ecc41f96a79f26c604ef24595c1bfc5ae2739d0814938fb2c6240779da39cee0821b3aeab80c7b073c728d9
-EBUILD focuswriter-1.6.13.ebuild 1093 BLAKE2B 7ea0feb52027aa668d78ae5b01eb42ff682911251311f627ace120c22f889e8239f126db26c9d49a181110d3b0a4f3c230194bd99e9657b7224bb679797342df SHA512 207a2a1bf4876f782c17096c94dfe360ca8c76ad77891582f6fffc56ad493ab7ec6894f27d1e19d697b11a51bed5a2456929824a383b62f5de7e5ca12844db23
-MISC metadata.xml 392 BLAKE2B dcb98e8e1ba1c2a2aea89d380d6a2a1a1cfd5fd9773f133aa7603b88384c91911429832a7117026cea4c092c1c84dfe440a2c4da875ce56e1da7e8670aecf068 SHA512 beaf6206dfa83ffa8acbae3d5f8c5a9041974588a18de742fa049d4ff0b8d75bcb2f40ab081418cdd2987709566b678f7016b1be0acb02deeec480cd25ddf3cb
diff --git a/app-editors/focuswriter/files/focuswriter-1.6.0-unbundle-qtsingleapplication.patch b/app-editors/focuswriter/files/focuswriter-1.6.0-unbundle-qtsingleapplication.patch
deleted file mode 100644
index 000db83f10e1..000000000000
--- a/app-editors/focuswriter/files/focuswriter-1.6.0-unbundle-qtsingleapplication.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/focuswriter.pro
-+++ b/focuswriter.pro
-@@ -7,6 +7,7 @@
- 
- TEMPLATE = app
- QT += network widgets printsupport multimedia concurrent
-+CONFIG += qtsingleapplication
- macx {
- 	QT += macextras
- }
-@@ -83,7 +84,7 @@
- 		src/spelling/dictionary_provider_voikko.cpp
- }
- 
--INCLUDEPATH += src src/fileformats src/qtsingleapplication src/qtzip src/spelling
-+INCLUDEPATH += src src/fileformats src/qtzip src/spelling
- 
- # Specify program sources
- HEADERS += src/action_manager.h \
-@@ -142,8 +143,6 @@
- 	src/fileformats/rtf_tokenizer.h \
- 	src/fileformats/rtf_writer.h \
- 	src/fileformats/txt_reader.h \
--	src/qtsingleapplication/qtsingleapplication.h \
--	src/qtsingleapplication/qtlocalpeer.h \
- 	src/qtzip/qtzipreader.h \
- 	src/qtzip/qtzipwriter.h \
- 	src/spelling/abstract_dictionary.h \
-@@ -207,8 +206,6 @@
- 	src/fileformats/rtf_tokenizer.cpp \
- 	src/fileformats/rtf_writer.cpp \
- 	src/fileformats/txt_reader.cpp \
--	src/qtsingleapplication/qtsingleapplication.cpp \
--	src/qtsingleapplication/qtlocalpeer.cpp \
- 	src/qtzip/qtzip.cpp \
- 	src/spelling/dictionary_dialog.cpp \
- 	src/spelling/dictionary_manager.cpp \
diff --git a/app-editors/focuswriter/focuswriter-1.6.10.ebuild b/app-editors/focuswriter/focuswriter-1.6.10.ebuild
deleted file mode 100644
index 9aa7b84840d7..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="A fullscreen and distraction-free word processor"
-HOMEPAGE="https://gottcode.org/focuswriter/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# drop qtcore subslot when minimal Qt is 5.10
-RDEPEND="
-	app-text/hunspell:=
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog CREDITS NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/focuswriter/focuswriter-1.6.13.ebuild b/app-editors/focuswriter/focuswriter-1.6.13.ebuild
deleted file mode 100644
index f61c59e9ba31..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.13.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="A fullscreen and distraction-free word processor"
-HOMEPAGE="https://gottcode.org/focuswriter/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# drop qtcore subslot when minimal Qt is 5.10
-RDEPEND="
-	app-text/hunspell:=
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog CREDITS NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/focuswriter/metadata.xml b/app-editors/focuswriter/metadata.xml
deleted file mode 100644
index d79d623beff3..000000000000
--- a/app-editors/focuswriter/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://gottcode.org/focuswriter/bugs/</bugs-to>
-		<remote-id type="github">gottcode/focuswriter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/fte-20051115-r3 b/app-editors/fte-20051115-r3
new file mode 100644
index 000000000000..9a634fc06bfb
--- /dev/null
+++ b/app-editors/fte-20051115-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=sys-libs/ncurses-5.2 X? ( x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXpm ) gpm? ( >=sys-libs/gpm-1.20 ) slang? ( >=sys-libs/slang-2.1.3 ) app-arch/unzip
+DESCRIPTION=Lightweight text-mode editor
+EAPI=4
+HOMEPAGE=http://fte.sourceforge.net
+IUSE=gpm slang X
+KEYWORDS=~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=|| ( GPL-2 Artistic )
+RDEPEND=>=sys-libs/ncurses-5.2 X? ( x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXpm ) gpm? ( >=sys-libs/gpm-1.20 )
+SLOT=0
+SRC_URI=mirror://sourceforge/fte/fte-20051115-src.zip mirror://sourceforge/fte/fte-20051115-common.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a7a663c31401c0239b54373519a10bc0
diff --git a/app-editors/fte-20110708-r1 b/app-editors/fte-20110708-r1
new file mode 100644
index 000000000000..1c8924889716
--- /dev/null
+++ b/app-editors/fte-20110708-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXpm ) gpm? ( >=sys-libs/gpm-1.20 ) slang? ( >=sys-libs/slang-2.1.3 ) app-arch/unzip
+DESCRIPTION=Lightweight text-mode editor
+EAPI=6
+HOMEPAGE=http://fte.sourceforge.net
+IUSE=gpm slang X
+KEYWORDS=~alpha ~amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=|| ( GPL-2 Artistic )
+RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXpm ) gpm? ( >=sys-libs/gpm-1.20 )
+SLOT=0
+SRC_URI=mirror://sourceforge/fte/fte-20110708-src.zip mirror://sourceforge/fte/fte-20110708-common.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3d1a334a6a5f1320edd0e8d42e0ecbd9
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
deleted file mode 100644
index 3a4695e7fd75..000000000000
--- a/app-editors/fte/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-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-20051115-common.zip 187849 BLAKE2B eb410c64b40650b475fb651a014c4ddf2cece6471f2144928b88644a04f9fe4886caf6f0f4b8d679a8fb506461bf7973f1e2bd3a9d8163f462e8eb03f2d85163 SHA512 18e1657a6fe1b48449dc97a357f00bfeb6626450520b48647e2751cc946d9d1bfc6d77d4b0fbdff0a980121502da870f739846b1db9569ff0b305530ee717323
-DIST fte-20051115-src.zip 549216 BLAKE2B 0ec3eeea813380cb0c2cac55dc42beaeecb10ec3c6bac02668d995b5735443cb92cdc430135973190560a8a4e9096737d9bc6b448258fa9e04c4bb1b18235609 SHA512 320c2c4f27041ff5e7417288e5acc8c776013da4aa7cfc187e6207086851642a7ed961383ca19f6ae6c1717a59453c6a9ca40a1c7eb77dae6e5b9184cd7c346a
-DIST fte-20110708-common.zip 200007 BLAKE2B ce1ac0f2bd68b2bb7ef1d96a46bd9a481cd46f5cde00607c64f752d5e87f6edefd8a92c8210e1ac7629ef8bc5720a8a2d75bd61f292f344e211b88a2462989fa SHA512 0bb59a5b6b4a5ef6c1234dadd8922cd50a13ad1f0c06d6046b74a95592ad55f720b43bbc78a42cab63dfc68c5e073d44d5179bd6ed72f346563f43f3c5c146f1
-DIST fte-20110708-src.zip 504199 BLAKE2B 42bb3cc4ae9be4b64c0b161488d91d4a260a2e6a1574fccb0fc652359e34f7b6b881f170dfd85a8954f2b2fdbe4fecaaf2fc68cd5244f185dde36fe1a694004e SHA512 2d59fadcdd988ee85b87425c343341e1b768a7e9ef838c5f8a1f22c4adc5bf2cc37d547f36354ca1740bce07b33d5ae93d14e24001b9dbd3b1b267986564a089
-EBUILD fte-20051115-r3.ebuild 2780 BLAKE2B 39ee917eca7bbf6172a1c550d900eaf9d8aef5db4cc325dc11c734560e2679cc0e2522bfeb8f5afcaae92042d3ee73505f89e7b76796dde5550932a58e5ffa2b SHA512 106f6eda464bb37d35d549e8c3a56c53a3571e259e748bf7f975d1e6fce4a4e1fa32ea85f8cc26f38ac5181cdd64af32012a8332594a74c09d4e064779a9778a
-EBUILD fte-20110708-r1.ebuild 2656 BLAKE2B f5894a82e98aaa1b9610bdf3320436de60d1a0cfa5f1d5e6f4a204082dfea885decb30f8835a83017fee9b5a34fc2156a55ba17c2d8dbbb211b85f05241b86fc SHA512 989ddf33022f0bd8b8d0e1d79bb1dcad111f8fbe3d7de329512feedbd4751a6790d5c08657ec83f110bf86547e05be5795fcfdbf2597ed172b11664a47bb38a0
-MISC metadata.xml 312 BLAKE2B 0092b7eaef6d8c1e8f1bd490c8d4e9f43909d86097fbf06692b2e92e7496332bac289bb40fc3cb9a7dc1d32a63ca19db01cc75e0a9014f1d2e8074816ed26a8b SHA512 3946924797105501c1388f172caf774488ebb480ff13664fffd75fb30ebdfba27d52c3e7d534e7dcad5204b6074ba28ee25a4724ed117748059fceeff9d23b60
diff --git a/app-editors/fte/files/fte b/app-editors/fte/files/fte
deleted file mode 100644
index 2e4621b92a62..000000000000
--- a/app-editors/fte/files/fte
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# simple wrapper shell script which selects appropriate fte executable
-#
-
-if [ -n "$DISPLAY" ]; then
-	if which xfte >/dev/null; then
-		exec xfte "$@"
-	elif which sfte >/dev/null; then
-		exec sfte "$@"
-	elif which vfte >/dev/null; then
-		echo "Only Console version installed!"
-	fi
-else
-	if [ "$TERM" = linux ] && which vfte >/dev/null; then
-		exec vfte "$@"
-	elif which sfte >/dev/null; then
-		exec sfte "$@"
-	elif which xfte >/dev/null; then
-		echo "Only X-Window version installed!"
-	fi
-
-fi
-
-echo "No binary executable from the FTE family has been found!"
-echo "Please install one of them."
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/fte/fte-20051115-r3.ebuild b/app-editors/fte/fte-20051115-r3.ebuild
deleted file mode 100644
index ea155c1e9f64..000000000000
--- a/app-editors/fte/fte-20051115-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Lightweight text-mode editor"
-HOMEPAGE="http://fte.sourceforge.net"
-SRC_URI="
-	mirror://sourceforge/fte/${P}-src.zip
-	mirror://sourceforge/fte/${P}-common.zip"
-
-LICENSE="|| ( GPL-2 Artistic )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="gpm slang X"
-
-S="${WORKDIR}/${PN}"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2
-	X? (
-		x11-libs/libXdmcp
-		x11-libs/libXau
-		x11-libs/libX11
-		x11-libs/libXpm
-	)
-	gpm? ( >=sys-libs/gpm-1.20 )"
-DEPEND="${RDEPEND}
-	slang? ( >=sys-libs/slang-2.1.3 )
-	app-arch/unzip"
-
-set_targets() {
-	export TARGETS=""
-	use slang && TARGETS="${TARGETS} sfte"
-	use X && TARGETS="${TARGETS} xfte"
-
-	[[ ${CHOST} == *-linux-gnu* ]] \
-		&& TARGETS="${TARGETS} vfte" \
-		|| TARGETS="${TARGETS} nfte"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/fte-gcc34 \
-		"${FILESDIR}"/${PN}-new_keyword.patch \
-		"${FILESDIR}"/${PN}-slang.patch \
-		"${FILESDIR}"/${PN}-interix.patch \
-		"${FILESDIR}"/${PN}-cpp14.patch # bug #595048
-
-	[[ -e /usr/include/linux/keyboard.h ]] && \
-		sed /usr/include/linux/keyboard.h -e '/wait.h/d' > src/hacked_keyboard.h
-
-	sed \
-		-e "s:<linux/keyboard.h>:\"hacked_keyboard.h\":" \
-		-i src/con_linux.cpp || die "sed keyboard"
-	sed \
-		-e 's:^OPTIMIZE:#&:g' \
-		-e '/^LDFLAGS/s:=:+=:g' \
-		-e 's:= g++:= $(CXX):g' \
-		-i src/fte-unix.mak || die "sed CFLAGS, LDFLAGS, CC"
-	ecvs_clean
-}
-
-src_configure() {
-	set_targets
-	sed \
-		-e "s:@targets@:${TARGETS}:" \
-		-e '/^XINCDIR  =/c\XINCDIR  =' \
-		-e '/^XLIBDIR  =/c\XLIBDIR  = -lstdc++' \
-		-e '/^SINCDIR   =/c\SINCDIR = -I'"${EPREFIX}"'/usr/include/slang' \
-		-i src/fte-unix.mak || die "sed targets"
-
-	if ! use gpm; then
-		sed \
-			-e "s:#define USE_GPM://#define USE_GPM:" \
-			-i src/con_linux.cpp || die "sed USE_GPM"
-		sed \
-			-e "s:-lgpm::" \
-			-i src/fte-unix.mak || die "sed -lgpm"
-	fi
-}
-
-src_compile() {
-	local os="-DLINUX" # by now the default in makefile
-	[[ ${CHOST} == *-interix* ]] && os=
-
-	DEFFLAGS="PREFIX='${EPREFIX}'/usr CONFIGDIR='${EPREFIX}'/usr/share/fte \
-		DEFAULT_FTE_CONFIG=../config/main.fte UOS=${os}"
-
-	set_targets
-	emake CXX=$(tc-getCXX) OPTIMIZE="${CXXFLAGS}" ${DEFFLAGS} TARGETS="${TARGETS}" all
-}
-
-src_install() {
-	local files
-
-	keepdir /etc/fte
-
-	into /usr
-
-	set_targets
-	files="${TARGETS} cfte"
-
-	for i in ${files}; do
-		dobin src/$i
-	done
-
-	dobin "${FILESDIR}"/fte
-
-	dodoc CHANGES BUGS HISTORY README TODO
-	dohtml doc/*
-
-	insinto /usr/share/fte
-	doins -r config/*
-}
-
-pkg_postinst() {
-	ebegin "Compiling configuration"
-	cd "${EPREFIX}"/usr/share/fte || die "missing configuration dir"
-	"${EPREFIX}"/usr/bin/cfte main.fte "${EPREFIX}"/etc/fte/system.fterc
-	eend $?
-}
diff --git a/app-editors/fte/fte-20110708-r1.ebuild b/app-editors/fte/fte-20110708-r1.ebuild
deleted file mode 100644
index e32fb0fe8861..000000000000
--- a/app-editors/fte/fte-20110708-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Lightweight text-mode editor"
-HOMEPAGE="http://fte.sourceforge.net"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}-src.zip
-	mirror://sourceforge/${PN}/${P}-common.zip"
-
-LICENSE="|| ( GPL-2 Artistic )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="gpm slang X"
-
-S="${WORKDIR}/${PN}"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	X? (
-		x11-libs/libXdmcp
-		x11-libs/libXau
-		x11-libs/libX11
-		x11-libs/libXpm
-	)
-	gpm? ( >=sys-libs/gpm-1.20 )"
-DEPEND="${RDEPEND}
-	slang? ( >=sys-libs/slang-2.1.3 )
-	app-arch/unzip"
-
-HTML_DOCS=( doc/. )
-
-set_targets() {
-	export TARGETS=""
-	use slang && TARGETS="${TARGETS} s${PN}"
-	use X && TARGETS="${TARGETS} x${PN}"
-
-	[[ ${CHOST} == *-linux-gnu* ]] \
-		&& TARGETS="${TARGETS} v${PN}" \
-		|| TARGETS="${TARGETS} n${PN}"
-}
-
-src_prepare() {
-	default
-
-	if [[ -e "${EPREFIX}"/usr/include/linux/keyboard.h ]]; then
-		sed "${EPREFIX}"/usr/include/linux/keyboard.h \
-			-e '/wait.h/d' > src/hacked_keyboard.h || die
-	fi
-
-	sed \
-		-e "s:<linux/keyboard.h>:\"hacked_keyboard.h\":" \
-		-i src/con_linux.cpp || die "sed keyboard"
-	sed \
-		-e 's:^OPTIMIZE:#&:g' \
-		-e '/^LDFLAGS/s:=:+=:g' \
-		-e 's:= g++:= $(CXX):g' \
-		-i src/${PN}-unix.mak || die "sed CFLAGS, LDFLAGS, CC"
-	ecvs_clean
-}
-
-src_configure() {
-	set_targets
-	sed \
-		-e "s:@targets@:${TARGETS}:" \
-		-e '/^XINCDIR  =/c\XINCDIR  =' \
-		-e '/^XLIBDIR  =/c\XLIBDIR  = -lstdc++' \
-		-e '/^SINCDIR   =/c\SINCDIR = -I'"${EPREFIX}"'/usr/include/slang' \
-		-i src/${PN}-unix.mak || die "sed targets"
-
-	if ! use gpm; then
-		sed \
-			-e "s:#define USE_GPM://#define USE_GPM:" \
-			-i src/con_linux.cpp || die "sed USE_GPM"
-		sed \
-			-e "s:-lgpm::" \
-			-i src/fte-unix.mak || die "sed -lgpm"
-	fi
-}
-
-src_compile() {
-	local os="-DLINUX" # by now the default in makefile
-	[[ ${CHOST} == *-interix* ]] && os=
-
-	DEFFLAGS="PREFIX='${EPREFIX}'/usr CONFIGDIR='${EPREFIX}'/usr/share/${PN} \
-		DEFAULT_FTE_CONFIG=../config/main.${PN} UOS=${os}"
-
-	set_targets
-	emake CXX="$(tc-getCXX)" OPTIMIZE="${CXXFLAGS}" "${DEFFLAGS}" TARGETS="${TARGETS}" all
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	into /usr
-
-	set_targets
-
-	local i files="${TARGETS} c${PN}"
-	for i in ${files}; do
-		dobin src/${i}
-	done
-
-	dobin "${FILESDIR}/${PN}"
-
-	einstalldocs
-
-	insinto /usr/share/${PN}
-	doins -r config/.
-}
-
-pkg_postinst() {
-	ebegin "Compiling configuration"
-	cd "${EPREFIX}"/usr/share/${PN} || die "missing configuration dir"
-	"${EPREFIX}"/usr/bin/c${PN} main.${PN} "${EPREFIX}"/etc/${PN}/system.${PN}rc || die
-	eend $?
-}
diff --git a/app-editors/fte/metadata.xml b/app-editors/fte/metadata.xml
deleted file mode 100644
index c209ef776339..000000000000
--- a/app-editors/fte/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>Lightweight text-mode editor.</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">fte</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-editors/gedit-3.22.1 b/app-editors/gedit-3.22.1
new file mode 100644
index 000000000000..2666bb379a63
--- /dev/null
+++ b/app-editors/gedit-3.22.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-3.21.3:3[introspection?] >=x11-libs/gtksourceview-3.21.2:3.0[introspection?] >=dev-libs/libpeas-1.14.1[gtk] gnome-base/gsettings-desktop-schemas gnome-base/gvfs x11-libs/libX11 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( >=app-text/gspell-0.2.5:0= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.50.1 >=sys-devel/gettext-0.18 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A text editor for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
+IUSE=+introspection +python spell vala python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 test
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-3.21.3:3[introspection?] >=x11-libs/gtksourceview-3.21.2:3.0[introspection?] >=dev-libs/libpeas-1.14.1[gtk] gnome-base/gsettings-desktop-schemas gnome-base/gvfs x11-libs/libX11 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( >=app-text/gspell-0.2.5:0= ) x11-themes/adwaita-icon-theme
+REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gedit/3.22/gedit-3.22.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a7dcd8892694aaff05765ffcb8558958
diff --git a/app-editors/gedit-plugins-3.22.0 b/app-editors/gedit-plugins-3.22.0
new file mode 100644
index 000000000000..b1ac41036e8e
--- /dev/null
+++ b/app-editors/gedit-plugins-3.22.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=app-editors/gedit-3.16 >=dev-libs/glib-2.32:2 >=dev-libs/libpeas-1.7.0[gtk] >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-3.21.3:3.0 python? ( python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-editors/gedit-3.16[introspection,python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/dbus-python-0.82[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-3.14:3.0[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6 ) terminal? ( x11-libs/vte:2.91[introspection] ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) app-text/yelp-tools >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official plugins for gedit
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ShippedPlugins
+IUSE=+python charmap git terminal vala python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/gedit-3.16 >=dev-libs/glib-2.32:2 >=dev-libs/libpeas-1.7.0[gtk] >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-3.21.3:3.0 python? ( python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-editors/gedit-3.16[introspection,python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/dbus-python-0.82[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-3.14:3.0[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6 ) terminal? ( x11-libs/vte:2.91[introspection] ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) )
+REQUIRED_USE=charmap? ( python ) git? ( python ) python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) terminal? ( python )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gedit-plugins/3.22/gedit-plugins-3.22.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c3733702d2e9534a5b5b0859f94c0d69
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
deleted file mode 100644
index 3c6925e0c47b..000000000000
--- a/app-editors/gedit-plugins/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gedit-plugins-3.22.0.tar.xz 1314512 BLAKE2B 2910a101da94112b4190d96111013675234c109bfc37e05ff98d53e87e0a4db8e5a4a6823017153d65a9d554cfb95fed000d56d9e721faebfeeb033fc7be2901 SHA512 5560b48c0b21b535de7247c39653c111439f9cb138025d7e3a600b94babbe060777c2095160b7e5ea39b8ba8be520ea3966b0ffc2ec15d17ea0bf814bf58748d
-EBUILD gedit-plugins-3.22.0.ebuild 2297 BLAKE2B 74878dee069c2eeed548f80084f2bf1b63cedeab159ab84b54bd2bde7ae5446b5b6facb77e0cc08184a6bfd7502508bd0e5e6130c412247b822233fdae060ada SHA512 dce1562f0c1882d55feec31b82f3261d5e026f1e7fc1eb295941769c2da57d4feba03637f266f2a370fa5efb9f33b90253900eb40ad1d065b2762a6f08ea9ad2
-MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.22.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.22.0.ebuild
deleted file mode 100644
index 676c4d9aa014..000000000000
--- a/app-editors/gedit-plugins/gedit-plugins-3.22.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="xml"
-VALA_MIN_API_VERSION="0.28"
-
-inherit eutils gnome2 multilib python-single-r1 vala
-
-DESCRIPTION="Official plugins for gedit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-IUSE_plugins="charmap git terminal vala"
-IUSE="+python ${IUSE_plugins}"
-# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
-REQUIRED_USE="
-	charmap? ( python )
-	git? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	terminal? ( python )
-"
-
-RDEPEND="
-	>=app-editors/gedit-3.16
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libpeas-1.7.0[gtk]
-	>=x11-libs/gtk+-3.9:3
-	>=x11-libs/gtksourceview-3.21.3:3.0
-	python? (
-		${PYTHON_DEPS}
-		>=app-editors/gedit-3.16[introspection,python,${PYTHON_USEDEP}]
-		dev-libs/libpeas[python,${PYTHON_USEDEP}]
-		>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		>=x11-libs/gtk+-3.9:3[introspection]
-		>=x11-libs/gtksourceview-3.14:3.0[introspection]
-		x11-libs/pango[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-	)
-	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
-	git? ( >=dev-libs/libgit2-glib-0.0.6 )
-	terminal? ( x11-libs/vte:2.91[introspection] )
-	vala? ( $(vala_depend) )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable python) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# FIXME: crazy !!!
-	if use python; then
-		find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
-		find "${ED}"/usr/share/gedit -type d -empty -delete || die
-	fi
-
-	# FIXME: upstream made this automagic...
-	clean_plugin charmap
-	clean_plugin git
-	clean_plugin terminal
-}
-
-clean_plugin() {
-	if use !${1} ; then
-		rm -rf "${ED}"/usr/share/gedit/plugins/${1}*
-		rm -rf "${ED}"/usr/$(get_libdir)/gedit/plugins/${1}*
-	fi
-}
diff --git a/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml
deleted file mode 100644
index 0b4585984564..000000000000
--- a/app-editors/gedit-plugins/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription>Official plugins for gedit</longdescription>
-<use>
-	<flag name="charmap">Insert special characters just by clicking on
-		them</flag>
-	<flag name="git">Shows document changes related to git's HEAD</flag>
-	<flag name="terminal">Embed a terminal in the bottom pane</flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
deleted file mode 100644
index fa9bf8791a19..000000000000
--- a/app-editors/gedit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gedit-3.22.1.tar.xz 2948048 BLAKE2B aa23b261bc0a463febf5affbd0dca647df8d1db9553356f145784b1ebed43ed15dfede12f62b3fcb6f00aac59e2d3a84c31627be32000830523a805d46d2e4ab SHA512 7251732f353b1d9dab0fe447fe90b2259df34ff0694d8731ce3be531c21ac82ab6e7f4a07090aeef364640154f4ba6103539a253bc7942952dcf1e331418f0eb
-EBUILD gedit-3.22.1.ebuild 2310 BLAKE2B d792c14afb2d9d87950afe72f2a0887564a7c6a6d6d7fb553ade64f4cde9e841a03bf2157fefb2e26923ae07da12b3527a65142bc6318b1781d1388dc12bbce2 SHA512 5ecdcb8f259361b27743fc29052e0c0a751367f46c6688a31f66942013aca448afd4113d41f7cf923b82bed61fa226e44943aef3dc795fbe3fced74d70663d78
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/gedit-3.22.1.ebuild b/app-editors/gedit/gedit-3.22.1.ebuild
deleted file mode 100644
index 34c804822997..000000000000
--- a/app-editors/gedit/gedit-3.22.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{4,5,6} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 multilib python-single-r1 vala virtualx
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+introspection +python spell vala"
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# X libs are not needed for OSX (aqua)
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.44:2[dbus]
-	>=x11-libs/gtk+-3.21.3:3[introspection?]
-	>=x11-libs/gtksourceview-3.21.2:3.0[introspection?]
-	>=dev-libs/libpeas-1.14.1[gtk]
-
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-
-	x11-libs/libX11
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-		dev-libs/libpeas[python,${PYTHON_USEDEP}] )
-	spell? ( >=app-text/gspell-0.2.5:0= )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	${vala_depend}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.50.1
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-# yelp-tools, gnome-common needed to eautoreconf
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-	gnome2_src_configure \
-		--disable-deprecations \
-		--disable-updater \
-		--enable-gvfs-metadata \
-		$(use_enable introspection) \
-		$(use_enable spell) \
-		$(use_enable python) \
-		$(use_enable vala)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
-
-src_install() {
-	local args=()
-	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
-	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
-
-	gnome2_src_install "${args[@]}"
-}
diff --git a/app-editors/gedit/metadata.xml b/app-editors/gedit/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/app-editors/gedit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-editors/ghex-3.18.3 b/app-editors/ghex-3.18.3
new file mode 100644
index 000000000000..32b135d26895
--- /dev/null
+++ b/app-editors/ghex-3.18.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3 >=dev-util/intltool-0.41.1 >=sys-devel/gettext-0.17 app-text/yelp-tools virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME hexadecimal editor
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
+KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3
+SLOT=2
+SRC_URI=mirror://gnome/sources/ghex/3.18/ghex-3.18.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=42459be406004710e9857c1f361c117d
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
deleted file mode 100644
index 19bb9e353278..000000000000
--- a/app-editors/ghex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ghex-3.18.3.tar.xz 1630720 BLAKE2B dacca0b015dd73dca9ea7a5303de8b6ef981c7e4fd93dfdbb0782ac61f073381fef7d5a1dcb8a88f2d31319fd9583ac6f556ed6856b5ba7d3449bbf2af2c991f SHA512 e03b154a22db000a5994c68bb72280113e69e7ef210f86ab2c6578e77daabf50bac8eb620ffaad5a7eb776d23383478cbdc7fb317fa336cef55173f858519023
-EBUILD ghex-3.18.3.ebuild 511 BLAKE2B a08be53d503c35c3a49e008da97bbdf7dd38bb44ff37ae7ea7b94fc6fdcfd8459fd6ac26c4e56b4741db05d8d9a7b6a05ac33af29c0c958175fe012e121ffb62 SHA512 c2549dc8e027269994643c0394dcd494406bca8d2bbf36f6aa1f0f0bde781df0b8c95042d7c2ec3e04c499f86602f3034ffb681b733222538670c4e3aed6b315
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/ghex/ghex-3.18.3.ebuild b/app-editors/ghex/ghex-3.18.3.ebuild
deleted file mode 100644
index fb9c73c07e41..000000000000
--- a/app-editors/ghex/ghex-3.18.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME hexadecimal editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/atk-1
-	>=dev-libs/glib-2.31.10:2
-	>=x11-libs/gtk+-3.3.8:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.41.1
-	>=sys-devel/gettext-0.17
-	app-text/yelp-tools
-	virtual/pkgconfig
-"
diff --git a/app-editors/ghex/metadata.xml b/app-editors/ghex/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/app-editors/ghex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-editors/ghostwriter-1.5.0 b/app-editors/ghostwriter-1.5.0
new file mode 100644
index 000000000000..4a0def564c82
--- /dev/null
+++ b/app-editors/ghostwriter-1.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-text/hunspell dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5
+DESCRIPTION=Cross-platform, aesthetic, distraction-free markdown editor
+EAPI=6
+HOMEPAGE=http://wereturtle.github.io/ghostwriter/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-text/hunspell dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/wereturtle/ghostwriter/archive/v1.5.0.tar.gz -> ghostwriter-1.5.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=2206c4ff81734288b2ec5b0f254bd17b
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
deleted file mode 100644
index 4a22fb9ceee9..000000000000
--- a/app-editors/ghostwriter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ghostwriter-1.5.0.tar.gz 620301 BLAKE2B 07af6c6b176f15a7b6bee0594936a346160783c553dfd91cd69bde3975ada5c125920c1029ab19aee21c89576c6fab311f7a893447c457ff5a174149e57f67bb SHA512 4b6e1430342069b224f7aece30d5a592a43e9f702cb93fc073fded741771ea74b8478203aeaecdabb791aa7ddd8055d5c36346518adc7dd19b61e5f2e2cbe219
-EBUILD ghostwriter-1.5.0.ebuild 1202 BLAKE2B dc409552f8019194c5181aba6b2a2b2ae428d087a141c4855ebe184ec716f61453ea2f4e3f99db4cfabf67b9fd880cb6d8d95b960aeade8ccfccb07478d14a68 SHA512 1c6a3bb5c8cd0f6d32d36f2e7efccc163182c719c79c1a6b071f7ff1ed53aef613073f7657626b1a8edf3db253a1ffe88b3f81d60b647a2c05ebb704f250421c
-MISC metadata.xml 453 BLAKE2B 6636da467e19bee48a67cd461772aceff513b36069401a92ad8d0cb3337b457130500d260f4ef3e82ad28bb18b3458e4dcd0803c6509725136294af1477a1026 SHA512 86f8ed39a361cdcb442ba81ea8928987278f5c9eb30cb7ddf249409352b2963be315b1b342189db4d809b9967389c5f808f4f0a60c90118463d40dda2828710c
diff --git a/app-editors/ghostwriter/ghostwriter-1.5.0.ebuild b/app-editors/ghostwriter/ghostwriter-1.5.0.ebuild
deleted file mode 100644
index d1344c71a9d1..000000000000
--- a/app-editors/ghostwriter/ghostwriter-1.5.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs de en es fr it ja pt_BR ru"
-
-inherit l10n qmake-utils
-
-DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor"
-HOMEPAGE="http://wereturtle.github.io/ghostwriter/"
-SRC_URI="https://github.com/wereturtle/ghostwriter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	app-text/hunspell
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-"
-
-DOCS=( CREDITS.md README.md )
-
-src_prepare() {
-	default
-
-	local mylrelease="$(qt5_get_bindir)"/lrelease
-
-	sed -i -e "/^VERSION =/s/\$.*/${PV}/" ghostwriter.pro || die "failed to override version"
-
-	prepare_locale() {
-		"${mylrelease}" "translations/${PN}_${1}.ts" || die "failed to prepare ${1} locale"
-	}
-
-	l10n_find_plocales_changes translations ${PN}_ .ts
-	l10n_for_each_locale_do prepare_locale
-}
-
-src_configure() {
-	eqmake5 \
-		CONFIG+=$(usex debug debug release) \
-		PREFIX="${EPREFIX}"/usr
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/app-editors/ghostwriter/metadata.xml b/app-editors/ghostwriter/metadata.xml
deleted file mode 100644
index 960a05beff6a..000000000000
--- a/app-editors/ghostwriter/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>reagentoo@gmail.com</email>
-		<name>Dmitry Baranov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">wereturtle/ghostwriter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/gummi-0.6.6-r1 b/app-editors/gummi-0.6.6-r1
new file mode 100644
index 000000000000..5d9fa5eb5251
--- /dev/null
+++ b/app-editors/gummi-0.6.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst postrm prepare
+DEPEND=dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:2 app-text/gtkspell:2 app-text/poppler[cairo] x11-libs/gtksourceview:2.0 x11-libs/pango >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Simple LaTeX editor for GTK+ users
+EAPI=6
+HOMEPAGE=https://github.com/alexandervdm/gummi
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:2
+SLOT=0
+SRC_URI=https://github.com/alexandervdm/gummi/archive/0.6.6.tar.gz -> gummi-0.6.6.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ee5b3637bee53cfeb652e7b459f16f44
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
deleted file mode 100644
index e579b9c99591..000000000000
--- a/app-editors/gummi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gummi-0.6.6.tar.gz 792642 BLAKE2B 4f6096999b06361811a9149fa08eff5d2315f01e55539c5849c4bc86aab5a482ad9a0adfe84de5d093e66a328b294b4d88e1e2e2f0355bab320f0c094581da97 SHA512 3be94927c9aafa4914ed2b6f6f5022dce5bcca315a1f947fafb8a4c8bbc5a2bc57f07f8ceaaacdd0b92a5a30483ea8b00e570faf62479280d2ad874716e4c47d
-EBUILD gummi-0.6.6-r1.ebuild 923 BLAKE2B 5192de8451af829ae3a9a2b673c17bb84263304d0ed1dc0a4249843c58ea0fd743d09f3dcdfe627dd22fa21ae4e42d444f63e25994c815178e6dd9c54def2668 SHA512 e65c0d73e2e9f4210048e50dda8247f1bebef281a5528edae821e45b407545933091c9446a7dc47d4c140f169d283281c643eece5bfab8c87f13bf24667f9a8c
-MISC metadata.xml 696 BLAKE2B fc79a12f64bb7a8961b064fad0deffdaaa483b26cf2899594828396bad3c431bebfaa6cd4c1259b2e8ebff13cc569b4ba787065cd241007a78b5c391f9279149 SHA512 dc55d2a4588bb6d42e4e97c8a383ea5a8b22668ca59083cb3acb50b703c2f6478b6dd51c1af82f622cb4c9b5da8062d80c569212383e7a904023eb39d84f5f9f
diff --git a/app-editors/gummi/gummi-0.6.6-r1.ebuild b/app-editors/gummi/gummi-0.6.6-r1.ebuild
deleted file mode 100644
index e1b1546fc67e..000000000000
--- a/app-editors/gummi/gummi-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools xdg-utils
-
-DESCRIPTION="Simple LaTeX editor for GTK+ users"
-HOMEPAGE="https://github.com/alexandervdm/gummi"
-SRC_URI="https://github.com/alexandervdm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-	x11-libs/gtk+:2"
-
-DEPEND="${RDEPEND}
-	app-text/gtkspell:2
-	app-text/poppler[cairo]
-	x11-libs/gtksourceview:2.0
-	x11-libs/pango"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "Gummi supports spell-checking through gtkspell. Support for"
-	elog "additional languages can be added by installing myspell-**-"
-	elog "packages for your language of choice."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/gummi/metadata.xml b/app-editors/gummi/metadata.xml
deleted file mode 100644
index c49d5d5f9d47..000000000000
--- a/app-editors/gummi/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>christian.tietz@mailbox.org</email>
-		<name>Christian Tietz</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>alexvandermey@gmail.com</email>
-			<name>Alexander van der Mey</name>
-		</maintainer>
-		<remote-id type="github">alexandervdm/gummi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/gvim-8.0.1298 b/app-editors/gvim-8.0.1298
new file mode 100644
index 000000000000..b785269993d7
--- /dev/null
+++ b/app-editors/gvim-8.0.1298
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-8.0.1298 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-8.0.1298 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1298.tar.gz -> vim-8.0.1298.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5a06be2079337155b84db4c542652e3b
diff --git a/app-editors/gvim-8.0.1428 b/app-editors/gvim-8.0.1428
new file mode 100644
index 000000000000..c32a7d7b46b9
--- /dev/null
+++ b/app-editors/gvim-8.0.1428
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-8.0.1428 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-8.0.1428 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1428.tar.gz -> vim-8.0.1428.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eeb951409969a69cfca1a67c8d004756
diff --git a/app-editors/gvim-8.0.1645 b/app-editors/gvim-8.0.1645
new file mode 100644
index 000000000000..4b87c12363e9
--- /dev/null
+++ b/app-editors/gvim-8.0.1645
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-8.0.1645 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-8.0.1645 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1645.tar.gz -> vim-8.0.1645.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e08f058ea77a5ab119d898ed35e237fe
diff --git a/app-editors/gvim-8.0.1699 b/app-editors/gvim-8.0.1699
new file mode 100644
index 000000000000..57b8585c9ebf
--- /dev/null
+++ b/app-editors/gvim-8.0.1699
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-8.0.1699 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-8.0.1699 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1699.tar.gz -> vim-8.0.1699.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=157e217532e4d3c7d0538261ffecf766
diff --git a/app-editors/gvim-8.0.1699-r1 b/app-editors/gvim-8.0.1699-r1
new file mode 100644
index 000000000000..197b684325a1
--- /dev/null
+++ b/app-editors/gvim-8.0.1699-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-8.0.1699 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-8.0.1699 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1699.tar.gz -> vim-8.0.1699.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=300412aaeb6c29b85a3592be496e2825
diff --git a/app-editors/gvim-8.1.0034 b/app-editors/gvim-8.1.0034
new file mode 100644
index 000000000000..2574130d5a4d
--- /dev/null
+++ b/app-editors/gvim-8.1.0034
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-8.1.0034 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-8.1.0034 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.1.0034.tar.gz -> vim-8.1.0034.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ec747914aa624dba0602c911b803e97f
diff --git a/app-editors/gvim-9999 b/app-editors/gvim-9999
new file mode 100644
index 000000000000..3df3c72ecbc2
--- /dev/null
+++ b/app-editors/gvim-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ec747914aa624dba0602c911b803e97f
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
deleted file mode 100644
index 616e4cad3f74..000000000000
--- a/app-editors/gvim/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX gvim-completion 1219 BLAKE2B 8a8d8ac5b42be0103da00ecda3445f24993df0b2762310dcc1a9e1cf892048b57c02b7da2ea19d900c40b782cabeda4c6f7b79b9b7b44b6fb7ad7ae723b46f88 SHA512 08bb32a3c9fcbdd00977b7343dda9cda44b389a13b1717ebddb462e22b6cf9d4db37d5b49ff752b931e305bf57e8f9f4a7d6e32ea25f8acd1b00e5f8320ac132
-AUX gvim.svg 4584 BLAKE2B 53d896f90404df6b185d1f4404c22e6bd6035722beb61d2223a6003e7c274cdfd4d97d7274346427d873a8e98a4ad32321c0a3ceab2b436124f90c707045b233 SHA512 78f5fb460281ab5d8b0ff6e28bf24231c1ade5ae46caab2e2d345d82b983ada7d945dd7d603b3e470c77dbd1eb329027852b6ba22afc441d64a1b66a1ee3867a
-AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d2cfc4ed9a7bded20c1a5cd1f19f41e0849e3ca08be4798ff23edd66a92bcbb31aee16c433a SHA512 f6538550f1ecadcccf74a6bbd5a6a0b71d18a234a854d1a0179144125555c42280000df9523e7c3d5a8b449f421af7bafcca1034951f085279cee0dd1160808a
-DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
-DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
-DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
-DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085
-DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7
-DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19
-EBUILD gvim-8.0.1298.ebuild 10469 BLAKE2B b0f04d4d5a1df2854184d2d0f9b64129524af078e86096704348a86710b8b551b77f3d8b0a2071a56a650cd747b45cf437e58ec7a3259b5b1332c46de1dd7f2e SHA512 27f0671ee4de3ffbbd4d6d56c09550fe4774ec1d9b5b45513f6314719e1f1c6e0ea55215dfe5b88c253d16bd97bbcc7cbf734d7c9049b11df625da300e7c589c
-EBUILD gvim-8.0.1428.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
-EBUILD gvim-8.0.1645.ebuild 10502 BLAKE2B 47db270abf2ea71b92173df98377634c0b59d04383059ac557c0c8fcd8aeeb11ff8aaa1a7cb4b40819f386b040952ca356457e500d9b0a9a553e1bea60379a16 SHA512 da4f6c564a06f5f8eb50a56836235eddadd20515afe66a74efd0fce24a3a048db52a0cc0ae8d7e5fbf5fd57f0861e0a50e966a4a31f106059f0952ceccb7b589
-EBUILD gvim-8.0.1699-r1.ebuild 10448 BLAKE2B c8002b9f8669abd503875a20cc9064210201c6dd88525290264395f8ac3f94bd9bbe25b2af0a6cd22105e380eada731c524c7cc53aca1a3943dd2de6345134ea SHA512 e5918d554625e921f081a536646075100ffceaefc67c610c6948f154f3a3e69a37cdee9bd87acdb9774df58ecdaa4213ab0ecdc09756d9a15f7bce523a672ad0
-EBUILD gvim-8.0.1699.ebuild 10490 BLAKE2B 18c912fb875ea79a541ecdc6723714782520d9f6524dc9eced18b3704c46ece46f296c45ad8a817978755b9367b43b04bf82e1692996fd08027e1db6a45553ef SHA512 bdf28681e8503cde8067c013ab634bdc0dbfab4d6367b3bdd5c4f11cd90e3f8c49471a87cd50086e80f305f797a7c7d5203ab7cee30dd41436a7f787c1f32a35
-EBUILD gvim-8.1.0034.ebuild 10447 BLAKE2B 52bf51193fadf512feccc8691d923cf7ca9e62faf037db5bced7a43cdcfe3b2bbd0b487cec1aa8f93674760cf5a9212c4b5a64bb68ebeb0e497ea50526e32839 SHA512 dc9f1fe1479fa607f376762abc8525118db403450e86547545f0aa05b7d53f0eb8fe7ac190ea65e08137501f3e4bb41b739ab580797f98ff707a4ab290f442c4
-EBUILD gvim-9999.ebuild 10447 BLAKE2B 52bf51193fadf512feccc8691d923cf7ca9e62faf037db5bced7a43cdcfe3b2bbd0b487cec1aa8f93674760cf5a9212c4b5a64bb68ebeb0e497ea50526e32839 SHA512 dc9f1fe1479fa607f376762abc8525118db403450e86547545f0aa05b7d53f0eb8fe7ac190ea65e08137501f3e4bb41b739ab580797f98ff707a4ab290f442c4
-MISC metadata.xml 578 BLAKE2B a0b7e41324455706748f79109affec89e72dece0b41346d0cc804742cc7e5aa88f89556623b1aac4f53387afe6e6145049079b1cd44d3411bcf2f8ee8c7c2bfd SHA512 b2db961a6e59b803e2371c4e6dda496917d6c5e332f36062be8dbfa4fb47b4b640d8deb6871c9ff3c5a527fdf9c16aa13f14b9e0a37f93a3a10c6f6b57808126
diff --git a/app-editors/gvim/files/gvim-completion b/app-editors/gvim/files/gvim-completion
deleted file mode 100644
index 6488a82bc76e..000000000000
--- a/app-editors/gvim/files/gvim-completion
+++ /dev/null
@@ -1,40 +0,0 @@
-# Author: Ciaran McCreesh <ciaranm@gentoo.org>
-#
-# completion for gvim
-
-_gvim()
-{
-    local cur prev cmd args
-
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-    cmd=${COMP_WORDS[0]}
-
-    if [[ "${prev}" == "--servername" ]] ; then
-        local servers
-        servers=$(gvim --serverlist )
-        COMPREPLY=( $( compgen -W "${servers}" -- $cur ) )
-
-    elif [[ "${prev}" == -[uUi] ]] ; then
-        COMPREPLY=( $( compgen -W "NONE" ) \
-                $( compgen -f -X "!*vim*" -- "$cur" ) )
-
-    elif [[ "${cur}" == -* ]] ; then
-        args='-t -q -c -S --cmd -A -b -C -d -D -e -E -f --nofork \
-            -F -g -h -H -i -L -l -m -M -N -n -nb -o -R -r -s \
-            -T -u -U -V -v -w -W -x -X -y -Y -Z --echo-wid \
-            --help --literal --noplugin --version'
-        args="${args} --echo-wid  --remote --remote-expr \
-            --remote-send --remote-silent --remote-wait \
-            --remote-wait-silent --serverlist \
-            --servername --socketid"
-        COMPREPLY=( $( compgen -W "${args}" -- $cur ) )
-    else
-        _filedir
-    fi
-}
-
-complete -o filenames -F _gvim gvim evim eview gview gvimdiff rgvim rgview
-
-# vim: set ft=sh sw=4 et sts=4 :
diff --git a/app-editors/gvim/files/gvim.svg b/app-editors/gvim/files/gvim.svg
deleted file mode 100644
index b82742a79012..000000000000
--- a/app-editors/gvim/files/gvim.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="256"
-   height="256"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="vim.svg">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2884"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="107.83967"
-     inkscape:cy="146.01885"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="743"
-     inkscape:window-height="605"
-     inkscape:window-x="88"
-     inkscape:window-y="321"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-796.36218)">
-    <path
-       style="fill:#19953f;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 128.02596,805.31213 8.0259779,926.7407 127.31168,1046.0264 l 120,-120.71427 -119.28572,-120 z"
-       id="path2890" />
-    <path
-       style="fill:#d0d0cf;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 26.24294,816.92274 -5,5 0,19.28572 5.446429,5.26785 7.232142,0.17858 0.178571,168.12501 7.142857,7.1429 22.142858,0 177.142853,-180.00006 0,-18.57143 -5,-5 -80,-0.71428 -5,7.14285 0,15.71429 5,6.42857 6.42857,0 -62.142855,60.00001 0.625005,-59.73215 7.14285,-10e-6 5.80357,-5.98214 0,-15.71429 -6.42857,-7.14286 -80.71428,-1.42857 0,10e-6 z"
-       id="path3664"
-       sodipodi:nodetypes="cccccccccccccccccccccccc" />
-    <path
-       style="fill:#d0d0cf;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 136.90826,933.24978 4.28572,-3.57143 12.14285,0.35715 3.92857,3.92857 -4.28571,12.14286 -3.57143,3.21428 -12.64794,-0.14794 -3.42349,-4.13777 3.57143,-11.78572 z"
-       id="path3666"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#d0d0cf;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 121.90826,956.10693 28.57143,0.35714 -15,45.00003 5.35714,0 -3.21428,8.9285 -26.78572,-0.3571 14.64286,-43.21429 -7.14286,0.35714 3.57143,-11.07142 z"
-       id="path3668" />
-    <path
-       style="fill:#d0d0cf;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 157.2654,956.46407 -3.71936,9.68618 6.82905,0 -15.25254,44.24235 23.57143,0 3.40554,-8.7193 -6.11475,-0.4005 8.42349,-26.2373 15,-0.35715 -11.07143,34.99995 23.15301,0.3572 2.91579,-8.2576 -5.56371,-0.1633 9.13777,-26.5791 12.85714,0 -11.07143,35 24.32904,0.2525 3.00508,-8.2729 -5.81626,-0.1939 11.69643,-37.14285 -4.64286,-7.5 -14.64285,0 -5.71429,5.71429 -5.71429,0 -6.07142,-6.07143 -12.5,0 -5.35715,5.35714 -6.07143,0 -6.07142,-5.71428 -18.92858,0 z"
-       id="path3670"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccc" />
-  </g>
-</svg>
diff --git a/app-editors/gvim/files/gvimrc-r1 b/app-editors/gvim/files/gvimrc-r1
deleted file mode 100644
index 27f398c1011c..000000000000
--- a/app-editors/gvim/files/gvimrc-r1
+++ /dev/null
@@ -1,28 +0,0 @@
-scriptencoding utf-8
-" ^^ Please leave the above line at the start of the file.
-
-" Default configuration file for gvim
-"
-" Written by Aron Griffis <agriffis@gentoo.org>
-"
-" This file is read AFTER normal Vim initializations, like reading your .vimrc
-" file (and the default /usr/share/vim/vimrc).  So there's no reason to
-" duplicate settings from vimrc.  Red Hat has had this wrong for years, to the
-" great annoyance of users.
-
-" Pre-GUI settings
-set columns=80 lines=30       " don't inherit geometry from parent term
-set mousemodel=popup          " right mouse button pops up a menu in the GUI
-
-" Use a sufficiently wide window automatically when started as "gvimdiff"
-if (&foldmethod == 'diff')
-	set columns=165
-endif
-
-" For bug 33327, add a mapping which allows shift-insert to function
-" as expected in insert and command-line modes
-map! <s-insert> <c-r>*
-
-if filereadable("@GENTOO_PORTAGE_EPREFIX@/etc/vim/gvimrc.local")
-  source @GENTOO_PORTAGE_EPREFIX@/etc/vim/gvimrc.local
-endif
diff --git a/app-editors/gvim/gvim-8.0.1298.ebuild b/app-editors/gvim/gvim-8.0.1298.ebuild
deleted file mode 100644
index 3fdb1bbddf1f..000000000000
--- a/app-editors/gvim/gvim-8.0.1298.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-				gnome? ( >=gnome-base/libgnomeui-2.6 )
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                          CARBON (not tested)
-	# -aqua gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/gvim-8.0.1428.ebuild b/app-editors/gvim/gvim-8.0.1428.ebuild
deleted file mode 100644
index b19e4d692308..000000000000
--- a/app-editors/gvim/gvim-8.0.1428.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-				gnome? ( >=gnome-base/libgnomeui-2.6 )
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                          CARBON (not tested)
-	# -aqua gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/gvim-8.0.1645.ebuild b/app-editors/gvim/gvim-8.0.1645.ebuild
deleted file mode 100644
index 7b9da4cf8c27..000000000000
--- a/app-editors/gvim/gvim-8.0.1645.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-				gnome? ( >=gnome-base/libgnomeui-2.6 )
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                          CARBON (not tested)
-	# -aqua gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/gvim-8.0.1699-r1.ebuild b/app-editors/gvim/gvim-8.0.1699-r1.ebuild
deleted file mode 100644
index 5cc2db95231c..000000000000
--- a/app-editors/gvim/gvim-8.0.1699-r1.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads"
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND="
-	${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                          CARBON (not tested)
-	# -aqua gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/gvim-8.0.1699.ebuild b/app-editors/gvim/gvim-8.0.1699.ebuild
deleted file mode 100644
index bb0c86ef868e..000000000000
--- a/app-editors/gvim/gvim-8.0.1699.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads"
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-				gnome? ( >=gnome-base/libgnomeui-2.6 )
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                          CARBON (not tested)
-	# -aqua gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/gvim-8.1.0034.ebuild b/app-editors/gvim/gvim-8.1.0034.ebuild
deleted file mode 100644
index 57cb962fe0ba..000000000000
--- a/app-editors/gvim/gvim-8.1.0034.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads"
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                          CARBON (not tested)
-	# -aqua gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
deleted file mode 100644
index 57cb962fe0ba..000000000000
--- a/app-editors/gvim/gvim-9999.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads"
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                          CARBON (not tested)
-	# -aqua gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml
deleted file mode 100644
index aa4ea747bcc9..000000000000
--- a/app-editors/gvim/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>vim@gentoo.org</email>
-    <name>Gentoo Vim Project</name>
-  </maintainer>
-  <use>
-    <flag name="gtk3">Enable GTK+3 interface</flag>
-    <flag name="netbeans">Include netbeans external editor integration support</flag>
-    <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">vim/vim</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-editors/hexcurse-1.55 b/app-editors/hexcurse-1.55
new file mode 100644
index 000000000000..49166cf982b8
--- /dev/null
+++ b/app-editors/hexcurse-1.55
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=sys-libs/ncurses-5.2:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=ncurses based hex editor
+EAPI=5
+HOMEPAGE=http://www.jewfish.net/description.php?title=HexCurse
+KEYWORDS=alpha amd64 arm hppa ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2:0=
+SLOT=0
+SRC_URI=http://www.jewfish.net/downloads/hexcurse-1.55.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d9f67f591626bf105e8a37eb41787361
diff --git a/app-editors/hexcurse-1.60.0 b/app-editors/hexcurse-1.60.0
new file mode 100644
index 000000000000..71b9d6c11a62
--- /dev/null
+++ b/app-editors/hexcurse-1.60.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=sys-libs/ncurses-5.2:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=ncurses based hex editor
+EAPI=6
+HOMEPAGE=https://github.com/LonnyGomes/hexcurse
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2:0=
+SLOT=0
+SRC_URI=https://github.com/LonnyGomes/hexcurse/archive/v1.60.0.tar.gz -> hexcurse-1.60.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=66c2dcdaf8706426716f2cd032af8744
diff --git a/app-editors/hexcurse/Manifest b/app-editors/hexcurse/Manifest
deleted file mode 100644
index 0e5f5e3085ed..000000000000
--- a/app-editors/hexcurse/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 1.55-gcc.patch 261 BLAKE2B 323f9408222a994b0571b1a154fc0117f9b1015f2592b35d98156fa783d26f4e1377d23b1820e280e5b8ce885e826fa00f9ce51b9400c0ebac4186aa2b0af0ce SHA512 ff9612dcc75e2e0aeb67c5170c97e2705a1447ffeade77457924f5b7c354b4f7a69f53c237d1674c39fab5c057c27b5b7fa3e0779ce2f19e0a128f0b0228023b
-AUX 1.55-tinfo.patch 339 BLAKE2B 9860fe0cead822ee4773b6500e53cc10366527fd2e9068ea29561e1b3c695719f210f860f840b65888ecfaccb6b4e4d5a9af5d0328652d948a53104609df547d SHA512 267841535437a1e71ae94fbfbfa7e2250cba919ee8a1c7a19f861d667f9b4e2032ed1cc6ed5b6b6ad7093aa62425d16f99a56d7a3e0737a4dd9f87bf7564f5e1
-AUX hexcurse-1.60.0-Werror.patch 291 BLAKE2B ce310d08d4880d53c2eb3c17794294cc124fffcbd991d00471a00fd796ed1bd4f1a1317e8a8690f5cd94abd0ede9b317f38cf2ee20ca1f5bffe60acdf89b7571 SHA512 01d6a272b2fd0bd033e4157f2fd2c13e1a8ec6148534217f0d38fbac04ac402b0be919abddffba519afb4bec16dba951a9bdd998cf21aa4fcf8b81b0d6d2b6ff
-AUX hexcurse-1.60.0-tinfo.patch 386 BLAKE2B e4f376cc9cf60c9163553aa9082e5c84a228f0704c575941414cde6527cb6c9b867d55cba45dbb35bdd95d79ee8d13acee3a139256d794f9f648af87581ed458 SHA512 ce0c25842a874d631d75826f6b967fe0d0f53a435e6222eed1310caa884b570c1cf131c14e0be84fc7de728e37cdaee5b950ada527fd03ddba0dacf578e4fe42
-DIST hexcurse-1.55.tar.gz 113512 BLAKE2B 68dbb21e0c8830256f51a477a968449d86da174ca3cc7d29232c6d2a2f909339a0555ff459ed373e62e35b3d1d8abfbbd32a9462006b20bfa1f4f641f4eba825 SHA512 39f9eae0bb891bdfb702fb871b75c53d15acf6e74b3272b616f00303f444bfddced6fbe3041eb3769fa90fbc226dd584f5d84f7427b659e63f3b74511938a4a7
-DIST hexcurse-1.60.0.tar.gz 171904 BLAKE2B f591469a859e71e0ada99975c3632f29b293f5bcf65dece9fb047908c860e11ee5b5d5f78e636d3163497acf396de64e568e560427cf0ee7f2c752e0fc5a2b72 SHA512 2301f10e9190922fc61cbbe3a834826ebf87bc5ece9191d368181e2336af240e68cbe46e3a60dee3e0e42281b2f05ae4a7060ee1083b37f4906eacc66e58a094
-EBUILD hexcurse-1.55.ebuild 696 BLAKE2B cdb02d320b04b6e5e2a0ef211dc736946580c84a2137874031ef58a1011a8caa3170ee656b227e2596caee0f1a8210cdd7793c1091d4e4b57538b40635acc359 SHA512 f36114841a36d099506cefbc2a525d653ced957007565a6ba549eb67531f81bce1998aba8d2d9c196127b129084b553ca71b135681ed83e3b2d40cc034a60292
-EBUILD hexcurse-1.60.0.ebuild 713 BLAKE2B ef37131406f851827fc94f0524de69bf0e79fa823acf982e8ca43751ea63a286fee96859839101274c03248561f9a8f337c966f8b78eb5608dd5e9c7b01b208a SHA512 98cc4f96741c84ca32b5b2bb7f9606b51d6f4e105672bb5cb0ddac18439baf8c96fe78c67203e96ead5d8352828a740018d73c258004a22be4f4de0d912b5bde
-MISC metadata.xml 463 BLAKE2B 104010d8e61f58282a944b121dd649fbceca67fe8981030d7aae737bf709029a94c75bfbd648c07bfbffedfee10cc0cb5718da7376eee7b4b5ce014a987acb6c SHA512 571a214805d30efc4f0f8a83964938e175aa1cecdbf76c1153189315dca316b625507860ac86b14209ff116706e8beedbea7b66aa5714ffde264ca94a88270c1
diff --git a/app-editors/hexcurse/files/1.55-gcc.patch b/app-editors/hexcurse/files/1.55-gcc.patch
deleted file mode 100644
index 22b996b3437d..000000000000
--- a/app-editors/hexcurse/files/1.55-gcc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/getopt.c
-+++ b/src/getopt.c
-@@ -36,8 +36,6 @@
-  * enables hexcurse to be compiled with SGI's proprietary compiler        */
- #ifdef _SGIAPI
- #include <alloca.h>
--#else
--char *alloca ();
- #endif
- #define __alloca      alloca
- /* end of modification */
diff --git a/app-editors/hexcurse/files/1.55-tinfo.patch b/app-editors/hexcurse/files/1.55-tinfo.patch
deleted file mode 100644
index f258c06f1cf7..000000000000
--- a/app-editors/hexcurse/files/1.55-tinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -13,7 +13,9 @@
- 
- dnl Checks for libraries.
- dnl Replace `main' with a function in -lncurses:
--AC_CHECK_LIB(ncurses, initscr,,AC_CHECK_LIB(curses, initscr))
-+AC_CHECK_LIB(ncurses, initscr)
-+AC_SEARCH_LIBS(initscr,curses)
-+AC_SEARCH_LIBS(LINES,tinfo)
- 
- dnl Checks for header files.
- AC_HEADER_STDC
diff --git a/app-editors/hexcurse/files/hexcurse-1.60.0-Werror.patch b/app-editors/hexcurse/files/hexcurse-1.60.0-Werror.patch
deleted file mode 100644
index 457574f15ac1..000000000000
--- a/app-editors/hexcurse/files/hexcurse-1.60.0-Werror.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,3 +1,3 @@
- bin_PROGRAMS = hexcurse 
--AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Werror -Wextra
-+AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Wextra
- hexcurse_SOURCES = file.c llist.c screen.c hexcurse.c stack.c getopt.c acceptch.c color.c
diff --git a/app-editors/hexcurse/files/hexcurse-1.60.0-tinfo.patch b/app-editors/hexcurse/files/hexcurse-1.60.0-tinfo.patch
deleted file mode 100644
index 1933a22bb044..000000000000
--- a/app-editors/hexcurse/files/hexcurse-1.60.0-tinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,7 +15,9 @@
- 
- dnl Checks for libraries.
- dnl Replace `main' with a function in -lncurses:
--AC_CHECK_LIB(ncurses, initscr,,[AC_CHECK_LIB(curses, initscr,,[AC_MSG_ERROR([ncurses library not found])])])
-+AC_CHECK_LIB(ncurses, initscr)
-+AC_SEARCH_LIBS(initscr,curses)
-+AC_SEARCH_LIBS(LINES,tinfo)
- 
- dnl Checks for header files.
- AC_HEADER_STDC
diff --git a/app-editors/hexcurse/hexcurse-1.55.ebuild b/app-editors/hexcurse/hexcurse-1.55.ebuild
deleted file mode 100644
index d1d3c8134882..000000000000
--- a/app-editors/hexcurse/hexcurse-1.55.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="ncurses based hex editor"
-HOMEPAGE="http://www.jewfish.net/description.php?title=HexCurse"
-SRC_URI="http://www.jewfish.net/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=sys-libs/ncurses-5.2:0="
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-gcc.patch \
-		"${FILESDIR}"/${PV}-tinfo.patch
-
-	eautoreconf
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-editors/hexcurse/hexcurse-1.60.0.ebuild b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
deleted file mode 100644
index 656648c05e7b..000000000000
--- a/app-editors/hexcurse/hexcurse-1.60.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="ncurses based hex editor"
-HOMEPAGE="https://github.com/LonnyGomes/hexcurse"
-SRC_URI="https://github.com/LonnyGomes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.60.0-Werror.patch
-	"${FILESDIR}"/${PN}-1.60.0-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-editors/hexcurse/metadata.xml b/app-editors/hexcurse/metadata.xml
deleted file mode 100644
index 05c3859ddbaf..000000000000
--- a/app-editors/hexcurse/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>base-system@gentoo.org</email>
-		<name>Gentoo Base System</name>
-	</maintainer>
-	<longdescription>
-		A console-based hex editor for the *NIX platform which uses the ncurses library.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">LonnyGomes/hexcurse</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/hexedit-1.2.13 b/app-editors/hexedit-1.2.13
new file mode 100644
index 000000000000..4020c6abb29c
--- /dev/null
+++ b/app-editors/hexedit-1.2.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses:= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=View and edit files in hex or ASCII
+EAPI=5
+HOMEPAGE=http://rigaux.org/hexedit.html
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=
+SLOT=0
+SRC_URI=http://rigaux.org/hexedit-1.2.13.src.tgz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2449114c4af83522e15552a4e387d00a
diff --git a/app-editors/hexedit/Manifest b/app-editors/hexedit/Manifest
deleted file mode 100644
index 57b2776eb3ff..000000000000
--- a/app-editors/hexedit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX hexedit-1.2.13-tinfo.patch 329 BLAKE2B b82e7b0495a8ccac367501f530d52f8b2988a242206efd25e14c433a25e1742c2bc3d0c7b1d1613ec8beec530264ce7fb177f2d3d9338c90eaf921a366726a66 SHA512 21306eddc00720a22365b84181581bc89db2a1d422cf769c2b29585144ab87064a19696ba946e16cc56e2d2d45aa12ebb88b3054ea0167124d960afdaa5a7d8a
-DIST hexedit-1.2.13.src.tgz 68778 BLAKE2B 377c4f0008f6e3b54e4cf2e0249fa344b684b11a6acea9daf7d8e6585524f9d11a4eb199d5289a57a72be5efbdf3060cc47269aad1d218784e7679a469ca4f50 SHA512 df9afb0b9b965e20ea8c427c1986b0200216601b157862199c35bae9e201ccc478ab0bfecd39d0dfaa85bf582f1cf372b0134fadcfeacf4734805a6e6dcaa2bb
-EBUILD hexedit-1.2.13.ebuild 698 BLAKE2B 89e3f6426b44847b7cdd5db5e0e67a840c3cdf7760f8657f8b1ddbd0d7a61e4ba9f37c43f22dddba1593939a928cf870fff627d960ed7d36ecd7bf053b7c5598 SHA512 fc82df639c0165215f4864d377e0610d096a29146b3949c5da34b14fcaa6140464072fafdb269b5662e56ece388d3aa092cea6dc36f624a060d34dcc150f8d75
-MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/app-editors/hexedit/files/hexedit-1.2.13-tinfo.patch b/app-editors/hexedit/files/hexedit-1.2.13-tinfo.patch
deleted file mode 100644
index 86e7dba4e88e..000000000000
--- a/app-editors/hexedit/files/hexedit-1.2.13-tinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -37,6 +37,7 @@
- AC_CHECK_LIB(curses, initscr, LIBS="$LIBS -lcurses",
-   AC_CHECK_LIB(ncurses, initscr, LIBS="$LIBS -lncurses")
- )
-+AC_SEARCH_LIBS(nodelay, tinfo)
- AC_CHECK_FUNC(use_default_colors, 
-   AC_DEFINE(HAVE_COLORS, , "Define if you want colored (fruit salad) display option")
- )
diff --git a/app-editors/hexedit/hexedit-1.2.13.ebuild b/app-editors/hexedit/hexedit-1.2.13.ebuild
deleted file mode 100644
index 6bf3c4700dec..000000000000
--- a/app-editors/hexedit/hexedit-1.2.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="View and edit files in hex or ASCII"
-HOMEPAGE="http://rigaux.org/hexedit.html"
-SRC_URI="http://rigaux.org/${P}.src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-DEPEND="sys-libs/ncurses:="
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.13-tinfo.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	dobin hexedit
-	doman hexedit.1
-	dodoc Changes
-}
diff --git a/app-editors/hexedit/metadata.xml b/app-editors/hexedit/metadata.xml
deleted file mode 100644
index 4e80019694b1..000000000000
--- a/app-editors/hexedit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tomjbe@gentoo.org</email>
-		<name>Thomas Beierlein</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-editors/hteditor-2.1.0 b/app-editors/hteditor-2.1.0
new file mode 100644
index 000000000000..d6d3a21d5c3d
--- /dev/null
+++ b/app-editors/hteditor-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) >=dev-libs/lzo-2 virtual/yacc sys-devel/flex >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A file viewer, editor and analyzer for text, binary, and executable files
+EAPI=6
+HOMEPAGE=http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/
+IUSE=X
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) >=dev-libs/lzo-2
+SLOT=0
+SRC_URI=mirror://sourceforge/hte/ht-2.1.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=c81ed8fd543d32b251d796c6bf8ca2de
diff --git a/app-editors/hteditor-2.1.0-r1 b/app-editors/hteditor-2.1.0-r1
new file mode 100644
index 000000000000..6ae5a0bbc118
--- /dev/null
+++ b/app-editors/hteditor-2.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) >=dev-libs/lzo-2 virtual/yacc sys-devel/flex >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A file viewer, editor and analyzer for text, binary, and executable files
+EAPI=6
+HOMEPAGE=http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/
+IUSE=X
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) >=dev-libs/lzo-2
+SLOT=0
+SRC_URI=mirror://sourceforge/hte/ht-2.1.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f58dd3e470236188aaff5c1ee331ef6c
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
deleted file mode 100644
index b7a08ac5d589..000000000000
--- a/app-editors/hteditor/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX hteditor-2.1.0-format-security.patch 1517 BLAKE2B 29ba4d308ac6b03b79f25c1aef38aac224ef936c0ebbb052e8a6238d863da34e575791bbbb6a430ff1e700f0c51f3ac27658646038f76c837a6fa2070d318bda SHA512 71b27c81d421d2ddee2e8ac6fe0d599678686880bebbd15464bee9ce4692f9e36dc1022f055ed6ff544985cdf1ccc496c1729ada193285b345597b5c186f5b5f
-AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa3252c4199367904b9d1b937f13d95e36f48a2d5c687d5e3d39edd56fba4fda74190facffbc7a8bc8b8ebfcf0bba9cd820226 SHA512 2bf1b8b6b945f9a153b2ee2afa03facbcebad36405bbe07c16230a2269595836fd802770b9209ce8a018195d77be553817352d99da6acdf0e7d8989a4ce09431
-AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
-AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
-DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
-EBUILD hteditor-2.1.0-r1.ebuild 1231 BLAKE2B c25a462ec8e00c6c689d03dfc8c74676743cf4f345ef34827e59cd875111c4c9e4d6f92d494bc2f33384e76036f7d7f8c0c6bf91d791b665f02f9d35847d51fa SHA512 b496fd7d0a1df96b80d387d49ff94bc11e59a324fefd2e66a5d26bae285c57be9f7a3f792ae265b3145d6437134772b393e2466d1062c2b1d8f224212351a908
-EBUILD hteditor-2.1.0.ebuild 1185 BLAKE2B 03f7e29f51fe3cc3e1aae710a962b07b0245ff81b60a5a946a1bac41e1539e7ea345b5069ab48d946c13382d58f6db7fd58430c8561a81e74e6ce57ad6fc1150 SHA512 1de23a98bf82d020b34543e0eb572eb44dcba82a6d294455a3c68c02a3da3aa22e6348e2c8d25ecab7878b5fcd7e4ab4b42d48c07f90e42b6befa54730ba0b9c
-MISC metadata.xml 460 BLAKE2B 517972433773ade8012213525db8c3395d6f6545d1e1499b18cb511df70a5c0f42bae14471d19f8a8e268f2149d4ed00b3a220a037cf7e57bb508d1239333295 SHA512 ff08b42c35979dbf9c165ae5895374779c53ab4d80e25edb9bf0d854ac44c89dd01bd817fc555d75036e687f007abbd717593af0554e6315dced60372bec4707
diff --git a/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch b/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch
deleted file mode 100644
index 408d1b9b1be3..000000000000
--- a/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugs.gentoo.org/521018
-
-From 5839355d67ff822593190473a41512ca19e4280a Mon Sep 17 00:00:00 2001
-From: Anton Gladky <gladk@debian.org>
-Date: Wed, 18 Feb 2015 21:20:39 +0100
-Subject: [PATCH] Fix "format not a string" compilation failure
-
-Compilation with the flag -Werror=format-security fails with
-the message:
-
-error: format not a string literal and no format arguments
-
-This patch solves the issue.
----
- asm/x86dis.cc | 6 +++---
- htpal.cc      | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/asm/x86dis.cc b/asm/x86dis.cc
-index 0830d9c..bb9028f 100644
---- a/asm/x86dis.cc
-+++ b/asm/x86dis.cc
-@@ -1218,15 +1218,15 @@ void x86dis::str_op(char *opstr, int *opstrlen, x86dis_insn *insn, x86_insn_op *
- 		default: {assert(0);}
- 		}
- 		if (!insn->rexprefix) {
--			sprintf(opstr, x86_regs[j][op->reg]);
-+			sprintf(opstr, "%s", x86_regs[j][op->reg]);
- 		} else {
--			sprintf(opstr, x86_64regs[j][op->reg]);
-+			sprintf(opstr, "%s", x86_64regs[j][op->reg]);
- 		}
- 		break;
- 	}
- 	case X86_OPTYPE_SEG:
- 		if (x86_segs[op->seg]) {
--			sprintf(opstr, x86_segs[op->seg]);
-+			sprintf(opstr, "%s", x86_segs[op->seg]);
- 		}
- 		break;
- 	case X86_OPTYPE_CRX:
-diff --git a/htpal.cc b/htpal.cc
-index 03dea18..3d5f51e 100644
---- a/htpal.cc
-+++ b/htpal.cc
-@@ -307,7 +307,7 @@ void palette_entry::strvalue(char *buf32bytes)
- 		text = "normal";
- 	}
- 	p = tag_make_color(p, 32, VCP(fg, bg));
--	p += sprintf(p, text);
-+	p += sprintf(p, "%s", text);
- 	p = tag_make_default_color(p, 32);
- 	*p = 0;
- }
--- 
-2.16.2
-
diff --git a/app-editors/hteditor/files/hteditor-2.1.0-gcc-6-uchar.patch b/app-editors/hteditor/files/hteditor-2.1.0-gcc-6-uchar.patch
deleted file mode 100644
index 67eaa6e01491..000000000000
--- a/app-editors/hteditor/files/hteditor-2.1.0-gcc-6-uchar.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/sebastianbiallas/ht/pull/21
-
-From 7ce68c4bca7fd64c0073f1770c6b5761c03174f0 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Wed, 21 Mar 2018 21:30:31 +0000
-Subject: [PATCH] ht: fix build failure on -funsigned-char platforms
-
-powerpc (and arm) have 'char' == 'unsigned char' by default.
-This causes build failures on c++11:
-
-```
-$ ./configure CFLAGS=-funsigned-char CXXFLAGS=-funsigned-char
-$ make
-
-g++ -DHAVE_CONFIG_H -I.   -I./analyser -I./asm -I./info -I./io/posix -I./io -I./output -I./eval -I.   -DNOMACROS -pipe -O3 -fomit-frame-pointer -Wall -fsigned-char -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64  -std=c++14 -Woverloaded-virtual -Wnon-virtual-dtor -funsigned-char -MT htcoffhd.o -MD -MP -MF .deps/htcoffhd.Tpo -c -o htcoffhd.o htcoffhd.cc
-htcoffhd.cc:93:1: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing]
- };
- ^
-htcoffhd.cc:131:1: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing]
- };
-```
-
-Use 'signed char' explicitly to maintain existing behavior.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- httag.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/httag.h b/httag.h
-index 7f5da1c..83e5c22 100644
---- a/httag.h
-+++ b/httag.h
-@@ -69,7 +69,7 @@ struct ht_tag_flags {
- } PACKED;
- 
- struct ht_tag_flags_s {
--	char bitidx;
-+	signed char bitidx;
- 	const char *desc;
- } PACKED;
- 
--- 
-2.16.2
-
diff --git a/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch b/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch
deleted file mode 100644
index ebcc3c0aa43e..000000000000
--- a/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=620732
-
-Fixes build failure on gcc-7:
-
-  htapp.cc: In function 'uint isqr(uint)':
-  htapp.cc:3026:18: error: call of overloaded 'abs(uint)' is ambiguous
-    while (abs(a - b) > 1) {
-                    ^
-
-Picked upstream patch that fixes it:
-
-commit 3b62f2f7e49e024ec9d3c5ffc8ff9cd87a107af6
-Author: Sebastian Biallas <sb@biallas.net>
-Date:   Sun Nov 13 15:25:26 2016 +0100
-
-    use unsigned variables
-
-diff --git a/htapp.cc b/htapp.cc
-index 53d8725..03236e2 100644
---- a/htapp.cc
-+++ b/htapp.cc
-@@ -3021,8 +3021,8 @@ void do_modal_resize()
- 
- static uint isqr(uint u)
- {
--	uint a = 2;
--	uint b = u/a;
-+	int a = 2;
-+	int b = u/a;
- 	while (abs(a - b) > 1) {
- 		a = (a+b)/2;
- 		b = u/a;
diff --git a/app-editors/hteditor/files/hteditor-2.1.0-tinfo.patch b/app-editors/hteditor/files/hteditor-2.1.0-tinfo.patch
deleted file mode 100644
index 556cb93569d4..000000000000
--- a/app-editors/hteditor/files/hteditor-2.1.0-tinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -198,6 +198,7 @@
- 	fi
- 	HT_LIBS="$HT_LIBS -l$CURSES_LIB"
- fi    
-+AC_SEARCH_LIBS(stdscr,tinfo)
- 
- dnl Makefile vars.
- AC_SUBST(IO_DIR)
diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
deleted file mode 100644
index a1d577aacafa..000000000000
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-MY_P=${P/editor}
-
-DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable files"
-HOMEPAGE="http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/"
-SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="X"
-
-RDEPEND="sys-libs/ncurses:0=
-	X? ( x11-libs/libX11 )
-	>=dev-libs/lzo-2"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-7.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${P}-gcc-6-uchar.patch
-	"${FILESDIR}"/${P}-format-security.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable X x11-textmode) \
-		--enable-maintainermode
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	#For prefix
-	chmod u+x "${S}/install-sh"
-
-	local HTML_DOCS="doc/*.html"
-	doinfo doc/*.info
-
-	default
-}
diff --git a/app-editors/hteditor/hteditor-2.1.0.ebuild b/app-editors/hteditor/hteditor-2.1.0.ebuild
deleted file mode 100644
index 1f5fc5b5ee5c..000000000000
--- a/app-editors/hteditor/hteditor-2.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-MY_P=${P/editor}
-
-DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable files"
-HOMEPAGE="http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/"
-SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="X"
-
-RDEPEND="sys-libs/ncurses:0=
-	X? ( x11-libs/libX11 )
-	>=dev-libs/lzo-2"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-7.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${P}-gcc-6-uchar.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable X x11-textmode) \
-		--enable-maintainermode
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	#For prefix
-	chmod u+x "${S}/install-sh"
-
-	local HTML_DOCS="doc/*.html"
-	doinfo doc/*.info
-
-	default
-}
diff --git a/app-editors/hteditor/metadata.xml b/app-editors/hteditor/metadata.xml
deleted file mode 100644
index d08e026268cd..000000000000
--- a/app-editors/hteditor/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">hte</remote-id>
-    <bugs-to>https://sourceforge.net/tracker/?group_id=1066</bugs-to>
-    <remote-id type="github">sebastianbiallas/ht</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-editors/jasspa-microemacs-20091011-r2 b/app-editors/jasspa-microemacs-20091011-r2
new file mode 100644
index 000000000000..d8225480d9fa
--- /dev/null
+++ b/app-editors/jasspa-microemacs-20091011-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=sys-libs/ncurses X? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nanoemacs? ( !app-editors/ne ) virtual/pkgconfig X? ( x11-libs/libXt x11-base/xorg-proto )
+DESCRIPTION=Jasspa Microemacs
+EAPI=4
+HOMEPAGE=http://www.jasspa.com/
+IUSE=nanoemacs X xpm
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=sys-libs/ncurses X? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nanoemacs? ( !app-editors/ne )
+SLOT=0
+SRC_URI=http://www.jasspa.com/release_20090909/jasspa-mesrc-20091011.tar.gz !nanoemacs? ( http://www.jasspa.com/release_20090909/jasspa-memacros-20091017.tar.gz http://www.jasspa.com/release_20090909/jasspa-mehtml-20091011.tar.gz http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=587797109cb3bbf75c2d257f402a66a0
diff --git a/app-editors/jasspa-microemacs-20091011-r3 b/app-editors/jasspa-microemacs-20091011-r3
new file mode 100644
index 000000000000..fb0b28ee6e01
--- /dev/null
+++ b/app-editors/jasspa-microemacs-20091011-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nanoemacs? ( !app-editors/ne ) virtual/pkgconfig X? ( x11-base/xorg-proto x11-libs/libXt )
+DESCRIPTION=Jasspa Microemacs
+EAPI=6
+HOMEPAGE=http://www.jasspa.com/
+IUSE=nanoemacs X xpm
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nanoemacs? ( !app-editors/ne )
+SLOT=0
+SRC_URI=http://www.jasspa.com/release_20090909/jasspa-mesrc-20091011.tar.gz !nanoemacs? ( http://www.jasspa.com/release_20090909/jasspa-memacros-20091017.tar.gz http://www.jasspa.com/release_20090909/jasspa-mehtml-20091011.tar.gz http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b88acd8cee25ffb5c2bf8943c4b5ce3f
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
deleted file mode 100644
index 980a6e1300d2..000000000000
--- a/app-editors/jasspa-microemacs/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX 20091011-linux3.patch 723 BLAKE2B 924852d26fc148c124e51e7d392d2a38482022b30bb1ad31e92ce12dd6efb97a154b7c05b8590788d4a4839c4de0bddb4f5576addf9cd64ac9d4511c6197801c SHA512 c3b0246cc83c6840b59b46cbd25ebe1f9364a029f555f916dbc3ca38d8e490514a9dfc9ae8748e751e49cc9a1f3be89af30d0fab95d35486d32cf87fec93431c
-AUX 20091011-ncurses.patch 583 BLAKE2B eaf5eafcfb9fbe6a889b64fcfe895016ec25d8be63975600c11e9cfb889b42b6d03426e1d574bf65899fd5bac00d0fd49a838c1d57e7ab7e3c2cb172664206af SHA512 d2a4ca646e825a9c517ed075205609d141f94735c9bba2f23f5c94ced05b9290e6e24a718d7e8cfbcad77663a6c07f311a387363e8737cb1cb4fc81cf34e9a22
-AUX jasspa-microemacs.desktop 282 BLAKE2B 4c881a43ab13c3043555bbced246aefd463247c467974f4c449d26f3d4db9e91fc47448afae30b478b6d0053da74d07e44f25f08a1e310c4072c45ddc63725e8 SHA512 e55698b2faf0a5a8fbb04e837400ab0d9be00d50ab20fd3d84718edf75a4bedef1155f04654ea1d491c3b456f1bf047e4b90f05efb0702deeb2f496c9ad091d2
-DIST jasspa-mehtml-20091011.tar.gz 628008 BLAKE2B 97c8326e7acfdc4bc4ddd2ef6bbcf0384f114cfe1487d1ab5f456b0b64ea87a2410ce644860a33c863224e4dc66a476a63881d865455a62a5ce5a0877d03bfc4 SHA512 0328ad7af88b98840c76003c15461f45cba9f54b7935330ec881c588cdd02ee937684ce42c1889f7ca311cc80bd027ae6cb6b088c5ed5105107b22b384780a4e
-DIST jasspa-memacros-20091017.tar.gz 1105437 BLAKE2B 0a74715db55498fed646f209a9121a96c673cb34c487968c4f838bacf6404db717fbd8392d26f8fa120174923724af91e4a14bda088bf229765d1e99c785d8ba SHA512 08908acac4dbe56695362172dabe621b8cca77a35da599c6cf5b4e87700c03f4ee190ca12d5c69b2d88c623cec527daac0980dec2ed713ff563e88ebe636a725
-DIST jasspa-mesrc-20091011.tar.gz 810128 BLAKE2B ce627dab7cf4ec09b099e755c3eb17e773c64fbff60741244cdb134ee1555ffff592ef3684eecae72d5da36c10cd7caa23a03112154c616ad3c7667d913354b4 SHA512 60cc5a83b3cafd8e517f88732dc94feb0329b962bc714eaa5616ba89776fbfac41833be88fd3a666443291184086494434fb8763747c1dc5e216ce793b694b68
-DIST meicons-extra.tar.gz 43345 BLAKE2B 5b3d6e8a76604364d8e5464ba764aec96d822054c02bffed4cd763f7691f78bc3455904cd06d89ddcf8a0861134ada3c7d228751d4f3685e6700ebfc3dda2354 SHA512 bb6879fb12ec1c7b346bc1df2412a837ffdd0569f6be2800a433307a7736bb31798b3c2a71e02cebdce39c59d93d1a986f80c92184604e4292606c98285fe02a
-EBUILD jasspa-microemacs-20091011-r2.ebuild 2115 BLAKE2B 007a275b88257cc808c872a7e659851f13fbc0916d4b8c1789e0e83fcf849b9bc317819de2e9785e240412bd967f6eeaf2f7d403399b28f102f07cbd2c6bd17c SHA512 ae515ed70c9b13b891de1cb703323555df57a7002a5aa69815b7f50aaf6f4e11bb155aaeb52d4cd60295a4d27e2cb50f5b0d8a3c61e99aa33bf01bb13986576c
-EBUILD jasspa-microemacs-20091011-r3.ebuild 2319 BLAKE2B 5c5b2bec2ff83769075c63cf67b79ccd2bbf4ef1f522fcaac0590fdc85123774abf0ce7aaf0bd3ffd755b750887fb07809f997847f111c06908e4a2be20349ef SHA512 85b6b933c33dcbf78886d0ae3bf6274876b10d45a86e5a542ea25c89fe3d5aa27e1bd68f9ea241a574dc25d1889f61755fd2abb552b4ff32600f4647b3e931ef
-MISC metadata.xml 1094 BLAKE2B 9983b2ebf7f9d7a979180ea0d4aa063ace2fa5a3a630339bb8112a8691eb6b46964d298d9b49c2d02b2dba2750e501b5740de2242da00abc4b24ba08af8d7fb1 SHA512 2116ed586b24da86206c4d38977c118bcf2381d455a3cd0fb9d672f8d709b5113fe4c8767e2d2f20f8c879a71f0e6bfb6384b9efe30cba82e177fa75dc4e0d6a
diff --git a/app-editors/jasspa-microemacs/files/20091011-linux3.patch b/app-editors/jasspa-microemacs/files/20091011-linux3.patch
deleted file mode 100644
index 35a5b22a1dce..000000000000
--- a/app-editors/jasspa-microemacs/files/20091011-linux3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Work around build failure on Linux 3.0.
-
---- me091011-orig/src/build
-+++ me091011/src/build
-@@ -130,17 +130,7 @@
-             MAKEBAS=irix6
-         fi
-     elif [ $PLATFORM = "Linux" ] ; then
--        MACHINE=`uname -m | cut -c 1-3`
--        if [ $MACHINE = "arm" ] ; then
--            MAKEBAS=zaurus
--        else
--            KERNEL_MAJOR=`uname -r | cut -c 1-1`
--            KERNEL_MINOR=`uname -r | cut -c 3-3`
--            MAKEBAS="linux$KERNEL_MAJOR$KERNEL_MINOR"
--            if [ ! -r $MAKEBAS.gmk ] ; then
--                MAKEBAS="linux2"
--            fi                
--        fi
-+        MAKEBAS=linux26
-         X11_MAKELIB=/usr/X11R6/lib
-     elif [ $PLATFORM = "OpenBSD" ] ; then
-         MAKEBAS=openbsd
diff --git a/app-editors/jasspa-microemacs/files/20091011-ncurses.patch b/app-editors/jasspa-microemacs/files/20091011-ncurses.patch
deleted file mode 100644
index 92a2885895b1..000000000000
--- a/app-editors/jasspa-microemacs/files/20091011-ncurses.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- me091011-orig/src/linux26.gmk
-+++ me091011/src/linux26.gmk
-@@ -66,12 +66,7 @@
- # accomplish this try to compile test.c and see if it can link termcap. For
- # Linux 2.6 then preference would appear to be "ncurses" rather than "termcap". 
- #
--test = $(shell echo "\#include <stdio.h>" > _t.c ; echo "main() { printf(\"HW\n\"); }" >> _t.c ; $(LD) $(LDFLAGS) -o /dev/null -lncurses _t.c 2>&1 ; rm -f _t.c)
--ifneq "$(strip $(test))" ""
--CONSOLE_LIBS  = -ltermcap
--else
- CONSOLE_LIBS  = -lncurses
--endif
- #
- # Rules
- .SUFFIXES: .c .oc .ow .ob .on .ov .oe .odc .odw .odb .odn .odv .ode
diff --git a/app-editors/jasspa-microemacs/files/jasspa-microemacs.desktop b/app-editors/jasspa-microemacs/files/jasspa-microemacs.desktop
deleted file mode 100644
index 62204880bd96..000000000000
--- a/app-editors/jasspa-microemacs/files/jasspa-microemacs.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Jasspa MicroEmacs
-GenericName=Text Editor
-Comment=Advanced Text Editor
-Icon=/usr/share/jasspa/icons/32x32/me.png
-TryExec=me
-Exec=me %F
-Terminal=false
-MimeType=text/plain;
-Categories=Development;TextEditor;
-StartupWMClass=MicroEmacs
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild
deleted file mode 100644
index eb138ec6f5bb..000000000000
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-MACROS_PV="20091017"
-
-DESCRIPTION="Jasspa Microemacs"
-HOMEPAGE="http://www.jasspa.com/"
-SRC_URI="http://www.jasspa.com/release_20090909/jasspa-mesrc-${PV}.tar.gz
-	!nanoemacs? (
-		http://www.jasspa.com/release_20090909/jasspa-memacros-${MACROS_PV}.tar.gz
-		http://www.jasspa.com/release_20090909/jasspa-mehtml-${PV}.tar.gz
-		http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="nanoemacs X xpm"
-
-RDEPEND="sys-libs/ncurses
-	X? ( x11-libs/libX11
-		xpm? ( x11-libs/libXpm ) )
-	nanoemacs? ( !app-editors/ne )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? ( x11-libs/libXt
-		x11-base/xorg-proto )"
-
-S="${WORKDIR}/me${PV:2}/src"
-
-src_unpack() {
-	unpack jasspa-mesrc-${PV}.tar.gz
-	if ! use nanoemacs; then
-		mkdir "${WORKDIR}/jasspa"
-		cd "${WORKDIR}/jasspa"
-		# everything except jasspa-mesrc
-		unpack ${A/jasspa-mesrc-${PV}.tar.gz/}
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-ncurses.patch"
-	epatch "${FILESDIR}/${PV}-linux3.patch"
-
-	# allow for some variables to be passed to make
-	sed -i -e \
-		'/make/s/\$OPTIONS/& CC="$CC" COPTIMISE="$CFLAGS" LDFLAGS="$LDFLAGS" CONSOLE_LIBS="$CONSOLE_LIBS" STRIP=true/' \
-		build || die "sed failed"
-}
-
-src_compile() {
-	local pkgdatadir="${EPREFIX}/usr/share/jasspa"
-	local me="" type=c
-	use nanoemacs && me="-ne"
-	use X && type=cw
-	use xpm || export XPM_INCLUDE=.		# prevent Xpm autodetection
-
-	CC="$(tc-getCC)" \
-	CONSOLE_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)" \
-	./build ${me} \
-		-t ${type} \
-		-p "~/.jasspa:${pkgdatadir}/site:${pkgdatadir}" \
-		|| die "build failed"
-}
-
-src_install() {
-	local me=me type=c
-	use nanoemacs && me=ne
-	use X && type=cw
-	newbin ${me}${type} ${me}
-
-	if ! use nanoemacs; then
-		keepdir /usr/share/jasspa/site
-		insinto /usr/share
-		doins -r "${WORKDIR}/jasspa"
-		use X && domenu "${FILESDIR}/${PN}.desktop"
-	fi
-
-	dodoc ../faq.txt ../readme.txt ../change.log
-}
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
deleted file mode 100644
index c431c2cfdd65..000000000000
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs xdg-utils
-
-MACROS_PV="20091017"
-DESCRIPTION="Jasspa Microemacs"
-HOMEPAGE="http://www.jasspa.com/"
-SRC_URI="http://www.jasspa.com/release_20090909/jasspa-mesrc-${PV}.tar.gz
-	!nanoemacs? (
-		http://www.jasspa.com/release_20090909/jasspa-memacros-${MACROS_PV}.tar.gz
-		http://www.jasspa.com/release_20090909/jasspa-mehtml-${PV}.tar.gz
-		http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="nanoemacs X xpm"
-
-RDEPEND="sys-libs/ncurses:0=
-	X? (
-		x11-libs/libX11
-		xpm? ( x11-libs/libXpm )
-	)
-	nanoemacs? ( !app-editors/ne )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXt
-	)"
-
-S="${WORKDIR}/me${PV:2}"
-PATCHES=(
-	"${FILESDIR}"/${PV}-ncurses.patch
-	"${FILESDIR}"/${PV}-linux3.patch
-)
-
-src_unpack() {
-	unpack jasspa-mesrc-${PV}.tar.gz
-	if ! use nanoemacs; then
-		mkdir "${WORKDIR}"/jasspa || die
-		cd "${WORKDIR}"/jasspa || die
-		# everything except jasspa-mesrc
-		unpack ${A/jasspa-mesrc-${PV}.tar.gz/}
-	fi
-}
-
-src_prepare() {
-	default
-	# allow for some variables to be passed to make
-	sed -i -e \
-		'/make/s/\$OPTIONS/& CC="$CC" COPTIMISE="$CFLAGS" LDFLAGS="$LDFLAGS" CONSOLE_LIBS="$CONSOLE_LIBS" STRIP=true/' \
-		src/build || die "sed failed"
-}
-
-src_compile() {
-	local pkgdatadir="${EPREFIX}/usr/share/jasspa"
-	local me="" type=c
-	use nanoemacs && me="-ne"
-	use X && type=cw
-	use xpm || export XPM_INCLUDE=.		# prevent Xpm autodetection
-
-	cd src || die
-	CC="$(tc-getCC)" \
-	CONSOLE_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)" \
-	./build ${me} \
-		-t ${type} \
-		-p "~/.jasspa:${pkgdatadir}/site:${pkgdatadir}" \
-		|| die "build failed"
-}
-
-src_install() {
-	local me=me type=c
-	use nanoemacs && me=ne
-	use X && type=cw
-	newbin src/${me}${type} ${me}
-
-	if ! use nanoemacs; then
-		keepdir /usr/share/jasspa/site
-		insinto /usr/share
-		doins -r "${WORKDIR}"/jasspa
-		if use X; then
-			insinto /usr/share/applications
-			doins "${FILESDIR}"/${PN}.desktop
-		fi
-	fi
-
-	dodoc faq.txt readme.txt change.log
-}
-
-pkg_postinst() {
-	use X && xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	use X && xdg_desktop_database_update
-}
diff --git a/app-editors/jasspa-microemacs/metadata.xml b/app-editors/jasspa-microemacs/metadata.xml
deleted file mode 100644
index ab5b22e79f36..000000000000
--- a/app-editors/jasspa-microemacs/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-   * An Emacs editor biased towards UNIX users, working across platforms by
-     providing a consistent interface under UNIX, Microsoft Windows '95/'98/NT
-     and DOS operating systems.
-   * Fully featured editor, retaining the lightness of the original
-     MicroEmacs 3.8 with much enhanced capability.
-   * Small memory and disk footprint.
-   * A much enhanced version of the Danial Lawrence's original MicroEmacs 3.8
-     of 1988. It is stressed that although Danial Lawrence's 3.8 version was
-     used as a base, he has had no involvement in the development of this
-     distribution.
-   * To avoid any confusion with the original MicroEmacs, this distribution
-     should be referred to as the JASSPA distribution.
-</longdescription>
-<use>
-  <flag name="nanoemacs">Build NanoEmacs instead of MicroEmacs</flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/jed-0.99.19 b/app-editors/jed-0.99.19
new file mode 100644
index 000000000000..a0d23f192d8c
--- /dev/null
+++ b/app-editors/jed-0.99.19
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=sys-libs/slang-2 gpm? ( sys-libs/gpm ) X? ( x11-libs/libX11 xft? ( >=media-libs/freetype-2 x11-libs/libXft ) ) X? ( x11-libs/libXt x11-base/xorg-proto )
+DESCRIPTION=Console S-Lang-based editor
+EAPI=4
+HOMEPAGE=http://www.jedsoft.org/jed/
+IUSE=X gpm xft
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2+
+RDEPEND=>=sys-libs/slang-2 gpm? ( sys-libs/gpm ) X? ( x11-libs/libX11 xft? ( >=media-libs/freetype-2 x11-libs/libXft ) )
+SLOT=0
+SRC_URI=ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-19.tar.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c7b7cf056662d8b5a6a45e204aae2de3
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
deleted file mode 100644
index 5d1f3dd669de..000000000000
--- a/app-editors/jed/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jed-0.99-19.tar.bz2 884198 BLAKE2B c3d967e59b909a39d0f7fb49c8ce9aef70585ba433bc5c6bebf5db1b6b88de0c41b35059a242a38be91a97a5296a279bdc85ac30ec9d4ae221d94e50e41d8995 SHA512 db8a30284f9b8e3e2c5d1a600eeb7af29c9f943a5c23d7c74fce926e0b0252f54805e214670e7c9357ce0e6918ad67cba2769a523979bfbd285328f94fff747c
-EBUILD jed-0.99.19.ebuild 1135 BLAKE2B 31333f1321e4f07b5d37b3198f4f91c22c7578996723c288a2d0152cf31b8dcc2f7c4343bc9c902c47772bcce8f670c048b48ea4eaf7272afd79d3510ca98bf5 SHA512 1311e8b402ab97a696f6538543da6b313fd84d62fd0fb3000642e03205d693d867fcb076843e9edcf1cab139ebeeda898875b6c33e6304381a537fa800d5981f
-MISC metadata.xml 614 BLAKE2B 023aea459e74aa16cbfd069da28b6c2bc1b87e17be50f1f49e4f070ef8764a75f53b56b6d61a9741caf93ccc1b07cd34a523940754fc33cb6591bdf7f6f417cc SHA512 79f54c7d84965a95e575c4c38d5c9a2158de0a1c539ee32f5839312bed707c8d0df00f7733c3cedeee1cfb3ac10619ff60dc0441f7062535f0d7f79094f5443b
diff --git a/app-editors/jed/jed-0.99.19.ebuild b/app-editors/jed/jed-0.99.19.ebuild
deleted file mode 100644
index 04e69c80056f..000000000000
--- a/app-editors/jed/jed-0.99.19.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit versionator
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="Console S-Lang-based editor"
-HOMEPAGE="http://www.jedsoft.org/jed/"
-SRC_URI="ftp://space.mit.edu/pub/davis/jed/v${PV%.*}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="X gpm xft"
-
-RDEPEND=">=sys-libs/slang-2
-	gpm? ( sys-libs/gpm )
-	X? (
-		x11-libs/libX11
-		xft? (
-			>=media-libs/freetype-2
-			x11-libs/libXft
-		)
-	)"
-DEPEND="${RDEPEND}
-	X? (
-		x11-libs/libXt
-		x11-base/xorg-proto
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	export JED_ROOT="${EPREFIX}"/usr/share/jed
-	econf \
-		$(use_enable gpm) \
-		$(use_enable xft)
-}
-
-src_compile() {
-	emake
-	use X && emake xjed
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc changes.txt INSTALL{,.unx} README
-	doinfo info/jed*
-
-	insinto /etc
-	doins lib/jed.conf
-
-	# replace IDE mode with EMACS mode
-	sed -i \
-		-e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' \
-		"${ED}"/etc/jed.conf || die
-}
diff --git a/app-editors/jed/metadata.xml b/app-editors/jed/metadata.xml
deleted file mode 100644
index a3f50195b266..000000000000
--- a/app-editors/jed/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-  Jed is a powerful editor, terminal and X11 interface. Color syntax
-  highlighting is one of its strong suits, along with emulation of GNU Emacs,
-  Wordstar, EDT and Brief. It also supports use of GPM on Linux consoles.
-  Jed has a multitude of programming modes and couples with the Slang library
-  for powerful extensions.
-</longdescription>
-</pkgmetadata>
diff --git a/app-editors/jedit-5.2.0-r1 b/app-editors/jedit-5.2.0-r1
new file mode 100644
index 000000000000..75079564601b
--- /dev/null
+++ b/app-editors/jedit-5.2.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-java/bsh:0 dev-java/jsr305:0 dev-java/ant-contrib:0 dev-java/ant-apache-bsf:0 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Programmer's editor written in Java
+EAPI=5
+HOMEPAGE=http://www.jedit.org
+IUSE=elibc_FreeBSD doc test elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86
+LICENSE=BSD GPL-2
+RDEPEND=dev-java/bsh:0 dev-java/jsr305:0 dev-java/ant-contrib:0 dev-java/ant-apache-bsf:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=mirror://sourceforge/jedit/jedit5.2.0source.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7760eec716cb10e10b228a73c691d297
diff --git a/app-editors/jedit-5.4.0 b/app-editors/jedit-5.4.0
new file mode 100644
index 000000000000..abcf96cb8201
--- /dev/null
+++ b/app-editors/jedit-5.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-java/jsr305:0 >=virtual/jdk-1.8 dev-java/ant-contrib:0 dev-java/ant-apache-bsf:0 dev-java/bsh:0 test? ( dev-java/ant-junit:0 dev-java/hamcrest-library:1.3 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Programmer's editor written in Java
+EAPI=6
+HOMEPAGE=http://www.jedit.org
+IUSE=elibc_FreeBSD doc test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=mirror://sourceforge/jedit/jedit5.4.0source.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c443e73b58ac0d64096f78ef00a85e9f
diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
deleted file mode 100644
index 373e1a3d6588..000000000000
--- a/app-editors/jedit/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX jedit-5.2.0-build-xml.patch 530 BLAKE2B c42c1a9f5350e66dc6e4160cb2b02d1e16eed53eebaad0f5dc725d00cab51fbd7423fc90d1b40de88b110b60a5263b0e1f48943975dcab291a0264c1d0abacfd SHA512 4396a20fe4d358b8ecf8938a467ed58dfdab81358a785fd56387dfed94b4aaafdbba4cb2639631c58c9c771a2fe9bdbcfc30807def5861473c9b35d7add73dbe
-AUX jedit-5.4.0-build-xml.patch 332 BLAKE2B 47bf100efa8d99ebebe9765df2c59f4bb4dfbed1922bab1dd7e5802c69c9ef3a124b065385df693159382b876a52fcfb3433c10177adf2c15653dd5fd314fb0b SHA512 6ea6e327f48a677063f0eb282baa1fff289b18b8f6e4106b7336ec2906a0652c24198f702cdaff283f48600e287a6e6525f562e5247af110a0ee60f3340e029c
-DIST jedit5.2.0source.tar.bz2 2456541 BLAKE2B 82723b5e5670324fe3acff6d6958a83331bf67ab5453eaa1109de192586e4bcce3832456fdfd493e233f30ccbbf256e48b60398f256d9cf4c0cc366816d8b23f SHA512 5af99ac864dd70701f24435840e26f73077ba02d155319965122bd24871e6825b82383054d29dfec72bbbedaac72bfb2d86097de6a0c79341f0a279dacd60126
-DIST jedit5.4.0source.tar.bz2 2535992 BLAKE2B 1560f680437e89cea789f2b0540225b0cbf92bc22f975c6d1850a7b3aa06a2b95d61a254fd0d4c0e7da916ee9de3a095ab5190ae5df3ad27e55c2f0ccef57db2 SHA512 2120370c54f8bd415f90b979c42bfca6101f76ba33f0ec6a8172adeb33173ba9c73cbd7f06b5dc8c12aa3eedf51f007752cdbf0c7423d77a1ac591beb5493112
-EBUILD jedit-5.2.0-r1.ebuild 2319 BLAKE2B 9edd505a076720624cc91df6c0a7fcfe34694aefae6021326d7b8d9624ca64cf156d9cb1d8992d073aac6b7aa455284f39c100c4e94f0bb889e21697b85c9db6 SHA512 7c333cee0b47c11267391206995b9e8190b624776905b541d035cf54965ce6bbb70fd5ddff48a796a25a19f1945c9dd099ae1e96bf21c01af369f241a6ec2f68
-EBUILD jedit-5.4.0.ebuild 2433 BLAKE2B 776a39e94ade38b7cc1012700428fe787d0fd6282c5f7eda915d429b6781ce967a0f3133c5fc873786cab989afa760b1b93549d1df0132c03b4457bb112462bd SHA512 8231c892e1f59d674296070c6c8eda9add12b098b3392623d8d38c2f802ef9398309e03f65962282bdd8bd98d837dd0845148d2d3dec6397f6532f51c08b241b
-MISC metadata.xml 311 BLAKE2B 7363e29fccf6d99776fe1e6ae7cdff121272dde68207519df05b765e52ffeb4d0c4a3184847aa1ca10291c30ac1438da5e393c6b23cc9a2bed46b7be06afff41 SHA512 86e21988f7f67ca938bfad13389991533b89202be6b7e721bd3cac1a8e4a2316e62444a81de56848d016273795f4c166216f9a7b599ebb3aa43c7657a7d4f182
diff --git a/app-editors/jedit/files/jedit-5.2.0-build-xml.patch b/app-editors/jedit/files/jedit-5.2.0-build-xml.patch
deleted file mode 100644
index da0a91d54d22..000000000000
--- a/app-editors/jedit/files/jedit-5.2.0-build-xml.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4dc53a4c320af0894bd600c77d4432c414cdee16 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 8 Aug 2015 00:05:20 +0200
-Subject: [PATCH] Do not have target "build" call target "test"
-
----
- build.xml | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/build.xml b/build.xml
-index f34934f..da5272a 100644
---- a/build.xml
-+++ b/build.xml
-@@ -504,7 +504,6 @@
- 				</copy>
- 			</contrib:then>
- 		</contrib:if>
--		<antcall target="test" />
- 	</target>
- 
- 	<target name="build-exe-launcher"
--- 
-2.5.0
-
diff --git a/app-editors/jedit/files/jedit-5.4.0-build-xml.patch b/app-editors/jedit/files/jedit-5.4.0-build-xml.patch
deleted file mode 100644
index 6a686a6f4a72..000000000000
--- a/app-editors/jedit/files/jedit-5.4.0-build-xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -505,7 +505,7 @@
- 	</target>
- 
- 	<target name="build"
--		depends="init,retrieve,setup,compile,test"
-+		depends="init,retrieve,setup,compile"
- 		description="build the jEdit JAR-file with full debug-information">
- 		<mkdir dir="${jar.location}"/>
- 		<jar destfile="${jar.location}/${jar.filename}"
diff --git a/app-editors/jedit/jedit-5.2.0-r1.ebuild b/app-editors/jedit/jedit-5.2.0-r1.ebuild
deleted file mode 100644
index 956701724a06..000000000000
--- a/app-editors/jedit/jedit-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc test"
-
-inherit eutils java-pkg-2 java-ant-2 xdg-utils
-
-DESCRIPTION="Programmer's editor written in Java"
-HOMEPAGE="http://www.jedit.org"
-SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
-
-LICENSE="BSD GPL-2"
-KEYWORDS="amd64 ppc64 x86"
-SLOT="0"
-IUSE=""
-
-CDEPEND="
-	dev-java/bsh:0
-	dev-java/jsr305:0
-	dev-java/ant-contrib:0
-	dev-java/ant-apache-bsf:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.7"
-
-S="${WORKDIR}/jEdit"
-
-JEDIT_HOME="/usr/share/${PN}"
-
-java_prepare() {
-	mkdir -p lib/{ant-contrib,compile,default-plugins,scripting} || die
-
-	epatch "${FILESDIR}"/${P}-build-xml.patch
-
-	java-ant_xml-rewrite -f "${S}/build.xml" -c \
-		-e javadoc \
-		-a failonerror \
-		-v no || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_ANT_TASKS="ant-apache-bsf ant-contrib bsh"
-EANT_GENTOO_CLASSPATH="jsr305"
-EANT_EXTRA_ARGS="-Divy.jar.present=true -Divy.done=true"
-EANT_BUILD_TARGET="build"
-# TODO could build more docs, ie generate-doc-faq generate-doc-news
-# generate-doc-users-guide ua.
-EANT_DOC_TARGET="generate-javadoc"
-# in fact needed only for docs, but shouldn't hurt
-EANT_NEEDS_TOOLS="true"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install () {
-	dodir ${JEDIT_HOME}
-
-	cp -R build/${PN}.jar jars doc keymaps macros modes properties startup \
-		"${D}${JEDIT_HOME}" || die
-
-	java-pkg_regjar "${JEDIT_HOME}/${PN}.jar"
-
-	java-pkg_dolauncher "${PN}" --main org.gjt.sp.jedit.jEdit
-
-	use doc && java-pkg_dojavadoc build/classes/javadoc/api
-
-	make_desktop_entry ${PN} \
-		jEdit \
-		${JEDIT_HOME}/doc/${PN}.png \
-		"Development;Utility;TextEditor"
-
-	# keep the plugin directory
-	keepdir ${JEDIT_HOME}/jars
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	elog "The system directory for jEdit plugins is"
-	elog "${JEDIT_HOME}/jars"
-	elog "If you get plugin related errors on startup, first try updating them."
-}
-
-pkg_postrm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		xdg_desktop_database_update
-		elog "jEdit plugins installed into /usr/share/jedit/jars"
-		elog "(after installation of jEdit itself) haven't been"
-		elog "removed. To get rid of jEdit completely, you may"
-		elog "want to run"
-		elog ""
-		elog "    rm -r ${JEDIT_HOME}"
-	fi
-}
diff --git a/app-editors/jedit/jedit-5.4.0.ebuild b/app-editors/jedit/jedit-5.4.0.ebuild
deleted file mode 100644
index e38548dd3afe..000000000000
--- a/app-editors/jedit/jedit-5.4.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc test"
-
-inherit eutils java-pkg-2 java-ant-2 xdg-utils
-
-DESCRIPTION="Programmer's editor written in Java"
-HOMEPAGE="http://www.jedit.org"
-SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
-
-LICENSE="BSD GPL-2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-SLOT="0"
-
-CP_DEPEND="dev-java/jsr305:0"
-
-RDEPEND="
-	${CP_DEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="
-	${CP_DEPEND}
-	>=virtual/jdk-1.8
-	dev-java/ant-contrib:0
-	dev-java/ant-apache-bsf:0
-	dev-java/bsh:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/hamcrest-library:1.3
-	)"
-
-S="${WORKDIR}/jEdit"
-
-JEDIT_HOME="/usr/share/${PN}"
-
-src_prepare() {
-	mkdir -p lib/{ant-contrib,compile,default-plugins,scripting,test} || die
-
-	eapply "${FILESDIR}"/${P}-build-xml.patch
-
-	java-ant_xml-rewrite -f "${S}/build.xml" -c \
-		-e javadoc \
-		-a failonerror \
-		-v no || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_ANT_TASKS="ant-apache-bsf ant-contrib bsh"
-EANT_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3"
-EANT_EXTRA_ARGS="-Divy.jar.present=true -Divy.done=true"
-EANT_BUILD_TARGET="build"
-# TODO could build more docs, ie generate-doc-faq generate-doc-news
-# generate-doc-users-guide ua.
-EANT_DOC_TARGET="generate-javadoc"
-# in fact needed only for docs, but shouldn't hurt
-EANT_NEEDS_TOOLS="true"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install () {
-	dodir ${JEDIT_HOME}
-
-	cp -R build/${PN}.jar jars doc keymaps macros modes properties startup \
-		"${D}${JEDIT_HOME}" || die
-
-	java-pkg_regjar "${JEDIT_HOME}/${PN}.jar"
-
-	java-pkg_dolauncher "${PN}" --main org.gjt.sp.jedit.jEdit
-
-	use doc && java-pkg_dojavadoc build/classes/javadoc/api
-
-	make_desktop_entry ${PN} \
-		jEdit \
-		${JEDIT_HOME}/doc/${PN}.png \
-		"Development;Utility;TextEditor"
-
-	# keep the plugin directory
-	keepdir ${JEDIT_HOME}/jars
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	elog "The system directory for jEdit plugins is"
-	elog "${JEDIT_HOME}/jars"
-	elog "If you get plugin related errors on startup, first try updating them."
-}
-
-pkg_postrm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		xdg_desktop_database_update
-		elog "jEdit plugins installed into /usr/share/jedit/jars"
-		elog "(after installation of jEdit itself) haven't been"
-		elog "removed. To get rid of jEdit completely, you may"
-		elog "want to run"
-		elog ""
-		elog "    rm -r ${JEDIT_HOME}"
-	fi
-}
diff --git a/app-editors/jedit/metadata.xml b/app-editors/jedit/metadata.xml
deleted file mode 100644
index 8c0bf782641b..000000000000
--- a/app-editors/jedit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jedit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/jext-5.0-r2 b/app-editors/jext-5.0-r2
new file mode 100644
index 000000000000..70e8573fc39f
--- /dev/null
+++ b/app-editors/jext-5.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 dev-java/jython:2.7 dev-java/jgoodies-looks:1.2 dev-java/gnu-regexp:1 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A text editor written in Java
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/jext/
+IUSE=elibc_FreeBSD doc elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=|| ( GPL-2 JPython )
+RDEPEND=>=virtual/jre-1.6 dev-java/jython:2.7 dev-java/jgoodies-looks:1.2 dev-java/gnu-regexp:1 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=mirror://sourceforge/jext/jext-sources-5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b5c1a6dfee1d1abc26470765a14ad015
diff --git a/app-editors/jext/Manifest b/app-editors/jext/Manifest
deleted file mode 100644
index 6f2e87a41ec3..000000000000
--- a/app-editors/jext/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX jext-5.0-enum-as-keyword.patch 5908 BLAKE2B c89cf37e0c340de7fc8ac0594af2e89de5a7b226a55dc7815d70009ae841ca4ef6feaa1f1fa3023c534d53c869d1a3d26f038d203f7e8860196c6b42df0d5d96 SHA512 22e06e0d57a11add9ca97dbfab54d9e6be9ae3d0c9ef216b5884a415d1c1f700cd86faf321a29852fca027ed05d9b5cd931b2febeba02a942c1b89bcb71372bf
-AUX jext-pre 2824 BLAKE2B 3356902e537037b6bdfa9157dd3756e701513681c609f47571ce3360ed5d1da798fc3a516446c6f82f2171d6b8664e4fb7f3bd17ac97fdc5ad760ad717e3c415 SHA512 f98efa43110d295a425750603dc59d94d734ba52a86323c908ebb50f60de36096c76a9b8c4f2572e60b57a256cf0b517636679e7e88062ae074872e767c3016f
-DIST jext-sources-5.0.tar.gz 1029772 BLAKE2B 632fca6aa3ff55979f1dee9fefd1505e0e19b38ca1ee0530472edd9fee95157df9cba56abb4ce4790807766d318a6d0ce29decb9b4a73d103bfe8127886fdf9d SHA512 ac66babfca05d112541e40b0aa8ebde33a69a3a97f42966be24a28232d3c100b9fe8007e26618909fd78111d3eb4ddecc2258599bff40e0e1959ea6632f43682
-EBUILD jext-5.0-r2.ebuild 1634 BLAKE2B 8f7108b1aead847906c387c923e893135944d383a0a63ab051e743d03151b02479ae829cf3ed55b92b0e62a80e06504926a04129cf657756aaa655810ad12bc9 SHA512 ca52e4d778e2052931ead7c8d0af6f1379afb0d3cf3026e3f017c5bbb566b03287f36c352f6f937688454e371eb9b4eb27dc7e9e8d6961057c53e394ab3cc023
-MISC metadata.xml 310 BLAKE2B d9dca671dbd1763f6dde0d2553f42101b997bb8f8c8839b869d71c3cbe3e80a3204427bce32759569f21b8e7b804ec60dbe1e1bff07117c37f9963a3031fb1c3 SHA512 ed4dde3976952248a6abb4a921a09572bf52a0a3da8fbab99c16986593d7b40a058645557d6d80e43e8db6414d5d3296bb3f5cd034d88b91dbc96b8743f72f16
diff --git a/app-editors/jext/files/jext-5.0-enum-as-keyword.patch b/app-editors/jext/files/jext-5.0-enum-as-keyword.patch
deleted file mode 100644
index c773e571d182..000000000000
--- a/app-editors/jext/files/jext-5.0-enum-as-keyword.patch
+++ /dev/null
@@ -1,173 +0,0 @@
---- src/lib/org/gjt/sp/jedit/textarea/InputHandler.java.orig	2015-07-03 17:52:13.843000000 +0000
-+++ src/lib/org/gjt/sp/jedit/textarea/InputHandler.java	2015-07-03 17:52:59.746000000 +0000
-@@ -141,10 +141,10 @@
-    */
-   public static String getActionName(ActionListener listener)
-   {
--    Enumeration enum = getActions();
--    while(enum.hasMoreElements())
-+    Enumeration myEnum = getActions();
-+    while(myEnum.hasMoreElements())
-     {
--      String name = (String)enum.nextElement();
-+      String name = (String)myEnum.nextElement();
-       ActionListener _listener = getAction(name);
-       if(_listener == listener)
-         return name;
---- src/lib/org/jext/options/OptionsDialog.java.orig	2015-07-03 17:54:19.179000000 +0000
-+++ src/lib/org/jext/options/OptionsDialog.java	2015-07-03 17:54:33.377000000 +0000
-@@ -297,11 +297,11 @@
- 
-   private void addOptionGroup(OptionGroup child, OptionGroup parent)
-   {
--    ArrayList enum = child.getMembers();
-+    ArrayList myEnum = child.getMembers();
- 
--    for (int i = 0; i < enum.size(); i++)
-+    for (int i = 0; i < myEnum.size(); i++)
-     {
--      Object elem = enum.get(i);
-+      Object elem = myEnum.get(i);
- 
-       if (elem instanceof OptionPane)
-       {
-@@ -669,4 +669,4 @@
- 
- }
- 
--// End of OptionsDialog.java
-\ No newline at end of file
-+// End of OptionsDialog.java
---- src/lib/org/jext/misc/VirtualFolders.java.orig	2015-07-03 17:49:57.731000000 +0000
-+++ src/lib/org/jext/misc/VirtualFolders.java	2015-07-03 17:51:11.418000000 +0000
-@@ -233,10 +233,10 @@
-         ret.append(crlf).append("<folderlist>");
-       }
- 
--      Enumeration enum = parent.children();
--      while (enum.hasMoreElements())
-+      Enumeration myEnum = parent.children();
-+      while (myEnum.hasMoreElements())
-       {
--        VirtualFolderNode child = (VirtualFolderNode) enum.nextElement();
-+        VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement();
-         ret.append(toXML(child, depth + 1));
-       }
- 
-@@ -317,20 +317,20 @@
- 
-   private void fixVisible()
-   {
--    Enumeration enum = root.depthFirstEnumeration();
-+    Enumeration myEnum = root.depthFirstEnumeration();
-     VirtualFolderNode node = null;
--    while (enum.hasMoreElements())
-+    while (myEnum.hasMoreElements())
-     {
- 
--      node = (VirtualFolderNode)enum.nextElement();
-+      node = (VirtualFolderNode)myEnum.nextElement();
-       TreePath path = new TreePath(node.getPath());
-       tree.collapsePath(path);
-     }
- 
--    enum = root.depthFirstEnumeration();
--    while (enum.hasMoreElements())
-+    myEnum = root.depthFirstEnumeration();
-+    while (myEnum.hasMoreElements())
-     {
--      node = (VirtualFolderNode)enum.nextElement();
-+      node = (VirtualFolderNode)myEnum.nextElement();
-       if (node.shouldBeVisible())
-       {
-         TreePath path = new TreePath(((VirtualFolderNode)node.getParent()).getPath());
-@@ -392,10 +392,10 @@
-   public static boolean folderExists(VirtualFolderNode parent, String name)
-   {
-     boolean exists = false;
--    Enumeration enum = parent.children();
--    while ((enum.hasMoreElements()) && !exists)
-+    Enumeration myEnum = parent.children();
-+    while ((myEnum.hasMoreElements()) && !exists)
-     {
--      VirtualFolderNode child = (VirtualFolderNode) enum.nextElement();
-+      VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement();
-       exists = child.toString().equals(name);
-     }
-     return exists;
-@@ -526,10 +526,10 @@
-     } else {
-       if (fromMenu)
-       {
--        Enumeration enum = node.children();
--        while (enum.hasMoreElements())
-+        Enumeration myEnum = node.children();
-+        while (myEnum.hasMoreElements())
-         {
--          VirtualFolderNode child = (VirtualFolderNode) enum.nextElement();
-+          VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement();
-           openNode(child, fromMenu);
-         }
-       }
---- src/lib/com/microstar/xml/XmlParser.java.orig	2015-07-03 17:41:23.209000000 +0000
-+++ src/lib/com/microstar/xml/XmlParser.java	2015-07-03 17:46:30.296000000 +0000
-@@ -1346,7 +1346,7 @@
-   {
-     String name;
-     int type;
--    String enum = null;
-+    String myEnum = null;
- 
- 				// Read the attribute name.
-     name = readNmtoken(true);
-@@ -1358,12 +1358,12 @@
- 				// Get the string of enumerated values
- 				// if necessary.
-     if (type == ATTRIBUTE_ENUMERATED || type == ATTRIBUTE_NOTATION) {
--      enum = dataBufferToString();
-+      myEnum = dataBufferToString();
-     }
- 
- 				// Read the default value.
-     requireWhitespace();
--    parseDefault(elementName, name, type, enum);
-+    parseDefault(elementName, name, type, myEnum);
-   }
- 
- 
-@@ -1451,7 +1451,7 @@
-     * Parse the default value for an attribute.
-     * [62] Default ::= '#REQUIRED' | '#IMPLIED' | ((%'#FIXED' S)? %AttValue
-     */
--  void parseDefault (String elementName, String name, int type, String enum)
-+  void parseDefault (String elementName, String name, int type, String myEnum)
-     throws java.lang.Exception
-   {
-     int valueType = ATTRIBUTE_DEFAULT_SPECIFIED;
-@@ -1477,7 +1477,7 @@
-       value = readLiteral(LIT_CHAR_REF);
-       context = CONTEXT_DTD;
-     }
--    setAttribute(elementName, name, type, enum, value, valueType);
-+    setAttribute(elementName, name, type, myEnum, value, valueType);
-   }
- 
- 
-@@ -2714,7 +2714,7 @@
-     * - int value type
-     * *TODO: do something with attribute types.
-     */
--  void setAttribute (String elName, String name, int type, String enumeration,
-+  void setAttribute (String elName, String name, int type, String myEnum,
- 		     String value, int valueType)
-     throws java.lang.Exception
-   {
-@@ -2736,7 +2736,7 @@
-       attribute[0] = new Integer(type);
-       attribute[1] = value;
-       attribute[2] = new Integer(valueType);
--      attribute[3] = enumeration;
-+      attribute[3] = myEnum;
-       attribute[4] = null;
-       attlist.put(name.intern(), attribute);
- 
diff --git a/app-editors/jext/files/jext-pre b/app-editors/jext/files/jext-pre
deleted file mode 100644
index 5a02d4b71db8..000000000000
--- a/app-editors/jext/files/jext-pre
+++ /dev/null
@@ -1,91 +0,0 @@
-# This script launches Jext, the Java text editor.
-# It checks for a $HOME/.jext directory and eventually creates it.
-# Next it checks for a /etc/jextrc and $JEXT_CONFFILE (~/.jext/variables) files which define the JEXT_HOME JAVA_CMD JAVA_OPT CLASSPATH and ToShow variables. The first is system wide(used in RPM install mainly), the second is per user.
-# If this file doesn't exist the script creates it by asking the options to the user.
-
-# Sharpshooter 23/02/2002
-# Blaisorblade 18/11/2002
-
-#For special cases about different config files(for developers with working
-#copy and an unstable one to be tested).
-if [ "$JEXT_CONFFILE" = "" ]
-then
-	JEXT_CONFFILE=~/.jext/variables
-fi
-
-# Help
-if  [ "$1" = "--help" -o "$1" = "-h" ]
-then
-	echo "This script launch Jext the Java text editor."
-	echo "Usage : $0 [--reconf] [files]"
-	echo "--reconf 		doesn't start jext but clears the"
-	echo "			$JEXT_CONFFILE file with the settings to start jext"
-	echo "			(jext & java location and jext options)."
-	exit 0
-fi
-
-if [ "$1" = "--reconf" ]
-then
-	echo "Clearing $JEXT_CONFFILE, you'll have to reenter jext & java \
-interpreter location"
-	rm -f "$JEXT_CONFFILE"
-	exit 0
-fi
-
-
-# Check for the user's ~/.jext directory.
-if ! [ -d ~/.jext ]
-then
-	echo "It seems you don't have a .jext directory in your home dir."
-	echo "I create it."
-	echo
-	mkdir -p ~/.jext/xinsert
-fi
-
-
-
-# Check for the $HOME/.jext/variables file.
-if ! [ -f $JEXT_CONFFILE -o -f /etc/jextrc ]
-then
-	#Let's add some explaination in the config file.
-	cat >$JEXT_CONFFILE <<EOM
-#This is included when launching Jext. It is a normal shell script \
-used to define env vars
-#Meanings of settings:
-#JEXT_HOME The home dir of jext(under which it finds the lib and so on dirs)
-#JAVA_CMD The complete path for the java command
-#JAVA_OPT The options to be passed to the java command(not to Jext itself!)
-#CLASSPATH The extra classpath to be specified(for cases such as AntWork plugin)
-#ToShow If this is set to y the output is not redirected to /dev/null;
-# Mainly for developers who want to trace Jext output(you could also use
-# the DickTracy plugin).
-EOM
-#----
-	JEXT_HOME="/usr/share/jext/lib"
-	echo "JEXT_HOME="$JEXT_HOME >> $JEXT_CONFFILE
-#----
-	ToShow=
-	echo "ToShow="$ToShow>>$JEXT_CONFFILE
-fi
-
-# Extract the contents of the $JEXT_CONFFILE file.
-[ -f /etc/jextrc ] && source /etc/jextrc
-[ -f $JEXT_CONFFILE ] && source $JEXT_CONFFILE
-
-#Needed to make Jext find his plugins(it searches them in `pwd`/plugins)
-for i in $@
-do
-  if [ "${i:0:1}" != "/" -a "${i:0:1}" != "-" ]; then #If the first char of $i is not a / then
-    files="$files `pwd`/$i"      #it is a relative path so we must make it absolute.
-  elif [ "$i" != "-" ]; then
-    files="$files $i"
-  else
-    case "$i" in
-      --reconf|--help|-h)
-      ;;
-      *)
-        files="$files $i"
-      ;;
-    esac
-  fi
-done
diff --git a/app-editors/jext/jext-5.0-r2.ebuild b/app-editors/jext/jext-5.0-r2.ebuild
deleted file mode 100644
index 2f7cae2e4a85..000000000000
--- a/app-editors/jext/jext-5.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A text editor written in Java"
-HOMEPAGE="https://sourceforge.net/projects/jext/"
-MY_PV="${PV/_}"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-sources-${MY_PV}.tar.gz"
-LICENSE="|| ( GPL-2 JPython )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-java/jython:2.7
-	dev-java/jgoodies-looks:1.2
-	dev-java/gnu-regexp:1"
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}-src-${MY_PV}"
-
-# Necessary otherwise it chokes on compiling with jdk-1.8
-# due to unmappable characters.
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-java_prepare() {
-	# bundles some com.microstar.xml who knows what's that
-	# also com.jgoodies.uif_lite which is apparently some jgoodies-looks
-	# example code which we don't package and there is probably no point
-	rm -v "${S}"/extplugins/Admin/*.jar || die
-	rm -rf src/lib/gnu || die
-
-	# Fix "enum as a keyword" error.
-	epatch "${FILESDIR}"/"${P}"-enum-as-keyword.patch
-}
-
-src_compile() {
-	cd "${S}/src" || die
-	eant jar $(use_doc javadocs) \
-		-Dclasspath="$(java-pkg_getjars jython-2.7,jgoodies-looks-1.2,gnu-regexp-1)"
-}
-
-src_install () {
-	java-pkg_newjar lib/${P}.jar
-	java-pkg_dojar lib/dawn*.jar
-
-	java-pkg_dolauncher ${PN} \
-		--main org.jext.Jext \
-		--java_args '-Dpython.path=$(java-config --classpath=jython-2.7)' \
-		-pre "${FILESDIR}/${PN}-pre"
-
-	if use doc; then
-		java-pkg_dohtml -r docs/api
-	fi
-}
-
-pkg_postinst() {
-	elog "Plugins are currently not built/installed. Patches welcome."
-}
diff --git a/app-editors/jext/metadata.xml b/app-editors/jext/metadata.xml
deleted file mode 100644
index 1db813e89d5f..000000000000
--- a/app-editors/jext/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jext</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/joe-4.2 b/app-editors/joe-4.2
new file mode 100644
index 000000000000..50d570775f60
--- /dev/null
+++ b/app-editors/joe-4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst prepare
+DEPEND=>=sys-libs/ncurses-5.2-r2
+DESCRIPTION=A free ASCII-Text Screen Editor for UNIX
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/joe-editor/
+IUSE=xterm
+KEYWORDS=alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+LICENSE=GPL-1+ CC-BY-3.0
+RDEPEND=xterm? ( >=x11-terms/xterm-239 )
+SLOT=0
+SRC_URI=mirror://sourceforge/joe-editor/joe-4.2.tar.gz
+_md5_=a2e001ee0cccacd8c329b75de950f9bf
diff --git a/app-editors/joe-4.3-r1 b/app-editors/joe-4.3-r1
new file mode 100644
index 000000000000..fedfaef2151d
--- /dev/null
+++ b/app-editors/joe-4.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=postinst prepare
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A free ASCII-Text Screen Editor for UNIX
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/joe-editor/
+IUSE=xterm
+KEYWORDS=alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+LICENSE=GPL-1+ CC-BY-3.0
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= xterm? ( >=x11-terms/xterm-239 )
+SLOT=0
+SRC_URI=mirror://sourceforge/joe-editor/joe-4.3.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=548536519757ec77d724b658c34c0714
diff --git a/app-editors/joe-4.4 b/app-editors/joe-4.4
new file mode 100644
index 000000000000..b8e093d42e91
--- /dev/null
+++ b/app-editors/joe-4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=postinst prepare
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A free ASCII-Text Screen Editor for UNIX
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/joe-editor/
+IUSE=xterm
+KEYWORDS=alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+LICENSE=GPL-1+ CC-BY-3.0
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= xterm? ( >=x11-terms/xterm-239 )
+SLOT=0
+SRC_URI=mirror://sourceforge/joe-editor/joe-4.4.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=548536519757ec77d724b658c34c0714
diff --git a/app-editors/joe-4.6 b/app-editors/joe-4.6
new file mode 100644
index 000000000000..5ce3be15d04b
--- /dev/null
+++ b/app-editors/joe-4.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=postinst postrm prepare
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=A free ASCII-Text Screen Editor for UNIX
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/joe-editor/
+IUSE=xterm
+KEYWORDS=alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+LICENSE=GPL-1+ CC-BY-3.0
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= xterm? ( >=x11-terms/xterm-239 )
+SLOT=0
+SRC_URI=mirror://sourceforge/joe-editor/joe-4.6.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2b59998ec994c407b10da4639dfcfc3a
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
deleted file mode 100644
index 6cfbb4573155..000000000000
--- a/app-editors/joe/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX joe-4.3-tinfo.patch 1063 BLAKE2B 574f78a31200df60dab81fea278bb238fbfe0a2b3f70f1f9a2ed78f3ae7a6e7a5d979fec61ad3ed9934aece27ce7836730e7f9755a7f25225dd74928c5454694 SHA512 93db2de58d2a03412cae7dc2b2769103f3ad275b68e22d6e3379871155656c8d4d4f29fbf014c6c8eb5b70ec234189af52a6b6b6826bfde46d6ee93b92f55bcd
-AUX joe-4.6-db.patch 392 BLAKE2B 8ca4d25a1e1be76b87e581720903064f4a54b928c6c7a91991d6ae6227df00e4b13c6c9fa3ac47563f5924c5e9aa18a86f1cb471155d8ca8fccc67e151f7bada SHA512 47eeffc203879ae7a644ef3875bda41c7bd776a51fcf7f6e9d4a30a5e5f0209d1067b516efcd5faac3ecf2fb204e0105eb9cc453df5c853413a613cfdb6e4fc6
-DIST joe-4.2.tar.gz 1341048 BLAKE2B 112163e67311051dad8714e19cdee1a11ff3bbe297341c89a4023f7d68fac7eecde57d1d522f72407b0a77c227c7af424ce20567c0c47dea6c14ac41f2f2301b SHA512 7c34f4467d89330ac195cfa76481d9ede4ee3764d0b1b24d091d1e6325bff451d2a9bc9f86a73404c9909587bcbe3e0c14511b739ec121edb7595ea1fcba028f
-DIST joe-4.3.tar.gz 1270523 BLAKE2B 442e05dd29a0a8d4a26500c89a2cafee88bf2d1ed00a4cb539d940e2e849456e6c4c5bf347b4803ee02ab38311b225cc8034177a1e0b7a1967a2629fd283b7e2 SHA512 a711ce129518863856b8f581ac7acdd7661f5e571cb77c5411317e0db0344c9ba44e73ec2ca9a307e639170a7914d53352eebcd00a33c9270809551f12376e69
-DIST joe-4.4.tar.gz 1350062 BLAKE2B eb58117e313ef4abc31026a2800f2b9258c12d0d865c768138ec42a97c1f7fedcd8e397f7aaf13f8bb3776f2571d5a85e27ea7f9a6fbd6710d935a2b80afcd1f SHA512 ef31443dda30569c5193cd1907e06f1caba349f746dedf3611b5527080e49a4026001d3d06629f3c9c712ae9265866efbdbba6f51d110c0e6ee95f39f0e3059d
-DIST joe-4.6.tar.gz 1895046 BLAKE2B fbf53d3b5b066cb32bb26b08d7d314a3bb89ac5ae22db498cdf3597bf8cb322bd9aa05543debd47ac7380a33982c388e13f38c60747503494c582393ae8eb13d SHA512 3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82
-EBUILD joe-4.2.ebuild 1170 BLAKE2B c1d8e1c49a3cbcc8dba6c6d679bb0b7e543e5b7ce5b2cde63c5a1970d1c4e2312f751323d4ebcddf1612465e526551756528548db4f4aeb04c93e14df2acfd6a SHA512 e0b51d75d14eb5bc34fd8628ce36f77cb4154965fe8189fccbb2d5d4a4dc746f6ccee09b13a50347a532619b06f13ec254c0c1fd37caaefa9886ca1e6e8504c9
-EBUILD joe-4.3-r1.ebuild 1303 BLAKE2B 7359e4551103885dc2f31f6a0813095bc08b04db37697beb90b1ef89fd682352e8cf835a638dd14fb10016ff49716a34e2623f4f60c632cabe8e9709d0c87301 SHA512 a93ff4ceea8a3fabca0b5c8ffbe0a610ccb446e6ab77ac161c4b6b4a6d63b6ba72fbc7328e0f3b6973ed8808909de0751499d696a2b2e76c705852086ef73d5a
-EBUILD joe-4.4.ebuild 1303 BLAKE2B 7359e4551103885dc2f31f6a0813095bc08b04db37697beb90b1ef89fd682352e8cf835a638dd14fb10016ff49716a34e2623f4f60c632cabe8e9709d0c87301 SHA512 a93ff4ceea8a3fabca0b5c8ffbe0a610ccb446e6ab77ac161c4b6b4a6d63b6ba72fbc7328e0f3b6973ed8808909de0751499d696a2b2e76c705852086ef73d5a
-EBUILD joe-4.6.ebuild 1473 BLAKE2B 68c33a26c049a333012daed4dc3cbe96b5c3594c77381747178a35c44445d620bdc6d52e4e1bac66cffeb4d9a9d7c407ade8951c6d74fca76e8454198b1518a6 SHA512 6b46979a7aad8f18a08c8df1172ace41f0baffefae79c5fed7f8d3aa3905d2948ae576dd633ca4df47ce1fb0f234606ba8ad8a44508712651048bb6b8bc144ec
-MISC metadata.xml 914 BLAKE2B 9af1e6230a119f778ed4404922ba650ceadb0ae58966cefd2df8b4424efd2b813a5c9805a1796623028308172fc9bf94b6effc9b9b7f34b0d1de9c484150a8eb SHA512 12324115a08719acf2377848a9cb930b4ad69764624a1cf093e4ef3e124fef85e059476a0f1b353314a03d97089fe0c518adf47f2da102f7492a1e612c420b15
diff --git a/app-editors/joe/files/joe-4.3-tinfo.patch b/app-editors/joe/files/joe-4.3-tinfo.patch
deleted file mode 100644
index fd259e183fd0..000000000000
--- a/app-editors/joe/files/joe-4.3-tinfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Lars Wendler <polynomial-c@gentoo.org>
-# Date 1473084371 -7200
-#      Mon Sep 05 16:06:11 2016 +0200
-# Node ID ae8afbceeed4e446a63ad3111291a98d1390ade2
-# Parent  57c0a14aedcb8eef82d5828721b55aac02847ee7
-configure.ac: search for ncurses' tinfo library if available
-
-ncurses can be built to split out the lowlevel terminfo library
-from ncurses library. In this case there's a libtinfo.so file
-alongside the usual libncurses*.so files.
-This patch adds tinfo to AC_SEARCH_LIBS when ncurses support
-is enabled. Without this patch configure silently fails to find
-tgetflag and thus does not link to ncurses at all.
-I've tested this change on both, ncurses with separate tinfo lib
-and ncurses without separate tinfo lib and in both cases joe
-successfully links against ncurses.
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -39,7 +39,7 @@
- 	curses=$enableval, curses=yes)
- 
- if test "$curses" = "yes"; then
--	search_libs="ncurses curses"
-+	search_libs="tinfo ncurses curses"
- fi
- 
- AC_ARG_ENABLE(termcap,
diff --git a/app-editors/joe/files/joe-4.6-db.patch b/app-editors/joe/files/joe-4.6-db.patch
deleted file mode 100644
index 6270e9045cd8..000000000000
--- a/app-editors/joe/files/joe-4.6-db.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/desktop/Makefile.am	2018-01-15 12:01:12.624449958 +0100
-+++ b/desktop/Makefile.am	2018-01-15 12:01:38.964448343 +0100
-@@ -1,8 +1,2 @@
- desktopdir = $(datarootdir)/applications
- dist_desktop_DATA = joe.desktop jmacs.desktop jstar.desktop jpico.desktop
--
--update-databases:
--	-update-desktop-database $(desktopdir)
--
--install-data-hook: update-databases
--uninstall-hook: update-databases
diff --git a/app-editors/joe/joe-4.2.ebuild b/app-editors/joe/joe-4.2.ebuild
deleted file mode 100644
index 750368519c35..000000000000
--- a/app-editors/joe/joe-4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
-HOMEPAGE="https://sourceforge.net/projects/joe-editor/"
-SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
-
-LICENSE="GPL-1+ CC-BY-3.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="xterm"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-RDEPEND="xterm? ( >=x11-terms/xterm-239 )"
-
-DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
-
-src_prepare() {
-	default
-	# Enable xterm mouse support in the rc files
-	if use xterm; then
-		cd "${S}"/rc
-		for i in *rc*.in; do
-			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die "sed failed"
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use xterm; then
-		elog "To enable full xterm clipboard you need to set the allowWindowOps"
-		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
-		elog "This is false by default due to potential security problems on some"
-		elog "architectures (see bug #91453)."
-	fi
-}
diff --git a/app-editors/joe/joe-4.3-r1.ebuild b/app-editors/joe/joe-4.3-r1.ebuild
deleted file mode 100644
index 89f4fbd78d42..000000000000
--- a/app-editors/joe/joe-4.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
-HOMEPAGE="https://sourceforge.net/projects/joe-editor/"
-SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
-
-LICENSE="GPL-1+ CC-BY-3.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="xterm"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0="
-RDEPEND="${DEPEND}
-	xterm? ( >=x11-terms/xterm-239 )"
-
-DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
-
-PATCHES=( "${FILESDIR}/${PN}-4.3-tinfo.patch" )
-
-src_prepare() {
-	default
-	# Enable xterm mouse support in the rc files
-	if use xterm; then
-		pushd "${S}"/rc &>/dev/null || die
-		local i
-		for i in *rc*.in; do
-			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die
-		done
-		popd &>/dev/null
-	fi
-	eautoreconf
-}
-
-pkg_postinst() {
-	if use xterm; then
-		elog "To enable full xterm clipboard you need to set the allowWindowOps"
-		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
-		elog "This is false by default due to potential security problems on some"
-		elog "architectures (see bug #91453)."
-	fi
-}
diff --git a/app-editors/joe/joe-4.4.ebuild b/app-editors/joe/joe-4.4.ebuild
deleted file mode 100644
index 89f4fbd78d42..000000000000
--- a/app-editors/joe/joe-4.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
-HOMEPAGE="https://sourceforge.net/projects/joe-editor/"
-SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
-
-LICENSE="GPL-1+ CC-BY-3.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="xterm"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0="
-RDEPEND="${DEPEND}
-	xterm? ( >=x11-terms/xterm-239 )"
-
-DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
-
-PATCHES=( "${FILESDIR}/${PN}-4.3-tinfo.patch" )
-
-src_prepare() {
-	default
-	# Enable xterm mouse support in the rc files
-	if use xterm; then
-		pushd "${S}"/rc &>/dev/null || die
-		local i
-		for i in *rc*.in; do
-			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die
-		done
-		popd &>/dev/null
-	fi
-	eautoreconf
-}
-
-pkg_postinst() {
-	if use xterm; then
-		elog "To enable full xterm clipboard you need to set the allowWindowOps"
-		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
-		elog "This is false by default due to potential security problems on some"
-		elog "architectures (see bug #91453)."
-	fi
-}
diff --git a/app-editors/joe/joe-4.6.ebuild b/app-editors/joe/joe-4.6.ebuild
deleted file mode 100644
index 73407dbf4711..000000000000
--- a/app-editors/joe/joe-4.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils
-
-DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
-HOMEPAGE="https://sourceforge.net/projects/joe-editor/"
-SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
-
-LICENSE="GPL-1+ CC-BY-3.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="xterm"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0="
-RDEPEND="${DEPEND}
-	xterm? ( >=x11-terms/xterm-239 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3-tinfo.patch"
-	"${FILESDIR}/${P}-db.patch"
-)
-
-DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
-
-src_prepare() {
-	default
-	# Enable xterm mouse support in the rc files
-	if use xterm; then
-		pushd "${S}"/rc &>/dev/null || die
-		local i
-		for i in *rc*.in; do
-			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die
-		done
-		popd &>/dev/null
-	fi
-	eautoreconf
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-	if use xterm; then
-		elog "To enable full xterm clipboard you need to set the allowWindowOps"
-		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
-		elog "This is false by default due to potential security problems on some"
-		elog "architectures (see bug #91453)."
-	fi
-}
-
-pkg_postrm(){
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-editors/joe/metadata.xml b/app-editors/joe/metadata.xml
deleted file mode 100644
index 9fd1399650ee..000000000000
--- a/app-editors/joe/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-            <email>amynka@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-  JOE (Joe's own editor) has the feel of most IBM PC text editors: The
-  key-sequences are reminiscent of WordStar and Turbo-C. JOE is much more
-  powerful than those editors, however. JOE has all of the features a UNIX
-  user should expect: full use of termcap/terminfo, excellent screen update
-  optimizations, simple installation, and all of the UNIX-integration features
-  of VI.
-</longdescription> 
-<use>
-  <flag name="xterm">Enable full xterm clipboard support</flag>
-</use>
-<upstream>
-  <remote-id type="sourceforge">joe-editor</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/app-editors/jove-4.16.0.73 b/app-editors/jove-4.16.0.73
new file mode 100644
index 000000000000..40807cfe5b53
--- /dev/null
+++ b/app-editors/jove-4.16.0.73
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses virtual/pkgconfig
+DESCRIPTION=Jonathan's Own Version of Emacs, a light emacs-like editor without LISP bindings
+EAPI=4
+HOMEPAGE=ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/
+IUSE=doc
+KEYWORDS=amd64 ppc x86
+LICENSE=JOVE
+RDEPEND=sys-libs/ncurses
+SLOT=0
+SRC_URI=ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/jove4.16.0.73.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0f5832cf466402d06b6ce5ea2fdbc75e
diff --git a/app-editors/jove/Manifest b/app-editors/jove/Manifest
deleted file mode 100644
index 0f74ef83eeeb..000000000000
--- a/app-editors/jove/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX jove-4.16.0.70.3.1-getline.patch 2058 BLAKE2B 53ac9a8221ed311e0b854b0e573f51c4fef0082a8b3969b7236ff3c8919bfe4fd6b1e91c6c03de8c8669118b8f7428a87b7737426ff3b67bc0f146d9e33ae83b SHA512 2481e0e69f35e128cc07e4782abff07b3aab8f9bbe7ee72304e2abccbacb481ded1b5088b626df32ea43978c52e91565257a4665a26dc4df5fc277079b42b382
-AUX jove-4.16.0.73-build.patch 5776 BLAKE2B 0b147601d48499076ae19a438861ca971142b8582228be3ad93ba4dc3ff2d2f36e85631152e681752405cdef9d077ffbd8503dc593f20bba79aaccc4bf73a77a SHA512 11398bf31dc4986f0708cd3321f0069d9af6a00c532431554b4433588be528f41b9003286e1d2300d74b314f05fc310aab8ed80fab22579c071cdd43d0a90d22
-AUX jove-4.16.0.73-doc.patch 1004 BLAKE2B 64f69c7ad34f71dcfb9ccd4e15c40c408c2a79e31e490f6e3a951ccae76e439939442fcca4d4a94d44bdb45166f2ba3a8bd0403e9b07a427d89f54073aee8171 SHA512 c15d8ffc92292e8284aebe93311c14e5d157d25e75c2228497faf1121e370e738ee345f27cce187196fceb4eb26c3222a4b39f734deb13ff14b2a044225a715d
-AUX jove-4.16.0.73-sendmail.patch 675 BLAKE2B a4a7126f215dabfde8bc47b2b9539c90f6ffd1c1e89dd33a2e7e2dcaf9f4b202b1e8a807560ea898ee0df9e778ee3af2f16c3c8e4e22f44675712464bba5d121 SHA512 a0c7179b601c620aad5b6bea5e07ff620bec14d27c1f8b27b0a25cb8cd687066abacf2786a00d79913087c2c5330da99e154f325b39243e9a19323a5c7729f10
-DIST jove4.16.0.73.tgz 465214 BLAKE2B cc1eeca2cdbd7ca98a5deaf27c37bfcdc529f2b388361e0cd5fd6278b72740a06283abd1f60212e6dc0d1e540e4dc4d99edb99b781645b13e1675644db0f38eb SHA512 2198504f9a23590710acba7f27661fa5649fdbed559a4c6bde9d2c1d673c22ce7d99a690be45a4602d37cf6e70399230c4ae3a251d8451af0c5252bdca61b09d
-EBUILD jove-4.16.0.73.ebuild 1106 BLAKE2B 13a7eaea327674fe90280d76fda7109cf9871a392150523f8b44353125eedb278b4e2b1dded62facbd2d2c09b2a5d4fda71886de77fbaaf52a9ea1d1fd2b4244 SHA512 f17f5e08d15c87203de69a31ebbfa8ad0574c1b258eb3e0b916d583d7163d74576f7e2c6886fdfdae7abb79d0c198e0e8aba0894044ac84e09742dbaf971c3d4
-MISC metadata.xml 623 BLAKE2B df929d3bcce78952076b8e17a79604f11f36dc57d2a49068838871590fa77f2c85499e4a8e66a71466d7488476a02744e651a9cdf18e8de92346521b7dd30674 SHA512 33f559b386d5163174eaf5c39ebabbecb886b822dc9db5d2d3a12449a1ec737a560956e8880dbabdf84c5ffe0486f76ef2eac55cd58c9c3406a153dc4d603788
diff --git a/app-editors/jove/files/jove-4.16.0.70.3.1-getline.patch b/app-editors/jove/files/jove-4.16.0.70.3.1-getline.patch
deleted file mode 100644
index 98cef6011f8c..000000000000
--- a/app-editors/jove/files/jove-4.16.0.70.3.1-getline.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-http://bugs.gentoo.org/274352
-Fix build failure with glibc-2.10
-
---- jove4.16.0.70-orig/insert.c
-+++ jove4.16.0.70/insert.c
-@@ -504,7 +504,7 @@
- 		atchar = 0;
- 	}
- 
--	getline(atline->l_dline, genbuf);
-+	get_line(atline->l_dline, genbuf);
- 	atchar += tchar;
- 	linecopy(genbuf, atchar, save);
- 	atline->l_dline = putline(genbuf);
---- jove4.16.0.70-orig/io.c
-+++ jove4.16.0.70/io.c
-@@ -1347,9 +1347,9 @@
- 
- void
- #ifdef USE_PROTOTYPES
--getline proto((daddr addr, register char *buf))
-+get_line proto((daddr addr, register char *buf))
- #else
--getline(addr, buf)
-+get_line(addr, buf)
- daddr	addr;
- register char	*buf;
- #endif
---- jove4.16.0.70-orig/io.h
-+++ jove4.16.0.70/io.h
-@@ -40,7 +40,7 @@
- 	close_file proto((File *fp)),
- 	d_cache_init proto((void)),
- 	file_write proto((char *fname, bool app)),
--	getline proto((daddr addr, char *buf)),
-+	get_line proto((daddr addr, char *buf)),
- 	lsave proto((void)),
- 	putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)),
- 	read_file proto((char *file, bool is_insert)),
---- jove4.16.0.70-orig/recover.c
-+++ jove4.16.0.70/recover.c
-@@ -165,7 +165,7 @@
- private char	*getblock proto((daddr atl));
- 
- void
--getline(tl, buf)
-+get_line(tl, buf)
- daddr	tl;
- char	*buf;
- {
-@@ -580,7 +580,7 @@
- 	Nchars = Nlines = 0L;
- 	while (--nlines >= 0) {
- 		addr = getaddr(ptrs_fp);
--		getline(addr, buf);
-+		get_line(addr, buf);
- 		Nlines += 1;
- 		Nchars += 1 + strlen(buf);
- 		fputs(buf, out);
---- jove4.16.0.70-orig/util.c
-+++ jove4.16.0.70/util.c
-@@ -280,7 +280,7 @@
- 			strcpy(buf, linebuf);
- 		Jr_Len = strlen(linebuf);
- 	} else
--		getline(line->l_dline, buf);
-+		get_line(line->l_dline, buf);
- 	return buf;
- }
- 
---- jove4.16.0.70-orig/util.h
-+++ jove4.16.0.70/util.h
-@@ -18,7 +18,7 @@
- #define eobp()		(lastp(curline) && eolp())
- #define eolp()		(linebuf[curchar] == '\0')
- #define firstp(line)	((line) == curbuf->b_first)
--#define getDOT()	getline(curline->l_dline, linebuf)
-+#define getDOT()	get_line(curline->l_dline, linebuf)
- #define lastp(line)	((line) == curbuf->b_last)
- 
- extern UnivPtr
diff --git a/app-editors/jove/files/jove-4.16.0.73-build.patch b/app-editors/jove/files/jove-4.16.0.73-build.patch
deleted file mode 100644
index 105d163d32be..000000000000
--- a/app-editors/jove/files/jove-4.16.0.73-build.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-Originally based on Debian patch jove_4.16.0.70-3.1.diff.gz
-
---- jove4.16.0.73-orig/doc/jove.rc
-+++ jove4.16.0.73/doc/jove.rc
-@@ -74,6 +74,6 @@
- 1 source jove.rc.$TERM
- 
- # source local custom rc file, if present
--1 source jove-local.rc
-+1 source /etc/jove/jove-local.rc
- 
- popd
---- jove4.16.0.73-orig/jove.c
-+++ jove4.16.0.73/jove.c
-@@ -1576,7 +1576,7 @@
- 	char	Joverc[FILESIZE];
- 
- 	if (dosys) {
--		PathCat(Joverc, sizeof(Joverc), ShareDir, "jove.rc");
-+		PathCat(Joverc, sizeof(Joverc), CONFIGDIR, "jove.rc");
- 		(void) joverc(Joverc);	/* system wide jove.rc */
- 	}
- 
---- jove4.16.0.73-orig/Makefile
-+++ jove4.16.0.73/Makefile
-@@ -21,13 +21,14 @@
- # If they don't exist, this makefile will try to create the directories
- # LIBDIR and SHAREDIR.  All others must already exist.
- 
--JOVEHOME = /usr/local
--SHAREDIR = $(JOVEHOME)/lib/jove
-+JOVEHOME = ${DESTDIR}/usr
-+SHAREDIR = $(JOVEHOME)/share/jove
- LIBDIR = $(JOVEHOME)/lib/jove
- BINDIR = $(JOVEHOME)/bin
- XEXT=
--MANDIR = $(JOVEHOME)/man/man$(MANEXT)
-+MANDIR = $(JOVEHOME)/share/man/man$(MANEXT)
- MANEXT = 1
-+CONFIGDIR=${DESTDIR}/etc/jove
- 
- # TMPDIR is where the tmp files get stored, usually /tmp, /var/tmp, or
- # /usr/tmp.  If you wish to be able to recover buffers after a system
-@@ -38,11 +39,11 @@
- # (in case the system startup salvages tempfiles by moving them,
- # which is probably a good idea).
- 
--TMPDIR = /tmp
--RECDIR = /var/preserve
-+TMPDIR = /var/tmp
-+RECDIR = ${DESTDIR}/var/lib/jove/preserve
- 
- # DFLTSHELL is the default shell invoked by JOVE and TEACHJOVE.
--DFLTSHELL = /bin/csh
-+DFLTSHELL = /bin/sh
- 
- # The install commands of BSD and System V differ in unpleasant ways:
- # -c: copy (BSD); -c dir: destination directory (SysV)
-@@ -56,15 +57,18 @@
- INSTALLFLAGS = # -g bin -o root
- 
- # to install executable files
--XINSTALL=cp
-+XINSTALL=install -m 755
- #XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
- #CYGWIN32: XINSTALL=install $(INSTALLFLAGS) -c -m 755
- 
- # to install text files
--TINSTALL=cp
-+TINSTALL=install -m 644
- #TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
- #CYGWIN32: TINSTALL=install $(INSTALLFLAGS) -c -m 644
- 
-+# to install directories
-+DINSTALL=install -d 755
-+
- # These should all just be right if the above ones are.
- # You will confuse JOVE if you move anything from LIBDIR or SHAREDIR.
- 
-@@ -72,7 +76,7 @@
- TEACHJOVE = $(BINDIR)/teachjove$(XEXT)
- RECOVER = $(LIBDIR)/recover$(XEXT)
- PORTSRV = $(LIBDIR)/portsrv$(XEXT)
--JOVERC = $(SHAREDIR)/jove.rc
-+JOVERC = $(CONFIGDIR)/jove.rc
- TERMSDIR = $(SHAREDIR)
- CMDS.DOC = $(SHAREDIR)/cmds.doc
- TEACH-JOVE = $(SHAREDIR)/teach-jove
-@@ -160,7 +164,7 @@
- #	SCO UNIX: TERMCAPLIB = -lcurses
- #	AIX on the R6000s: TERMCAPLIB = -lcurses -ltermcap -ls
- 
--TERMCAPLIB = -ltermcap
-+TERMCAPLIB = -lncurses
- 
- # Extra libraries flags needed by oddball systems.
- # Modern BSD systems using openpty need its library.
-@@ -181,7 +185,7 @@
- #	PDP-11 with separate I&D: -i
- #	PDP-11 without separate I&D: -n
- 
--LDFLAGS =
-+#LDFLAGS =
- 
- # for SCO Xenix, set
- #	MEMFLAGS = -Mle
-@@ -236,7 +240,8 @@
- TROFF = troff -Tpost
- TROFFPOST = | /usr/lib/lp/postscript/dpost -
- 
--MANUALS = $(JOVEM) $(TEACHJOVEM) $(XJOVEM) $(JOVETOOLM)
-+MANUALS = $(JOVEM) $(TEACHJOVEM)
-+# $(XJOVEM) $(JOVETOOLM)
- 
- C_SRC = commands.c commands.tab abbrev.c argcount.c ask.c buf.c c.c case.c jctype.c \
- 	delete.c disp.c extend.c fp.c fmt.c insert.c io.c iproc.c \
-@@ -283,8 +288,7 @@
- # all: default target.
- # Builds everything that "install" needs.
- all:	jjove$(XEXT) recover$(XEXT) teachjove$(XEXT) portsrv$(XEXT) \
--	doc/cmds.doc doc/jove.$(MANEXT) doc/teachjove.$(MANEXT) \
--	doc/jovetool.$(MANEXT)
-+	doc/cmds.doc doc/jove.$(MANEXT) doc/teachjove.$(MANEXT) 
- 
- jjove$(XEXT):	$(OBJECTS)
- 	$(LDCC) $(LDFLAGS) $(OPTFLAGS) -o jjove$(XEXT) $(OBJECTS) $(TERMCAPLIB) $(EXTRALIBS)
-@@ -341,6 +345,7 @@
- 	@echo \#define LIBDIR \"$(LIBDIR)\" >> paths.h
- 	@echo \#define SHAREDIR \"$(SHAREDIR)\" >> paths.h
- 	@echo \#define DFLTSHELL \"$(DFLTSHELL)\" >> paths.h
-+	@echo \#define CONFIGDIR \"$(CONFIGDIR)\" >> paths.h
- 
- makexjove:
- 	( cd xjove ; make CC="$(CC)" OPTFLAGS="$(OPTFLAGS)" SYSDEFS="$(SYSDEFS)" $(TOOLMAKEEXTRAS) xjove )
-@@ -358,18 +363,31 @@
- # Thus, if "all" is done first, "install" can be invoked with
- # JOVEHOME pointing at a playpen where files are to be marshalled.
- # This property is fragile.
--install: $(LIBDIR) $(SHAREDIR) \
-+install: $(BINDIR) $(LIBDIR) $(SHAREDIR) $(CONFIGDIR) $(RECDIR) \
- 	 $(TEACH-JOVE) $(CMDS.DOC) $(TERMSDIR)docs \
- 	 $(PORTSRVINST) $(RECOVER) $(JOVE) $(TEACHJOVE) $(MANUALS)
--	$(TINSTALL) doc/jove.rc $(JOVERC)
-+	$(TINSTALL) doc/jove.rc $(CONFIGDIR)
- 	@echo See the README about changes to /etc/rc or /etc/rc.local
- 	@echo so that the system recovers jove files on reboot after a crash
- 
-+$(BINDIR)::
-+	$(DINSTALL) $(BINDIR)
-+
- $(LIBDIR)::
--	test -d $(LIBDIR) || mkdir -p $(LIBDIR)
-+	$(DINSTALL) $(LIBDIR)
- 
- $(SHAREDIR)::
--	test -d $(SHAREDIR) || mkdir -p $(SHAREDIR)
-+	$(DINSTALL) $(SHAREDIR)
-+
-+$(CONFIGDIR)::
-+	 $(DINSTALL) $(CONFIGDIR)
-+
-+$(RECDIR)::
-+	$(DINSTALL) $(RECDIR)
-+	chmod 1777 $(RECDIR)
-+
-+$(MANDIR)::
-+	$(DINSTALL) $(MANDIR)
- 
- $(TEACH-JOVE): doc/teach-jove
- 	$(TINSTALL) doc/teach-jove $(TEACH-JOVE)
-@@ -410,7 +428,7 @@
- 	     -e 's;<SHAREDIR>;$(SHAREDIR);' \
- 	     -e 's;<SHELL>;$(DFLTSHELL);' doc/jove.nr > doc/jove.$(MANEXT)
- 
--$(JOVEM): doc/jove.$(MANEXT)
-+$(JOVEM): $(MANDIR) doc/jove.$(MANEXT)
- 	$(TINSTALL) doc/jove.$(MANEXT) $(JOVEM)
- 
- # doc/jove.doc is the formatted manpage (only needed by DOS)
-@@ -427,7 +445,7 @@
- 	     -e 's;<SHAREDIR>;$(SHAREDIR);' \
- 	     -e 's;<SHELL>;$(DFLTSHELL);' doc/teachjove.nr > doc/teachjove.$(MANEXT)
- 
--$(TEACHJOVEM): doc/teachjove.$(MANEXT)
-+$(TEACHJOVEM): $(MANDIR) doc/teachjove.$(MANEXT)
- 	$(TINSTALL) doc/teachjove.$(MANEXT) $(TEACHJOVEM)
- 
- $(XJOVEM): doc/xjove.nr
diff --git a/app-editors/jove/files/jove-4.16.0.73-doc.patch b/app-editors/jove/files/jove-4.16.0.73-doc.patch
deleted file mode 100644
index d62add543af6..000000000000
--- a/app-editors/jove/files/jove-4.16.0.73-doc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Originally based on Debian patch jove_4.16.0.70-3.1.diff.gz
-
---- jove4.16.0.73-orig/doc/intro.nr
-+++ jove4.16.0.73/doc/intro.nr
-@@ -56,9 +56,8 @@
- ..
- .
- .\" Change the extra vertical spacing around .DS/.DE
--.\" Does not work with groff's version of MS (GS is 1 iff groff MS)
--.if !\n(GS .if n .nr DD 0v
--.if !\n(GS .if t .nr DD \n(PD/2u
-+.if n .nr DD 0v
-+.if t .nr DD \n(PD/2u
- .
- .nr LL 6.5i
- .nr LT 6.5i
-@@ -152,7 +151,7 @@
- }
- 
- _	
--\fBJOVE\ (C OvrWt)\ \ \ [Main:1]\ \ "hello.c"\ \ \(**\ \ /home/foo\fP	<\ the Mode Line
-+\fBJOVE\ (C OvrWt)\ \ \ [Main:1]\ \ "hello.c"\ \ \(**\ \ /home/foo\ \ \ \ 15:23\fP	<\ the Mode Line
- _	
- : write-file (default hello.c) aloha.c\^\(sq 	<\ the Message Line
- =	
-@@ -1978,7 +1977,7 @@
- \ \ \ \ return 0;	<\ second Window
- }\^\(sq
- _	
--\fBJOVE\ (C OvrWt)\ \ \ [Main:1]\ \ "aloha.c"\ \ \-\-\ \ /home/foo\fP	<\ the Mode Line
-+\fBJOVE\ (C OvrWt)\ \ \ [Main:1]\ \ "aloha.c"\ \ \-\-\ \ /home/foo\ \ \ \ 15:28\fP	<\ the Mode Line
- _	
- [Point pushed]	<\ the Message Line
- =	
diff --git a/app-editors/jove/files/jove-4.16.0.73-sendmail.patch b/app-editors/jove/files/jove-4.16.0.73-sendmail.patch
deleted file mode 100644
index 072dd1f843ce..000000000000
--- a/app-editors/jove/files/jove-4.16.0.73-sendmail.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- jove4.16.0.73-orig/recover.c
-+++ jove4.16.0.73/recover.c
-@@ -776,7 +776,7 @@
- 
- 	last_update = ctime(&(rec->UpdTime));
- 	/* Start up mail */
--	sprintf(mail_cmd, "/bin/mail %s", pw->pw_name);
-+	sprintf(mail_cmd, "/usr/sbin/sendmail -t %s", pw->pw_name);
- 	setuid(getuid());
- 	if ((mail_pipe = popen(mail_cmd, "w")) == NULL)
- 		return;
-@@ -784,6 +784,7 @@
- 	setbuf(mail_pipe, mail_cmd);
- 	/* Let's be grammatically correct! */
- 	buf_string = rec->Nbuffers == 1? "buffer" : "buffers";
-+	fprintf(mail_pipe, "To: %s\n", pw->pw_name);
- 	fprintf(mail_pipe, "Subject: Jove saved %d %s after \"%s\" crashed\n",
- 		rec->Nbuffers, buf_string, hname());
- 	fprintf(mail_pipe, " \n");
diff --git a/app-editors/jove/jove-4.16.0.73.ebuild b/app-editors/jove/jove-4.16.0.73.ebuild
deleted file mode 100644
index 72d2a677cad1..000000000000
--- a/app-editors/jove/jove-4.16.0.73.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Jonathan's Own Version of Emacs, a light emacs-like editor without LISP bindings"
-HOMEPAGE="ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/"
-SRC_URI="ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/${PN}${PV}.tgz"
-
-LICENSE="JOVE"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.16.0.70.3.1-getline.patch"
-	epatch "${FILESDIR}/${P}-build.patch"
-	epatch "${FILESDIR}/${P}-sendmail.patch"
-	epatch "${FILESDIR}/${P}-doc.patch"
-}
-
-src_compile() {
-	tc-export CC
-
-	emake OPTFLAGS="${CFLAGS}" \
-		SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \
-		TERMCAPLIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-
-	if use doc; then
-		# Full manual (*not* man page)
-		emake doc/jove.man
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/jove/preserve
-
-	dodoc README
-	if use doc; then
-		dodoc doc/jove.man
-	fi
-}
diff --git a/app-editors/jove/metadata.xml b/app-editors/jove/metadata.xml
deleted file mode 100644
index e18d3b3af8c5..000000000000
--- a/app-editors/jove/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-  Jove is a compact, powerful, Emacs-style text-editor. It provides the common
-  emacs keyboard bindings, together with a reasonable assortment of the most
-  popular advanced features (e.g., interactive shell windows, compile-it,
-  language specific modes) while weighing in with CPU, memory, and disk
-  requirements comparable to vi.
-</longdescription>
-</pkgmetadata>
diff --git a/app-editors/juffed-0.10_p20160323-r1 b/app-editors/juffed-0.10_p20160323-r1
new file mode 100644
index 000000000000..ed3d65ebef97
--- /dev/null
+++ b/app-editors/juffed-0.10_p20160323-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=app-i18n/enca dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=x11-libs/qscintilla-2.9.4:=[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=QScintilla-based tabbed text editor with syntax highlighting
+EAPI=6
+HOMEPAGE=http://juffed.com/en/
+IUSE=debug
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-i18n/enca dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+SLOT=0
+SRC_URI=https://github.com/Mezomish/juffed/tarball/5ba17f90ec173e773470bc80ea26bca9a3f093fd -> juffed-0.10_p20160323.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7778308b332b0109fa33a7354357dbff
diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest
deleted file mode 100644
index 54d609664106..000000000000
--- a/app-editors/juffed/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX FindQtSingleApplication.cmake 4004 BLAKE2B e6c047be5112811430258e527a6d0ac5217838c9acbdbf6edf49909f3858c6fedb1c3da0471d4301cb918683b6194207650f9c4d06735e62993da3720b263356 SHA512 5ba7845f12a0e425fdeda180faab8b6e53ed3ae0ae291e5a33878a5f955f9295ea7058f1cce43ee4292fd00a6b8ddc45c71d050210ed4b26e1d3f4472df04f9e
-AUX juffed-0.10_p20160323-qscintilla-2.10.patch 565 BLAKE2B 92ee287c1dd3321ba706ea01656037e87a27a5cb6f43695a043481a0c4231b5753d9b4af74f82f9d37f2b2c137871f52d37a310fa9f75188955e761a46279762 SHA512 6b3f70930a3f7f5a59687b8484d5356804cff478da63732e5af261de12ced6e93f71bc53b93b3e286bf54e0cae61090729ccc54b42b37e2f97ee5a9640c18bd3
-AUX juffed-0.10_p20160323-qt-5.11.patch 719 BLAKE2B d9790a4a6a515a41a988949f8a0d1f52a0b19b53578138acd9d5ce141898317ab1776373f688a5c6fec059e67f14dfb5842c6367f9596df581a673a22e38567b SHA512 04174f544f040ba0cb4f28e1aed8e593d18fd4d7f53f94a6c99c5246a4603a234285959a887ffa155b72ce17f056eadd5dd31a041541c463630dd33d2a2a8952
-DIST juffed-0.10_p20160323.tar.gz 1617451 BLAKE2B 497a117d587fb1d6eb819bdc1cc403a660b808fa07d03fbfa74362c195aafc98733653fa5d7e28803df2bd4d8acb34a3c0d979395c1a6122631cee40d37e2239 SHA512 a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5
-EBUILD juffed-0.10_p20160323-r1.ebuild 1386 BLAKE2B e88936ebe034967e5a6b1eb3b2b1855c1cf1bfad3160e21c6498773a774d9f1fc89db8743ae1686400657f95cfe97c024f41b9d89c53b10c6a3b1489ec0cc5a3 SHA512 60d4c2a48a2c91c3ec1e57245d02da45f0dd021538c82809c9608d5e5916d0f86160f1dc644007b0e7ed4c4c933fc45b00e02826063ed3aa3fceda6787f632b6
-MISC metadata.xml 323 BLAKE2B d45bb12a8240e1b12594d50a1284b69b365e15f7a857b34b0ee12f4c9af0d7681ba22bbc959e7133780f682f6ae6dad53f6ecb2eb7db65cf1b6f4a64c742cdb3 SHA512 43f71ede8fa11b874c187d61b6f1c3949c10bd632e5a98f4094463f785be8f719a2d2205f3f0b7645047398e026fe71b1ef79366d762ff12f257d0a239e84a4d
diff --git a/app-editors/juffed/files/FindQtSingleApplication.cmake b/app-editors/juffed/files/FindQtSingleApplication.cmake
deleted file mode 100644
index eb56607e9480..000000000000
--- a/app-editors/juffed/files/FindQtSingleApplication.cmake
+++ /dev/null
@@ -1,94 +0,0 @@
-# - Try to find the QtSingleApplication includes and library
-# which defines
-#
-# QTSINGLEAPPLICATION_FOUND - system has QtSingleApplication
-# QTSINGLEAPPLICATION_INCLUDE_DIR - where to find header QtSingleApplication
-# QTSINGLEAPPLICATION_LIBRARIES - the libraries to link against to use QtSingleApplication
-# QTSINGLEAPPLICATION_LIBRARY - where to find the QtSingleApplication library (not for general use)
-
-# copyright (c) 2013 TI_Eugene ti.eugene@gmail.com
-#
-# Redistribution and use is allowed according to the terms of the FreeBSD license.
-
-SET(QTSINGLEAPPLICATION_FOUND FALSE)
-
-IF(QT4_FOUND)
-    message(STATUS "Looking for Qt4 single application library")
-    FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication
-                # standard locations
-                /usr/include
-                /usr/include/QtSolutions
-                # qt4 location except mac's frameworks
-                "${QT_INCLUDE_DIR}/QtSolutions"
-                # mac's frameworks
-                ${FRAMEWORK_INCLUDE_DIR}/QtSolutions
-    )
-
-    SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES}
-        QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6)
-    FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
-        NAMES ${QTSINGLEAPPLICATION_NAMES}
-        PATHS ${QT_LIBRARY_DIR}
-    )
-ELSEIF(Qt5Widgets_FOUND)
-    message(STATUS "Looking for Qt5 single application library")
-    FOREACH(TOP_INCLUDE_PATH in ${Qt5Widgets_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
-        FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication ${TOP_INCLUDE_PATH}/QtSolutions)
-
-        IF(QTSINGLEAPPLICATION_INCLUDE_DIR)
-            BREAK()
-        ENDIF()
-    ENDFOREACH()
-
-    SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES}
-        Qt5Solutions_SingleApplication-2.6 libQt5Solutions_SingleApplication-2.6
-        QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6)
-    GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION)
-    GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)
-
-    FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
-        NAMES ${QTSINGLEAPPLICATION_NAMES}
-        PATHS ${QT5_WIDGETSLIBRARYPATH}
-    )
-ENDIF()
-
-IF (QTSINGLEAPPLICATION_LIBRARY AND QTSINGLEAPPLICATION_INCLUDE_DIR)
-
-    SET(QTSINGLEAPPLICATION_LIBRARIES ${QTSINGLEAPPLICATION_LIBRARY})
-    SET(QTSINGLEAPPLICATION_FOUND TRUE)
-
-    IF (CYGWIN)
-        IF(BUILD_SHARED_LIBS)
-        # No need to define QTSINGLEAPPLICATION_USE_DLL here, because it's default for Cygwin.
-        ELSE(BUILD_SHARED_LIBS)
-        SET (QTSINGLEAPPLICATION_DEFINITIONS -DQTSINGLEAPPLICATION_STATIC)
-        ENDIF(BUILD_SHARED_LIBS)
-    ENDIF (CYGWIN)
-
-ENDIF (QTSINGLEAPPLICATION_LIBRARY AND QTSINGLEAPPLICATION_INCLUDE_DIR)
-
-IF (QTSINGLEAPPLICATION_FOUND)
-  IF (NOT QtSingleApplication_FIND_QUIETLY)
-    MESSAGE(STATUS "Found QtSingleApplication: ${QTSINGLEAPPLICATION_LIBRARY}")
-    MESSAGE(STATUS "         includes: ${QTSINGLEAPPLICATION_INCLUDE_DIR}")
-  ENDIF (NOT QtSingleApplication_FIND_QUIETLY)
-ELSE (QTSINGLEAPPLICATION_FOUND)
-  IF (QtSingleApplication_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find QtSingleApplication library")
-  ENDIF (QtSingleApplication_FIND_REQUIRED)
-ENDIF (QTSINGLEAPPLICATION_FOUND)
-
-MARK_AS_ADVANCED(QTSINGLEAPPLICATION_INCLUDE_DIR QTSINGLEAPPLICATION_LIBRARY)
-
-if(NOT TARGET QtSingleApplication::QtSingleApplication)
-    add_library(QtSingleApplication::QtSingleApplication UNKNOWN IMPORTED)
-    set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}"
-        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}"
-    )
-    if(EXISTS "${QTSINGLEAPPLICATION_LIBRARY}")
-    set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-        IMPORTED_LOCATION "${QTSINGLEAPPLICATION_LIBRARY}")
-    endif()
-endif(NOT TARGET QtSingleApplication::QtSingleApplication)
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch
deleted file mode 100644
index fcfab7f4072f..000000000000
--- a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/FindQScintilla2.cmake	2016-03-23 20:43:22.000000000 +0100
-+++ b/cmake/FindQScintilla2.cmake	2017-10-08 17:25:06.984464985 +0200
-@@ -52,7 +52,7 @@
-         ENDIF()
-     ENDFOREACH()
- 
--    SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qt5scintilla2 libqt5scintilla2 libqscintilla2-qt5 qscintilla2-qt5)
-+    SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 libqscintilla2_qt5 qscintilla2_qt5)
-     GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION)
-     GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)
- 
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch
deleted file mode 100644
index 4dfa7fae31f7..000000000000
--- a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From cb10c88a091c62c29054138a2da69d05cbf1e406 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 10 Apr 2018 19:43:17 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- plugins/keybindings/KeysPage.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/keybindings/KeysPage.cpp b/plugins/keybindings/KeysPage.cpp
-index 6579e3e..e68b039 100644
---- a/plugins/keybindings/KeysPage.cpp
-+++ b/plugins/keybindings/KeysPage.cpp
-@@ -1,9 +1,10 @@
- #include "KeysPage.h"
- 
--#include <QPushButton>
-+#include <QAction>
- #include <QHeaderView>
- #include <QKeyEvent>
- #include <QMessageBox>
-+#include <QPushButton>
- 
- #include "KeySettings.h"
- #include "Log.h"
--- 
-2.17.0
-
diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
deleted file mode 100644
index 97e18f2d896c..000000000000
--- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=5ba17f90ec173e773470bc80ea26bca9a3f093fd
-inherit cmake-utils vcs-snapshot xdg-utils
-
-DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting"
-HOMEPAGE="http://juffed.com/en/"
-SRC_URI="https://github.com/Mezomish/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	app-i18n/enca
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README )
-
-PATCHES=(
-	"${FILESDIR}/${P}-qscintilla-2.10.patch"
-	"${FILESDIR}/${P}-qt-5.11.patch"
-)
-
-src_prepare() {
-	# Upstream version outdated/dysfunctional and CRLF terminated
-	cp "${FILESDIR}"/FindQtSingleApplication.cmake cmake/ || die
-
-	cmake-utils_src_prepare
-
-	sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DUSE_ENCA=ON
-		-DUSE_QT5=ON
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-		-DLIB_SUFFIX=${libdir/lib/}
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/juffed/metadata.xml b/app-editors/juffed/metadata.xml
deleted file mode 100644
index 5d63c46383a4..000000000000
--- a/app-editors/juffed/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">juffed</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/jupp-3.1_p30 b/app-editors/jupp-3.1_p30
new file mode 100644
index 000000000000..c8edf66f8661
--- /dev/null
+++ b/app-editors/jupp-3.1_p30
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=ncurses? ( sys-libs/ncurses:0= ) !app-editors/joe
+DESCRIPTION=portable version of JOE's Own Editor
+EAPI=6
+HOMEPAGE=https://www.mirbsd.org/jupp.htm
+IUSE=ncurses
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-1
+RDEPEND=ncurses? ( sys-libs/ncurses:0= ) !app-editors/joe
+SLOT=0
+SRC_URI=https://www.mirbsd.org/MirOS/dist/jupp/joe-3.1jupp30.tgz
+_md5_=8bdc5edf764f3d16fa27b384d49449e1
diff --git a/app-editors/jupp/Manifest b/app-editors/jupp/Manifest
deleted file mode 100644
index 4856a0fb4774..000000000000
--- a/app-editors/jupp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST joe-3.1jupp30.tgz 468421 BLAKE2B 630ef1cd3f3c73060b331126ec8e6a24d7277b3f2bfb293eb6110d1dade34ffe6efc502d0985e603b2c86a10bf27faa6151e28b777189332b805e387b756dea6 SHA512 673d48da41f61797d6aeb548e62720d1a60e3e000445558be88fb0d7ca8a1a7ce7c8bdd5b5bd58ac2c16d46dd4541da7922999256669f693a570a11562d6550f
-EBUILD jupp-3.1_p30.ebuild 655 BLAKE2B acb7eb09ef67338fd151402e1d2eb5cd1973754e444b949dcfb0686e595bedeb51580a931fbd3f233cc376380dce84303d5457de6a02421ddfeb69c1ffd37036 SHA512 2d6c88d083f3f60ca6ae05db950ce05a87742546ac675baae43abb96d3b73f52843c82bdee795b782e3e7c36c27a6f6baefd11cf20027bdb2e3641a6cbdeeb37
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/app-editors/jupp/jupp-3.1_p30.ebuild b/app-editors/jupp/jupp-3.1_p30.ebuild
deleted file mode 100644
index f2d4cfe084ce..000000000000
--- a/app-editors/jupp/jupp-3.1_p30.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="portable version of JOE's Own Editor"
-HOMEPAGE="https://www.mirbsd.org/jupp.htm"
-SRC_URI="https://www.mirbsd.org/MirOS/dist/${PN}/joe-${PV/_p/${PN}}.tgz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses"
-
-RDEPEND="ncurses? ( sys-libs/ncurses:0= )
-	!app-editors/joe"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-	chmod +x configure
-}
-
-src_configure() {
-	econf \
-		--enable-search_libs \
-		--enable-termcap \
-		$(use_enable ncurses curses)
-}
-
-src_install() {
-	default
-	dodoc HINTS INFO LIST
-}
diff --git a/app-editors/jupp/metadata.xml b/app-editors/jupp/metadata.xml
deleted file mode 100644
index a535b8852829..000000000000
--- a/app-editors/jupp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-editors/kakoune-0_pre20171120 b/app-editors/kakoune-0_pre20171120
new file mode 100644
index 000000000000..7dcd838aaf45
--- /dev/null
+++ b/app-editors/kakoune-0_pre20171120
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup unpack
+DEPEND=app-text/asciidoc virtual/pkgconfig sys-libs/ncurses:0=[unicode]
+DESCRIPTION=Selection-oriented code editor inspired by vim
+EAPI=6
+HOMEPAGE=https://github.com/mawww/kakoune
+IUSE=debug static
+KEYWORDS=~amd64 ~x86
+LICENSE=Unlicense
+RDEPEND=sys-libs/ncurses:0=[unicode]
+SLOT=0
+SRC_URI=https://github.com/mawww/kakoune/tarball/079b006cdab6f0ae594f80fff18ad61b71b0754d -> kakoune-0_pre20171120.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=47f45be2c8c676d28a9d1f7c162e179d
diff --git a/app-editors/kakoune-9999 b/app-editors/kakoune-9999
new file mode 100644
index 000000000000..f42053346b56
--- /dev/null
+++ b/app-editors/kakoune-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare setup unpack
+DEPEND=app-text/asciidoc virtual/pkgconfig sys-libs/ncurses:0=[unicode] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Selection-oriented code editor inspired by vim
+EAPI=6
+HOMEPAGE=https://github.com/mawww/kakoune
+IUSE=debug static
+LICENSE=Unlicense
+RDEPEND=sys-libs/ncurses:0=[unicode]
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2c7ed0dd81dac874546c1cd7946b0281
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
deleted file mode 100644
index b8f1c3857d04..000000000000
--- a/app-editors/kakoune/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST kakoune-0_pre20171120.tar.gz 460659 BLAKE2B 443583e5d766b227f678f9adec76f06a0dfe6a29e2d6f38896b20a911e08e933e1e631d1018e1510a49fbb71b4b0258029fd33ece8c478bd228ef67b6fae939a SHA512 0208fd932dcf6cef3fac3338dfc15f0ba36ed4e3fa282cc5ffac5ad823f91b553a8c34747ff33ec4382257a1eb71f21181b63595031f9f237cba3bc8eeda3626
-EBUILD kakoune-0_pre20171120.ebuild 1096 BLAKE2B c6ceef7195ed877fa4d6de7e905f41f5fac78eedd1824d03cc3e5552f0ac21b77de241128e214c3821a9d71c786d2e00bd9b2a881d70247129d344b5bc73040b SHA512 92f13420ab2324095b41b0b1a29df3779dc9328ee5ccf3ab576f46765b9c6104e4ad097fcbd0347192b60fb907097ce040c33dbd7f95a036db575dfe8d563c8d
-EBUILD kakoune-9999.ebuild 1013 BLAKE2B 9255ed63a1c4b7923e77f4edb2b2fe209937e5b5ffe8339933a017c66ab178d8253f33b46e5138a9ce3b47bc236b6727f92a1c4fbc86ef9ea4559a27c9f8ed8f SHA512 87f9ecc92473631e9b3c835aaf310411ec1892571c83f4a87593de1aa976fdc44b4946c982b1cd8e54663c1e83df2db5558980d1b5e0007ad0b7042cad372931
-MISC metadata.xml 461 BLAKE2B 10780dda95d0505d21c847f6bde5e370588d4f935145f7cf12a879f0798bdfb9bd61285521fb2be8227c19efe17c408498b9860069bba5be496887c263eeb8f9 SHA512 36c7ce23f0c5259e7bec75c2506aaabcdac43c71b34479824976dbcfecc42c96d3144ce6def550c79f92b7f02c97a1e053532626142818dc05641a4ea2974c97
diff --git a/app-editors/kakoune/kakoune-0_pre20171120.ebuild b/app-editors/kakoune/kakoune-0_pre20171120.ebuild
deleted file mode 100644
index 862daa7fc9be..000000000000
--- a/app-editors/kakoune/kakoune-0_pre20171120.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs vcs-snapshot versionator
-
-REF="079b006cdab6f0ae594f80fff18ad61b71b0754d"
-
-DESCRIPTION="Selection-oriented code editor inspired by vim"
-HOMEPAGE="https://github.com/mawww/kakoune"
-SRC_URI="https://github.com/mawww/${PN}/tarball/${REF} -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-"
-DEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if tc-is-gcc && ! version_is_at_least 5.0 $(gcc-version); then
-			die "Clang or GCC >=5.0 is required to build this version"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/CXXFLAGS += -O3/d' src/Makefile || \
-		die "Failed to patch makefile"
-}
-
-src_configure() {
-	tc-export CXX
-	export debug=$(usex debug)
-	export static=$(usex static)
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" PREFIX="${EPREFIX}/usr" docdir="${ED%/}/usr/share/doc/${PF}" install
-}
diff --git a/app-editors/kakoune/kakoune-9999.ebuild b/app-editors/kakoune/kakoune-9999.ebuild
deleted file mode 100644
index f083c66b5e3e..000000000000
--- a/app-editors/kakoune/kakoune-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs git-r3 versionator
-
-DESCRIPTION="Selection-oriented code editor inspired by vim"
-HOMEPAGE="https://github.com/mawww/kakoune"
-EGIT_REPO_URI="https://github.com/mawww/kakoune.git"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug static"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-"
-DEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if tc-is-gcc && ! version_is_at_least 5.0 $(gcc-version); then
-			die "Clang or GCC >=5.0 is required to build this version"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/CXXFLAGS += -O3/d' src/Makefile || \
-		die "Failed to patch makefile"
-}
-
-src_configure() {
-	tc-export CXX
-	export debug=$(usex debug)
-	export static=$(usex static)
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" PREFIX="${EPREFIX}/usr" docdir="${ED%/}/usr/share/doc/${PF}" install
-}
diff --git a/app-editors/kakoune/metadata.xml b/app-editors/kakoune/metadata.xml
deleted file mode 100644
index 753a3985cd00..000000000000
--- a/app-editors/kakoune/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hilobakho@gmail.com</email>
-		<name>Mykyta Holubakha</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mawww/kakoune</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/kile-2.9.92 b/app-editors/kile-2.9.92
new file mode 100644
index 000000000000..1fb1f482c645
--- /dev/null
+++ b/app-editors/kile-2.9.92
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdoctools-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/okular-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 pdf? ( app-text/poppler[qt5] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Latex Editor and TeX shell based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://kile.sourceforge.io/
+IUSE=+pdf +png debug +handbook
+KEYWORDS=amd64 x86
+LICENSE=FDL-1.2 GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdoctools-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/okular-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-17.12.3:5 >=kde-apps/okular-17.12.3:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( >=app-text/texlive-core-2014 app-text/ghostscript-gpl ) png? ( app-text/dvipng virtual/imagemagick-tools[png?] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://sourceforge/kile/kile-2.9.92.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f1ba6770546e81551f08d66e4e1478bd
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
deleted file mode 100644
index 419501e76d41..000000000000
--- a/app-editors/kile/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kile-2.9.92.tar.bz2 8556142 BLAKE2B dd18ece7394439de3c0037fbea7c66316c5ee457bd4ad8c35f8519713f917e1c1641c806290303c26dd9e31e2f39346bc35091b211ca23a2d342332388d18c3f SHA512 e3af0c2cb1a0970428e2d772ef5025ead67aee94cdc03b6ec173de5628e8d4619f74296a1734eac8241939d40a05b805b8bd33bb4c27a1c19ad47fb35087cf7d
-EBUILD kile-2.9.92.ebuild 1641 BLAKE2B 0befdeaff3e43df7ce23a97d8fc6b4f0ead7792fd9c3df8b370d6264edc4856ab52307bbfcaabb95d69f8ee69242431d6cb296a04520fe5081de43359e372fe0 SHA512 65994d27678afa75af8d66acc8ffac5e1a1fa887839fff251f5dfc70634a432a785125b45058f610bc8f4bf78f5e6f9d2903dd6da39f90bdabc90ad3019d33e0
-MISC metadata.xml 476 BLAKE2B a152c0446aad3c66df2574332dc89f6797a16db142daafc82c3845f159b68bfcb922615f5912429d9965141ede27945512e5af1f5811ccbfa761026cc105b4b3 SHA512 82eaa93d944622e571887200fc50166b34ad4098ca2612749e72fff4e80f9f3fa07736cb8cd171fe3258fcd18209f7e60b01c859ad3cf20e4e238eab9dc3e486
diff --git a/app-editors/kile/kile-2.9.92.ebuild b/app-editors/kile/kile-2.9.92.ebuild
deleted file mode 100644
index 30c5495c7917..000000000000
--- a/app-editors/kile/kile-2.9.92.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
-HOMEPAGE="https://kile.sourceforge.io/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="FDL-1.2 GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+pdf +png"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep okular)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	pdf? ( app-text/poppler[qt5] )
-"
-RDEPEND="${DEPEND}
-	!app-editors/kile:4
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep okular 'pdf?')
-	virtual/latex-base
-	virtual/tex-base
-	pdf? (
-		>=app-text/texlive-core-2014
-		app-text/ghostscript-gpl
-	)
-	png? (
-		app-text/dvipng
-		virtual/imagemagick-tools[png?]
-	)
-"
-
-DOCS=( kile-remote-control.txt )
-
-src_prepare() {
-	kde5_src_prepare
-
-	# I know upstream wants to help us but it doesn't work..
-	sed -e '/INSTALL( FILES AUTHORS/s/^/#DISABLED /' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package pdf Poppler)
-	)
-
-	kde5_src_configure
-}
diff --git a/app-editors/kile/metadata.xml b/app-editors/kile/metadata.xml
deleted file mode 100644
index 56d53b857b49..000000000000
--- a/app-editors/kile/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">kile</remote-id>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/latexila-3.22.1 b/app-editors/latexila-3.22.1
new file mode 100644
index 000000000000..393e0901f2b9
--- /dev/null
+++ b/app-editors/latexila-3.22.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=|| ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) app-text/enchant >=app-text/gspell-1.0:0= >=dev-libs/glib-2.40:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3 >=x11-libs/gtksourceview-3.18:3.0= x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) app-text/yelp-tools dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Integrated LaTeX environment for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/LaTeXila
+IUSE=+introspection +latexmk rubber
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=|| ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) app-text/enchant >=app-text/gspell-1.0:0= >=dev-libs/glib-2.40:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3 >=x11-libs/gtksourceview-3.18:3.0= x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
+SLOT=0
+SRC_URI=mirror://gnome/sources/latexila/3.22/latexila-3.22.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8b37d407402f8e03872e4ad1a21169c8
diff --git a/app-editors/latexila-3.24.2 b/app-editors/latexila-3.24.2
new file mode 100644
index 000000000000..701cf3a998b3
--- /dev/null
+++ b/app-editors/latexila-3.24.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=|| ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] ) app-text/enchant >=app-text/gspell-1.0:0= >=dev-libs/glib-2.50:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtef-2.0 >=x11-libs/gtk+-3.20:3 >=x11-libs/gtksourceview-3.24:3.0= x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) app-text/yelp-tools dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Integrated LaTeX environment for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/LaTeXila
+IUSE=+introspection +latexmk rubber
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=|| ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] ) app-text/enchant >=app-text/gspell-1.0:0= >=dev-libs/glib-2.50:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtef-2.0 >=x11-libs/gtk+-3.20:3 >=x11-libs/gtksourceview-3.24:3.0= x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
+SLOT=0
+SRC_URI=mirror://gnome/sources/latexila/3.24/latexila-3.24.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=29beecf66493685f2af77fe273dfd799
diff --git a/app-editors/latexila-3.24.3 b/app-editors/latexila-3.24.3
new file mode 100644
index 000000000000..9b1811ab78f9
--- /dev/null
+++ b/app-editors/latexila-3.24.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=|| ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] ) app-text/enchant >=app-text/gspell-1.0:0= >=dev-libs/glib-2.50:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtef-2.0 >=x11-libs/gtk+-3.20:3 >=x11-libs/gtksourceview-3.24:3.0= x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) app-text/yelp-tools dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Integrated LaTeX environment for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/LaTeXila
+IUSE=+introspection +latexmk rubber
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=|| ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] ) app-text/enchant >=app-text/gspell-1.0:0= >=dev-libs/glib-2.50:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtef-2.0 >=x11-libs/gtk+-3.20:3 >=x11-libs/gtksourceview-3.24:3.0= x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
+SLOT=0
+SRC_URI=mirror://gnome/sources/latexila/3.24/latexila-3.24.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=29beecf66493685f2af77fe273dfd799
diff --git a/app-editors/latexila/Manifest b/app-editors/latexila/Manifest
deleted file mode 100644
index 1d8eff4f3532..000000000000
--- a/app-editors/latexila/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST latexila-3.22.1.tar.xz 1111820 BLAKE2B 8a3e375ba048112565f6b074ec62a243fb34890f6e903a2ba2d36f7bb5ede6b0fcb8b488a725752c2edd06b0c71916f13915ebdc26fcf8b6a889523b99141b10 SHA512 7c2d3b95b9547e97c79f5e6384b1f33ccb81e70cea1d26fcc07845f3f391ac54b5931ddcec742f3439ba55e8f9f2a2054935795ab16bee584eb05780a72ba3a9
-DIST latexila-3.24.2.tar.xz 1120940 BLAKE2B fe564f7a53da496ac149e67c236c4c726db2b3dcd31240d05b3e89459b1f2f0bb623a6028e14d6cf8cc0188e32e9aa8000fd62b5599cc1e6dba0626a16946108 SHA512 8facaa57a87b58ba3aeffcd1c59e2770fe8e95bdbf0cd2e5fa39554c1eba3ba93aa4cb544fd09564cc9481d919a0b04d46169d053f9f155deaa8826050a4c72c
-DIST latexila-3.24.3.tar.xz 1112940 BLAKE2B 2410276574f02735dde9ce77a9bba257e3732784664b302870957fc3f8603bedddaebed4da3f6da1e1f6fc30e3dc233146b65dbf7589a8776c653018a4129355 SHA512 c7c8996704e68ed136d3d2a04c839faf5497a78ad459411daaabfba38ac883f253325f07a8c126cc4b2f1d553fe08b39f1d6a51d1b6944540dc13142173e4361
-EBUILD latexila-3.22.1.ebuild 1104 BLAKE2B 5017ad5bf77bf93cdebdafa7a7381a08b20b09d3bcedfb0375de136e55bee66f78a92346563531cd2b69dd1e171e84203e5fad0cfb6b5dc3fa77880b3a7d95bd SHA512 8d6acab4710c29a32215bbed77baab8193eec2d2abaab2b4d8329fdb2444750dbc903e004f86aae6cf8b73213225833b3034a70e0b3a972ef33344b0418fe492
-EBUILD latexila-3.24.2.ebuild 1155 BLAKE2B 3cc09d5496231ac907053b163351f24822d703c109e80bc7ddbcb3e4896f99ae87453030a4b3e14ab877fb6a2ae4b84f112d3e2219c82e0cb39b3f45ceec9bc5 SHA512 8e9f098ae73e4a88b7ebeacf604b358824046abf73a9736796869b753dbac9fc78ad884bb8772a5aa74ffe2133396d4941240661008492fe5007c778a03f4bc0
-EBUILD latexila-3.24.3.ebuild 1155 BLAKE2B 3cc09d5496231ac907053b163351f24822d703c109e80bc7ddbcb3e4896f99ae87453030a4b3e14ab877fb6a2ae4b84f112d3e2219c82e0cb39b3f45ceec9bc5 SHA512 8e9f098ae73e4a88b7ebeacf604b358824046abf73a9736796869b753dbac9fc78ad884bb8772a5aa74ffe2133396d4941240661008492fe5007c778a03f4bc0
-MISC metadata.xml 464 BLAKE2B 8d70a6283779236162f7d0838ca7e97ae90ae5641cfb2fa551426238ce06b64a22f368ddec6a13fea472b2aa038a7854a7c53fc3bdf5c0a13cc9cbefa042fe39 SHA512 2015c3aac4abb5275c45db624fb6ee841e55ca1fd4e976d60528b04b5084a0cbae7fc625369d03e2ca2ee3ee16719df1740246a06208b10e5a99ea3c6612a0b1
diff --git a/app-editors/latexila/latexila-3.22.1.ebuild b/app-editors/latexila/latexila-3.22.1.ebuild
deleted file mode 100644
index d38c4d8d96b1..000000000000
--- a/app-editors/latexila/latexila-3.22.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Integrated LaTeX environment for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection +latexmk rubber"
-
-COMMON_DEPEND="
-	$(vala_depend)
-	app-text/enchant
-	>=app-text/gspell-1.0:0=
-	>=dev-libs/glib-2.40:2[dbus]
-	>=dev-libs/libgee-0.10:0.8=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/gtksourceview-3.18:3.0=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	x11-themes/hicolor-icon-theme
-	latexmk? ( dev-tex/latexmk )
-	rubber? ( dev-tex/rubber )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection)
-}
diff --git a/app-editors/latexila/latexila-3.24.2.ebuild b/app-editors/latexila/latexila-3.24.2.ebuild
deleted file mode 100644
index d95cfae59a3f..000000000000
--- a/app-editors/latexila/latexila-3.24.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_MIN_API_VERSION="0.34"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Integrated LaTeX environment for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection +latexmk rubber"
-
-COMMON_DEPEND="
-	$(vala_depend)
-	app-text/enchant
-	>=app-text/gspell-1.0:0=
-	>=dev-libs/glib-2.50:2[dbus]
-	>=dev-libs/libgee-0.10:0.8=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtef-2.0
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/gtksourceview-3.24:3.0=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	x11-themes/hicolor-icon-theme
-	latexmk? ( dev-tex/latexmk )
-	rubber? ( dev-tex/rubber )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection)
-}
diff --git a/app-editors/latexila/latexila-3.24.3.ebuild b/app-editors/latexila/latexila-3.24.3.ebuild
deleted file mode 100644
index d95cfae59a3f..000000000000
--- a/app-editors/latexila/latexila-3.24.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_MIN_API_VERSION="0.34"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Integrated LaTeX environment for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection +latexmk rubber"
-
-COMMON_DEPEND="
-	$(vala_depend)
-	app-text/enchant
-	>=app-text/gspell-1.0:0=
-	>=dev-libs/glib-2.50:2[dbus]
-	>=dev-libs/libgee-0.10:0.8=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtef-2.0
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/gtksourceview-3.24:3.0=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	x11-themes/hicolor-icon-theme
-	latexmk? ( dev-tex/latexmk )
-	rubber? ( dev-tex/rubber )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection)
-}
diff --git a/app-editors/latexila/metadata.xml b/app-editors/latexila/metadata.xml
deleted file mode 100644
index d886385e009e..000000000000
--- a/app-editors/latexila/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="latexmk">Install <pkg>dev-tex/latexmk</pkg> (used by default
-		for the build tools)</flag>
-	<flag name="rubber">Install <pkg>dev-tex/rubber</pkg> (can be used for the
-		build tools)</flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/le-1.14.3 b/app-editors/le-1.14.3
new file mode 100644
index 000000000000..582754fecf27
--- /dev/null
+++ b/app-editors/le-1.14.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=sys-libs/ncurses:0= app-arch/xz-utils
+DESCRIPTION=Terminal text editor
+EAPI=5
+HOMEPAGE=https://www.gnu.org/directory/text/editors/le-editor.html
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=ftp://ftp.yars.free.net/pub/source/le/le-1.14.3.tar.lzma
+_md5_=3faedaa1bdfafef97e7edb93f3029899
diff --git a/app-editors/le-1.16.1 b/app-editors/le-1.16.1
new file mode 100644
index 000000000000..9caeadbe403d
--- /dev/null
+++ b/app-editors/le-1.16.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=sys-libs/ncurses:0= app-arch/xz-utils
+DESCRIPTION=Terminal text editor
+EAPI=6
+HOMEPAGE=http://lav.yar.ru/programs.html
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=http://lav.yar.ru/download/le/le-1.16.1.tar.gz
+_md5_=60a32e8e757df9a5db4e1c2fcfd8b14c
diff --git a/app-editors/le-1.16.3 b/app-editors/le-1.16.3
new file mode 100644
index 000000000000..3b9af1479307
--- /dev/null
+++ b/app-editors/le-1.16.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Terminal text editor
+EAPI=6
+HOMEPAGE=http://lav.yar.ru/programs.html
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=http://lav.yar.ru/download/le/le-1.16.3.tar.gz
+_md5_=82f2f5c6796525ad3dc13525181932b0
diff --git a/app-editors/le-1.16.5 b/app-editors/le-1.16.5
new file mode 100644
index 000000000000..0a568c228262
--- /dev/null
+++ b/app-editors/le-1.16.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Terminal text editor
+EAPI=6
+HOMEPAGE=http://lav.yar.ru/programs.html
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=http://lav.yar.ru/download/le/le-1.16.5.tar.gz
+_md5_=21f7a8650f29398cec5f682b700be6a4
diff --git a/app-editors/le/Manifest b/app-editors/le/Manifest
deleted file mode 100644
index b8f3d462853b..000000000000
--- a/app-editors/le/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST le-1.14.3.tar.lzma 392205 BLAKE2B 81dca0bbfa2b23a7bc66103dae3aaecdb50651ab9305d812ad3e838953a60494b4b562219d2fb4a03c9737f96f5f75277c8d0e96ff01448b739c12e44e62a0e8 SHA512 5f09680ba365d80a71dcb09975d2347c0dcb725b8db6c08588fadd82a3a844bd370c3de597b644c57ecfed1c4557d22544a6e9aee6323b1e43f6d8c423843339
-DIST le-1.16.1.tar.gz 977143 BLAKE2B 4dcba27bd3c0add2ced4209da618070e201bedfe333fa99951720144048c5a26d3d691ff244b64d3e8dfa4f42a598767b78ff601a7f2f0ce0e069a316d6ee0e0 SHA512 77dda0a3c9cf98d9775937373eed2489f22b641ed870f3152cd59dacff373844f5d8d85f4df864c396b812995625bcdb8f5444de93336495ecb1ea7df27e464e
-DIST le-1.16.3.tar.gz 985541 BLAKE2B 9b205f14fae619a7ef355eeacd91a3fd3e093f2f53db607b0b71b16805536780fce4f932173987332924c1e392eba6e5e338d986459502c7eaa0223a70a63db3 SHA512 b1ee5440fb71f4214170bc0a1654b68671bac5f08b38e62fdeeaeab2710365aff7cb7c3d13aecbc052b8596c95d7caadd6b3347f9bcb8cc5272a4639856ae46d
-DIST le-1.16.5.tar.gz 1012934 BLAKE2B c3e037f701e5e8916258fd55a02550f0bae42f56a0a464c7e45e5365e89475bd76ee74aae48cbdb7f5c8d7a665279a63a885007a88a556e86bec875584438f0a SHA512 2c74267f9d02944e0c72f109d9be024d1ec1de84dd6f381f7f8667be1d68b8ebd107ac970f1901f2c77e3150897562d42b9b10ec321356ca1e1ee45728941660
-EBUILD le-1.14.3.ebuild 523 BLAKE2B f57bd51998eaea4f15b420f69f12c3fa3260db82e92387aa94a81eabe84a712cf2423aac325c437f0fe9068d8e6e0bb7b6f3fc13ef45894cf025b2afcb3cfa8f SHA512 9d04c3765306fd5e1b021b57943d58a998909f7858c3f270b5dfe9e6c83d5e51b9527b41c90fcb309c3ed60c6337dca2f59ba8049b42798e9eeb1c110752877b
-EBUILD le-1.16.1.ebuild 482 BLAKE2B 83482fbf242c9301f48e26895be69296bdef286db5c52f661864c68539291deb87d404b3b45cd563aa2a7cba8717a7af59165011750b954573156410629fc20a SHA512 6de4d2214385b6d7cb42ff8c6ce6dbb1a976be5d211125d75ee2f758f546b3c14a206ff70925cc1e214797ebece6f6911a8a484276ad8c2a17b83222be44fbf0
-EBUILD le-1.16.3.ebuild 460 BLAKE2B fba82f3d371ef0005574250a1f4c0682b1301f766c507f1daeda45a078e3c248b0552beac2e2ccaea75b241f2e3232b8e3ea294963fd5157324d99254d2d777a SHA512 7c7acc1c43316f8d139ecc7dfa6894fba025e3627df71682b005e7764577e8fd5bcfeabeedac3982c190eb0002beaae05c6749e026c3beec24874e9a75d4a7c6
-EBUILD le-1.16.5.ebuild 493 BLAKE2B da878d578c071da03ab2695eb93d81b78eec0939aae91686358eb84d8a49e721797216a14f7ea7dc1ff5ec3a8587d8a6ba633d0f7c7df907cc638b7a74c98d50 SHA512 06ad3696987ea24032d0a09f617121e38f4487dd5554c78aceddea6b4c3dd66d9df835299a9b417543b62891275c9aee2fa8925710f2c9d0f75ff45ff4546aae
-MISC metadata.xml 372 BLAKE2B 87ce04f23c2c03caf708509901ae504cb952d4b69819e0f3cfcc5e3b149d82db976965c1bdbc31db66a481726264a2dfe355f3407938479c71be6111a96391f5 SHA512 366c7a4b144ab34cc9a6bd3328ce4c27f32fd9d638949361ee5e9db29cf3f564d3ad392f9cd59858d359e9050c76c0eb5afa12900834462daaba949675aa232b
diff --git a/app-editors/le/le-1.14.3.ebuild b/app-editors/le/le-1.14.3.ebuild
deleted file mode 100644
index 534fd98f98f9..000000000000
--- a/app-editors/le/le-1.14.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Terminal text editor"
-HOMEPAGE="https://www.gnu.org/directory/text/editors/le-editor.html"
-SRC_URI="ftp://ftp.yars.free.net/pub/source/le/le-${PV}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog FEATURES HISTORY INSTALL NEWS README TODO
-}
diff --git a/app-editors/le/le-1.16.1.ebuild b/app-editors/le/le-1.16.1.ebuild
deleted file mode 100644
index 66438770c4a8..000000000000
--- a/app-editors/le/le-1.16.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Terminal text editor"
-HOMEPAGE="http://lav.yar.ru/programs.html"
-SRC_URI="http://lav.yar.ru/download/le/le-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog FEATURES HISTORY INSTALL NEWS README TODO
-}
diff --git a/app-editors/le/le-1.16.3.ebuild b/app-editors/le/le-1.16.3.ebuild
deleted file mode 100644
index 3fd15af0392f..000000000000
--- a/app-editors/le/le-1.16.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Terminal text editor"
-HOMEPAGE="http://lav.yar.ru/programs.html"
-SRC_URI="http://lav.yar.ru/download/le/le-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog FEATURES HISTORY INSTALL NEWS README TODO
-}
diff --git a/app-editors/le/le-1.16.5.ebuild b/app-editors/le/le-1.16.5.ebuild
deleted file mode 100644
index 6de5576e4175..000000000000
--- a/app-editors/le/le-1.16.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Terminal text editor"
-HOMEPAGE="http://lav.yar.ru/programs.html"
-SRC_URI="http://lav.yar.ru/download/le/le-${PV}.tar.gz"
-
-DOCS="AUTHORS ChangeLog FEATURES HISTORY INSTALL NEWS README THANKS TODO"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/app-editors/le/metadata.xml b/app-editors/le/metadata.xml
deleted file mode 100644
index e0c7b195e250..000000000000
--- a/app-editors/le/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@schellstede.de</email>
-		<name>Gerold Schellstede</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-editors/leafpad-0.8.18.1 b/app-editors/leafpad-0.8.18.1
new file mode 100644
index 000000000000..bebc7fd951cb
--- /dev/null
+++ b/app-editors/leafpad-0.8.18.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=virtual/libintl x11-libs/gtk+:2 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A simple GTK2 text editor
+EAPI=6
+HOMEPAGE=http://tarot.freeshell.org/leafpad/
+IUSE=emacs
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=virtual/libintl x11-libs/gtk+:2
+SLOT=0
+SRC_URI=mirror://nongnu/leafpad/leafpad-0.8.18.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0e3f3f4d91c82c3be7510ae3fc40f338
diff --git a/app-editors/leafpad/Manifest b/app-editors/leafpad/Manifest
deleted file mode 100644
index ca0da40611f4..000000000000
--- a/app-editors/leafpad/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX leafpad-0.8.18.1-fdo.patch 557 BLAKE2B be91b5e3c6159701303254d6c7c753dce3b19eb05046f097470b83ac0f21c52bc05da4862dedb05f658fd47efa8d349a4ee5b3361192076abe6ed451497ae7e3 SHA512 db3badb11cb1244035f988c7a512a0fc2559fdd0afa4c7fe432e3d600648526f9f19d42c939466325931819e229eecafb49b4c75837a01d122eac214fd66de32
-AUX leafpad-0.8.18.1-format-security.patch 821 BLAKE2B 2b26cdc2ddc6cd0047c40fcf0b4c1f4bab4aedd422169ccfcf88c58db60320f7fa75367ba6a6d46ba9fa28c6d7275f79dbadafb393e0e7e8f78352ebc7574c03 SHA512 d8a39dc2412055a41eeb7966ff7e3884489d584726501233f67d8d56bded6e50467bcc60a4c2d0be972c0eb6732d9bdc7d00f69845737b049e8b0cc046f87a64
-DIST leafpad-0.8.18.1.tar.gz 289117 BLAKE2B 41f01f9b9e031c749a4b1a06d32edbcf9b0f0a694141c79bb462fce29d59f87efa52bc4a7faf270ce28f04697deb6350fe4e26317d28450d7d785a01007c06c2 SHA512 1caad712967f634f585ab32e406534b5ce2c5621008c1eb5b2b48f17ca0f48cd834ea2ea1c67eda4053fa84e8727ff0e708e99d3b5dad838dcf0701389788257
-EBUILD leafpad-0.8.18.1.ebuild 826 BLAKE2B 51a19dda328c9d214a88a45f1df00462730fcfc758cf29650c4e587d2e8b2e0c6371f556f2aec9150ad6eb2dec2d6534122d63cfeed4701d7e9a0c2e9cef075b SHA512 08dc550cdec48dc11200f548341120674c6f81c17808dd99792f14d9b67191335a60d6b28b7ef80b86434d11fc3dbc7a7382944228bfed678e74f1b769a6e840
-MISC metadata.xml 205 BLAKE2B 14c07c010c87fb27c21a84c8c1a03a4f7a145a8de84571b9a112a7bbf9f0677a8cb7e02a61d9d9dc322174839e0f5e6c721a07988a835b189ac6fb97c39527ce SHA512 e94eb3d2eec0ffa8543112e75899eb7f2c582d2e5615a82b568e907e488f0a8b400946550ae39c7d278a8fa8c8912e6221e3013868ce7e218abbcf76b57cb693
diff --git a/app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch b/app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch
deleted file mode 100644
index 6aaf4352632b..000000000000
--- a/app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-desktop-file-validate:
-
-leafpad.desktop: error: value "text/plain" for string list key "MimeType" in group "Desktop Entry"
-does not have a semicolon (';') as trailing character
-
-leafpad.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
-
---- a/data/leafpad.desktop.in
-+++ b/data/leafpad.desktop.in
-@@ -1,10 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
- _Name=Leafpad
- _Comment=Simple text editor
- Exec=leafpad %f
- Icon=leafpad
- Terminal=false
- Type=Application
--MimeType=text/plain
-+MimeType=text/plain;
- Categories=GTK;Utility;TextEditor;
diff --git a/app-editors/leafpad/files/leafpad-0.8.18.1-format-security.patch b/app-editors/leafpad/files/leafpad-0.8.18.1-format-security.patch
deleted file mode 100644
index 4ea3b39fde02..000000000000
--- a/app-editors/leafpad/files/leafpad-0.8.18.1-format-security.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-- dialog.c:39:3: error: format not a string literal and no format arguments [-Werror=format-security]
-
---- a/src/dialog.c
-+++ b/src/dialog.c
-@@ -36,6 +36,7 @@
- 		GTK_DIALOG_DESTROY_WITH_PARENT,
- 		type,
- 		GTK_BUTTONS_NONE,
-+		"%s",
- 		str);
- 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
- 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
-@@ -61,6 +62,7 @@
- 		GTK_DIALOG_DESTROY_WITH_PARENT,
- 		GTK_MESSAGE_QUESTION,
- 		GTK_BUTTONS_NONE,
-+		"%s",
- 		str);
- 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
- 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
---- a/src/gtkprint.c
-+++ b/src/gtkprint.c
-@@ -165,6 +165,7 @@
- 		GTK_DIALOG_DESTROY_WITH_PARENT,
- 		GTK_MESSAGE_ERROR,
- 		GTK_BUTTONS_NONE,
-+		"%s",
- 		message);
- 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
- 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
diff --git a/app-editors/leafpad/leafpad-0.8.18.1.ebuild b/app-editors/leafpad/leafpad-0.8.18.1.ebuild
deleted file mode 100644
index 9497f53825fb..000000000000
--- a/app-editors/leafpad/leafpad-0.8.18.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A simple GTK2 text editor"
-HOMEPAGE="http://tarot.freeshell.org/leafpad/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="emacs"
-
-RDEPEND="virtual/libintl
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fdo.patch
-	"${FILESDIR}"/${P}-format-security.patch
-)
-
-src_configure() {
-	econf \
-		--enable-chooser \
-		--enable-print \
-		$(use_enable emacs)
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-editors/leafpad/metadata.xml b/app-editors/leafpad/metadata.xml
deleted file mode 100644
index 84561732eef6..000000000000
--- a/app-editors/leafpad/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<use>
-		<flag name="emacs">Enable Emacs key theme</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-editors/leo-5.6 b/app-editors/leo-5.6
new file mode 100644
index 000000000000..cf8fc30866b9
--- /dev/null
+++ b/app-editors/leo-5.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/silvercity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Leo: Literate Editor with Outlines
+EAPI=6
+HOMEPAGE=https://github.com/leo-editor/leo-editor/
+IUSE=doc python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=app-text/silvercity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/leo-editor/leo-editor/archive/5.6.tar.gz -> leo-5.6.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c3f1e7cccfe38390a8760968bcbedb0f
diff --git a/app-editors/leo/Manifest b/app-editors/leo/Manifest
deleted file mode 100644
index 9056608e27e5..000000000000
--- a/app-editors/leo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST leo-5.6.tar.gz 9255687 BLAKE2B 46a9aa1d90a1663ece57731b3685def3bf050f2c398310aca9d24c07256d23e40a94e505c43bd90c6c5a58fda2021409d3e6510eddd5a1bc0533273c45495475 SHA512 c9f6583be4f6a76d781adccc4076782c6f136b1057796228a398cd31c92d61e1b7a86d151f36352c6b1f677bb3d298b6f347c9874e3782c645fdb6ee38747955
-EBUILD leo-5.6.ebuild 814 BLAKE2B dd44ea7d558f405d76b6a2ff47f113c1c7b0599c40b075cf397975999ab5a3605a8afd93f063f2d17e912f315be2faa84a634e0c8106a60df476852d2b03549a SHA512 416fb44fae4634fd72a5f14ab2816275d68b3c178499159836044db84cfee6f704548f4588b475be8dce19d1b67174ec0fc55157183800a34ec75c728f23a833
-MISC metadata.xml 308 BLAKE2B 2c8d0a692156e40f0d67d490212ded6b82a67efb0450e6512db856cc108772745dbcc5fade6b866b85bf07b4416db3357d3c04f3287ef8958477e6008828a8a3 SHA512 cfa3bb11079aca56b6b381f365e655078a1f07738c3af9d6c7d10313ee0a6826c0f40cc70e8ff31be6bf033a5effc8a7d725bccda8f78341700df10717976c66
diff --git a/app-editors/leo/leo-5.6.ebuild b/app-editors/leo/leo-5.6.ebuild
deleted file mode 100644
index 2ee3cdc76dc0..000000000000
--- a/app-editors/leo/leo-5.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-editor-${PV}"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQUIRED_USE="tk"
-inherit distutils-r1
-
-DESCRIPTION="Leo: Literate Editor with Outlines"
-HOMEPAGE="https://github.com/leo-editor/leo-editor/"
-SRC_URI="https://github.com/leo-editor/leo-editor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	app-text/silvercity[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	cp leo/dist/setup.py leo/dist/leo-install.py . || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( leo/doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-editors/leo/metadata.xml b/app-editors/leo/metadata.xml
deleted file mode 100644
index 4e9fe29019ce..000000000000
--- a/app-editors/leo/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">leo-editor/leo-editor</remote-id>
-    <remote-id type="sourceforge">leo</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-editors/levee-3.5a b/app-editors/levee-3.5a
new file mode 100644
index 000000000000..44a6f8618c4d
--- /dev/null
+++ b/app-editors/levee-3.5a
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!app-text/lv sys-libs/ncurses:0=
+DESCRIPTION=Really tiny vi clone, for things like rescue disks
+EAPI=5
+HOMEPAGE=http://www.pell.chi.il.us/~orc/Code/
+KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=levee
+RDEPEND=!app-text/lv sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=http://www.pell.chi.il.us/~orc/Code/levee/levee-3.5a.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b8df87aa20659cea0fa303f13187671c
diff --git a/app-editors/levee/Manifest b/app-editors/levee/Manifest
deleted file mode 100644
index 597a44d375db..000000000000
--- a/app-editors/levee/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX levee-3.4o-darwin.patch 318 BLAKE2B 910cf037791f260d7c8471f0b8abb9fabdd9c281acf4c27fd8e4985b0700d5e93c7daf783cf6cda0583d16ffa8b681d7bf7c48035129b9782e23ccf331fbec6e SHA512 8f29e675e03ef67922f396950cc7245bd6dda15aa2bdea21fc2b75b3f93d641cc46cd5cdfa878dc5780ff01e66e9d8708a6e67625248bd21fe2679b458f60faf
-AUX levee-3.5-glibc210.patch 2448 BLAKE2B 181bfb232b5ee9356c1a7ee23b54d65f3c73a77589335323c535db96b7160a6bcc00c44f4b5b6cd077c15615e5e02ad0e9f09b06011ebc57ab9301c1f5660b8e SHA512 178e77e6fb88517c0001d95e99164a67d3d6342dc0ff3dd2d355f2b2823d2fbdf2a851909d2c935dc629391a4ccc861c55a6c5ed9ce8d74dd1987c924c9f9307
-AUX levee-3.5a-QA.patch 637 BLAKE2B b98f04d4abd20b8b937d360e809e88c0b86b7b010ed24327cf8243b47f9ec11232865ad41999f5a1ad42ba09a891153452522bc69bebf305ef54218810febbfc SHA512 30878ad11f021fed3912dd06b397c80539c98b0795a39a98134a6466a8d3041162bf9e3d43ede9780e5f415ba481a21b925d16f33297118fb246158607f19227
-DIST levee-3.5a.tar.gz 67733 BLAKE2B 291b502a8c9581c2c0f2ca6714c17c86692067d5de66e987f8a7b506965a21ff149c6fe445532e9b065e40dd7e519d1ebc6b5ff69c5b4a4129138df224f71dfd SHA512 e95b4fc6370903dda07aff0a612c7f34425ab0b854d05a08f42b7e339d1a86a436316d31f3667748943e2ce2e68be7f2369e4a3b36c0715b00d31b8ab50cdaf1
-EBUILD levee-3.5a.ebuild 1010 BLAKE2B d30c62eb676bb0147ea5c7c1cb2885eece7406ac42ae355ef723d976f34e87a4bf0438a06149424b86295bf5182f4b43799640242cbccf60e5c5d46c8b12b7d9 SHA512 c35a57895a8341e1f4889bb72ac59dc1682132b5ee5eb173f50dd16a3ce9103c12f4993ae2f5c3149e95943acd6ba86ae335b6af9e6cf6cee51f921188dcccb7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/levee/files/levee-3.4o-darwin.patch b/app-editors/levee/files/levee-3.4o-darwin.patch
deleted file mode 100644
index 9481b1a3ade9..000000000000
--- a/app-editors/levee/files/levee-3.4o-darwin.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- unixcall.c.orig	2007-03-18 17:46:05 +0100
-+++ unixcall.c	2007-03-18 17:51:13 +0100
-@@ -77,6 +77,13 @@
- static int ioset = 0;
- static struct termios old;
- 
-+#if defined(__MACH__)
-+# define TCGETS TIOCGETA
-+# define TCSETS TIOCSETA
-+# define TCGETA TIOCGETA
-+# define TCSETAF TIOCSETAF
-+#endif
-+
- void
- initcon()
- {
diff --git a/app-editors/levee/files/levee-3.5-glibc210.patch b/app-editors/levee/files/levee-3.5-glibc210.patch
deleted file mode 100644
index 51cc829cda25..000000000000
--- a/app-editors/levee/files/levee-3.5-glibc210.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -NrU5 levee-3.5.original/editcor.c levee-3.5/editcor.c
---- levee-3.5.original/editcor.c	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/editcor.c	2009-07-21 23:07:21.000000000 +0000
-@@ -183,11 +183,11 @@
- 
-     strcpy(scratch, "/tmp/lv.XXXXXX");
-     
-     clrprompt();
-     printch('!');
--    if ( !getline(instring) )
-+    if ( !get_line(instring) )
- 	return FALSE;
- 
-     if ( (tf = mkstemp(scratch)) < 0 ) {
- 	prints("[tempfile error]");
- 	return FALSE;
-diff -NrU5 levee-3.5.original/extern.h levee-3.5/extern.h
---- levee-3.5.original/extern.h	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/extern.h	2009-07-21 23:02:39.000000000 +0000
-@@ -195,11 +195,11 @@
- extern exec_type PROC editcore();
- 
- extern char PROC line(), peekc(), readchar();
- extern char PROC *findparse(),*makepat();
- 
--extern bool PROC getline();
-+extern bool PROC get_line();
- extern bool PROC putfile();
- extern bool PROC doyank(), deletion(), putback();
- extern bool PROC pushb(),pushi(),pushmem(),uputcmd(), delete_to_undo();
- extern bool PROC ok_to_scroll(), move_to_undo();
- 
-diff -NrU5 levee-3.5.original/main.c levee-3.5/main.c
---- levee-3.5.original/main.c	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/main.c	2009-07-21 23:09:52.000000000 +0000
-@@ -251,11 +251,11 @@
- 	println();
- 
-     mode=emode;
-     do {
- 	prompt(FALSE,":");
--	if (getline(instring))
-+	if (get_line(instring))
- 	    exec(instring, &mode, &noquit);
- 	indirect = FALSE;
- 	if (mode == E_VISUAL && zotscreen && noquit) {	/*ask for more*/
- 	    prints(" [more]");
- 	    if ((ch=peekc()) == 13 || ch == ' ' || ch == ':')
-diff -NrU5 levee-3.5.original/misc.c levee-3.5/misc.c
---- levee-3.5.original/misc.c	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/misc.c	2009-07-21 23:09:10.000000000 +0000
-@@ -19,11 +19,11 @@
-  */
- #include "levee.h"
- #include "extern.h"
- 
- bool PROC
--getline(str)
-+get_line(str)
- char *str;
- {
-     int len;
-     char flag;
-     
-diff -NrU5 levee-3.5.original/move.c levee-3.5/move.c
---- levee-3.5.original/move.c	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/move.c	2009-07-21 23:10:26.000000000 +0000
-@@ -158,11 +158,11 @@
-     case FSEARCH:
-     case BSEARCH:
- 	clrprompt();
- 	if (cmd == PATT_FWD || cmd == PATT_BACK) {
- 	    printch(tsearch = instring[0] = chars[cmd-PATT_FWD]);
--	    if (!getline(&instring[1]))
-+	    if (!get_line(&instring[1]))
- 		return ESCAPED;	/* needs to skip later tests */
- 	}
- 	else {
- 	    if (!lsearch)
- 		return BADMOVE;
diff --git a/app-editors/levee/files/levee-3.5a-QA.patch b/app-editors/levee/files/levee-3.5a-QA.patch
deleted file mode 100644
index 7e37c76b34ac..000000000000
--- a/app-editors/levee/files/levee-3.5a-QA.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -NrU5 levee-3.5a.original/configure.inc levee-3.5a/configure.inc
---- levee-3.5a.original/configure.inc	2009-08-12 19:51:26.000000000 +0000
-+++ levee-3.5a/configure.inc	2009-08-12 20:13:41.000000000 +0000
-@@ -1074,11 +1074,11 @@
-     else
- 	PROG_INSTALL="$DEST"
-     fi
- 
-     AC_SUB 'INSTALL' "$PROG_INSTALL"
--    AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -s -m 755"
-+    AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -m 755"
-     AC_SUB 'INSTALL_DATA' "$PROG_INSTALL -m 444"
- 
-     # finally build a little directory installer
-     # if mkdir -p works, use that, otherwise use install -d,
-     # otherwise build a script to do it by hand.
diff --git a/app-editors/levee/levee-3.5a.ebuild b/app-editors/levee/levee-3.5a.ebuild
deleted file mode 100644
index 965d248fd053..000000000000
--- a/app-editors/levee/levee-3.5a.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Really tiny vi clone, for things like rescue disks"
-HOMEPAGE="http://www.pell.chi.il.us/~orc/Code/"
-SRC_URI="http://www.pell.chi.il.us/~orc/Code/levee/${P}.tar.gz"
-
-LICENSE="levee"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="!app-text/lv
-	sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.4o-darwin.patch
-	epatch "${FILESDIR}"/${P}-QA.patch
-	epatch "${FILESDIR}"/${PN}-3.5-glibc210.patch
-}
-
-src_configure() {
-	export AC_CPP_PROG=$(tc-getCPP)
-	export AC_PATH=${PATH}
-	export AC_LIBDIR="$($(tc-getPKG_CONFIG) --libs ncurses)"
-	./configure.sh --prefix="${PREFIX}"/usr || die "configure failed"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS} -Wall -Wextra ${LDFLAGS}" CC=$(tc-getCC)
-}
-
-src_install() {
-	emake PREFIX="${D}${EPREFIX}" install
-}
diff --git a/app-editors/levee/metadata.xml b/app-editors/levee/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-editors/levee/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-editors/lpe-1.2.6.13 b/app-editors/lpe-1.2.6.13
new file mode 100644
index 000000000000..a14b6d4f46e8
--- /dev/null
+++ b/app-editors/lpe-1.2.6.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/slang-2.2.4 >=sys-libs/ncurses-5.7-r7:0= virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=a lightweight programmers editor
+EAPI=5
+HOMEPAGE=https://packages.qa.debian.org/l/lpe.html
+IUSE=nls
+KEYWORDS=amd64 ppc sparc x86 ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/slang-2.2.4 >=sys-libs/ncurses-5.7-r7:0=
+SLOT=0
+SRC_URI=mirror://debian/pool/main/l/lpe/lpe_1.2.6.13-0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=dc443f10c1b36efcc5dc03508ee68b76
diff --git a/app-editors/lpe/Manifest b/app-editors/lpe/Manifest
deleted file mode 100644
index e417bdaa32b5..000000000000
--- a/app-editors/lpe/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lpe-1.2.6.13-make-382.patch 794 BLAKE2B 87248819ab6b670a752c394070bca60aaf916deabc0b9ee8e5a8a43a8aa2b8d2bac6b623edbecf1a3937263f2adde3db058c36e49544137cc330746ff05ba8af SHA512 1f40434c9f545fca31461f0fa5bf801478d9c3c96a1a24905425b5471d88ad03178ff72d9a8f9459f3ceb2000a3d857f0d9d38cd2fd745952707991101d8283f
-DIST lpe_1.2.6.13-0.1.tar.gz 600523 BLAKE2B 8866aff63276d5e39ed48b4d9e8b9a23d541c13e196815c29586df83f8c6b5895a8dde8fb16b0929bffc49416907d74d48fdbc5ce736a855f2d2daad6472fb96 SHA512 f02769baca396285fe8f98c934f6274185d2bf8b08f3b007cbfa4e6aadb455abfb7cab13d53a3d1fa71ea0c29c4222784dcbc9a7508501c7d1839671503758ed
-EBUILD lpe-1.2.6.13.ebuild 1224 BLAKE2B 19d4804320a9e5bd902ff9a8af8d5f40d44935454d95d083bbf559242f8a479ab7daa3867f61d70339b01c0f3316a6c767044ef1543cd8f818462ec6fbca8d6b SHA512 418d95c8877cfb1c3c0217f3a7e22d36bd4b3e74744eae24f86a840f2f6f821c3d819ae480c2227439129bd3bac96aa2754c54117c854261f4e874f3d1bfc117
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch b/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch
deleted file mode 100644
index f8d96ef087e9..000000000000
--- a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/335324
-
---- intl/Makefile.in
-+++ intl/Makefile.in
-@@ -202,12 +202,12 @@
- # The dependency for intlh.inst is different in gettext and all other
- # packages.  Because we cannot you GNU make features we have to solve
- # the problem while rewriting Makefile.in.
--@GT_YES@intlh.inst: intlh.inst.in ../config.status
--@GT_YES@	cd .. \
--@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
--@GT_YES@	  $(SHELL) ./config.status
--@GT_NO@.PHONY: intlh.inst
--@GT_NO@intlh.inst:
-+intlh.inst: intlh.inst.in ../config.status
-+	cd .. \
-+	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-+	  $(SHELL) ./config.status
-+.PHONY: intlh.inst
-+intlh.inst:
- 
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/app-editors/lpe/lpe-1.2.6.13.ebuild b/app-editors/lpe/lpe-1.2.6.13.ebuild
deleted file mode 100644
index bd88d5531da9..000000000000
--- a/app-editors/lpe/lpe-1.2.6.13.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="a lightweight programmers editor"
-HOMEPAGE="https://packages.qa.debian.org/l/lpe.html"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}-0.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-linux"
-IUSE="nls"
-
-RDEPEND=">=sys-libs/slang-2.2.4
-	>=sys-libs/ncurses-5.7-r7:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make-382.patch
-
-	# You should add PKG_CHECK_MODULES(NCURSES, ncurses) to configure.in and
-	# replace -lncurses in src/Makefile.am with $(NCURSES_LIBS)
-	# That is, if you need eautoreconf
-	sed -i \
-		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs-only-l ncurses):" \
-		src/Makefile.in || die
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake \
-		libdir="${ED}/usr/$(get_libdir)" \
-		prefix="${ED}/usr" \
-		datadir="${ED}/usr/share" \
-		mandir="${ED}/usr/share/man" \
-		infodir="${ED}/usr/share/info" \
-		docdir="${ED}/usr/share/doc/${PF}" \
-		exdir="${ED}/usr/share/doc/${PF}/examples" \
-		install
-
-	prune_libtool_files --all
-}
diff --git a/app-editors/lpe/metadata.xml b/app-editors/lpe/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-editors/lpe/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-editors/metadata.xml b/app-editors/metadata.xml
deleted file mode 100644
index 195f8754aab5..000000000000
--- a/app-editors/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The app-editors category contains text editors.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie app-editors enthält Texteditoren.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría app-editors contiene editores de textos.
-	</longdescription>
-	<longdescription lang="ja">
-		app-editorsカテゴリにはテキストエディタが含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De app-editors categorie bevat text editors.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm app-editors chứa các trình soạn thảo văn bản.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria app-editors contiene editor di testo.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria app-editors contém editores de texto.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria app-editors zawiera edytory tekstu.
-	</longdescription>
-</catmetadata>
-
diff --git a/app-editors/mg-20171014 b/app-editors/mg-20171014
new file mode 100644
index 000000000000..182db7f30776
--- /dev/null
+++ b/app-editors/mg-20171014
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 ) virtual/pkgconfig
+DESCRIPTION=MicroGnuEmacs, a port from the BSDs
+EAPI=6
+HOMEPAGE=https://homepage.boetes.org/software/mg/
+IUSE=livecd
+KEYWORDS=alpha amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
+SLOT=0
+SRC_URI=https://homepage.boetes.org/software/mg/mg-20171014.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=14f7277cdb99f67ee4e33d6ef7944ea1
diff --git a/app-editors/mg-20180408 b/app-editors/mg-20180408
new file mode 100644
index 000000000000..27417c2634b2
--- /dev/null
+++ b/app-editors/mg-20180408
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 ) virtual/pkgconfig
+DESCRIPTION=MicroGnuEmacs, a port from the BSDs
+EAPI=7
+HOMEPAGE=https://homepage.boetes.org/software/mg/
+IUSE=livecd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
+SLOT=0
+SRC_URI=https://github.com/hboetes/mg/archive/20180408.tar.gz -> mg-20180408.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f55b11473e92a05efeeba4965ff58e93
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
deleted file mode 100644
index 67a705cfb541..000000000000
--- a/app-editors/mg/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mg-20171014.tar.gz 141045 BLAKE2B a5b3bda6ff3b6416093069b471762687c2279737aa05b297ccd3077aff195cf52831566768613a81dcc977a27ac5ffd6e8a1874aa1010b6d90f4c678b6825cee SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56
-DIST mg-20180408.tar.gz 141988 BLAKE2B db7da46fb0160acf8695f05234ed0c8e9a45e4239dc3abd433ddfb8b66e2b1aa550ffc4b409486a8990881d791ed73269a8ab78f6846cd4f0bee67761c11d281 SHA512 25fceb18fcbe63010e7a2e107aa5c30356938be2e04ff48869a12b5018dbb83bcf4dc70b03674713516616037247952a51454a28ca418cdc7b020d1f415f8701
-EBUILD mg-20171014.ebuild 1047 BLAKE2B ee8886aaabefaeb4005d711eb0520c4508407ff0d44c1b1a0094b025764242c9ff35df8808288b7b9df3a48120d0f00de880b454d1fb7176c0c570e5a3781e07 SHA512 e2f54dbdccc36ed6055b96c69246507c085fd88bb5bd136a05e8d2c364c0c887dc866405116fe1f28d63a03392c82da2abb2bee34db1075490cb3cbce24e92b0
-EBUILD mg-20180408.ebuild 1067 BLAKE2B 3ed53a0b87ea634bf765910a35f1b00005734f98d6bb0b8bc2579281de1fbf6cfed29d72a964e521e1b1c94d63b19030d474c6eb1468e62957043e25a5ad3a9a SHA512 d7757132baf374b65f3e6dce63dafc5183bd65518d72a53a06d8a401835de59b719c9f0c2c5ad0d7701c4567929eb526f623104516d7ee79cbea77918fce7504
-MISC metadata.xml 384 BLAKE2B 86ad99174028addfaef8bb9f143949161c8d1d81f2e946b3aa9088bd644b61ce97869d0a0b669abcff56e925fe8757d77f6123a2dfe340b8620db2ae84ba0b55 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf
diff --git a/app-editors/mg/metadata.xml b/app-editors/mg/metadata.xml
deleted file mode 100644
index 00486d5abd44..000000000000
--- a/app-editors/mg/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-  mg is Micro GNU/emacs, this is a portable version of the mg maintained by
-  the OpenBSD team.
-</longdescription>
-</pkgmetadata>
diff --git a/app-editors/mg/mg-20171014.ebuild b/app-editors/mg/mg-20171014.ebuild
deleted file mode 100644
index 232a6b42a429..000000000000
--- a/app-editors/mg/mg-20171014.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-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"
-IUSE="livecd"
-
-RDEPEND="sys-libs/ncurses:0
-	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# fix path to tutorial in man page
-	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
-
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install()  {
-	dobin mg
-	doman mg.1
-	dodoc README tutorial
-	# don't compress the tutorial, otherwise mg cannot open it
-	docompress -x /usr/share/doc/${PF}/tutorial
-}
-
-pkg_postinst() {
-	if use livecd; then
-		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
-	fi
-}
diff --git a/app-editors/mg/mg-20180408.ebuild b/app-editors/mg/mg-20180408.ebuild
deleted file mode 100644
index a7eea4e9015c..000000000000
--- a/app-editors/mg/mg-20180408.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="https://homepage.boetes.org/software/mg/"
-SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="livecd"
-
-RDEPEND="sys-libs/ncurses:0
-	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# fix path to tutorial in man page
-	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install()  {
-	dobin mg
-	doman mg.1
-	dodoc README tutorial
-	# don't compress the tutorial, otherwise mg cannot open it
-	docompress -x /usr/share/doc/${PF}/tutorial
-}
-
-pkg_postinst() {
-	if use livecd; then
-		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
-	fi
-}
diff --git a/app-editors/moe-1.6 b/app-editors/moe-1.6
new file mode 100644
index 000000000000..7ff13548949a
--- /dev/null
+++ b/app-editors/moe-1.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare unpack
+DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) sys-libs/ncurses:0= virtual/pkgconfig
+DESCRIPTION=A powerful and user-friendly console text editor
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/moe/
+KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=mirror://gnu/moe/moe-1.6.tar.lz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=803de735660dbab94e3815c45e32e72a
diff --git a/app-editors/moe-1.7 b/app-editors/moe-1.7
new file mode 100644
index 000000000000..0ea7d671ffb3
--- /dev/null
+++ b/app-editors/moe-1.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare unpack
+DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) sys-libs/ncurses:0= virtual/pkgconfig
+DESCRIPTION=A powerful and user-friendly console text editor
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/moe/
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=mirror://gnu/moe/moe-1.7.tar.lz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cf78b6b1c1758676956a34b4c14ea9d8
diff --git a/app-editors/moe-1.9 b/app-editors/moe-1.9
new file mode 100644
index 000000000000..f637fbb12c04
--- /dev/null
+++ b/app-editors/moe-1.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare unpack
+DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) sys-libs/ncurses:0= virtual/pkgconfig
+DESCRIPTION=A powerful and user-friendly console text editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/moe/
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=mirror://gnu/moe/moe-1.9.tar.lz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
+_md5_=597ee29cad78ac0ac69d9fe9031aee20
diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest
deleted file mode 100644
index cbe35ad693ca..000000000000
--- a/app-editors/moe/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX moe-1.6-tinfo.patch 379 BLAKE2B 4b2b0b895181d98b742c5abe5bab3690a9f37d987e0b63123d2b0288ec0f0980df3bb9cc654e5cfcabcaeee69714aec7e3e99974bab4a8fbc36105c071b2a988 SHA512 8fa0661bce445d585aa37d845a4b41a0d1ed08aeab4117f6f1c6bdac346d7d774dfe38253dc11f0be7bd68c136eaac5aa889e174e0556f036fbdaf2e8b06373f
-DIST moe-1.6.tar.lz 75108 BLAKE2B 0d675ceecea6670fe24e860d030ef43905add64334d0769d24a57fb3b0cc421e7065c6d36df7e2c154db66936ab8849f9bf42288767810aec34db4261fef23f6 SHA512 0aa717c865d41f73adccddbb158ae67b611a64f24258bcce5a68fea8175d28d6db55a0fb356fb294bfe3106c0973607b1fcc76ceee17d360e30eb80650ec043b
-DIST moe-1.7.tar.lz 79644 BLAKE2B e4e353d1daba8b40842d86a0821c8a0668bbe9e6875b988190f870b8fd637ee3f0006ca088f9aeb1dedcc69b17c45ced4167ffb248adb429531516b64229caee SHA512 e961291c55e5b2af09e3b5cb0d07b557b0af1f6143339390e5b06f4bdebace888f7c3866ec936bd20f25b23cc96fdfdb7bd3da6690e684ec24513b106ae53b49
-DIST moe-1.9.tar.lz 82046 BLAKE2B 9144dfc4ce17bc04f3ad9aa9ec271f173df6c581705e5d922a346f94c086a97af9429478c016d7081c1fd38787055666504f04d25a8b9f5c1020dc147aaafdb0 SHA512 277700e4a796e1a7aee42de55ba4599a350a612f95a1a2eca5078d85f6f9a7db190fb5611eb2f286c98580af847a2934bf38a4bce10176db4c5cddc2d257f929
-EBUILD moe-1.6.ebuild 704 BLAKE2B df78a79db97d09095063227346f7377faaf250c7846fadc680765627f6d9214ae670b9083befd78e190c07baaeda416e0eaeb4f8e8c6cb11bda40248d6c5b708 SHA512 9136ed57d5fe7a7991588f2194ce04969d4be94dac8c5ccd0258264bda052c1cd7d1d34dad1cdd29cb7aabc08547be354d014e1781f2216715cb12ddff22c86b
-EBUILD moe-1.7.ebuild 712 BLAKE2B 439fd6f1a4dd14bfbf693fbf2c0a5be8889bc857be448f0daa47fa4675b6e091ec6e8f8bbe22cfd9d993220af39ec472041b082348124f4d6afe2ffcdd0bc0fe SHA512 15fb3c954ad0c81e9ee9e191c6b96b9b0f494875d8415b30fc997aedcb691961bf546573147afa8ae2f87f2851df23b4e44195ad10cc690df8306e97de90e00d
-EBUILD moe-1.9.ebuild 705 BLAKE2B eecb3509f0e4b13520434fa0f8610855695c24e5e37ecee76ad848d03ca40b7015008e5ff498fdfef18d6d30d8f44a141b26e004b4692ba245518eb175695408 SHA512 fa237dcff35bf6f48994b6a394dc086c22296bcd7315b54772b693e0a6c2187b9ca41c7ff51ebb2aceb67835513b827e5d3ccfcc25ffeb5f3a68517eca19e882
-MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-editors/moe/files/moe-1.6-tinfo.patch b/app-editors/moe/files/moe-1.6-tinfo.patch
deleted file mode 100644
index 5a94ec599e89..000000000000
--- a/app-editors/moe/files/moe-1.6-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in.orig	2014-11-03 00:33:57.152593136 +0300
-+++ b/Makefile.in	2014-11-03 00:34:21.121592519 +0300
-@@ -4,7 +4,7 @@
- INSTALL_PROGRAM = $(INSTALL) -m 755
- INSTALL_DATA = $(INSTALL) -m 644
- INSTALL_DIR = $(INSTALL) -d -m 755
--LIBS = -lncurses
-+LIBS = $(shell ${PKG_CONFIG} --libs ncurses)
- SHELL = /bin/sh
- 
- edobjs = basic_buffer.o block.o buffer.o buffer_handle.o \
diff --git a/app-editors/moe/metadata.xml b/app-editors/moe/metadata.xml
deleted file mode 100644
index 6698a4ab7883..000000000000
--- a/app-editors/moe/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-editors/moe/moe-1.6.ebuild b/app-editors/moe/moe-1.6.ebuild
deleted file mode 100644
index 85f0a9065dcf..000000000000
--- a/app-editors/moe/moe-1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="A powerful and user-friendly console text editor"
-HOMEPAGE="https://www.gnu.org/software/moe/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	$(unpacker_src_uri_depends)
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	tc-export CXX PKG_CONFIG
-	sed -i \
-		-e "/^CXXFLAGS=/d" \
-		-e "/^LDFLAGS=/d" \
-		-e  "/^CXX=/d" \
-		configure || die "sed on configure failed"
-
-	epatch_user
-
-	epatch "${FILESDIR}/${P}-tinfo.patch"
-}
diff --git a/app-editors/moe/moe-1.7.ebuild b/app-editors/moe/moe-1.7.ebuild
deleted file mode 100644
index c7f8b897e55c..000000000000
--- a/app-editors/moe/moe-1.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="A powerful and user-friendly console text editor"
-HOMEPAGE="https://www.gnu.org/software/moe/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	$(unpacker_src_uri_depends)
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	tc-export CXX PKG_CONFIG
-	sed -i \
-		-e "/^CXXFLAGS=/d" \
-		-e "/^LDFLAGS=/d" \
-		-e  "/^CXX=/d" \
-		configure || die "sed on configure failed"
-
-	epatch_user
-
-	epatch "${FILESDIR}/${PN}-1.6-tinfo.patch"
-}
diff --git a/app-editors/moe/moe-1.9.ebuild b/app-editors/moe/moe-1.9.ebuild
deleted file mode 100644
index c511c32637fa..000000000000
--- a/app-editors/moe/moe-1.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs unpacker
-
-DESCRIPTION="A powerful and user-friendly console text editor"
-HOMEPAGE="https://www.gnu.org/software/moe/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	$(unpacker_src_uri_depends)
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	tc-export CXX PKG_CONFIG
-	sed -i \
-		-e "/^CXXFLAGS=/d" \
-		-e "/^LDFLAGS=/d" \
-		-e  "/^CXX=/d" \
-		configure || die "sed on configure failed"
-
-	eapply_user
-
-	eapply "${FILESDIR}/${PN}-1.6-tinfo.patch"
-}
diff --git a/app-editors/mousepad-0.4.0-r1 b/app-editors/mousepad-0.4.0-r1
new file mode 100644
index 000000000000..7184eb35c647
--- /dev/null
+++ b/app-editors/mousepad-0.4.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2.30:2= dbus? ( >=dev-libs/dbus-glib-0.100:0= ) !gtk3? ( >=x11-libs/gtk+-2.24:2= x11-libs/gtksourceview:2.0= ) gtk3? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= ) dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=GTK+-based editor for the Xfce Desktop Environment
+EAPI=6
+HOMEPAGE=https://git.xfce.org/apps/mousepad/about/
+IUSE=dbus gtk3
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.30:2= dbus? ( >=dev-libs/dbus-glib-0.100:0= ) !gtk3? ( >=x11-libs/gtk+-2.24:2= x11-libs/gtksourceview:2.0= ) gtk3? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/mousepad/0.4/mousepad-0.4.0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8f557a6ada1833c703bfd1f19eb822db
diff --git a/app-editors/mousepad-0.4.1 b/app-editors/mousepad-0.4.1
new file mode 100644
index 000000000000..65af2f36dc85
--- /dev/null
+++ b/app-editors/mousepad-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2.30:2= dbus? ( >=dev-libs/dbus-glib-0.100:0= ) !gtk3? ( >=x11-libs/gtk+-2.24:2= x11-libs/gtksourceview:2.0= ) gtk3? ( >=x11-libs/gtk+-3.20:3= x11-libs/gtksourceview:3.0= ) dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=GTK+-based editor for the Xfce Desktop Environment
+EAPI=6
+HOMEPAGE=https://git.xfce.org/apps/mousepad/about/
+IUSE=dbus gtk3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.30:2= dbus? ( >=dev-libs/dbus-glib-0.100:0= ) !gtk3? ( >=x11-libs/gtk+-2.24:2= x11-libs/gtksourceview:2.0= ) gtk3? ( >=x11-libs/gtk+-3.20:3= x11-libs/gtksourceview:3.0= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/mousepad/0.4/mousepad-0.4.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d2619f1edeb1975a2a021cd6c00be50e
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
deleted file mode 100644
index ff1c18802451..000000000000
--- a/app-editors/mousepad/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mousepad-0.4.0.tar.bz2 578483 BLAKE2B d723ee7dc721703cfc46ad359dbf37c676ba12db4c8f4e874e1578b203a1f35cc077229ccbc9950b82e1784042f191018734cfaa09785b6b602388011db4a7b0 SHA512 5196abd04268d1ace118dc485b72bfcfb7f9175eeaf52bc97c08c1646371d26401403a3bb199d882380bcb998547c65af9bd054f0365afd846c0ad74d3c3b1fe
-DIST mousepad-0.4.1.tar.bz2 644161 BLAKE2B 656245afb38423cff7eb8a038c8247d9023e10eb85f574f25fd4fad50b0316cbe125630ddff330adb91c49eec9ee3ed67ecd0546b9fecb065c832882b3e42145 SHA512 2ffbb4245a3344437bd41f9f28cc066ae45062f6b6d169aa274e933f033c434f0b10845ccf42ab846dcad25ae7cee36ea6619bfb6889e8cd41c994be87b77be8
-EBUILD mousepad-0.4.0-r1.ebuild 1038 BLAKE2B 13e3b71311815f929ce27f769acbbd6125655c377eecf53837f0dc7db4b40c81cb9df26205ebe559a3117b4fe1981f353cd2ee5b84409897c7a1f7e246a36d28 SHA512 72ee6c2efb7add6ce32834423be4ac131b771ca02ed0dd444b6829add27843b7e3205c2d6dbeb8be532e6fffe199e5d20982dabfe0188320354571cdc87e77c5
-EBUILD mousepad-0.4.1.ebuild 1002 BLAKE2B 8e625e065ec75d47cda76adf2bf42b2aac79c816af471c67045992039c3e0e832b651d439d4e85b7576255a1b4599305e47112c26ff0cfdf67dce9b38ae8b751 SHA512 693bad643771bd8a603c119a783dd32aa45c6e2bf9d2623704c5a8c437a7bad26f8826bca21abdc290cfae10c6ac163190180ea6900700321ffb9ed9e6e5da5a
-MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
diff --git a/app-editors/mousepad/metadata.xml b/app-editors/mousepad/metadata.xml
deleted file mode 100644
index e44ea637f98f..000000000000
--- a/app-editors/mousepad/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-  <use>
-    <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
-  </use>
-</pkgmetadata>
diff --git a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild b/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
deleted file mode 100644
index e9ce62e3020a..000000000000
--- a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
-HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus gtk3"
-
-RDEPEND=">=dev-libs/glib-2.30:2=
-	dbus? ( >=dev-libs/dbus-glib-0.100:0= )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2=
-		x11-libs/gtksourceview:2.0= )
-	gtk3? ( x11-libs/gtk+:3=
-		x11-libs/gtksourceview:3.0= )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable dbus)
-		$(use_enable gtk3)
-		)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/mousepad/mousepad-0.4.1.ebuild b/app-editors/mousepad/mousepad-0.4.1.ebuild
deleted file mode 100644
index b9f379a428ba..000000000000
--- a/app-editors/mousepad/mousepad-0.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
-HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus gtk3"
-
-RDEPEND=">=dev-libs/glib-2.30:2=
-	dbus? ( >=dev-libs/dbus-glib-0.100:0= )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2=
-		x11-libs/gtksourceview:2.0= )
-	gtk3? ( >=x11-libs/gtk+-3.20:3=
-		x11-libs/gtksourceview:3.0= )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable dbus)
-		$(use_enable gtk3)
-		)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/nano-2.8.7 b/app-editors/nano-2.8.7
new file mode 100644
index 000000000000..41d1d3e6568f
--- /dev/null
+++ b/app-editors/nano-2.8.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) )
+DESCRIPTION=GNU GPL'd Pico clone with more functionality
+EAPI=6
+HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
+IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
+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
+LICENSE=GPL-3
+RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
+SLOT=0
+SRC_URI=https://www.nano-editor.org/dist/v2.8/nano-2.8.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3625a34ddfa46225c0762b4c495e4a87
diff --git a/app-editors/nano-2.9.7 b/app-editors/nano-2.9.7
new file mode 100644
index 000000000000..0bdca1e73d53
--- /dev/null
+++ b/app-editors/nano-2.9.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) )
+DESCRIPTION=GNU GPL'd Pico clone with more functionality
+EAPI=6
+HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
+IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
+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
+LICENSE=GPL-3
+RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
+SLOT=0
+SRC_URI=https://www.nano-editor.org/dist/v2.9/nano-2.9.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ba334a4032e57c9e2d888e1cc8bf11eb
diff --git a/app-editors/nano-2.9.8 b/app-editors/nano-2.9.8
new file mode 100644
index 000000000000..5c7ef34f6191
--- /dev/null
+++ b/app-editors/nano-2.9.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) )
+DESCRIPTION=GNU GPL'd Pico clone with more functionality
+EAPI=6
+HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
+IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
+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
+LICENSE=GPL-3
+RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
+SLOT=0
+SRC_URI=https://www.nano-editor.org/dist/v2.9/nano-2.9.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ba334a4032e57c9e2d888e1cc8bf11eb
diff --git a/app-editors/nano-9999 b/app-editors/nano-9999
new file mode 100644
index 000000000000..31a5faed9267
--- /dev/null
+++ b/app-editors/nano-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GNU GPL'd Pico clone with more functionality
+EAPI=6
+HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
+IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
+LICENSE=GPL-3
+RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ba334a4032e57c9e2d888e1cc8bf11eb
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
deleted file mode 100644
index ccc13e70931e..000000000000
--- a/app-editors/nano/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX nano-2.8.7-minimal_compile_fix.patch 1206 BLAKE2B 72265b226a23282baf1d16fe62637a3a6123342da9ddf9fa205d7eaafea710aa62fcafad1188cc1c08bd537be3ddb98403afbfd035fdac5712d6bf24bf2fa40e SHA512 1ebf43ca322c0cd49b7a3ffaad33057d4ac899c7a930569df124e54f713b28ece7e01aa625db91ece0126a07228256d188154bce464bd4c1a97945d686d9f0f3
-DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79
-DIST nano-2.9.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
-MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82
diff --git a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch b/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch
deleted file mode 100644
index ef8d74910164..000000000000
--- a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 28cfab7580c42a6d6c9c5d787ce736094fd51a0c Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Tue, 29 Aug 2017 19:28:44 +0200
-Subject: tweaks: fix compilation when configured with --enable-tiny
-
-When moving the cursor to the top-left corner, it is not necessary
-to compute leftedge because firstcolumn IS the relevant leftedge.
-
-Reported-by: Jordi Mallach <jordi@debian.org>
----
- src/move.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/move.c b/src/move.c
-index d138356..ce276e4 100644
---- a/src/move.c
-+++ b/src/move.c
-@@ -121,7 +121,7 @@ void do_page_up(void)
- 	openfile->current = openfile->edittop;
- 	openfile->current_y = 0;
- 
--	leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop);
-+	leftedge = openfile->firstcolumn;
- 	target_column = 0;
-     } else
- 	get_edge_and_target(&leftedge, &target_column);
-@@ -152,7 +152,7 @@ void do_page_down(void)
- 	openfile->current = openfile->edittop;
- 	openfile->current_y = 0;
- 
--	leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop);
-+	leftedge = openfile->firstcolumn;
- 	target_column = 0;
-     } else
- 	get_edge_and_target(&leftedge, &target_column);
--- 
-cgit v1.0-41-gc330
-
diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml
deleted file mode 100644
index ba70fb9893e9..000000000000
--- a/app-editors/nano/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-</maintainer>
-<longdescription>
-GNU nano - an enhanced clone of the Pico text editor.
-
-The nano project was started because of a few "problems" with the
-wonderfully easy-to-use and friendly Pico text editor.
-
-First and foremost is its license: the Pine suite does not use the
-GPL or a GPL-friendly license, and has unclear restrictions on
-redistribution.  Because of this, Pine and Pico are not included with
-many GNU/Linux distributions.  Also, other features (like goto line
-number or search and replace) were unavailable until recently or
-require a command line flag.  Yuck.
-
-nano aims to solve these problems by emulating the functionality of
-Pico as closely as possible while addressing the problems above and
-perhaps providing other extra functionality.
-</longdescription>
-<use>
- <flag name="justify">Enable justify/unjustify functions for text formatting.</flag>
- <flag name="debug">
-  Enable debug messages and assert warnings.  Note that these will all be sent
-  straight to stderr rather than some logging facility.
- </flag>
- <flag name="magic">
-  Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting
- </flag>
- <flag name="minimal">
-  Disable all fancy features, including ones that otherwise have a dedicated
-  USE flag (such as spelling).
- </flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/nano/nano-2.8.7.ebuild b/app-editors/nano/nano-2.8.7.ebuild
deleted file mode 100644
index dfa5e6cfd21c..000000000000
--- a/app-editors/nano/nano-2.8.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
-	inherit git-r3 autotools
-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"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-minimal_compile_fix.patch" #629510
-)
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		--disable-wrapping-as-root
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-		$(usex ncurses --without-slang $(use_with slang))
-	)
-	case ${CHOST} in
-		*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
-	esac
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/trash
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED%/}"/etc/nanorc || die
-	fi
-
-	dodir /usr/bin
-	dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.9.7.ebuild b/app-editors/nano/nano-2.9.7.ebuild
deleted file mode 100644
index a0bec925c03d..000000000000
--- a/app-editors/nano/nano-2.9.7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
-	inherit git-r3 autotools
-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"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		--disable-wrapping-as-root
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-		$(usex ncurses --without-slang $(use_with slang))
-	)
-	case ${CHOST} in
-		*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
-	esac
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D%/}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED%/}"/etc/nanorc || die
-	fi
-
-	dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.9.8.ebuild b/app-editors/nano/nano-2.9.8.ebuild
deleted file mode 100644
index a0bec925c03d..000000000000
--- a/app-editors/nano/nano-2.9.8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
-	inherit git-r3 autotools
-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"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		--disable-wrapping-as-root
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-		$(usex ncurses --without-slang $(use_with slang))
-	)
-	case ${CHOST} in
-		*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
-	esac
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D%/}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED%/}"/etc/nanorc || die
-	fi
-
-	dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
deleted file mode 100644
index a0bec925c03d..000000000000
--- a/app-editors/nano/nano-9999.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
-	inherit git-r3 autotools
-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"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		--disable-wrapping-as-root
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-		$(usex ncurses --without-slang $(use_with slang))
-	)
-	case ${CHOST} in
-		*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
-	esac
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D%/}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED%/}"/etc/nanorc || die
-	fi
-
-	dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/ne-3.0.1-r1 b/app-editors/ne-3.0.1-r1
new file mode 100644
index 000000000000..e28a2f7b0a2c
--- /dev/null
+++ b/app-editors/ne-3.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/ncurses:0=[tinfo?]
+DESCRIPTION=the nice editor, easy to use for the beginner and powerful for the wizard
+EAPI=6
+HOMEPAGE=http://ne.di.unimi.it/
+IUSE=tinfo
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0=[tinfo?] dev-lang/perl
+SLOT=0
+SRC_URI=http://ne.di.unimi.it//ne-3.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e3906e384cec294ef47a6b1f6f6779c7
diff --git a/app-editors/ne-3.1.1 b/app-editors/ne-3.1.1
new file mode 100644
index 000000000000..8ef930d50390
--- /dev/null
+++ b/app-editors/ne-3.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/ncurses:0=[tinfo?]
+DESCRIPTION=the nice editor, easy to use for the beginner and powerful for the wizard
+EAPI=6
+HOMEPAGE=http://ne.di.unimi.it/
+IUSE=tinfo
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0=[tinfo?] dev-lang/perl
+SLOT=0
+SRC_URI=http://ne.di.unimi.it//ne-3.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e3906e384cec294ef47a6b1f6f6779c7
diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
deleted file mode 100644
index 60c4a5c26302..000000000000
--- a/app-editors/ne/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ne-3.0.1.tar.gz 1193311 BLAKE2B a58afd00660a7266a37fb0626ddd326fa3366eede6d44cfdd3a002fa3c90db3cbfd852a414c9e8f091e1eac0786cb4d296d1b26144d8afd1d5118da29823603f SHA512 3750140a49c7424e92e509137d5f31d305b81d41939a2578f6a26065216ebd1aa444b0e8d7e79dd09cc525e1055cda4d756f21ec810f860063d2eec861ea8273
-DIST ne-3.1.1.tar.gz 1219488 BLAKE2B 6d778c1b2e9e18154322a6b327cc4a2711619c353eb82073ad00f3e40b3b8e61f7ee7ce6fee3f0e02b38d001dc26365f44b63f70ddd6089f186a52bdf4c69a17 SHA512 e572ca2a0cd39a59adaea911c80e083872103d90a586117efcabbc3881cf1a48d0c3d06f20eebcd9254177afafef15fd581778cd251b1b25b64ad68a5f8afc37
-EBUILD ne-3.0.1-r1.ebuild 1111 BLAKE2B 0792d5d622570bcaca6c63b858ffacf6402ae26dbd26cd2e659f54ac8cf9ef9b0560bf98d50946f18d599f77838de63aaaa8a7f68f87d47dc127ab3f3be20672 SHA512 bfba8a0823cefb302869bc454b83ab1e1deb23d2eff52d779a453d20b3a250327e9e5003aca3c1d75c7048572f2ddbd2869af9687ff12b4667d110bbeb9bb7ec
-EBUILD ne-3.1.1.ebuild 1111 BLAKE2B 0792d5d622570bcaca6c63b858ffacf6402ae26dbd26cd2e659f54ac8cf9ef9b0560bf98d50946f18d599f77838de63aaaa8a7f68f87d47dc127ab3f3be20672 SHA512 bfba8a0823cefb302869bc454b83ab1e1deb23d2eff52d779a453d20b3a250327e9e5003aca3c1d75c7048572f2ddbd2869af9687ff12b4667d110bbeb9bb7ec
-MISC metadata.xml 249 BLAKE2B bd3f8cd51cd7f93c68a6ae940a7ac6a572bbd81ce9a4011bede9117025d2ec55636679e49269ca3df422ac132cc7fbfc1c982a707e30a70479b33fa0a21b0350 SHA512 40160ace781dd306147377e882be12701aa73684143080278ac55ba434185e3673aeadad11224743eefa70962ed005db0337e2ef2b5dbe6eb9fdec01bf72283c
diff --git a/app-editors/ne/metadata.xml b/app-editors/ne/metadata.xml
deleted file mode 100644
index 1d1325e157ac..000000000000
--- a/app-editors/ne/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="tinfo">Link against libtinfo from sys-libs/ncurses</flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/ne/ne-3.0.1-r1.ebuild b/app-editors/ne/ne-3.0.1-r1.ebuild
deleted file mode 100644
index 9d68adc0f1a0..000000000000
--- a/app-editors/ne/ne-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="http://ne.di.unimi.it/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="tinfo"
-
-DEPEND="sys-libs/ncurses:0=[tinfo?]"
-
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-"
-
-HTML_DOCS=( doc/html/. )
-
-src_prepare() {
-	default
-	sed -i -e 's/-O3//' src/makefile || die
-}
-
-src_configure() {
-	local sedflags="s|-lcurses|-lncurses|g"
-	use tinfo && sedflags="s|-lcurses|-ltinfo|g"
-	sed -i -e "${sedflags}" src/makefile || die
-}
-
-src_compile() {
-	append-cflags -std=c11
-	emake -C src CC="$(tc-getCC)" \
-		NE_GLOBAL_DIR="/usr/share/${PN}" \
-		OPTS="${CFLAGS}" \
-		"${PN}"
-}
-
-src_install() {
-	dobin "src/${PN}"
-
-	insinto "/usr/share/${PN}/syntax"
-	doins syntax/*.jsf
-
-	doman "doc/${PN}.1"
-	dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.*
-}
diff --git a/app-editors/ne/ne-3.1.1.ebuild b/app-editors/ne/ne-3.1.1.ebuild
deleted file mode 100644
index 9d68adc0f1a0..000000000000
--- a/app-editors/ne/ne-3.1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="http://ne.di.unimi.it/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="tinfo"
-
-DEPEND="sys-libs/ncurses:0=[tinfo?]"
-
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-"
-
-HTML_DOCS=( doc/html/. )
-
-src_prepare() {
-	default
-	sed -i -e 's/-O3//' src/makefile || die
-}
-
-src_configure() {
-	local sedflags="s|-lcurses|-lncurses|g"
-	use tinfo && sedflags="s|-lcurses|-ltinfo|g"
-	sed -i -e "${sedflags}" src/makefile || die
-}
-
-src_compile() {
-	append-cflags -std=c11
-	emake -C src CC="$(tc-getCC)" \
-		NE_GLOBAL_DIR="/usr/share/${PN}" \
-		OPTS="${CFLAGS}" \
-		"${PN}"
-}
-
-src_install() {
-	dobin "src/${PN}"
-
-	insinto "/usr/share/${PN}/syntax"
-	doins syntax/*.jsf
-
-	doman "doc/${PN}.1"
-	dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.*
-}
diff --git a/app-editors/nedit-5.6-r1 b/app-editors/nedit-5.6-r1
new file mode 100644
index 000000000000..a0abc62ffc84
--- /dev/null
+++ b/app-editors/nedit-5.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 || ( dev-util/yacc sys-devel/bison ) dev-lang/perl
+DESCRIPTION=Multi-purpose text editor for the X Window System
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/nedit
+KEYWORDS=alpha amd64 ~mips ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/nedit/nedit-source/nedit-5.6a-src.tar.gz https://dev.gentoo.org/~jlec/distfiles/nedit.png.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=82049fbb702374ebf49c259410b00690
diff --git a/app-editors/nedit-5.6-r2 b/app-editors/nedit-5.6-r2
new file mode 100644
index 000000000000..cebd1d484e73
--- /dev/null
+++ b/app-editors/nedit-5.6-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 || ( dev-util/yacc sys-devel/bison ) dev-lang/perl
+DESCRIPTION=Multi-purpose text editor for the X Window System
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/nedit
+KEYWORDS=~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/nedit/nedit-source/nedit-5.6a-src.tar.gz https://dev.gentoo.org/~jlec/distfiles/nedit.png.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=50039ef51e363c9008a824556e31c0f3
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
deleted file mode 100644
index d7aac0a872a6..000000000000
--- a/app-editors/nedit/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX nedit-5.6-40_Pointer_to_Integer.patch 10379 BLAKE2B d7a855d17ca5744ec3d1a8f6b286911458236b452a98d36fe57e0779e17101786e7c52702dbc20f98b460f3b3ac05093823214adc99eb17399919d2361a60085 SHA512 263fd5109c5fc16ea8328ad7855b8ab74e6e744d89374d68bc7db495a3295888f3599d2e9d6653097b4f7b68bae968a5deb7240a565f8fa1beba451b8b1f1b55
-AUX nedit-5.6-fix-crash-with-noX.patch 4726 BLAKE2B 1378cd446adf148d5a69b772e790c6bbb052ce27c668c4b391f3f08081bc523368a6c4a63eae39c503b4f569c7f374c0b9c5303bf23505acb2f322dcc98f1121 SHA512 38a3292370482b295afa3eb7033061e2837819c519fa1d3215c4d69bdf11871ee193615ecec8a01a102da5e27e3098337db06ab296f3feffac53ed84d660bb90
-AUX nedit-5.6-format.patch 453 BLAKE2B b8a226e93e2c1666caefb5032706d8ac08284af3e2a2658f794b4af6eaae18311db52ed01a49c368d050958e55ef2fbc0893ee3b8bc63418bce676c5c4d7aae1 SHA512 50e93d7f297ae0b10bec34176c707cc61d4c205e1293cb02b94f85359604864df8698bf35725f007b9c9eb585d0cf18c2498b6d7f55960fabb93b3d98bfe02b8
-AUX nedit-5.6-ldflags.patch 800 BLAKE2B ee06dcdd07f7d01c23c943e85382d33d316e85c364b1c3bc243ee3468078e8a47a770191389dd53a94d83b6e896e9dbe15b40d365aab4f3a8ef5c8705941ea9a SHA512 65818ef8b425414bf4c9f0bd9b71b56df5a6ef05f0e2914558733cbc7bbe435199e8c69c66b2f460964d1913bbc6fb8722a77d881ea4efa1be07f8fb55ad66e4
-AUX nedit-5.6-security.patch 1944 BLAKE2B 8b3e21d074f274c5ba24f1888d9d13d71ac08f80c0e063a5e0e85794a1677c10f7d6d64298e0588a73e86af1d3dfdacb32a389a53ff7a4e408f9006006adc60e SHA512 437ff658c4ae4918fa73dee97773d9b8bf9b2dbfd4af3752ab3bdb735ded2508e449170e2aeea43d9bfbdb48e75d52154a847cb9a3a59e7f4b6ad0ec9027bfcd
-DIST nedit-5.6a-src.tar.gz 1353454 BLAKE2B e3e8ed86b12a4c3673513b65c7ca08c11b22dcac4816287be680f112c5c8de0c59510f26605a7f288846fb4bb8c28dd958c534a52450a905f7639712d832e69a SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0
-DIST nedit.png.xz 14000 BLAKE2B dd50757a52fe3a2c57490cd0783f323877dc23733acc28b2c303d73724b6b66ed73dc819827ea52b96410fd7264a991040f00d609070bd87945d406328567ca0 SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3
-EBUILD nedit-5.6-r1.ebuild 1989 BLAKE2B 8d5cde4cb3ecd3a20db4ecc763a1a97db7ba9a86dbea7c5355d8c5c7056ef3afe7d90fb94f97dd4652b8d71a7163ef17346b71fdd0a1ad9dfaa966d5b2c8a203 SHA512 147d9308121e65466d22b9973f8d0ab69b0fca53769b51dce8da933a8a069e025cf1222f4ff5d03af3df71fd4c0a93def2f99c0b9402456e3903bce5ebf5dc3b
-EBUILD nedit-5.6-r2.ebuild 2037 BLAKE2B b881666c19e2d9aa63e219ad2a1a0d4d632470d80bbe74bbddfcbd7272a210882bc172e9499d61c77afd8fa63fa30f465fd9c7814c893e635ad0833adf05bb31 SHA512 ed954cd69acc1652f597d188c72c38f38e8ff0d06ede0f7b98c818b1c0a442c9e688a1ade3cb245ab3de907966c86210dd6b28528ddef448fc367c6d8aab20ed
-MISC metadata.xml 292 BLAKE2B 10ee90c2d8d7cc7bdef834d511467fe8dc1bf90929caf19a919d2e428c6d42f432f996bddd4cf1e4f2fbee70621e85144a7458b70b8c139aac20e3f7f82a0710 SHA512 0c0cc8a66f8640a0239d6b971d6faf8ca3b5a50909306b47c02b6f5b401b71534e6965cec6cfb38a47bdb09cb871cd217f9316220b6d7ca2a1019b27bf2f7699
diff --git a/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch b/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch
deleted file mode 100644
index 9081ea340619..000000000000
--- a/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# Description: fix warning: cast from pointer to integer of different size
-# Origin: https://sourceforge.net/tracker/download.php?group_id=11005&atid=311005&file_id=340993&aid=2846694
-# Bug: https://sourceforge.net/tracker/?func=detail&atid=311005&aid=2846694&group_id=11005
-# Author: Jack Howarth <jwhowarth@users.sourceforge.net>
-
-@DPATCH@
-diff -urNad nedit-5.6~cvs20081118~/Xlt/SlideC.c nedit-5.6~cvs20081118/Xlt/SlideC.c
---- nedit-5.6~cvs20081118~/Xlt/SlideC.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/Xlt/SlideC.c	2009-09-15 22:05:42.000000000 +0200
-@@ -28,6 +28,7 @@
- #endif
- 
- #include <Xm/XmP.h>
-+#include <stdint.h>
- 
- #include "SlideCP.h"
- 
-@@ -116,14 +117,14 @@
- /* notify that initialize called    XtArgsProc        */ NULL,
- /* NULL                             XtProc            */ NULL,
- /* NULL                             XtPointer         */ NULL,
--/* NULL                             Cardinal          */ (Cardinal)NULL,
-+/* NULL                             Cardinal          */ (Cardinal)(uintptr_t)NULL,
- /* resources for subclass fields    XtResourceList    */ resources,
- /* number of entries in resources   Cardinal          */ XtNumber(resources),
- /* resource class quarkified        XrmClass          */ NULLQUARK,
--/* NULL                             Boolean           */ (Boolean)NULL,
--/* NULL                             XtEnum            */ (XtEnum)NULL,
--/* NULL				    Boolean           */ (Boolean)NULL,
--/* NULL                             Boolean           */ (Boolean)NULL,
-+/* NULL                             Boolean           */ (Boolean)(uintptr_t)NULL,
-+/* NULL                             XtEnum            */ (XtEnum)(uintptr_t)NULL,
-+/* NULL				    Boolean           */ (Boolean)(uintptr_t)NULL,
-+/* NULL                             Boolean           */ (Boolean)(uintptr_t)NULL,
- /* free data for subclass pointers  XtWidgetProc      */ destroy,
- /* NULL                             XtProc            */ NULL,
- /* NULL			            XtProc            */ NULL,
-diff -urNad nedit-5.6~cvs20081118~/source/file.c nedit-5.6~cvs20081118/source/file.c
---- nedit-5.6~cvs20081118~/source/file.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/file.c	2009-09-15 22:06:42.000000000 +0200
-@@ -52,6 +52,7 @@
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <unistd.h>
- 
-@@ -1914,7 +1915,7 @@
-     if (XmToggleButtonGetState(w)) {
-         XtPointer userData;
-         XtVaGetValues(w, XmNuserData, &userData, NULL);
--        *(int*) clientData = (int) userData;
-+        *(int*) clientData = (int) (uintptr_t) userData;
-     }
- }
- 
-diff -urNad nedit-5.6~cvs20081118~/source/highlight.c nedit-5.6~cvs20081118/source/highlight.c
---- nedit-5.6~cvs20081118~/source/highlight.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/highlight.c	2009-09-15 22:07:06.000000000 +0200
-@@ -49,6 +49,7 @@
- #include <limits.h>
- #include <math.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #ifdef VMS
- #include "../util/VMSparam.h"
-@@ -512,7 +513,7 @@
-     if (!pattern) {
- 	return NULL;
-     }
--    return (void*)pattern->userStyleIndex;    
-+    return (void*)(uintptr_t)pattern->userStyleIndex;    
- }
-     
- /*
-diff -urNad nedit-5.6~cvs20081118~/source/macro.c nedit-5.6~cvs20081118/source/macro.c
---- nedit-5.6~cvs20081118~/source/macro.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/macro.c	2009-09-15 22:07:27.000000000 +0200
-@@ -60,6 +60,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
-@@ -2924,7 +2925,7 @@
-         readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
-     	btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
-     	    	XmNlabelString, s1=XmStringCreateSimple(btnLabel),
--    	    	XmNuserData, (XtPointer)(i+1), NULL);
-+    	    	XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
-     	XtAddCallback(btn, XmNactivateCallback, dialogBtnCB, window);
-     	XmStringFree(s1);
-     }
-@@ -2965,7 +2966,7 @@
-     	return; /* shouldn't happen */
-     if (XtClass(w) == xmPushButtonWidgetClass) {
- 	XtVaGetValues(w, XmNuserData, &userData, NULL);
--	retVal.val.n = (int)userData;
-+	retVal.val.n = (int)(uintptr_t)userData;
-     } else
-     	retVal.val.n = 1;
-     retVal.tag = INT_TAG;
-@@ -3101,7 +3102,7 @@
-         readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
-     	btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
-     	    	XmNlabelString, s1=XmStringCreateSimple(btnLabel),
--    	    	XmNuserData, (XtPointer)(i+1), NULL);
-+    	    	XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
-     	XtAddCallback(btn, XmNactivateCallback, stringDialogBtnCB, window);
-     	XmStringFree(s1);
-     }
-@@ -3155,7 +3156,7 @@
-        returned in w. */
-     if (XtClass(w) == xmPushButtonWidgetClass) {
- 	XtVaGetValues(w, XmNuserData, &userData, NULL);
--	btnNum = (int)userData;
-+	btnNum = (int)(uintptr_t)userData;
-     } else
-     	btnNum = 1;
-     
-@@ -3680,7 +3681,7 @@
-       readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
-       btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
-               XmNlabelString, s1=XmStringCreateSimple(btnLabel),
--              XmNuserData, (XtPointer)(i+1), NULL);
-+              XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
-       XtAddCallback(btn, XmNactivateCallback, listDialogBtnCB, window);
-       XmStringFree(s1);
-     }
-@@ -3760,7 +3761,7 @@
-        returned in w. */
-     if (XtClass(w) == xmPushButtonWidgetClass) {
-       XtVaGetValues(w, XmNuserData, &userData, NULL);
--      btnNum = (int)userData;
-+      btnNum = (int)(uintptr_t)userData;
-     } else
-       btnNum = 1;
-     
-diff -urNad nedit-5.6~cvs20081118~/source/preferences.c nedit-5.6~cvs20081118/source/preferences.c
---- nedit-5.6~cvs20081118~/source/preferences.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/preferences.c	2009-09-15 22:07:47.000000000 +0200
-@@ -58,6 +58,7 @@
- #include <ctype.h>
- #include <pwd.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
-@@ -2296,7 +2297,7 @@
- 	XtVaGetValues(menu, XmNchildren, &items, XmNnumChildren, &nItems, NULL);
- 	for (n=0; n<(int)nItems; n++) {
-     	    XtVaGetValues(items[n], XmNuserData, &userData, NULL);
--    	    XmToggleButtonSetState(items[n], (int)userData == mode, False);
-+    	    XmToggleButtonSetState(items[n], (int)(uintptr_t)userData == mode, False);
- 	}
-     }
- }
-@@ -5148,7 +5149,7 @@
-             	xmToggleButtonGadgetClass, menu,
-             	XmNlabelString, s1=XmStringCreateSimple(LanguageModes[i]->name),
-  	    	XmNmarginHeight, 0,
--   		XmNuserData, (void *)i,
-+   		XmNuserData, (void *)(uintptr_t)i,
-     		XmNset, window->languageMode==i, NULL);
-         XmStringFree(s1);
- 	XtAddCallback(btn, XmNvalueChangedCallback, setLangModeCB, window);
-@@ -5169,14 +5170,14 @@
-     XtVaGetValues(w, XmNuserData, &mode, NULL);
-     
-     /* If the mode didn't change, do nothing */
--    if (window->languageMode == (int)mode)
-+    if (window->languageMode == (int)(uintptr_t)mode)
-     	return;
-     
-     /* redo syntax highlighting word delimiters, etc. */
- /*
-     reapplyLanguageMode(window, (int)mode, False);
- */
--    params[0] = (((int)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)mode]->name;
-+    params[0] = (((int)(uintptr_t)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)(uintptr_t)mode]->name;
-     XtCallActionProc(window->textArea, "set_language_mode", NULL, params, 1);
- }
- 
-diff -urNad nedit-5.6~cvs20081118~/source/regularExp.c nedit-5.6~cvs20081118/source/regularExp.c
---- nedit-5.6~cvs20081118~/source/regularExp.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/regularExp.c	2009-09-15 22:08:16.000000000 +0200
-@@ -88,6 +88,7 @@
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- 
- #ifdef HAVE_DEBUG_H
-@@ -4157,7 +4158,7 @@
-       table [*c] = 1;
-    }
- 
--   table [(int) NULL] = 1; /* These       */
-+   table [(int)(uintptr_t) NULL] = 1; /* These       */
-    table [(int) '\t'] = 1; /* characters  */
-    table [(int) '\n'] = 1; /* are always  */
-    table [(int) ' ' ] = 1; /* delimiters. */
-diff -urNad nedit-5.6~cvs20081118~/source/userCmds.c nedit-5.6~cvs20081118/source/userCmds.c
---- nedit-5.6~cvs20081118~/source/userCmds.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/userCmds.c	2009-09-15 22:08:47.000000000 +0200
-@@ -49,6 +49,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <ctype.h>
- #ifdef VMS
-@@ -1116,7 +1117,7 @@
- 	    	XtVaGetValues(items[n], XmNsubMenuId, &subMenu, NULL);
- 		dimSelDepItemsInMenu(subMenu, menuList, nMenuItems, sensitive);
- 	    } else {
--		index = (int)userData - 10;
-+		index = (int)(uintptr_t)userData - 10;
- 		if (index <0 || index >= nMenuItems)
-     		    return;
- 		if (menuList[index]->input == FROM_SELECTION)
-@@ -1928,7 +1929,7 @@
-     	    XmNlabelString, st1,
-     	    XmNacceleratorText, st2,
-     	    XmNmnemonic, f->mnemonic,
--    	    XmNuserData, (XtPointer)(index+10), NULL);
-+    	    XmNuserData, (XtPointer)(uintptr_t)(index+10), NULL);
-     XtAddCallback(btn, XmNactivateCallback, cbRtn, cbArg);
-     XmStringFree(st1);
-     XmStringFree(st2);
-diff -urNad nedit-5.6~cvs20081118~/util/prefFile.c nedit-5.6~cvs20081118/util/prefFile.c
---- nedit-5.6~cvs20081118~/util/prefFile.c	2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/util/prefFile.c	2009-09-15 22:04:14.000000000 +0200
-@@ -38,6 +38,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdint.h>
- #ifdef VMS
- #include "VMSparam.h"
- #else
-@@ -353,9 +354,9 @@
-       	*(int *)rsrcDescrip->valueAddr = 0;
-     	return False;
-       case PREF_STRING:
--	if ((int)strlen(string) >= (int)rsrcDescrip->arg)
-+	if ((int)strlen(string) >= (int)(uintptr_t)rsrcDescrip->arg)
-       	    return False;
--	strncpy(rsrcDescrip->valueAddr, string, (int)rsrcDescrip->arg);
-+	strncpy(rsrcDescrip->valueAddr, string, (int)(uintptr_t)rsrcDescrip->arg);
-       	return True;
-       case PREF_ALLOC_STRING:
-       	*(char **)rsrcDescrip->valueAddr = XtMalloc(strlen(string) + 1);
diff --git a/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch
deleted file mode 100644
index 92b0778e2ab2..000000000000
--- a/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -urN a/source/highlightData.c b/source/highlightData.c
---- a/source/highlightData.c	2018-03-13 08:42:40.930188154 +0100
-+++ b/source/highlightData.c	2018-03-13 08:44:59.651196431 +0100
-@@ -1280,7 +1280,7 @@
-     XFontStruct *font;
-     
-     if (styleNo<0)
--        return GetDefaultFontStruct(window->fontList);
-+	return GetDefaultFontStruct(TheDisplay, window->fontList);
-     fontNum = HighlightStyles[styleNo]->font;
-     if (fontNum == BOLD_FONT)
-     	font = window->boldFontStruct;
-@@ -1289,10 +1289,10 @@
-     else if (fontNum == BOLD_ITALIC_FONT)
-     	font = window->boldItalicFontStruct;
-     else /* fontNum == PLAIN_FONT */
--    	font = GetDefaultFontStruct(window->fontList);
-+	font = GetDefaultFontStruct(TheDisplay, window->fontList);
-     
-     /* If font isn't loaded, silently substitute primary font */
--    return font == NULL ? GetDefaultFontStruct(window->fontList) : font;
-+    return font == NULL ? GetDefaultFontStruct(TheDisplay, window->fontList) : font;
- }
- 
- int FontOfNamedStyleIsBold(char *styleName)
-diff -urN a/source/text.c b/source/text.c
---- a/source/text.c	2018-03-13 08:42:40.931188154 +0100
-+++ b/source/text.c	2018-03-13 08:46:37.785202286 +0100
-@@ -778,9 +778,13 @@
-     textBuffer *buf;
-     Pixel white, black;
-     int textLeft;
--    int charWidth = fs->max_bounds.width;
--    int marginWidth = new->text.marginWidth;
--    int lineNumCols = new->text.lineNumCols;
-+    int charWidth;
-+    int marginWidth;
-+    int lineNumCols;
-+
-+    charWidth = fs->max_bounds.width;
-+    marginWidth = new->text.marginWidth;
-+    lineNumCols = new->text.lineNumCols;
-     
-     /* Set the initial window size based on the rows and columns resources */
-     if (request->core.width == 0)
-diff -urN a/source/window.c b/source/window.c
---- a/source/window.c	2018-03-13 08:42:40.937188155 +0100
-+++ b/source/window.c	2018-03-13 08:48:07.727207652 +0100
-@@ -1839,7 +1839,7 @@
- 
-     /* Change the primary font in all the widgets */
-     if (primaryChanged) {
--        font = GetDefaultFontStruct(window->fontList);
-+	font = GetDefaultFontStruct(TheDisplay, window->fontList);
-         XtVaSetValues(window->textArea, textNfont, font, NULL);
-         for (i=0; i<window->nPanes; i++)
-             XtVaSetValues(window->textPanes[i], textNfont, font, NULL);
-@@ -1861,7 +1861,7 @@
-        size appropriate for the new font, but only do so if there's only
-        _one_ document in the window, in order to avoid growing-window bug */
-     if (NDocuments(window) == 1) {
--	fontWidth = GetDefaultFontStruct(window->fontList)->max_bounds.width;
-+	fontWidth = GetDefaultFontStruct(TheDisplay, window->fontList)->max_bounds.width;
- 	fontHeight = textD->ascent + textD->descent;
- 	newWindowWidth = (oldTextWidth*fontWidth) / oldFontWidth + borderWidth;
- 	newWindowHeight = (oldTextHeight*fontHeight) / oldFontHeight + 
-@@ -2244,7 +2244,7 @@
-             textNrows, rows, textNcolumns, cols,
-             textNlineNumCols, lineNumCols,
-             textNemulateTabs, emTabDist,
--            textNfont, GetDefaultFontStruct(window->fontList),
-+	    textNfont, GetDefaultFontStruct(TheDisplay, window->fontList),
-             textNhScrollBar, hScrollBar, textNvScrollBar, vScrollBar,
-             textNreadOnly, IS_ANY_LOCKED(window->lockReasons),
-             textNwordDelimiters, delimiters,
-
---- a/util/misc.c	2018-03-13 08:50:54.892217626 +0100
-+++ b/util/misc.c	2018-03-13 08:56:50.346238834 +0100
-@@ -1018,7 +1018,7 @@
- ** a Motif font list.  Since Motif stores this, it saves us from storing
- ** it or querying it from the X server.
- */
--XFontStruct *GetDefaultFontStruct(XmFontList font)
-+XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font)
- {
-     XFontStruct *fs;
-     XmFontContext context;
-@@ -1028,6 +1028,17 @@
-     XmFontListGetNextFont(context, &charset, &fs);
-     XmFontListFreeFontContext(context);
-     XtFree(charset);
-+
-+    /* FontList might be a render table with no only XFT fonts */ 
-+    if (fs == NULL) {
-+	fs = XLoadQueryFont(d, "fixed");
-+    }
-+
-+    if (fs == NULL) {
-+	fprintf(stderr, "Unabled to load any fallback fonts.\n");
-+	exit(EXIT_FAILURE);
-+    }
-+
-     return fs;
- }
-    
-diff -urN a/util/misc.h b/util/misc.h
---- a/util/misc.h	2018-03-13 08:50:54.890217626 +0100
-+++ b/util/misc.h	2018-03-13 08:55:52.790235400 +0100
-@@ -65,7 +65,7 @@
- void AccelLockBugPatch(Widget topWidget, Widget topMenuContainer);
- void UpdateAccelLockPatch(Widget topWidget, Widget newButton);
- char *GetXmStringText(XmString fromString);
--XFontStruct *GetDefaultFontStruct(XmFontList font);
-+XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font);
- XmString* StringTable(int count, ...);
- void FreeStringTable(XmString *table);
- void SimulateButtonPress(Widget widget);
-
diff --git a/app-editors/nedit/files/nedit-5.6-format.patch b/app-editors/nedit/files/nedit-5.6-format.patch
deleted file mode 100644
index e2d6e17a6470..000000000000
--- a/app-editors/nedit/files/nedit-5.6-format.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up nedit-5.6/source/nc.c.format nedit-5.6/source/nc.c
---- nedit-5.6/source/nc.c.format	2014-12-28 13:56:20.000000000 +0000
-+++ nedit-5.6/source/nc.c	2015-06-17 07:30:25.617032345 +0100
-@@ -503,7 +503,7 @@ static int startServer(const char *messa
-     
-     /* prompt user whether to start server */
-     if (!Preferences.autoStart) {
--	printf(message);
-+	printf("%s", message);
- 	do {
-     	    c = getc(stdin);
- 	} while (c == ' ' || c == '\t');
diff --git a/app-editors/nedit/files/nedit-5.6-ldflags.patch b/app-editors/nedit/files/nedit-5.6-ldflags.patch
deleted file mode 100644
index a549b02490c0..000000000000
--- a/app-editors/nedit/files/nedit-5.6-ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/source/Makefile.common	2004-03-21 15:25:56.000000000 +0100
-+++ b/source/Makefile.common	2009-10-24 10:47:03.667835157 +0200
-@@ -21,12 +21,12 @@
- # we only want natural rebuilds to regenerate the link date.
- nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB)
- 	$(CC) $(CFLAGS) -c linkdate.c
--	$(CC) $(CFLAGS) $(OBJS) linkdate.o $(XMLLIB) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) linkdate.o $(XMLLIB) \
- 	 $(XLTLIB) ../util/libNUtil.a $(LIBS) -o $@
- 
- # Note LIBS isn't quite right here; it links unnecessarily against Motif
- nc: nc.o server_common.o ../util/libNUtil.a
--	$(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
- 
- help.o: help.c
- 	$(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@
diff --git a/app-editors/nedit/files/nedit-5.6-security.patch b/app-editors/nedit/files/nedit-5.6-security.patch
deleted file mode 100644
index b24ef2355a3c..000000000000
--- a/app-editors/nedit/files/nedit-5.6-security.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: nedit-5.5/source/file.c
-===================================================================
---- nedit-5.5.orig/source/file.c	2004-08-24 11:37:24.000000000 +0200
-+++ nedit-5.5/source/file.c	2010-03-27 18:44:01.000000000 +0100
-@@ -1314,7 +1314,7 @@
- */
- void PrintString(const char *string, int length, Widget parent, const char *jobName)
- {
--    char tmpFileName[L_tmpnam];    /* L_tmpnam defined in stdio.h */
-+    char *tmpFileName=strdup("/tmp/neditXXXXXX");
-     FILE *fp;
-     int fd;
- 
-@@ -1325,14 +1325,10 @@
- 	    1. Create a filename
- 	    2. Open the file with the O_CREAT|O_EXCL flags
- 	So all an attacker can do is a DoS on the print function. */
--    tmpnam(tmpFileName);
-+    fd = mkstemp(tmpFileName);
- 
-     /* open the temporary file */
--#ifdef VMS
--    if ((fp = fopen(tmpFileName, "w", "rfm = stmlf")) == NULL)
--#else
--    if ((fd = open(tmpFileName, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR)) < 0 || (fp = fdopen(fd, "w")) == NULL)
--#endif /* VMS */
-+    if ((fp = fdopen(fd, "w")) == NULL)
-     {
-         DialogF(DF_WARN, parent, 1, "Error while Printing",
-                 "Unable to write file for printing:\n%s", "OK",
-@@ -1346,7 +1342,7 @@
-     
-     /* write to the file */
- #ifdef IBM_FWRITE_BUG
--    write(fileno(fp), string, length);
-+    write(fd, string, length);
- #else
-     fwrite(string, sizeof(char), length, fp);
- #endif
-@@ -1356,6 +1352,7 @@
-                 "%s not printed:\n%s", "OK", jobName, errorString());
-         fclose(fp); /* should call close(fd) in turn! */
-         remove(tmpFileName);
-+	free(tmpFileName);
-         return;
-     }
-     
-@@ -1366,6 +1363,7 @@
-                 "Error closing temp. print file:\n%s", "OK",
-                 errorString());
-         remove(tmpFileName);
-+	free(tmpFileName);
-         return;
-     }
- 
-@@ -1377,6 +1375,7 @@
-     PrintFile(parent, tmpFileName, jobName);
-     remove(tmpFileName);
- #endif /*VMS*/
-+    free(tmpFileName);
-     return;
- }
- 
diff --git a/app-editors/nedit/metadata.xml b/app-editors/nedit/metadata.xml
deleted file mode 100644
index ec930b3c0db0..000000000000
--- a/app-editors/nedit/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>amynka@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">nedit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/nedit/nedit-5.6-r1.ebuild b/app-editors/nedit/nedit-5.6-r1.ebuild
deleted file mode 100644
index 86b946aebecb..000000000000
--- a/app-editors/nedit/nedit-5.6-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Multi-purpose text editor for the X Window System"
-HOMEPAGE="https://sourceforge.net/projects/nedit"
-SRC_URI="
-	https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz
-	https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=x11-libs/motif-2.3:0
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	|| ( dev-util/yacc sys-devel/bison )
-	dev-lang/perl"
-
-S="${WORKDIR}/${PN}-5.6"
-
-src_prepare() {
-	#respecting LDFLAGS, bug #208189
-	epatch \
-		"${FILESDIR}"/${P}-format.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-40_Pointer_to_Integer.patch \
-		"${FILESDIR}"/${P}-security.patch
-	sed \
-		-e "s:bin/:${EPREFIX}/bin/:g" \
-		-i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
-	sed \
-		-e "s:nc:neditc:g" -i doc/nc.pod || die
-	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
-		makefiles/Makefile.linux || die
-	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:"                  \
-		   -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
-		   -e "s:-lX11:-lX11 -lXmu -liconv:"                   \
-		   -e "s:check_tif_rule::"                             \
-		makefiles/Makefile.macosx || die
-
-	epatch_user
-}
-
-src_compile() {
-	case "${CHOST}" in
-		*-darwin*)
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx
-			;;
-		*-linux*)
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
-			;;
-	esac
-	emake VERSION="NEdit ${PV}" -C doc all
-}
-
-src_install() {
-	dobin source/nedit
-	newbin source/nc neditc
-
-	make_desktop_entry "${PN}"
-	doicon "${WORKDIR}/${PN}.png"
-
-	newman doc/nedit.man nedit.1
-	newman doc/nc.man neditc.1
-
-	dodoc README ReleaseNotes ChangeLog
-	dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt
-	dohtml doc/nedit.html
-}
diff --git a/app-editors/nedit/nedit-5.6-r2.ebuild b/app-editors/nedit/nedit-5.6-r2.ebuild
deleted file mode 100644
index a37c9fcd64a5..000000000000
--- a/app-editors/nedit/nedit-5.6-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Multi-purpose text editor for the X Window System"
-HOMEPAGE="https://sourceforge.net/projects/nedit"
-SRC_URI="
-	https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz
-	https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=x11-libs/motif-2.3:0
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	|| ( dev-util/yacc sys-devel/bison )
-	dev-lang/perl"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-format.patch"
-	  "${FILESDIR}/${P}-ldflags.patch"
-	  "${FILESDIR}/${P}-40_Pointer_to_Integer.patch"
-	  "${FILESDIR}/${P}-security.patch"
-	  "${FILESDIR}/${P}-fix-crash-with-noX.patch"
-)
-
-src_prepare() {
-	#respecting LDFLAGS, bug #208189
-	default
-	sed \
-		-e "s:bin/:${EPREFIX}/bin/:g" \
-		-i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
-	sed \
-		-e "s:nc:neditc:g" -i doc/nc.pod || die
-	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
-		makefiles/Makefile.linux || die
-	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:"                  \
-		   -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
-		   -e "s:-lX11:-lX11 -lXmu -liconv:"                   \
-		   -e "s:check_tif_rule::"                             \
-		makefiles/Makefile.macosx || die
-}
-
-src_compile() {
-	case "${CHOST}" in
-		*-darwin*)
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx
-			;;
-		*-linux*)
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
-			;;
-	esac
-	emake VERSION="NEdit ${PV}" -C doc all
-}
-
-src_install() {
-	dobin source/nedit
-	newbin source/nc neditc
-
-	make_desktop_entry "${PN}"
-	doicon "${WORKDIR}/${PN}.png"
-
-	newman doc/nedit.man nedit.1
-	newman doc/nc.man neditc.1
-
-	dodoc README ReleaseNotes ChangeLog
-	dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt
-	dohtml doc/nedit.html
-}
diff --git a/app-editors/neovim-0.2.0-r1 b/app-editors/neovim-0.2.0-r1
new file mode 100644
index 000000000000..c25b7e5a831d
--- /dev/null
+++ b/app-editors/neovim-0.2.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1 ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) dev-util/gperf virtual/libiconv virtual/libintl sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Vim-fork focused on extensibility and agility.
+EAPI=6
+HOMEPAGE=https://neovim.io
+IUSE=+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 vim
+RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1 ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
+SLOT=0
+SRC_URI=https://github.com/neovim/neovim/archive/v0.2.0.tar.gz -> neovim-0.2.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c171e0cac0ee41b751e40693835e7e67
diff --git a/app-editors/neovim-0.2.2-r1 b/app-editors/neovim-0.2.2-r1
new file mode 100644
index 000000000000..233759ad1c27
--- /dev/null
+++ b/app-editors/neovim-0.2.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1:= ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) dev-util/gperf virtual/libiconv virtual/libintl sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Vim-fork focused on extensibility and agility.
+EAPI=6
+HOMEPAGE=https://neovim.io
+IUSE=+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 vim
+RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1:= ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
+SLOT=0
+SRC_URI=https://github.com/neovim/neovim/archive/v0.2.2.tar.gz -> neovim-0.2.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2c845405fbeea36e19715a463044f224
diff --git a/app-editors/neovim-0.3.0 b/app-editors/neovim-0.3.0
new file mode 100644
index 000000000000..dc31c6c2149c
--- /dev/null
+++ b/app-editors/neovim-0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1:= ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) dev-util/gperf virtual/libiconv virtual/libintl sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Vim-fork focused on extensibility and agility.
+EAPI=6
+HOMEPAGE=https://neovim.io
+IUSE=+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 vim
+RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1:= ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
+SLOT=0
+SRC_URI=https://github.com/neovim/neovim/archive/v0.3.0.tar.gz -> neovim-0.3.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d80e978881a59ae41c1774bee985f696
diff --git a/app-editors/neovim-9999 b/app-editors/neovim-9999
new file mode 100644
index 000000000000..960590abe178
--- /dev/null
+++ b/app-editors/neovim-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1 ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) dev-util/gperf virtual/libiconv virtual/libintl sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Vim-fork focused on extensibility and agility.
+EAPI=6
+HOMEPAGE=https://neovim.io
+IUSE=+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc
+LICENSE=Apache-2.0 vim
+RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1 ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c171e0cac0ee41b751e40693835e7e67
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
deleted file mode 100644
index 93a79e7565b6..000000000000
--- a/app-editors/neovim/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-DIST neovim-0.2.0.tar.gz 7846467 BLAKE2B ee929122b3855ccab6247a0e8ab975b09d77e1034229ea324ed82ad705cacbd39f55d2fa96eea3f3677c7efe64c69ebecedd5fde09e508a6fd23acb6a1f5b489 SHA512 fc4be03c5bee1c9928376938679f9a900f3ee2e58df817d1cb9b5af51350dccca63a7638114b0326ec4565a047faaa4b50fecfc932c1d59ee92efa54625e22cd
-DIST neovim-0.2.2.tar.gz 8325879 BLAKE2B dbf43c5927b8c8719adae9a3f73c57429de47f1b7c7489a118b7467df2f0d32cd02df8e10889727b4dd77fe8b4fb4f95520c678d6775d5d908705770a47cec0c SHA512 5609defe86ac98356f1b9ae9adc6049bb4df920a9a2ae3104f761d52d4dd54cbc84d2596231595dd9b0aa97201fef2121e6c5c86a19267ab6b871dbf4b568209
-DIST neovim-0.3.0.tar.gz 8903630 BLAKE2B 44936f0042be1771725a42168865d65f9afe048c116ed0d5f1542dffd8206a21dc4cbab1e08e97fdc27083251655c43df0451c5808ed6c6ad99eb2d582c55b9b SHA512 8944be5562a69d5da5bce3a6673cc0b1930eb5592eb15c40139a1991f89f63435141449e7b4371ee28ff426575fcad475396e3d982004e17a902bda1d8ae6a95
-EBUILD neovim-0.2.0-r1.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c8ff092651032731a6548778820805e8a4e4c0a2e40d463a11d1898e8c0e47ca76f38802df2119b70cf250932dba SHA512 3bd497e867430446993f46ad6eb038a57e0915703e8ce800040f76ae6b57e9c015241cdc8eff9a08d45f9ff71cbce2e99fc5bd7c91541e751817a54ad99498c5
-EBUILD neovim-0.2.2-r1.ebuild 1878 BLAKE2B 8f2ddcdb916fe4ce6e83626c1b86ddad10253e1cf5ebc5f41789fc52d2a002e7ed8f07cac17a5551aae1050fa6f5e3b3214436d8f9a63afd67cadb982f974db5 SHA512 095e7760a09f76e1940dfd06b02a786b29c7647d123232287da673677b27b613c320507dc206d74fe9ad6420e2bc3115b266488529d83719f1f0105d692afb20
-EBUILD neovim-0.3.0.ebuild 1984 BLAKE2B ed5d735cff11aa8bdaaea8768aa31d1852d0c050875aade4096eb4ecad0e2cd1be767b24c25aa2c6002cc788d8958803554218a185173a9203bcbe7094581b56 SHA512 17be8075a4ebdf97ef12b23eee2e383b7014bbc1a860715eca9f0de6f979d517d156765cf0038fdba86251b3a59a4271cd7670817cb25c995f720d279e9e3fb5
-EBUILD neovim-9999.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c8ff092651032731a6548778820805e8a4e4c0a2e40d463a11d1898e8c0e47ca76f38802df2119b70cf250932dba SHA512 3bd497e867430446993f46ad6eb038a57e0915703e8ce800040f76ae6b57e9c015241cdc8eff9a08d45f9ff71cbce2e99fc5bd7c91541e751817a54ad99498c5
-MISC metadata.xml 720 BLAKE2B fda1bb6780b08bc3eeef497f01932dde422aa9ef5bdf3e713248c5d1234b1511b6c534ec761b2979861526a1eac54d63b36543bf2b36d0a6a0a2edc9cc58caea SHA512 8ac4d9b779ee3b6c13c16a7071c0f3a67ce867ac9538f3e89a420e16d2a8d2671f901fad4df6e4709141e5af10290543dfb5e79150a0bffb994456150c4fc77f
diff --git a/app-editors/neovim/files/sysinit.vim b/app-editors/neovim/files/sysinit.vim
deleted file mode 100644
index 92b802f345cf..000000000000
--- a/app-editors/neovim/files/sysinit.vim
+++ /dev/null
@@ -1,104 +0,0 @@
-" Default Gentoo configuration file for neovim
-" Based on the default vimrc shipped by Gentoo with app-editors/vim-core
-
-" You can override any of these settings on a global basis via the
-" "/etc/vim/nvimrc.local" file, and on a per-user basis via "~/.nvimrc".
-" You may need to create these.
-
-" Neovim comes with sensible defaults, see:
-" https://github.com/neovim/neovim/issues/2676
-" Most of the general settings from Gentoo's vimrc have been dropped here.
-" We add only some necessary fixes and a few Gentoo specific settings.
-
-" {{{ Locale settings
-" If we have a BOM, always honour that rather than trying to guess.
-if &fileencodings !~? "ucs-bom"
-  set fileencodings^=ucs-bom
-endif
-
-" Always check for UTF-8 when trying to determine encodings.
-if &fileencodings !~? "utf-8"
-  " If we have to add this, the default encoding is not Unicode.
-  let g:added_fenc_utf8 = 1
-  set fileencodings+=utf-8
-endif
-" }}}
-
-" {{{ Fix &shell, see bug #101665.
-if "" == &shell
-  if executable("/bin/bash")
-    set shell=/bin/bash
-  elseif executable("/bin/sh")
-    set shell=/bin/sh
-  endif
-endif
-"}}}
-
-" {{{ Our default /bin/sh is bash, not ksh, so syntax highlighting for .sh
-" files should default to bash. See :help sh-syntax and bug #101819.
-if has("eval")
-  let is_bash=1
-endif
-" }}}
-
-" {{{ Autocommands
-if has("autocmd")
-
-augroup gentoo
-  au!
-
-  " Gentoo-specific settings for ebuilds.  These are the federally-mandated
-  " required tab settings.  See the following for more information:
-  " http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml
-  " Note that the rules below are very minimal and don't cover everything.
-  " Better to emerge app-vim/gentoo-syntax, which provides full syntax,
-  " filetype and indent settings for all things Gentoo.
-  au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab
-
-  " In text files, limit the width of text to 78 characters, but be careful
-  " that we don't override the user's setting.
-  autocmd BufNewFile,BufRead *.txt
-        \ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") |
-        \   setlocal textwidth=78 |
-        \ endif
-
-  " When editing a file, always jump to the last cursor position
-  autocmd BufReadPost *
-        \ if ! exists("g:leave_my_cursor_position_alone") |
-        \   if line("'\"") > 0 && line ("'\"") <= line("$") |
-        \     exe "normal g'\"" |
-        \   endif |
-        \ endif
-
-  " When editing a crontab file, set backupcopy to yes rather than auto. See
-  " :help crontab and bug #53437.
-  autocmd FileType crontab set backupcopy=yes
-
-  " If we previously detected that the default encoding is not UTF-8
-  " (g:added_fenc_utf8), assume that a file with only ASCII characters (or no
-  " characters at all) isn't a Unicode file, but is in the default encoding.
-  " Except of course if a byte-order mark is in effect.
-  autocmd BufReadPost *
-        \ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" &&
-        \   ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
-        \     set fileencoding= |
-        \ endif
-
-  " Strip trailing spaces on write
-  autocmd BufWritePre *.e{build,class}
-        \ if ! exists("g:leave_my_trailing_space_alone") |
-        \   :%s/\s\+$//e |
-        \ endif
-
-augroup END
-
-endif " has("autocmd")
-" }}}
-
-" {{{ nvimrc.local
-if filereadable("/etc/vim/nvimrc.local")
-  source /etc/vim/nvimrc.local
-endif
-" }}}
-
-" vim: set tw=80 sw=2 sts=2 et foldmethod=marker :
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
deleted file mode 100644
index 57f11481bec1..000000000000
--- a/app-editors/neovim/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>vim@gentoo.org</email>
-    <name>Gentoo Vim Project</name>
-  </maintainer>
-  <use>
-    <flag name="clipboard">Enable clipboard support through a provider</flag>
-    <flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag>
-    <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
-    <flag name="remote">Enable support for remote options using nvr</flag>
-    <flag name="tui">Build the neovim unix tui</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">neovim/neovim</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-editors/neovim/neovim-0.2.0-r1.ebuild b/app-editors/neovim/neovim-0.2.0-r1.ebuild
deleted file mode 100644
index 12fbcafd7b64..000000000000
--- a/app-editors/neovim/neovim-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
-
-CDEPEND=">=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		>=dev-libs/libtermkey-0.19
-		>=dev-libs/unibilium-1.1.1
-	)
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit=]
-	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )"
-
-DEPEND="
-	${CDEPEND}
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl"
-
-RDEPEND="
-	${CDEPEND}
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	remote? ( dev-python/neovim-remote )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
-		-DPREFER_LUA=$(usex luajit no yes)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
diff --git a/app-editors/neovim/neovim-0.2.2-r1.ebuild b/app-editors/neovim/neovim-0.2.2-r1.ebuild
deleted file mode 100644
index 1a1d6f4dfff4..000000000000
--- a/app-editors/neovim/neovim-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
-
-CDEPEND=">=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		>=dev-libs/libtermkey-0.19
-		>=dev-libs/unibilium-1.1.1:=
-	)
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit=]
-	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )"
-
-DEPEND="
-	${CDEPEND}
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl"
-
-RDEPEND="
-	${CDEPEND}
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	remote? ( dev-python/neovim-remote )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
-		-DPREFER_LUA=$(usex luajit no yes)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
diff --git a/app-editors/neovim/neovim-0.3.0.ebuild b/app-editors/neovim/neovim-0.3.0.ebuild
deleted file mode 100644
index b25617fdef50..000000000000
--- a/app-editors/neovim/neovim-0.3.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
-
-CDEPEND=">=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		>=dev-libs/libtermkey-0.19
-		>=dev-libs/unibilium-1.1.1:=
-	)
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit=]
-	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )"
-
-DEPEND="
-	${CDEPEND}
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl"
-
-RDEPEND="
-	${CDEPEND}
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	remote? ( dev-python/neovim-remote )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
-		-DPREFER_LUA=$(usex luajit no yes)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
deleted file mode 100644
index 12fbcafd7b64..000000000000
--- a/app-editors/neovim/neovim-9999.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
-
-CDEPEND=">=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		>=dev-libs/libtermkey-0.19
-		>=dev-libs/unibilium-1.1.1
-	)
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit=]
-	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )"
-
-DEPEND="
-	${CDEPEND}
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl"
-
-RDEPEND="
-	${CDEPEND}
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	remote? ( dev-python/neovim-remote )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
-		-DPREFER_LUA=$(usex luajit no yes)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
diff --git a/app-editors/ng-1.5_beta1-r2 b/app-editors/ng-1.5_beta1-r2
new file mode 100644
index 000000000000..a6f7cbf6f8f6
--- /dev/null
+++ b/app-editors/ng-1.5_beta1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=sys-libs/ncurses:0= !dev-java/nailgun canna? ( app-i18n/canna ) sys-apps/sed >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Emacs like micro editor Ng -- based on mg2a
+EAPI=6
+HOMEPAGE=http://tt.sakura.ne.jp/~amura/ng/
+IUSE=canna
+KEYWORDS=amd64 ppc x86
+LICENSE=Emacs
+RDEPEND=sys-libs/ncurses:0= !dev-java/nailgun canna? ( app-i18n/canna )
+SLOT=0
+SRC_URI=http://tt.sakura.ne.jp/~amura/archives/ng/ng-1.5beta1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7f21b4fdae1bd23a3e5933c0ccdd8151
diff --git a/app-editors/ng/Manifest b/app-editors/ng/Manifest
deleted file mode 100644
index 63775ee80fae..000000000000
--- a/app-editors/ng/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ng-1.5beta1-configure.patch 658 BLAKE2B c76c062312f36e59c4f31f6d24ab992b7722ea3f8d323954b4a3981acc708e751b869e5ce3aafd47869e3893effc3d5705cde7648bb948d7acb7d79d906953e0 SHA512 afea99d16b06308feed87512ccfe084b3f3c222afdb9a3f430ec02882d99cf81d7506dd329601a58ab62d8def05e48f3ff502d0d76ecada8cca2c42931bdca1b
-AUX ng-1.5beta1-ncurses.patch 551 BLAKE2B a0c3df0b923d67600686c1d7240099dac5fd3276dbad809b7988e9e3467f23addfc73c691407a47d96966880814f0d3e9ec2e552fddefacc9670b0e431e1074a SHA512 14d457f782e8441866763a0fc82dd727a9fd7e7ab9dbc92da313b0eb739fd3f415d89633d7f553f9937b7d6a97164d8eda6caa45602edea22a8036cc50d2b91d
-DIST ng-1.5beta1.tar.gz 662557 BLAKE2B 02f1f5277aaba279226d732351eb604205e8bfc030678551a5f2439bde61651bf5aa4e02e06f3283fdab710cc5a1ed9a3eae1e42fd4fa8a8145699b425c4e61e SHA512 eaf3ee067cd98aebc757def9880c5a324975e9f5d0f1db030b11853e86631bca892bf344358ca21b778f5e10ae0d2ed97553221a368326f7a4d9d41f6867abcd
-EBUILD ng-1.5_beta1-r2.ebuild 1197 BLAKE2B 8195a72627884bd4a62d02c1cc3cc8f574a6dafa1a902722b23c193f744f1dfe807d4c170c4a20e3625c672e99bb549dfe55b90a136b1c4e64ca3f3446ad8c53 SHA512 f68dd90eb19c24cb8f5e55a0fb7e7cee9e7d2669a2b6172ff6eb51aa003bc40a84c1e9b87ceebf58ec4c019338d9d273f3ea8c6193da3e34bc2963fac0e7778b
-MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-editors/ng/files/ng-1.5beta1-configure.patch b/app-editors/ng/files/ng-1.5beta1-configure.patch
deleted file mode 100644
index 25f383a0be2d..000000000000
--- a/app-editors/ng/files/ng-1.5beta1-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/sys/unix/configure.in b/sys/unix/configure.in
-index e034edc..b62535d 100644
---- a/sys/unix/configure.in
-+++ b/sys/unix/configure.in
-@@ -83,8 +83,12 @@ AC_DEFINE_UNQUOTED(RMDIR_CMD, "$rmdir_cmd")
- dnl If the user wants canna support.
- AC_MSG_CHECKING(if --enable-canna option specified)
- AC_ARG_ENABLE(canna,
--	[  --enable-canna[=DIR]    Build a canna version.],
--	[cv_canna="yes"; cannapath=$enableval], [cv_canna="no"])
-+	[  --enable-canna[=DIR]    Build a canna version.])
-+AS_IF([test "x$enable_canna" != "xno"], [
-+	cv_canna="yes"; cannapath=$enableval
-+][
-+	cv_canna="no";
-+])
- AC_MSG_RESULT($cv_canna)
- if test "$cv_canna" = "yes"; then
- 
diff --git a/app-editors/ng/files/ng-1.5beta1-ncurses.patch b/app-editors/ng/files/ng-1.5beta1-ncurses.patch
deleted file mode 100644
index 6808d911152b..000000000000
--- a/app-editors/ng/files/ng-1.5beta1-ncurses.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure	2004-05-12 09:26:44.000000000 +0900
-+++ b/configure	2004-05-12 09:27:06.000000000 +0900
-@@ -1077,3+1077,3 @@
- rm -f conftest*
--test "$ac_cv_search_tgetstr" = "no" && for i in curses ncurses termlib; do
-+test "$ac_cv_search_tgetstr" = "no" && for i in ncurses termlib; do
- LIBS="-l$i  $ac_func_search_save_LIBS"
-@@ -1140,3 +1140,3 @@
- rm -f conftest*
--test "$ac_cv_search_tgetstr" = "no" && for i in termcap curses ncurses; do
-+test "$ac_cv_search_tgetstr" = "no" && for i in termcap ncurses; do
- LIBS="-l$i  $ac_func_search_save_LIBS"
diff --git a/app-editors/ng/metadata.xml b/app-editors/ng/metadata.xml
deleted file mode 100644
index c921b96adf6c..000000000000
--- a/app-editors/ng/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-editors/ng/ng-1.5_beta1-r2.ebuild b/app-editors/ng/ng-1.5_beta1-r2.ebuild
deleted file mode 100644
index fbb432af3cc5..000000000000
--- a/app-editors/ng/ng-1.5_beta1-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="${P/_beta/beta}"
-
-DESCRIPTION="Emacs like micro editor Ng -- based on mg2a"
-HOMEPAGE="http://tt.sakura.ne.jp/~amura/ng/"
-SRC_URI="http://tt.sakura.ne.jp/~amura/archives/ng/${MY_P}.tar.gz"
-
-LICENSE="Emacs"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="canna"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	!dev-java/nailgun
-	canna? ( app-i18n/canna )"
-
-DEPEND="
-	${RDEPEND}
-	sys-apps/sed"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${MY_P}-ncurses.patch"
-	"${FILESDIR}/${MY_P}-configure.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e "/NO_BACKUP/s/undef/define/" config.h || die "sed failed"
-	pushd sys/unix > /dev/null || die
-	eautoconf
-	popd > /dev/null || die
-	cp sys/unix/configure . || die
-}
-
-src_configure() {
-	econf $(use_enable canna)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ng
-	dodoc docs/* MANIFEST dot.ng
-
-	insinto /usr/share/ng
-	doins bin/*
-
-	insinto /etc/skel
-	newins dot.ng .ng
-}
-
-pkg_postinst() {
-	elog
-	elog "If you want to use user Config"
-	elog "cp /etc/skel/.ng ~/.ng"
-	elog "and edit your .ng configuration file."
-	elog
-}
diff --git a/app-editors/notepadqq-1.2.0 b/app-editors/notepadqq-1.2.0
new file mode 100644
index 000000000000..a2b7ecbf476d
--- /dev/null
+++ b/app-editors/notepadqq-1.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5
+DESCRIPTION=Notepad++-like editor for Linux
+EAPI=6
+HOMEPAGE=http://notepadqq.altervista.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/notepadqq/notepadqq/archive/v1.2.0.tar.gz -> notepadqq-1.2.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8d82fa39276a276e7a59943a1fd2a753
diff --git a/app-editors/notepadqq-1.4.8 b/app-editors/notepadqq-1.4.8
new file mode 100644
index 000000000000..4df3921cf143
--- /dev/null
+++ b/app-editors/notepadqq-1.4.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5
+DESCRIPTION=Notepad++-like editor for Linux
+EAPI=6
+HOMEPAGE=http://notepadqq.altervista.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/notepadqq/notepadqq/archive/v1.4.8.tar.gz -> notepadqq-1.4.8.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4cb6e74b023c28d5f18ee658e48bdfab
diff --git a/app-editors/notepadqq-9999 b/app-editors/notepadqq-9999
new file mode 100644
index 000000000000..6d6ed5516919
--- /dev/null
+++ b/app-editors/notepadqq-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install postinst postrm prepare unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Notepad++-like editor for Linux
+EAPI=6
+HOMEPAGE=http://notepadqq.altervista.org
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5
+SLOT=0
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cf6957556d844213174afe26cf4e3a55
diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
deleted file mode 100644
index 98850a53ce6d..000000000000
--- a/app-editors/notepadqq/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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 1008 BLAKE2B c65cc138faee367ad66004fc41b875a7fd4e2581ef6675ac9bd3d17bc4e032210e6a855a5566e5411b388f4acdcddf349a68ac96cca7c31d58fc5013e3ef1a76 SHA512 68f988d84a6f6535d2edf92a2b46dcee09b10019a62e9be01ac97eb4c5a6f26588939e4e4937592e6093a5e9227e63f310aad7363428d866f56cb76892c126d0
-EBUILD notepadqq-9999.ebuild 1034 BLAKE2B 39c30d0811cab55d047285f1aebc5788fb09f06a59668d5bae1fb42ee891ff56e5cd205c955614f060c10e2cadc92053d85cba06045ada2c9174501130913e13 SHA512 f2bf51e64055fb5f5b2560be7926a37327416b690a932b7778b32b04b83be72ee0e3aab0ebf68ec6fd47234fcb6faca097f818a696a80306e962bc11e7bb3082
-MISC metadata.xml 345 BLAKE2B ae751443c2fd3565e979b52de96cb3804aa010a346fe4d404c2bf69f602a14d70e59af441caa25b5c8a2ed17fdc564539ee196366dc9ff290f7b756ec8121ddc SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033
diff --git a/app-editors/notepadqq/metadata.xml b/app-editors/notepadqq/metadata.xml
deleted file mode 100644
index 778dcea02be0..000000000000
--- a/app-editors/notepadqq/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">notepadqq/notepadqq</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-editors/notepadqq/notepadqq-1.2.0.ebuild b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
deleted file mode 100644
index cbebd28ae63f..000000000000
--- a/app-editors/notepadqq/notepadqq-1.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Notepad++-like editor for Linux"
-HOMEPAGE="http://notepadqq.altervista.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/qtsvg:5
-"
-
-src_prepare() {
-	default
-
-	# Silence a QA warning
-	sed '/^OnlyShowIn/d' \
-		-i support_files/shortcuts/notepadqq.desktop \
-		|| die
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/notepadqq/notepadqq-1.4.8.ebuild b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
deleted file mode 100644
index d85db1653d71..000000000000
--- a/app-editors/notepadqq/notepadqq-1.4.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Notepad++-like editor for Linux"
-HOMEPAGE="http://notepadqq.altervista.org"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/qtsvg:5
-"
-
-src_prepare() {
-	default
-
-	# Silence a QA warning
-	sed '/^OnlyShowIn/d' \
-		-i support_files/shortcuts/notepadqq.desktop \
-		|| die
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild
deleted file mode 100644
index 9db258a39568..000000000000
--- a/app-editors/notepadqq/notepadqq-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Notepad++-like editor for Linux"
-HOMEPAGE="http://notepadqq.altervista.org"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/qtsvg:5
-"
-
-src_prepare() {
-	default
-
-	# Silence a QA warning
-	sed '/^OnlyShowIn/d' \
-		-i support_files/shortcuts/notepadqq.desktop \
-		|| die
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/nvi-1.81.6-r7 b/app-editors/nvi-1.81.6-r7
new file mode 100644
index 000000000000..541e11e34842
--- /dev/null
+++ b/app-editors/nvi-1.81.6-r7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=>=sys-libs/db-4.2.52_p5:= >=sys-libs/ncurses-5.6-r2:= perl? ( dev-lang/perl ) tcl? ( >=dev-lang/tcl-8.5:0= ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Vi clone
+EAPI=6
+HOMEPAGE=https://sites.google.com/a/bostic.com/keithbostic/vi
+IUSE=perl tcl unicode
+KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x64-macos ~amd64-fbsd
+LICENSE=BSD
+RDEPEND=>=sys-libs/db-4.2.52_p5:= >=sys-libs/ncurses-5.6-r2:= perl? ( dev-lang/perl ) tcl? ( >=dev-lang/tcl-8.5:0= ) app-eselect/eselect-vi
+REQUIRED_USE=tcl? ( !unicode )
+SLOT=0
+SRC_URI=http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/nvi-1.81.6.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	db-use	582140d1a711279e50ce284fc7b609f5	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e9d99d7cadb7015fad5af85b93d1d541
diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
deleted file mode 100644
index 607808fd03c4..000000000000
--- a/app-editors/nvi/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX nvi-1.81.6-ac_config_header.patch 410 BLAKE2B d47c639e45fae8521e6a70492b73e91728c6c790df7c90b414da69c3af9d1aca442ee61f6cd4b7863f4e167d84036bf7f7b3b472db48cdbb26ae33f62ac4e9d6 SHA512 ef4fb4869b8dbf0a1677aba99f00de5730dc64f48aab35de113f91d22aea769054d2ce875af7c084d1fa3c3a526f2695fbba9ad248c86a296e6c2580c682f8d4
-AUX nvi-1.81.6-db.patch 690 BLAKE2B 84f57da7f49f9d62ed8bfe2104dbc5d6713e378b88356d4dcda3da2a0d3ede782678c16f76871271b16c07b1c1c2703d48e4d41baa44af2a62f330c8621ec860 SHA512 83c8d875b57a73a012bb22935c99b814e7836a809fe1e4eba0021425892dcb66930cded4c2a2af38984db25d23285ce86aaf4cf2def8acb5f669ada368f30f28
-AUX nvi-1.81.6-db44.patch 1351 BLAKE2B c90ac2bdad322a63e2687a0cc6455757a75fab5d7db9597a5291b7b3df6dd3624c55b5346fdece22ca72538053ddac7aeae1837cbd5a2f7883d832226293322b SHA512 d59b3dd860562fe433379951405527825977d3e847a6575d30deb146e0fb8617e13c1962fca0341557093f34a725bb131d2979c15466d8fc6194ad1f928a7e7f
-AUX nvi-1.81.6-perl-as-needed.patch 2807 BLAKE2B fe2d17e99f6ce258388c001e1dd23b58e50e5d3608d1a295443acde146b22fc0494141ac68d42f80dac94e3b97e57fb57582780f355f9706a241a6aad47450c7 SHA512 9bff6bec4970240edcb43e66d17e26a3a035d003124f355f8688794fd3459da6d2d64435a19dd8b701cc4f75c24680299a7407c779fbc0a96647e31b3a1fa21f
-AUX nvi-1.81.6-perl-shortnames.patch 384 BLAKE2B 703ba7c2248b327151f280528689a3c478acc5ffa91f193aca323d6bfb38cfae1b6461424fc9326498c08e66dade54f6a486bde8f9126d4ea244b06c8ea4bd98 SHA512 f013a692ff5d62f41b6fa39c8ddea5907c2ed4dbcf4c84725edb71c61aa09dd54a470ee1228eadfdda745a6eeae653f490b30f7e77952b66515285ecbf2f82b7
-AUX nvi-1.81.6-printf-types.patch 437 BLAKE2B a7cf425c52882b693e928af13790df0959167a64f201d2a41059d3ae21470241020cd604be5418560652729858696ba4e40356c1753daa2906dcc94247675b34 SHA512 8da354d7278300fea44e9dae1f539c23211257aa9475e5a223f7d3aca7d5edaebf6245923f32174cece3386f5564a7794efd6ef2394bbdaaf35c14b99a2c731b
-AUX nvi-1.81.6-strlen-macro-renaming.patch 18467 BLAKE2B 2c764c05ba9e8745369441062452e6bcdf6c065d2c9a040d4ef0f3d2041ec31c574be18bca3432b3ac252c693e2feec4f7df9851055305bad9760fc33d7220ec SHA512 af3470a3f56ede588439153ca84db331a418eecc08787ce89680e5614020418bfa0cb806530525d08ce65af189cb338162a5d77444c14f36036df3bb0327b196
-AUX nvi-1.81.6-use_pkgconfig_for_ncurses.patch 945 BLAKE2B ffdef923f5355ab4839955865cce148c8713517d19c5c6cb8fc4dcff227c1c833bc120d505f36d81240d64d4a0472628c61a28456db1675ecc2d47c3323a1507 SHA512 15d524acfc98bfef4d490a5bb985be6d620487b82b997ffc6fae3e0ad90e7c3a392dd67ebe9fb247c758976485937102dd14422d6218ccbb0491018af5c21906
-DIST nvi-1.81.6.tar.bz2 1758309 BLAKE2B 7aa9b1a7f5337bb246a4a8779180830efd2fb1cfeda2c0d5fc153393cd683237cdfc2a69ac22b228629561ae2222d4eb36746fae4dfb6b9ff44945265988929a SHA512 7e203f7ea6723427d18ff55361254991f50d395f89aab2ea52d0902c474acb24c289da7c35d9e907d652145f13483d8a8270f5c8ee72bd723a3b1eaeecc4f9fd
-EBUILD nvi-1.81.6-r7.ebuild 2067 BLAKE2B 95bc40a128c37818c77af97583c8ce9e5071babdb04d93dcfb1ded14e41dbdd8da05e56f47f9ce40a55f47c7c080f1e9c5f390dd135600e9997a5d55e15a526d SHA512 f7e7d51f2ac4838f44ff481bed8259ff1c4b6fd98c71cffce26641db264c18793e0f0936aef333dab3e7d2963fb7c5e3561633ab5135a3395734bd6089e8d7d7
-MISC metadata.xml 365 BLAKE2B 9fe6afdbd6ccfb6b2bb5283a69ee95db93a6de6f487718be7b190a19204cb9e6426bbb8f2f1536fd6512c819955b5214c70c151344668ebf2c58827cbdcd24bb SHA512 f87d93b660215d0d7271ecb980798e1c5bef9ab24a4773ea2e60748cfa4dd57644567820d5862e33520b7a71f4ef07bac60265f0e656a26aad5360c74b7611fd
diff --git a/app-editors/nvi/files/nvi-1.81.6-ac_config_header.patch b/app-editors/nvi/files/nvi-1.81.6-ac_config_header.patch
deleted file mode 100644
index 49f9453983bc..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-ac_config_header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr nvi-1.81.6.orig/dist/configure.in nvi-1.81.6/dist/configure.in
---- nvi-1.81.6.orig/dist/configure.in	2013-07-09 16:54:56.000000000 -0400
-+++ nvi-1.81.6/dist/configure.in	2013-07-09 16:59:35.000000000 -0400
-@@ -4,7 +4,7 @@
- AC_INIT(../common/main.c)
- AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE(vi, 1.81.6)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- 
- dnl Configure setup.
- AC_PROG_INSTALL()
diff --git a/app-editors/nvi/files/nvi-1.81.6-db.patch b/app-editors/nvi/files/nvi-1.81.6-db.patch
deleted file mode 100644
index 70015261aee4..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-db.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/common/exf.c
-+++ b/common/exf.c
-@@ -228,13 +228,18 @@
- 		/*
- 		 * XXX
- 		 * A seat of the pants calculation: try to keep the file in
--		 * 15 pages or less.  Don't use a page size larger than 10K
-+		 * 15 pages or less.  Don't use a page size larger than 8K
--		 * (vi should have good locality) or smaller than 1K.
-+		 * (vi should have good locality) or smaller than 1K. DB asks
-+		 * for a power of two, so give it one.
- 		 */
- 		psize = ((sb.st_size / 15) + 1023) / 1024;
--		if (psize > 10)
-+		if (psize >= 8)
--			psize = 10;
-+			psize = 8;
-+		else if (psize >= 4)
-+			psize = 4;
-+		else if (psize >= 2)
-+			psize = 2;
--		if (psize == 0)
-+		else
- 			psize = 1;
- 		psize *= 1024;
- 
diff --git a/app-editors/nvi/files/nvi-1.81.6-db44.patch b/app-editors/nvi/files/nvi-1.81.6-db44.patch
deleted file mode 100644
index 4d4c75d2cb35..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-db44.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-  First part is adapted from http://cvsweb.se.netbsd.org/cgi-bin/bsdweb.cgi/pkgsrc/editors/nvi/patches/patch-aa?rev=1.3;content-type=text/plain
-
---- a/common/db.h
-+++ b/common/db.h
-@@ -4,7 +4,7 @@
- #define DB_BUFFER_SMALL		ENOMEM
- #endif
- 
--#if DB_VERSION_MAJOR >= 3 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR >= 3 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR > 3
- #define db_env_open(env,path,flags,mode)				\
-     (env)->open(env, path, flags, mode)
- #define db_env_remove(env,path,flags)					\
-@@ -16,7 +16,10 @@
-     (env)->remove(env, path, NULL, flags)
- #endif
- 
--#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
-+# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 4) || DB_VERSION_MAJOR > 4
-+#define db_open(db,file,type,flags,mode)				\
-+    (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode)
-+#elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
- #define db_open(db,file,type,flags,mode)				\
-     (db)->open(db, NULL, file, NULL, type, flags, mode)
- #else
---- a/common/msg.c
-+++ b/common/msg.c
-@@ -724,7 +724,8 @@
- 		p = buf;
- 	} else
- 		p = file;
--	if ((sp->db_error = db_create(&db, 0, 0)) != 0 ||
-+	if (access(p, R_OK) != 0 ||
-+	    (sp->db_error = db_create(&db, 0, 0)) != 0 ||
- 	    (sp->db_error = db->set_re_source(db, p)) != 0 ||
- 	    (sp->db_error = db_open(db, NULL, DB_RECNO, 0, 0)) != 0) {
- 		if (first) {
diff --git a/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch b/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch
deleted file mode 100644
index adf75b69cb35..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/dist/configure.in
-+++ b/dist/configure.in
-@@ -105,7 +105,7 @@
- 
- dnl A/UX has a broken getopt(3), strpbrk(3).
- case "$host_os" in
--aux*)	   LIBOBJS="getopt.o strpbrk.o $LIBOBJS";;
-+aux*)	   LIBOBJS="libvi_la-getopt.o libvi_la-strpbrk.o $LIBOBJS";;
- esac
- 
- dnl Ultrix has a broken POSIX.1 VDISABLE value.
-@@ -434,7 +434,7 @@
-         	-e 'ldopts'`
- 	perlldflags=`cd $srcdir;$vi_cv_path_perl -MExtUtils::Embed \
-         	-e 'ccdlflags'`
--	LIBOBJS="perl.o perlxsi.o perlsfio.o $LIBOBJS"
-+	LIBOBJS="libvi_la-perl.o libvi_la-perlxsi.o libvi_la-perlsfio.o $LIBOBJS"
- 	AC_DEFINE(HAVE_PERL_INTERP)
- 	AC_CACHE_CHECK([whether we need to use perl's setenv], 
- 		vi_cv_perl_setenv, [
-@@ -471,7 +471,7 @@
- 		AC_MSG_ERROR([No Tcl library found;])
- 	fi
- 	. $vi_cv_tclconfig
--	LIBOBJS="tcl.o $LIBOBJS"
-+	LIBOBJS="libvi_la-tcl.o $LIBOBJS"
- 	LIBS="$TCL_LIB_SPEC $TCL_LIBS $LIBS"
- 	AC_DEFINE(HAVE_TCL_INTERP)
- fi
-@@ -607,12 +607,12 @@
- 
- dnl If we needed setenv or unsetenv, add in the clib/env.c replacement file.
- if test "$need_env" = yes; then
--	LIBOBJS="env.o $LIBOBJS"
-+	LIBOBJS="libvi_la-env.o $LIBOBJS"
- fi
- 
- dnl If we need strsep, add it and define it so we get a prototype.
- if test "$need_strsep" = yes; then
--	LIBOBJS="strsep.o $LIBOBJS"
-+	LIBOBJS="libvi_la-strsep.o $LIBOBJS"
- fi
- 
- dnl Check for fcntl/flock
-@@ -1003,7 +1003,7 @@
- 	PATH="$OLDPATH"
- 
- 	AC_DEFINE(USE_DYNAMIC_LOADING)
--	LIBOBJS="dldb.o $LIBOBJS"
-+	LIBOBJS="libvi_la-dldb.o $LIBOBJS"
- 	dl_src=../common/dldb.c
- 	LIBS="-ldl $LIBS"
- else
-@@ -1046,9 +1046,9 @@
- 	CPPFLAGS="-I$vi_cv_dbsrc/include_auto $CPPFLAGS"
- 	CPPFLAGS="-I$with_db_build $CPPFLAGS"
- 	AC_DEFINE(USE_DB4_LOGGING)
--	LIBOBJS="log4.o vi_auto.o vi_rec.o $LIBOBJS"
-+	LIBOBJS="libvi_la-log4.o libvi_la-vi_auto.o libvi_la-vi_rec.o $LIBOBJS"
- else
--	LIBOBJS="log.o $LIBOBJS"
-+	LIBOBJS="libvi_la-log.o $LIBOBJS"
- fi
- 
- dnl We compile in nvi's RE routines unless the user specifies otherwise.
-@@ -1064,7 +1064,7 @@
- case "$vi_cv_re_lib" in
- "bundled RE")
- 	CPPFLAGS="-I\$(visrcdir)/regex $CPPFLAGS"
--	LIBOBJS="regcomp.o regerror.o regexec.o regfree.o $LIBOBJS";;
-+	LIBOBJS="libvi_la-regcomp.o libvi_la-regerror.o libvi_la-regexec.o libvi_la-regfree.o $LIBOBJS";;
- "other RE")
- 	;;
- esac
---- a/dist/Makefile.am
-+++ b/dist/Makefile.am
-@@ -169,12 +169,15 @@
- 	$(visrcdir)/common/pthread.c \
- 	$(visrcdir)/common/vi_auto.c \
- 	$(visrcdir)/common/vi_rec.c \
--	$(visrcdir)/perl_api/perl.xs \
-+	perl.c \
- 	$(visrcdir)/perl_api/perlsfio.c \
-+	perlxsi.c \
- 	$(visrcdir)/tcl_api/tcl.c
- # Is this the way to do it ?
- libvi_la_DEPENDENCIES = @LTLIBOBJS@
--libvi_la_LIBADD = @LTLIBOBJS@
-+libvi_la_LIBADD = @LTLIBOBJS@ @perllibs@
-+libvi_la_CPPFLAGS = @perlldflags@ $(AM_CPPFLAGS)
-+libvi_la_LDFLAGS = @perlldflags@
- 
- bin_PROGRAMS = @vi_programs@ @vi_ipc@
- EXTRA_PROGRAMS = vi vi-ipc vi-motif vi-gtk
diff --git a/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch b/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch
deleted file mode 100644
index 3567646688e7..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/perl_api/perlsfio.c
-+++ b/perl_api/perlsfio.c
-@@ -32,6 +32,7 @@
- /* perl redefines them
-  * avoid warnings
-  */
-+#undef re_compile
- #undef USE_DYNAMIC_LOADING
- #undef DEBUG
- #undef PACKAGE
---- a/perl_api/perl.xs
-+++ b/perl_api/perl.xs
-@@ -38,6 +38,7 @@
- /* perl redefines them
-  * avoid warnings
-  */
-+#undef re_compile
- #undef USE_DYNAMIC_LOADING
- #undef DEBUG
- #undef PACKAGE
diff --git a/app-editors/nvi/files/nvi-1.81.6-printf-types.patch b/app-editors/nvi/files/nvi-1.81.6-printf-types.patch
deleted file mode 100644
index 20fc47c18f25..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-printf-types.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-lno and last are uint32_t which might be different from unsigned long
-
---- a/common/msg.c
-+++ b/common/msg.c
-@@ -640,7 +640,8 @@ msgq_status(SCR *sp, db_recno_t lno, u_i
- 			p += len;
- 		} else {
- 			t = msg_cat(sp, "027|line %lu of %lu [%ld%%]", &len);
--			(void)sprintf(p, t, lno, last, (lno * 100) / last);
-+			(void)sprintf(p, t, (u_long)lno, (u_long)last,
-+					((long)lno * 100L) / (long)last);
- 			p += strlen(p);
- 		}
- 	} else {
diff --git a/app-editors/nvi/files/nvi-1.81.6-strlen-macro-renaming.patch b/app-editors/nvi/files/nvi-1.81.6-strlen-macro-renaming.patch
deleted file mode 100644
index 70a47fd93fd5..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-strlen-macro-renaming.patch
+++ /dev/null
@@ -1,499 +0,0 @@
-Created by: Karl Hakimian 
-Added by: Jesus Rivero <neurogeek@gentoo.org>
-Added on: Feb 18, 2015
-diff -rupN nvi-1.81.6.orig/common/api.c nvi-1.81.6/common/api.c
---- nvi-1.81.6.orig/common/api.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/common/api.c	2015-02-17 11:04:50.199111784 -0800
-@@ -423,7 +423,7 @@ api_opts_get(SCR *sp, CHAR_T *name, char
- 	switch (op->type) {
- 	case OPT_0BOOL:
- 	case OPT_1BOOL:
--		MALLOC_RET(sp, *value, char *, STRLEN(op->name) + 2 + 1);
-+		MALLOC_RET(sp, *value, char *, NVI_STRLEN(op->name) + 2 + 1);
- 		(void)sprintf(*value,
- 		    "%s"WS, O_ISSET(sp, offset) ? "" : "no", op->name);
- 		if (boolvalue != NULL)
-diff -rupN nvi-1.81.6.orig/common/msg.c nvi-1.81.6/common/msg.c
---- nvi-1.81.6.orig/common/msg.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/common/msg.c	2015-02-17 11:04:50.203891722 -0800
-@@ -378,7 +378,7 @@ msgq_wstr(SCR *sp, mtype_t mtype, CHAR_T
- 		msgq(sp, mtype, fmt);
- 		return;
- 	}
--	INT2CHAR(sp, str, STRLEN(str) + 1, nstr, nlen);
-+	INT2CHAR(sp, str, NVI_STRLEN(str) + 1, nstr, nlen);
- 	msgq_str(sp, mtype, nstr, fmt);
- }
- 
-diff -rupN nvi-1.81.6.orig/common/multibyte.h nvi-1.81.6/common/multibyte.h
---- nvi-1.81.6.orig/common/multibyte.h	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/common/multibyte.h	2015-02-17 11:04:50.204262910 -0800
-@@ -12,7 +12,7 @@ typedef	wchar_t		CHAR_T;
- typedef	u_int		UCHAR_T;
- #define RCHAR_BIT	24
- 
--#define STRLEN		wcslen
-+#define NVI_STRLEN		wcslen
- #define STRTOL		wcstol
- #define STRTOUL		wcstoul
- #define SPRINTF		swprintf
-@@ -31,7 +31,7 @@ typedef	u_char		CHAR_T;
- typedef	u_char		UCHAR_T;
- #define RCHAR_BIT	CHAR_BIT
- 
--#define STRLEN		strlen
-+#define NVI_STRLEN		strlen
- #define STRTOL		strtol
- #define STRTOUL		strtoul
- #define SPRINTF		snprintf
-diff -rupN nvi-1.81.6.orig/common/options.c nvi-1.81.6/common/options.c
---- nvi-1.81.6.orig/common/options.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/common/options.c	2015-02-17 11:04:50.195900457 -0800
-@@ -315,7 +315,7 @@ opts_init(SCR *sp, int *oargs)
- 
- 	/* Set numeric and string default values. */
- #define	OI(indx, str) {							\
--	a.len = STRLEN(str);						\
-+	a.len = NVI_STRLEN(str);						\
- 	if ((CHAR_T*)str != b2)	  /* GCC puts strings in text-space. */	\
- 		(void)MEMCPY(b2, str, a.len+1);				\
- 	if (opts_set(sp, argv, NULL)) {					\
-@@ -620,10 +620,10 @@ opts_set(SCR *sp, ARGS **argv, char *usa
- 				goto badnum;
- 			if ((nret =
- 			    nget_uslong(sp, &value, sep, &endp, 10)) != NUM_OK) {
--				INT2CHAR(sp, name, STRLEN(name) + 1, 
-+				INT2CHAR(sp, name, NVI_STRLEN(name) + 1, 
- 					     np, nlen);
- 				p2 = msg_print(sp, np, &nf);
--				INT2CHAR(sp, sep, STRLEN(sep) + 1, 
-+				INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, 
- 					     np, nlen);
- 				t2 = msg_print(sp, np, &nf2);
- 				switch (nret) {
-@@ -647,10 +647,10 @@ opts_set(SCR *sp, ARGS **argv, char *usa
- 				break;
- 			}
- 			if (*endp && !ISBLANK(*endp)) {
--badnum:				INT2CHAR(sp, name, STRLEN(name) + 1, 
-+badnum:				INT2CHAR(sp, name, NVI_STRLEN(name) + 1, 
- 					     np, nlen);
- 				p2 = msg_print(sp, np, &nf);
--				INT2CHAR(sp, sep, STRLEN(sep) + 1, 
-+				INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, 
- 					     np, nlen);
- 				t2 = msg_print(sp, np, &nf2);
- 				msgq(sp, M_ERR,
-@@ -680,7 +680,7 @@ badnum:				INT2CHAR(sp, name, STRLEN(nam
- 				break;
- 
- 			/* Report to subsystems. */
--			INT2CHAR(sp, sep, STRLEN(sep) + 1, np, nlen);
-+			INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, np, nlen);
- 			if (op->func != NULL &&
- 			    op->func(sp, spo, np, &value) ||
- 			    ex_optchange(sp, offset, np, &value) ||
-@@ -712,7 +712,7 @@ badnum:				INT2CHAR(sp, name, STRLEN(nam
- 			 * Do nothing if the value is unchanged, the underlying
- 			 * functions can be expensive.
- 			 */
--			INT2CHAR(sp, sep, STRLEN(sep) + 1, np, nlen);
-+			INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, np, nlen);
- 			if (!F_ISSET(op, OPT_ALWAYS) &&
- 			    O_STR(sp, offset) != NULL &&
- 			    !strcmp(O_STR(sp, offset), np))
-@@ -879,7 +879,7 @@ opts_dump(SCR *sp, enum optdisp type)
- 		}
- 		F_CLR(&sp->opts[cnt], OPT_SELECTED);
- 
--		curlen = STRLEN(op->name);
-+		curlen = NVI_STRLEN(op->name);
- 		switch (op->type) {
- 		case OPT_0BOOL:
- 		case OPT_1BOOL:
-@@ -1049,7 +1049,7 @@ opts_search(CHAR_T *name)
- 	 * Check to see if the name is the prefix of one (and only one)
- 	 * option.  If so, return the option.
- 	 */
--	len = STRLEN(name);
-+	len = NVI_STRLEN(name);
- 	for (found = NULL, op = optlist; op->name != NULL; ++op) {
- 		if (op->name[0] < name[0])
- 			continue;
-diff -rupN nvi-1.81.6.orig/dist/tags nvi-1.81.6/dist/tags
---- nvi-1.81.6.orig/dist/tags	2007-11-18 08:43:55.000000000 -0800
-+++ nvi-1.81.6/dist/tags	2015-02-17 11:04:50.225314084 -0800
-@@ -1068,8 +1068,8 @@ SPRINTF	../common/multibyte.h	37;"	d
- STANDARD_TAB	../common/key.h	213;"	d
- STRCMP	../common/multibyte.h	19;"	d
- STRCMP	../common/multibyte.h	38;"	d
--STRLEN	../common/multibyte.h	15;"	d
--STRLEN	../common/multibyte.h	34;"	d
-+NVI_STRLEN	../common/multibyte.h	15;"	d
-+NVI_STRLEN	../common/multibyte.h	34;"	d
- STRPBRK	../common/multibyte.h	20;"	d
- STRPBRK	../common/multibyte.h	39;"	d
- STRSET	../common/multibyte.h	22;"	d
-diff -rupN nvi-1.81.6.orig/ex/ex_argv.c nvi-1.81.6/ex/ex_argv.c
---- nvi-1.81.6.orig/ex/ex_argv.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_argv.c	2015-02-17 11:04:50.267171388 -0800
-@@ -217,7 +217,7 @@ argv_exp2(SCR *sp, EXCMD *excp, CHAR_T *
- 
- 			*p = '\0';
- 			INT2CHAR(sp, bp + SHELLOFFSET, 
--				 STRLEN(bp + SHELLOFFSET) + 1, np, nlen);
-+				 NVI_STRLEN(bp + SHELLOFFSET) + 1, np, nlen);
- 			d = strdup(np);
- 			rval = argv_lexp(sp, excp, d);
- 			free (d);
-@@ -332,7 +332,7 @@ argv_fexp(SCR *sp, EXCMD *excp, CHAR_T *
- 				    "115|No previous command to replace \"!\"");
- 				return (1);
- 			}
--			len += tlen = STRLEN(exp->lastbcomm);
-+			len += tlen = NVI_STRLEN(exp->lastbcomm);
- 			off = p - bp;
- 			ADD_SPACE_RETW(sp, bp, blen, len);
- 			p = bp + off;
-@@ -683,7 +683,7 @@ err:		if (ifp != NULL)
- 		 * XXX
- 		 * Assume that all shells have -c.
- 		 */
--		INT2CHAR(sp, bp, STRLEN(bp)+1, np, nlen);
-+		INT2CHAR(sp, bp, NVI_STRLEN(bp)+1, np, nlen);
- 		execl(sh_path, sh, "-c", np, (char *)NULL);
- 		msgq_str(sp, M_SYSERR, sh_path, "118|Error: execl: %s");
- 		_exit(127);
-diff -rupN nvi-1.81.6.orig/ex/ex_cscope.c nvi-1.81.6/ex/ex_cscope.c
---- nvi-1.81.6.orig/ex/ex_cscope.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_cscope.c	2015-02-17 11:04:50.261539058 -0800
-@@ -140,7 +140,7 @@ ex_cscope(SCR *sp, EXCMD *cmdp)
- 		for (; *p && isspace(*p); ++p);
- 	}
- 
--	INT2CHAR(sp, cmd, STRLEN(cmd) + 1, np, nlen);
-+	INT2CHAR(sp, cmd, NVI_STRLEN(cmd) + 1, np, nlen);
- 	if ((ccp = lookup_ccmd(np)) == NULL) {
- usage:		msgq(sp, M_ERR, "309|Use \"cscope help\" for help");
- 		return (1);
-@@ -214,7 +214,7 @@ cscope_add(SCR *sp, EXCMD *cmdp, CHAR_T
- 	 * >1 additional args: object, too many args.
- 	 */
- 	cur_argc = cmdp->argc;
--	if (argv_exp2(sp, cmdp, dname, STRLEN(dname))) {
-+	if (argv_exp2(sp, cmdp, dname, NVI_STRLEN(dname))) {
- 		return (1);
- 	}
- 	if (cmdp->argc == cur_argc) {
-@@ -228,7 +228,7 @@ cscope_add(SCR *sp, EXCMD *cmdp, CHAR_T
- 		return (1);
- 	}
- 
--	INT2CHAR(sp, dname, STRLEN(dname)+1, np, nlen);
-+	INT2CHAR(sp, dname, NVI_STRLEN(dname)+1, np, nlen);
- 
- 	/*
- 	 * The user can specify a specific file (so they can have multiple
-@@ -471,7 +471,7 @@ cscope_find(SCR *sp, EXCMD *cmdp, CHAR_T
- 	}
- 
- 	/* Create the cscope command. */
--	INT2CHAR(sp, pattern, STRLEN(pattern) + 1, np, nlen);
-+	INT2CHAR(sp, pattern, NVI_STRLEN(pattern) + 1, np, nlen);
- 	np = strdup(np);
- 	if ((tqp = create_cs_cmd(sp, np, &search)) == NULL)
- 		goto err;
-@@ -801,7 +801,7 @@ cscope_help(SCR *sp, EXCMD *cmdp, CHAR_T
- 	char *np;
- 	size_t nlen;
- 
--	INT2CHAR(sp, subcmd, STRLEN(subcmd) + 1, np, nlen);
-+	INT2CHAR(sp, subcmd, NVI_STRLEN(subcmd) + 1, np, nlen);
- 	return (csc_help(sp, np));
- }
- 
-@@ -842,7 +842,7 @@ cscope_kill(SCR *sp, EXCMD *cmdp, CHAR_T
- 	char *np;
- 	size_t nlen;
- 
--	INT2CHAR(sp, cn, STRLEN(cn) + 1, np, nlen);
-+	INT2CHAR(sp, cn, NVI_STRLEN(cn) + 1, np, nlen);
- 	return (terminate(sp, NULL, atoi(np)));
- }
- 
-diff -rupN nvi-1.81.6.orig/ex/ex_filter.c nvi-1.81.6/ex/ex_filter.c
---- nvi-1.81.6.orig/ex/ex_filter.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_filter.c	2015-02-17 11:04:50.263257613 -0800
-@@ -138,7 +138,7 @@ err:		if (input[0] != -1)
- 		else
- 			++name;
- 
--		INT2SYS(sp, cmd, STRLEN(cmd)+1, np, nlen);
-+		INT2SYS(sp, cmd, NVI_STRLEN(cmd)+1, np, nlen);
- 		execl(O_STR(sp, O_SHELL), name, "-c", np, (char *)NULL);
- 		msgq_str(sp, M_SYSERR, O_STR(sp, O_SHELL), "execl: %s");
- 		_exit (127);
-@@ -283,7 +283,7 @@ err:		if (input[0] != -1)
- 	 * Ignore errors on vi file reads, to make reads prettier.  It's
- 	 * completely inconsistent, and historic practice.
- 	 */
--uwait:	INT2CHAR(sp, cmd, STRLEN(cmd) + 1, np, nlen);
-+uwait:	INT2CHAR(sp, cmd, NVI_STRLEN(cmd) + 1, np, nlen);
- 	return (proc_wait(sp, (long)utility_pid, np,
- 	    ftype == FILTER_READ && F_ISSET(sp, SC_VI) ? 1 : 0, 0) || rval);
- }
-diff -rupN nvi-1.81.6.orig/ex/ex_init.c nvi-1.81.6/ex/ex_init.c
---- nvi-1.81.6.orig/ex/ex_init.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_init.c	2015-02-17 11:04:50.279419412 -0800
-@@ -61,7 +61,7 @@ ex_screen_copy(SCR *orig, SCR *sp)
- 
- 		if (oexp->lastbcomm != NULL &&
- 		    (nexp->lastbcomm = v_wstrdup(sp, oexp->lastbcomm, 
--				     STRLEN(oexp->lastbcomm))) == NULL) {
-+				     NVI_STRLEN(oexp->lastbcomm))) == NULL) {
- 			msgq(sp, M_SYSERR, NULL);
- 			return(1);
- 		}
-diff -rupN nvi-1.81.6.orig/ex/ex_tag.c nvi-1.81.6/ex/ex_tag.c
---- nvi-1.81.6.orig/ex/ex_tag.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_tag.c	2015-02-17 11:04:50.275254557 -0800
-@@ -68,7 +68,7 @@ ex_tag_first(SCR *sp, CHAR_T *tagarg)
- 
- 	/* Build an argument for the ex :tag command. */
- 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, OOBLNO, 0);
--	argv_exp0(sp, &cmd, tagarg, STRLEN(tagarg));
-+	argv_exp0(sp, &cmd, tagarg, NVI_STRLEN(tagarg));
- 
- 	/*
- 	 * XXX
-@@ -115,7 +115,7 @@ ex_tag_push(SCR *sp, EXCMD *cmdp)
- 
- 		/* Taglength may limit the number of characters. */
- 		if ((tl =
--		    O_VAL(sp, O_TAGLENGTH)) != 0 && STRLEN(exp->tag_last) > tl)
-+		    O_VAL(sp, O_TAGLENGTH)) != 0 && NVI_STRLEN(exp->tag_last) > tl)
- 			exp->tag_last[tl] = '\0';
- 		break;
- 	case 0:
-@@ -587,7 +587,7 @@ ex_tag_copy(SCR *orig, SCR *sp)
- 	/* Copy the last tag. */
- 	if (oexp->tag_last != NULL &&
- 	    (nexp->tag_last = v_wstrdup(sp, oexp->tag_last, 
--					STRLEN(oexp->tag_last))) == NULL) {
-+					NVI_STRLEN(oexp->tag_last))) == NULL) {
- 		msgq(sp, M_SYSERR, NULL);
- 		return (1);
- 	}
-@@ -997,7 +997,7 @@ ctag_slist(SCR *sp, CHAR_T *tag)
- 	exp = EXP(sp);
- 
- 	/* Allocate and initialize the tag queue structure. */
--	INT2CHAR(sp, tag, STRLEN(tag) + 1, np, nlen);
-+	INT2CHAR(sp, tag, NVI_STRLEN(tag) + 1, np, nlen);
- 	len = nlen - 1;
- 	CALLOC_GOTO(sp, tqp, TAGQ *, 1, sizeof(TAGQ) + len + 1);
- 	CIRCLEQ_INIT(&tqp->tagq);
-diff -rupN nvi-1.81.6.orig/ex/ex_util.c nvi-1.81.6/ex/ex_util.c
---- nvi-1.81.6.orig/ex/ex_util.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_util.c	2015-02-17 11:04:50.268378054 -0800
-@@ -153,7 +153,7 @@ ex_wemsg(SCR* sp, CHAR_T *p, exm_t which
- 	char *np;
- 	size_t nlen;
- 
--	if (p) INT2CHAR(sp, p, STRLEN(p), np, nlen);
-+	if (p) INT2CHAR(sp, p, NVI_STRLEN(p), np, nlen);
- 	else np = NULL;
- 	ex_emsg(sp, np, which);
- }
-diff -rupN nvi-1.81.6.orig/ex/ex_write.c nvi-1.81.6/ex/ex_write.c
---- nvi-1.81.6.orig/ex/ex_write.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ex/ex_write.c	2015-02-17 11:04:50.277249383 -0800
-@@ -158,7 +158,7 @@ exwr(SCR *sp, EXCMD *cmdp, enum which cm
- 			ex_emsg(sp, cmdp->cmd->usage, EXM_USAGE);
- 			return (1);
- 		}
--		if (argv_exp1(sp, cmdp, p, STRLEN(p), 1))
-+		if (argv_exp1(sp, cmdp, p, NVI_STRLEN(p), 1))
- 			return (1);
- 
- 		/*
-@@ -203,7 +203,7 @@ exwr(SCR *sp, EXCMD *cmdp, enum which cm
- 		    &cmdp->addr1, &cmdp->addr2, NULL, flags));
- 
- 	/* Build an argv so we get an argument count and file expansion. */
--	if (argv_exp2(sp, cmdp, p, STRLEN(p)))
-+	if (argv_exp2(sp, cmdp, p, NVI_STRLEN(p)))
- 		return (1);
- 
- 	/*
-@@ -255,7 +255,7 @@ exwr(SCR *sp, EXCMD *cmdp, enum which cm
- 			set_alt_name(sp, name);
- 		break;
- 	default:
--		INT2CHAR(sp, p, STRLEN(p) + 1, n, nlen);
-+		INT2CHAR(sp, p, NVI_STRLEN(p) + 1, n, nlen);
- 		ex_emsg(sp, n, EXM_FILECOUNT);
- 		return (1);
- 	}
-diff -rupN nvi-1.81.6.orig/ip/ip_term.c nvi-1.81.6/ip/ip_term.c
---- nvi-1.81.6.orig/ip/ip_term.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/ip/ip_term.c	2015-02-17 11:04:50.280203225 -0800
-@@ -127,7 +127,7 @@ ip_optchange(SCR *sp, int offset, char *
- 
- 	ipb.code = SI_EDITOPT;
- 	ipb.str1 = (char*)opt->name;
--	ipb.len1 = STRLEN(opt->name) * sizeof(CHAR_T);
-+	ipb.len1 = NVI_STRLEN(opt->name) * sizeof(CHAR_T);
- 
- 	(void)vi_send(ipp->o_fd, "ab1", &ipb);
- 	return (0);
-diff -rupN nvi-1.81.6.orig/perl_api/perl.xs nvi-1.81.6/perl_api/perl.xs
---- nvi-1.81.6.orig/perl_api/perl.xs	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/perl_api/perl.xs	2015-02-17 11:04:50.189684363 -0800
-@@ -326,7 +326,7 @@ perl_ex_perl(scrp, cmdp, cmdlen, f_lno,
- 	newVIrv(pp->svid, scrp);
- 
- 	istat = signal(SIGINT, my_sighandler);
--	INT2CHAR(scrp, cmdp, STRLEN(cmdp)+1, np, nlen);
-+	INT2CHAR(scrp, cmdp, NVI_STRLEN(cmdp)+1, np, nlen);
- 	perl_eval(np);
- 	signal(SIGINT, istat);
- 
-@@ -421,7 +421,7 @@ perl_ex_perldo(scrp, cmdp, cmdlen, f_lno
- 	/* Backwards compatibility. */
- 	newVIrv(pp->svid, scrp);
- 
--	INT2CHAR(scrp, cmdp, STRLEN(cmdp)+1, np, nlen);
-+	INT2CHAR(scrp, cmdp, NVI_STRLEN(cmdp)+1, np, nlen);
- 	if (!(command = malloc(length = nlen - 1 + sizeof("sub {}"))))
- 		return 1;
- 	snprintf(command, length, "sub {%s}", np);
-diff -rupN nvi-1.81.6.orig/regex/engine.c nvi-1.81.6/regex/engine.c
---- nvi-1.81.6.orig/regex/engine.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/regex/engine.c	2015-02-17 11:04:50.181456859 -0800
-@@ -161,7 +161,7 @@ int eflags;
- 		stop = string + pmatch[0].rm_eo;
- 	} else {
- 		start = string;
--		stop = start + STRLEN(start);
-+		stop = start + NVI_STRLEN(start);
- 	}
- 	if (stop < start)
- 		return(REG_INVARG);
-diff -rupN nvi-1.81.6.orig/regex/regcomp.c nvi-1.81.6/regex/regcomp.c
---- nvi-1.81.6.orig/regex/regcomp.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/regex/regcomp.c	2015-02-17 11:04:50.175705539 -0800
-@@ -198,7 +198,7 @@ regcomp(regex_t *preg, const RCHAR_T *pa
- 			return(REG_INVARG);
- 		len = preg->re_endp - pattern;
- 	} else
--		len = STRLEN(pattern);
-+		len = NVI_STRLEN(pattern);
- 
- 	/* do the mallocs early so failure handling is easy */
- 	g = (struct re_guts *)malloc(sizeof(struct re_guts) +
-@@ -818,7 +818,7 @@ p_b_cclass(register struct parse *p, reg
- 		NEXT();
- 	len = p->next - sp;
- 	for (cp = cclasses; cp->name != NULL; cp++)
--		if (STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
-+		if (NVI_STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
- 			break;
- 	if (cp->name == NULL) {
- 		/* oops, didn't find it */
-@@ -889,7 +889,7 @@ p_b_coll_elem(register struct parse *p,
- 	}
- 	len = p->next - sp;
- 	for (cp = cnames; cp->name != NULL; cp++)
--		if (STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
-+		if (NVI_STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
- 			return(cp->code);	/* known name */
- 	if (len == 1)
- 		return(*sp);	/* single character */
-diff -rupN nvi-1.81.6.orig/vi/v_event.c nvi-1.81.6/vi/v_event.c
---- nvi-1.81.6.orig/vi/v_event.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/vi/v_event.c	2015-02-17 11:04:50.242966563 -0800
-@@ -97,7 +97,7 @@ v_editopt(SCR *sp, VICMD *vp)
- 	size_t nlen;
- 	char *p2;
- 
--	INT2CHAR(sp, vp->ev.e_str2, STRLEN(vp->ev.e_str2)+1, np, nlen);
-+	INT2CHAR(sp, vp->ev.e_str2, NVI_STRLEN(vp->ev.e_str2)+1, np, nlen);
- 	p2 = strdup(np);
- 	rval = api_opts_set(sp, vp->ev.e_str1, p2, 
- 			    vp->ev.e_val1, vp->ev.e_val1);
-@@ -135,7 +135,7 @@ v_tag(SCR *sp, VICMD *vp)
- 		return (1);
- 
- 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, OOBLNO, 0);
--	argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw));
-+	argv_exp0(sp, &cmd, VIP(sp)->keyw, NVI_STRLEN(VIP(sp)->keyw));
- 	return (v_exec_ex(sp, vp, &cmd));
- }
- 
-@@ -167,7 +167,7 @@ v_tagsplit(SCR *sp, VICMD *vp)
- 
- 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, OOBLNO, 0);
- 	F_SET(&cmd, E_NEWSCREEN);
--	argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw));
-+	argv_exp0(sp, &cmd, VIP(sp)->keyw, NVI_STRLEN(VIP(sp)->keyw));
- 	return (v_exec_ex(sp, vp, &cmd));
- }
- 
-diff -rupN nvi-1.81.6.orig/vi/v_ex.c nvi-1.81.6/vi/v_ex.c
---- nvi-1.81.6.orig/vi/v_ex.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/vi/v_ex.c	2015-02-17 11:04:50.246380280 -0800
-@@ -210,7 +210,7 @@ v_tagpush(SCR *sp, VICMD *vp)
- 	EXCMD cmd;
- 
- 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, 0, 0);
--	argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw) + 1);
-+	argv_exp0(sp, &cmd, VIP(sp)->keyw, NVI_STRLEN(VIP(sp)->keyw) + 1);
- 	return (v_exec_ex(sp, vp, &cmd));
- }
- 
-diff -rupN nvi-1.81.6.orig/vi/vs_msg.c nvi-1.81.6/vi/vs_msg.c
---- nvi-1.81.6.orig/vi/vs_msg.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/vi/vs_msg.c	2015-02-17 11:04:50.251093618 -0800
-@@ -175,7 +175,7 @@ vs_update(SCR *sp, const char *m1, const
- 	 */
- 	if (F_ISSET(sp, SC_SCR_EXWROTE)) {
- 		if (m2 != NULL)
--			INT2CHAR(sp, m2, STRLEN(m2) + 1, np, nlen);
-+			INT2CHAR(sp, m2, NVI_STRLEN(m2) + 1, np, nlen);
- 		(void)ex_printf(sp,
- 		    "%s\n", m1 == NULL? "" : m1, m2 == NULL ? "" : np);
- 		(void)ex_fflush(sp);
-@@ -203,7 +203,7 @@ vs_update(SCR *sp, const char *m1, const
- 	} else
- 		len = 0;
- 	if (m2 != NULL) {
--		mlen = STRLEN(m2);
-+		mlen = NVI_STRLEN(m2);
- 		if (len + mlen > sp->cols - 2)
- 			mlen = (sp->cols - 2) - len;
- 		(void)gp->scr_waddstr(sp, m2, mlen);
-diff -rupN nvi-1.81.6.orig/vi/vs_split.c nvi-1.81.6/vi/vs_split.c
---- nvi-1.81.6.orig/vi/vs_split.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/vi/vs_split.c	2015-02-17 11:04:50.256136584 -0800
-@@ -628,7 +628,7 @@ vs_fg(SCR *sp, SCR **nspp, CHAR_T *name,
- 	wp = sp->wp;
- 
- 	if (name)
--	    INT2CHAR(sp, name, STRLEN(name) + 1, np, nlen);
-+	    INT2CHAR(sp, name, NVI_STRLEN(name) + 1, np, nlen);
- 	else
- 	    np = NULL;
- 	if (newscreen)
-diff -rupN nvi-1.81.6.orig/vi/v_txt.c nvi-1.81.6/vi/v_txt.c
---- nvi-1.81.6.orig/vi/v_txt.c	2007-11-18 08:41:42.000000000 -0800
-+++ nvi-1.81.6/vi/v_txt.c	2015-02-17 11:04:50.240596567 -0800
-@@ -2049,7 +2049,7 @@ retry:		for (len = 0,
- 		return (0);
- 	case 1:				/* One match. */
- 		/* If something changed, do the exchange. */
--		nlen = STRLEN(cmd.argv[0]->bp);
-+		nlen = NVI_STRLEN(cmd.argv[0]->bp);
- 		if (len != nlen || MEMCMP(cmd.argv[0]->bp, p, len))
- 			break;
- 
diff --git a/app-editors/nvi/files/nvi-1.81.6-use_pkgconfig_for_ncurses.patch b/app-editors/nvi/files/nvi-1.81.6-use_pkgconfig_for_ncurses.patch
deleted file mode 100644
index a9bf7e0a06a4..000000000000
--- a/app-editors/nvi/files/nvi-1.81.6-use_pkgconfig_for_ncurses.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -uNr nvi-1.81.6.orig/dist/configure.in nvi-1.81.6/dist/configure.in
---- nvi-1.81.6.orig/dist/configure.in	2013-07-09 17:17:35.000000000 -0400
-+++ nvi-1.81.6/dist/configure.in	2013-07-09 17:18:48.000000000 -0400
-@@ -263,11 +263,13 @@
- 	[  --enable-gtk            Build a Gtk front-end for vi.],
- 	[vi_cv_gtk=$enableval], [vi_cv_gtk="no"])
- AC_MSG_RESULT($vi_cv_gtk)
-+
-+#
-+# Find pkg-config
-+#
-+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+
- if test "$vi_cv_gtk" = "yes"; then
--	#
--	# Find pkg-config
--	#
--	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- 	if test x$PKG_CONFIG = xno ; then
- 	    if test "$vi_cv_widechar" = "yes"; then
- 	        AC_MSG_ERROR(
-@@ -531,7 +533,7 @@
- 			[CURSHEADER=ncursesw/ncurses.h])
- 	    fi
- 	    vi_programs="vi $vi_programs"
--	    CURSLIBS="-l$vi_cv_curses"
-+	    CURSLIBS=`$PKG_CONFIG --libs $vi_cv_curses`
- 	else
- 	    AC_MSG_WARN([*** No suitable curses library found.])
- 	    if test "$vi_programs"X = X; then
diff --git a/app-editors/nvi/metadata.xml b/app-editors/nvi/metadata.xml
deleted file mode 100644
index f954e7f9956d..000000000000
--- a/app-editors/nvi/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>felix.janda@posteo.de</email>
-		<name>Felix Janda</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-editors/nvi/nvi-1.81.6-r7.ebuild b/app-editors/nvi/nvi-1.81.6-r7.ebuild
deleted file mode 100644
index cb13313dae92..000000000000
--- a/app-editors/nvi/nvi-1.81.6-r7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools db-use flag-o-matic
-
-DESCRIPTION="Vi clone"
-HOMEPAGE="https://sites.google.com/a/bostic.com/keithbostic/vi"
-SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x64-macos ~amd64-fbsd"
-IUSE="perl tcl unicode"
-
-CDEPEND=">=sys-libs/db-4.2.52_p5:=
-	>=sys-libs/ncurses-5.6-r2:=
-	perl? ( dev-lang/perl )
-	tcl? ( >=dev-lang/tcl-8.5:0= )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	app-eselect/eselect-vi"
-
-REQUIRED_USE="tcl? ( !unicode )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-strlen-macro-renaming.patch
-	"${FILESDIR}"/${P}-db44.patch
-	"${FILESDIR}"/${P}-db.patch
-	"${FILESDIR}"/${P}-perl-as-needed.patch
-	"${FILESDIR}"/${P}-perl-shortnames.patch
-	"${FILESDIR}"/${P}-ac_config_header.patch
-	"${FILESDIR}"/${P}-use_pkgconfig_for_ncurses.patch
-	"${FILESDIR}"/${P}-printf-types.patch
-	)
-
-src_prepare() {
-	default
-
-	cd dist || die
-	chmod +x findconfig || die
-
-	mv configure.{in,ac} || die
-	sed -i -e "s@-ldb@-l$(db_libname)@" configure.ac || die
-	sed -i -e "s@^install-\(.*\)-local:@install-\1-hook:@" Makefile.am || die
-	eautoreconf -Im4
-}
-
-src_configure() {
-	local myconf
-
-	use perl && myconf="${myconf} --enable-perlinterp"
-	use unicode && myconf="${myconf} --enable-widechar"
-	use tcl && myconf="${myconf} --enable-tclinterp"
-
-	append-cppflags "-D_PATH_MSGCAT=\"\\\"${EPREFIX%/}/usr/share/vi/catalog/\\\"\""
-	append-cppflags -I"$(db_includedir)"
-
-	# Darwin doesn't have stropts.h, bug #619416
-	[[ ${CHOST} == *-darwin* ]] && export vi_cv_sys5_pty=no
-
-	pushd dist 2>/dev/null || die
-	econf \
-		--program-prefix=n \
-		${myconf}
-	popd 2>/dev/null || die
-}
-
-src_compile() {
-	emake -C dist
-}
-
-src_install() {
-	emake -C dist DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	einfo "Setting /usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
diff --git a/app-editors/okteta-0.25.1 b/app-editors/okteta-0.25.1
new file mode 100644
index 000000000000..cfec6d8a5fcb
--- /dev/null
+++ b/app-editors/okteta-0.25.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Hex editor by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/okteta https://utils.kde.org/projects/okteta
+IUSE=crypt designer test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/okteta/0.25.1/src/okteta-0.25.1.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd59eb01dc544aca2208054374321931
diff --git a/app-editors/okteta-17.12.3 b/app-editors/okteta-17.12.3
new file mode 100644
index 000000000000..a8ded5ebee2d
--- /dev/null
+++ b/app-editors/okteta-17.12.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Hex editor by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/okteta https://utils.kde.org/projects/okteta
+IUSE=crypt designer test debug +handbook test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.3/okteta-17.12.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=49722ebeea10b4623650646c2cb5b7d5
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
deleted file mode 100644
index b96d27907cf1..000000000000
--- a/app-editors/okteta/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST okteta-0.25.1.tar.xz 951952 BLAKE2B 180cb7426b85cc8598f774d50556fe26d95d11e7c8b5be542a38fd4fa1c0479b401e6be59e7ca86eabba805c2a5d2ea2d818960cb218d173fd87db23f9c5525f SHA512 67e594ee1674176cbf506ca1191ced748bf6aec268d57211e052552f9673c359ccb3fefd403b5cf63e04f63a4fd3b42b0d21ef8eefcbac999081d58505df2174
-DIST okteta-17.12.3.tar.xz 962772 BLAKE2B 4a347db4db1d248ccb73e2ab77d4b10449ccea2e1e23ae7770a338f1c96f3990de4a3362b566abde29d47ef4b1084614e219ea646e4b0704ecac048a4559d921 SHA512 d89bcd46001336d912f2d3f08247cdb13a02688316f078455e851feae03b638688683df2779c19089481b69baa2a582fd063d3180ebe66962ab249fc39c3850d
-EBUILD okteta-0.25.1.ebuild 1605 BLAKE2B 7c5a9e81733f75e9cd2ef29ce31a6c17cec9d8c49d90beeecb6407f73843b3a1a0009306dfd4e2e7d0d7620ccc1adbcbf6a1748a9e53b5858a7983c9c4617736 SHA512 82c9fc2dba9978f4671ab98d3b981377b94f5bb71c30050ff2a40e66852eda4f9fb2498289cbb402b0d2ad2d372c3d23d030c632a29cde25ae577588478782c7
-EBUILD okteta-17.12.3.ebuild 1600 BLAKE2B e68d7db197867765954cdd58adfb44574135aa17f5e2059cb67f6c79fd692317b9f6cf7c870a79b13223c6ccced6c96e5d29acddee915d950d6b64faf61f3b61 SHA512 6e58c656f55f854a4fe64579880f51a75d8f09bb656bb74784490fa91fa1e238a4c3e006c99fa3064187f65cfb7fe942cc9e049f943c2c55415c2e607a92475d
-MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/metadata.xml b/app-editors/okteta/metadata.xml
deleted file mode 100644
index a50ada50ef0e..000000000000
--- a/app-editors/okteta/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/app-editors/okteta/okteta-0.25.1.ebuild b/app-editors/okteta/okteta-0.25.1.ebuild
deleted file mode 100644
index 89727e9e83b1..000000000000
--- a/app-editors/okteta/okteta-0.25.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Hex editor by KDE"
-HOMEPAGE="https://www.kde.org/applications/utilities/okteta
-https://utils.kde.org/projects/okteta"
-IUSE="crypt designer"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript 'scripttools')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	crypt? ( app-crypt/qca:2[qt5(+)] )
-	designer? ( $(add_qt_dep designer) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOMIT_EXAMPLES=ON
-		$(cmake-utils_use_find_package crypt Qca-qt5)
-		-DBUILD_DESIGNERPLUGIN=$(usex designer)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local myctestargs=( -j1 )
-
-	kde5_src_test
-}
diff --git a/app-editors/okteta/okteta-17.12.3.ebuild b/app-editors/okteta/okteta-17.12.3.ebuild
deleted file mode 100644
index fa883ad1b7c3..000000000000
--- a/app-editors/okteta/okteta-17.12.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Hex editor by KDE"
-HOMEPAGE="https://www.kde.org/applications/utilities/okteta
-https://utils.kde.org/projects/okteta"
-SRC_URI="mirror://kde/stable/applications/${PV}/${P}.tar.xz"
-KEYWORDS="amd64 x86"
-IUSE="crypt designer"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript 'scripttools')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	crypt? ( app-crypt/qca:2[qt5(+)] )
-	designer? ( $(add_qt_dep designer) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOMIT_EXAMPLES=ON
-		$(cmake-utils_use_find_package crypt Qca-qt5)
-		$(cmake-utils_use_find_package designer Qt5Designer)
-		$(cmake-utils_use_find_package designer Qt5UiPlugin)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local myctestargs=( -j1 )
-
-	kde5_src_test
-}
diff --git a/app-editors/padre-1.0.0 b/app-editors/padre-1.0.0
new file mode 100644
index 000000000000..497c1ab8a1d9
--- /dev/null
+++ b/app-editors/padre-1.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Algorithm-Diff-1.190.0 >=dev-perl/Capture-Tiny-0.06 >=dev-perl/Class-Adapter-1.05 >=dev-perl/Class-Inspector-1.22 >=dev-perl/Class-XSAccessor-1.130.0 >=dev-perl/DBD-SQLite-1.350.0 >=dev-perl/DBI-1.58 >=dev-perl/Devel-Dumpvar-0.04 >=dev-perl/Debug-Client-0.200.0 >=dev-perl/Devel-Refactor-0.05 >=dev-perl/File-Copy-Recursive-0.37 >=dev-perl/File-Find-Rule-0.30 >=dev-perl/File-HomeDir-0.91 >=virtual/perl-File-Path-2.08 >=dev-perl/File-Remove-1.40 >=dev-perl/File-ShareDir-1.00 >=virtual/perl-File-Spec-3.27.01 >=virtual/perl-File-Temp-0.20 >=dev-perl/File-Which-1.08 dev-perl/File-pushd virtual/perl-Getopt-Long >=dev-perl/HTML-Parser-3.58 >=dev-perl/IO-stringy-2.110 virtual/perl-IO >=dev-perl/IO-String-1.08 >=dev-perl/IPC-Run-0.83 >=dev-perl/JSON-XS-2.2.9 >=virtual/perl-Scalar-List-Utils-1.18 >=dev-perl/libwww-perl-5.815 >=dev-perl/List-MoreUtils-0.22 >=dev-perl/Locale-Msgfmt-0.15 >=dev-perl/Module-Manifest-0.07 >=dev-perl/ORLite-1.960.0 >=dev-perl/ORLite-Migrate-1.100.0 >=dev-perl/PAR-0.989 >=dev-perl/Params-Util-0.33 >=dev-perl/Parse-ErrorString-Perl-0.14 >=dev-perl/Parse-ExuberantCTags-1.00 >=dev-perl/Pod-Abstract-0.16 >=dev-perl/Pod-POM-0.17 >=virtual/perl-Pod-Simple-3.07 >=dev-perl/PPI-1.205 >=dev-perl/PPIx-EditorTools-0.130.0 >=dev-perl/PPIx-Regexp-0.011 dev-perl/Probe-Perl >=dev-perl/Sort-Versions-1.500.0 >=virtual/perl-Storable-2.16 >=dev-perl/Template-Tiny-0.11 >=virtual/perl-Text-Balanced-0.80 >=dev-perl/Text-Diff-1.410.0 >=dev-perl/Text-FindIndent-0.10 >=dev-perl/Text-Patch-1.800.0 >=virtual/perl-threads-1.71 >=virtual/perl-threads-shared-1.33 >=virtual/perl-Time-HiRes-1.97.18 >=dev-perl/URI-0 >=dev-perl/Wx-0.990.100 >=dev-perl/Wx-Perl-ProcessStream-0.28 >=dev-perl/Wx-Scintilla-0.340.0 >=dev-perl/YAML-Tiny-1.32 >=virtual/perl-version-0.79 dev-lang/perl:=[-build(-)]
+DESCRIPTION=Perl Application Development and Refactoring Environment
+EAPI=5
+HOMEPAGE=http://padre.perlide.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Algorithm-Diff-1.190.0 >=dev-perl/Capture-Tiny-0.06 >=dev-perl/Class-Adapter-1.05 >=dev-perl/Class-Inspector-1.22 >=dev-perl/Class-XSAccessor-1.130.0 >=dev-perl/DBD-SQLite-1.350.0 >=dev-perl/DBI-1.58 >=dev-perl/Devel-Dumpvar-0.04 >=dev-perl/Debug-Client-0.200.0 >=dev-perl/Devel-Refactor-0.05 >=dev-perl/File-Copy-Recursive-0.37 >=dev-perl/File-Find-Rule-0.30 >=dev-perl/File-HomeDir-0.91 >=virtual/perl-File-Path-2.08 >=dev-perl/File-Remove-1.40 >=dev-perl/File-ShareDir-1.00 >=virtual/perl-File-Spec-3.27.01 >=virtual/perl-File-Temp-0.20 >=dev-perl/File-Which-1.08 dev-perl/File-pushd virtual/perl-Getopt-Long >=dev-perl/HTML-Parser-3.58 >=dev-perl/IO-stringy-2.110 virtual/perl-IO >=dev-perl/IO-String-1.08 >=dev-perl/IPC-Run-0.83 >=dev-perl/JSON-XS-2.2.9 >=virtual/perl-Scalar-List-Utils-1.18 >=dev-perl/libwww-perl-5.815 >=dev-perl/List-MoreUtils-0.22 >=dev-perl/Locale-Msgfmt-0.15 >=dev-perl/Module-Manifest-0.07 >=dev-perl/ORLite-1.960.0 >=dev-perl/ORLite-Migrate-1.100.0 >=dev-perl/PAR-0.989 >=dev-perl/Params-Util-0.33 >=dev-perl/Parse-ErrorString-Perl-0.14 >=dev-perl/Parse-ExuberantCTags-1.00 >=dev-perl/Pod-Abstract-0.16 >=dev-perl/Pod-POM-0.17 >=virtual/perl-Pod-Simple-3.07 >=dev-perl/PPI-1.205 >=dev-perl/PPIx-EditorTools-0.130.0 >=dev-perl/PPIx-Regexp-0.011 dev-perl/Probe-Perl >=dev-perl/Sort-Versions-1.500.0 >=virtual/perl-Storable-2.16 >=dev-perl/Template-Tiny-0.11 >=virtual/perl-Text-Balanced-0.80 >=dev-perl/Text-Diff-1.410.0 >=dev-perl/Text-FindIndent-0.10 >=dev-perl/Text-Patch-1.800.0 >=virtual/perl-threads-1.71 >=virtual/perl-threads-shared-1.33 >=virtual/perl-Time-HiRes-1.97.18 >=dev-perl/URI-0 >=dev-perl/Wx-0.990.100 >=dev-perl/Wx-Perl-ProcessStream-0.28 >=dev-perl/Wx-Scintilla-0.340.0 >=dev-perl/YAML-Tiny-1.32 >=virtual/perl-version-0.79 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PL/PLAVEN/Padre-1.00.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=debb6dfdb810a3697d0755752810f742
diff --git a/app-editors/padre-1.0.0-r1 b/app-editors/padre-1.0.0-r1
new file mode 100644
index 000000000000..5c305c3d9642
--- /dev/null
+++ b/app-editors/padre-1.0.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl[ithreads] >=dev-lang/perl-5.10.1 >=dev-perl/Algorithm-Diff-1.190.0 >=dev-perl/Capture-Tiny-0.06 >=dev-perl/Class-Adapter-1.05 >=dev-perl/Class-Inspector-1.22 >=dev-perl/Class-XSAccessor-1.130.0 >=dev-perl/DBD-SQLite-1.350.0 >=dev-perl/DBI-1.58 >=dev-perl/Devel-Dumpvar-0.04 >=dev-perl/Debug-Client-0.200.0 >=dev-perl/Devel-Refactor-0.05 >=dev-perl/File-Copy-Recursive-0.37 >=dev-perl/File-Find-Rule-0.30 >=dev-perl/File-HomeDir-0.91 >=virtual/perl-File-Path-2.08 >=dev-perl/File-Remove-1.40 >=dev-perl/File-ShareDir-1.00 >=virtual/perl-File-Spec-3.27.01 >=virtual/perl-File-Temp-0.20 >=dev-perl/File-Which-1.08 dev-perl/File-pushd virtual/perl-Getopt-Long >=dev-perl/HTML-Parser-3.58 >=dev-perl/IO-stringy-2.110 virtual/perl-IO >=dev-perl/IO-String-1.08 >=dev-perl/IPC-Run-0.83 >=dev-perl/JSON-XS-2.2.9 >=virtual/perl-Scalar-List-Utils-1.18 >=dev-perl/libwww-perl-5.815 >=dev-perl/List-MoreUtils-0.22 >=dev-perl/Locale-Msgfmt-0.15 >=dev-perl/Module-Manifest-0.07 >=dev-perl/ORLite-1.960.0 >=dev-perl/ORLite-Migrate-1.100.0 >=dev-perl/PAR-0.989 >=dev-perl/Params-Util-0.33 >=dev-perl/Parse-ErrorString-Perl-0.14 >=dev-perl/Parse-ExuberantCTags-1.00 >=dev-perl/Pod-Abstract-0.16 >=dev-perl/Pod-POM-0.17 >=virtual/perl-Pod-Simple-3.07 >=dev-perl/PPI-1.205 >=dev-perl/PPIx-EditorTools-0.130.0 >=dev-perl/PPIx-Regexp-0.011 dev-perl/Probe-Perl >=dev-perl/Sort-Versions-1.500.0 >=virtual/perl-Storable-2.16 >=dev-perl/Template-Tiny-0.11 >=virtual/perl-Text-Balanced-0.80 >=dev-perl/Text-Diff-1.410.0 >=dev-perl/Text-FindIndent-0.10 >=dev-perl/Text-Patch-1.800.0 >=virtual/perl-threads-1.71 >=virtual/perl-threads-shared-1.33 >=virtual/perl-Time-HiRes-1.97.18 >=dev-perl/URI-0 >=dev-perl/Wx-0.990.100 >=dev-perl/Wx-Perl-ProcessStream-0.28 >=dev-perl/Wx-Scintilla-0.340.0 >=dev-perl/YAML-Tiny-1.32 >=virtual/perl-version-0.79 dev-lang/perl:=
+DESCRIPTION=Perl Application Development and Refactoring Environment
+EAPI=6
+HOMEPAGE=http://padre.perlide.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl[ithreads] >=dev-lang/perl-5.10.1 >=dev-perl/Algorithm-Diff-1.190.0 >=dev-perl/Capture-Tiny-0.06 >=dev-perl/Class-Adapter-1.05 >=dev-perl/Class-Inspector-1.22 >=dev-perl/Class-XSAccessor-1.130.0 >=dev-perl/DBD-SQLite-1.350.0 >=dev-perl/DBI-1.58 >=dev-perl/Devel-Dumpvar-0.04 >=dev-perl/Debug-Client-0.200.0 >=dev-perl/Devel-Refactor-0.05 >=dev-perl/File-Copy-Recursive-0.37 >=dev-perl/File-Find-Rule-0.30 >=dev-perl/File-HomeDir-0.91 >=virtual/perl-File-Path-2.08 >=dev-perl/File-Remove-1.40 >=dev-perl/File-ShareDir-1.00 >=virtual/perl-File-Spec-3.27.01 >=virtual/perl-File-Temp-0.20 >=dev-perl/File-Which-1.08 dev-perl/File-pushd virtual/perl-Getopt-Long >=dev-perl/HTML-Parser-3.58 >=dev-perl/IO-stringy-2.110 virtual/perl-IO >=dev-perl/IO-String-1.08 >=dev-perl/IPC-Run-0.83 >=dev-perl/JSON-XS-2.2.9 >=virtual/perl-Scalar-List-Utils-1.18 >=dev-perl/libwww-perl-5.815 >=dev-perl/List-MoreUtils-0.22 >=dev-perl/Locale-Msgfmt-0.15 >=dev-perl/Module-Manifest-0.07 >=dev-perl/ORLite-1.960.0 >=dev-perl/ORLite-Migrate-1.100.0 >=dev-perl/PAR-0.989 >=dev-perl/Params-Util-0.33 >=dev-perl/Parse-ErrorString-Perl-0.14 >=dev-perl/Parse-ExuberantCTags-1.00 >=dev-perl/Pod-Abstract-0.16 >=dev-perl/Pod-POM-0.17 >=virtual/perl-Pod-Simple-3.07 >=dev-perl/PPI-1.205 >=dev-perl/PPIx-EditorTools-0.130.0 >=dev-perl/PPIx-Regexp-0.011 dev-perl/Probe-Perl >=dev-perl/Sort-Versions-1.500.0 >=virtual/perl-Storable-2.16 >=dev-perl/Template-Tiny-0.11 >=virtual/perl-Text-Balanced-0.80 >=dev-perl/Text-Diff-1.410.0 >=dev-perl/Text-FindIndent-0.10 >=dev-perl/Text-Patch-1.800.0 >=virtual/perl-threads-1.71 >=virtual/perl-threads-shared-1.33 >=virtual/perl-Time-HiRes-1.97.18 >=dev-perl/URI-0 >=dev-perl/Wx-0.990.100 >=dev-perl/Wx-Perl-ProcessStream-0.28 >=dev-perl/Wx-Scintilla-0.340.0 >=dev-perl/YAML-Tiny-1.32 >=virtual/perl-version-0.79 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PL/PLAVEN/Padre-1.00.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=f2851387a59c6e28f371ecb6335edc39
diff --git a/app-editors/padre/Manifest b/app-editors/padre/Manifest
deleted file mode 100644
index c36d663adf59..000000000000
--- a/app-editors/padre/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX padre-1.0.0-DBD-Sqlite.patch 1139 BLAKE2B e46deb29f997585e78f2316796ce2aaeb6f04b0b984f76f502e140873cdf872a42e26548dc7a1c2cbdefecad1be705fcae04b9f697e541476088fb9140a94d95 SHA512 a23818ef3bedf24a11e8e1cdf5aca8b0a3eb67123e796c0014116c51c2b2c7c55bbe50f04bc200650e3e4b34c519929478d4ff4b38b120a360d8d23438c36a4d
-DIST Padre-1.00.tar.gz 1969274 BLAKE2B 2c0a982b2addaaa8c2cf994c2aeed7985779b3c9663b3022c83a67ebc4a3d0c35fa7f5e6d0f7649cf9e47c51e1a01df42a977e03366f0f2b75c76964b4bf1dde SHA512 8a2630eb54944b85ec77eaf90595fe6bb482b88ae87622b9e54973fbc1cc5f7ccf83d7b2481a9a66886310db9678569d23b18de033f7759db71ac73fd3151856
-EBUILD padre-1.0.0-r1.ebuild 2834 BLAKE2B b195570fca53d8f09683a4462d06a138c867c7deb7ffac8de872c3c6de5c7f4d0e9bd88c57d66eb25c7a9ca326f998f7630ac683f143a6d42d45a368983d43ed SHA512 a510626b62b631481aa62b0d8c033d4229a7220d3f179e2f10f91ef50b48a9ba9174b2adca416c4ea153643269a83e172d13ed67d583f8b205f2ae526ef9ad84
-EBUILD padre-1.0.0.ebuild 2852 BLAKE2B 601d6fae4be854c4d2ee3496f790b29e2fa9f06a80142eeadce31e5e1b1210d7a9e59f9427dc145c53458005ad0066056d2620488f553dbfed3296bae19b13f7 SHA512 fb3dd90a40c8331fdd3f066464cb648a84922edf1a69cdc3738c43e52c95ac59bf033bf33fec56dbc8a14f64c0e7407a047ea1a47e4962785b4704e49cfbc174
-MISC metadata.xml 329 BLAKE2B 7115d35fa36e4d84896fee53da9a121ffdfb07ca64ad3c440e3a48197330549d6386605f3e28bb56c9b21b04f7a2d68e16dc98009ef9d67173011a9d1112f24e SHA512 303fdbb023bfe2ab534a2b0d17257c6d5e7dcf5d8647d300823f5bb556d1ffc5005c8cf47829b4178b0d3111e0dc71db9a6c620a8ac92bf639680ec2fee37d0d
diff --git a/app-editors/padre/files/padre-1.0.0-DBD-Sqlite.patch b/app-editors/padre/files/padre-1.0.0-DBD-Sqlite.patch
deleted file mode 100644
index 2685dea75748..000000000000
--- a/app-editors/padre/files/padre-1.0.0-DBD-Sqlite.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a9fb73f6b0ba76370f60300edfaf03f50e8326e0 Mon Sep 17 00:00:00 2001
-From: Charlie Gonzalez <itcharlie@gmail.com>
-Date: Wed, 17 Feb 2016 00:36:08 -0500
-Subject: [PATCH] =?UTF-8?q?Applying=20Petr=20P=C3=ADsa=C5=99=20=20fix=20?=
- =?UTF-8?q?=20for=20DBD::SQLite=20error?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fix corrects test failures for DBD::SQLite  inside Padre.
----
- lib/Padre/Locker.pm | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/Padre/Locker.pm b/lib/Padre/Locker.pm
-index 7eaf919..e0db4e8 100644
---- a/lib/Padre/Locker.pm
-+++ b/lib/Padre/Locker.pm
-@@ -102,7 +102,7 @@ sub shutdown {
- sub db_increment {
- 	my $self = shift;
- 	unless ( $self->{db_depth}++ ) {
--		Padre::DB->begin;
-+		
- 
- 		# Database operations we lock on are the most likely to
- 		# involve writes. So opportunistically prevent blocking
-@@ -111,6 +111,7 @@ sub db_increment {
- 		# corruption if (and only if) there is a power outage,
- 		# operating system crash, or catastrophic hardware failure.
- 		Padre::DB->pragma( synchronous => 0 );
-+		Padre::DB->begin;
- 	}
- 	return;
- }
diff --git a/app-editors/padre/metadata.xml b/app-editors/padre/metadata.xml
deleted file mode 100644
index 076d507391be..000000000000
--- a/app-editors/padre/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">Padre</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-editors/padre/padre-1.0.0-r1.ebuild b/app-editors/padre/padre-1.0.0-r1.ebuild
deleted file mode 100644
index aae5b0669614..000000000000
--- a/app-editors/padre/padre-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Padre
-DIST_AUTHOR=PLAVEN
-DIST_VERSION=1.00
-inherit perl-module
-
-DESCRIPTION="Perl Application Development and Refactoring Environment"
-HOMEPAGE="http://padre.perlide.org/"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Test Deps
-TDEPEND="
-	>=dev-perl/Test-MockObject-1.09
-	>=dev-perl/Test-Script-1.07
-	>=dev-perl/Test-Exception-0.27
-	>=dev-perl/Test-NoWarnings-0.084
-	>=virtual/perl-Test-Simple-0.88
-	>=dev-perl/Test-Warn-0.240.0
-"
-
-RDEPEND="
-	dev-lang/perl[ithreads]
-	>=dev-lang/perl-5.10.1
-	>=dev-perl/Algorithm-Diff-1.190.0
-	>=dev-perl/Capture-Tiny-0.06
-	>=dev-perl/Class-Adapter-1.05
-	>=dev-perl/Class-Inspector-1.22
-	>=dev-perl/Class-XSAccessor-1.130.0
-	>=dev-perl/DBD-SQLite-1.350.0
-	>=dev-perl/DBI-1.58
-	>=dev-perl/Devel-Dumpvar-0.04
-	>=dev-perl/Debug-Client-0.200.0
-	>=dev-perl/Devel-Refactor-0.05
-	>=dev-perl/File-Copy-Recursive-0.37
-	>=dev-perl/File-Find-Rule-0.30
-	>=dev-perl/File-HomeDir-0.91
-	>=virtual/perl-File-Path-2.08
-	>=dev-perl/File-Remove-1.40
-	>=dev-perl/File-ShareDir-1.00
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-File-Temp-0.20
-	>=dev-perl/File-Which-1.08
-	dev-perl/File-pushd
-	virtual/perl-Getopt-Long
-	>=dev-perl/HTML-Parser-3.58
-	>=dev-perl/IO-stringy-2.110
-	virtual/perl-IO
-	>=dev-perl/IO-String-1.08
-	>=dev-perl/IPC-Run-0.83
-	>=dev-perl/JSON-XS-2.2.9
-	>=virtual/perl-Scalar-List-Utils-1.18
-	>=dev-perl/libwww-perl-5.815
-	>=dev-perl/List-MoreUtils-0.22
-	>=dev-perl/Locale-Msgfmt-0.15
-	>=dev-perl/Module-Manifest-0.07
-	>=dev-perl/ORLite-1.960.0
-	>=dev-perl/ORLite-Migrate-1.100.0
-	>=dev-perl/PAR-0.989
-	>=dev-perl/Params-Util-0.33
-	>=dev-perl/Parse-ErrorString-Perl-0.14
-	>=dev-perl/Parse-ExuberantCTags-1.00
-	>=dev-perl/Pod-Abstract-0.16
-	>=dev-perl/Pod-POM-0.17
-	>=virtual/perl-Pod-Simple-3.07
-	>=dev-perl/PPI-1.205
-	>=dev-perl/PPIx-EditorTools-0.130.0
-	>=dev-perl/PPIx-Regexp-0.011
-	dev-perl/Probe-Perl
-	>=dev-perl/Sort-Versions-1.500.0
-	>=virtual/perl-Storable-2.16
-	>=dev-perl/Template-Tiny-0.11
-	>=virtual/perl-Text-Balanced-0.80
-	>=dev-perl/Text-Diff-1.410.0
-	>=dev-perl/Text-FindIndent-0.10
-	>=dev-perl/Text-Patch-1.800.0
-	>=virtual/perl-threads-1.71
-	>=virtual/perl-threads-shared-1.33
-	>=virtual/perl-Time-HiRes-1.97.18
-	>=dev-perl/URI-0
-	>=dev-perl/Wx-0.990.100
-	>=dev-perl/Wx-Perl-ProcessStream-0.28
-	>=dev-perl/Wx-Scintilla-0.340.0
-	>=dev-perl/YAML-Tiny-1.32
-	>=virtual/perl-version-0.79
-"
-DEPEND="${RDEPEND}"
-#	test? (
-#		${TDEPEND}
-#	)
-#"
-
-DIST_TEST=skip
-
-PATCHES=(
-	"${FILESDIR}/${P}-DBD-Sqlite.patch"
-)
-
-src_configure() {
-	unset DISPLAY
-	perl-module_src_configure
-}
-src_prepare() {
-	sed -i -e 's/^use inc::Module::Install/use lib q[.];\nuse inc::Module::Install/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/app-editors/padre/padre-1.0.0.ebuild b/app-editors/padre/padre-1.0.0.ebuild
deleted file mode 100644
index bc3967a1dbb3..000000000000
--- a/app-editors/padre/padre-1.0.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=Padre
-MODULE_AUTHOR=PLAVEN
-MODULE_VERSION=1.00
-inherit perl-module
-
-DESCRIPTION="Perl Application Development and Refactoring Environment"
-HOMEPAGE="http://padre.perlide.org/"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Test Deps
-TDEPEND="
-	>=dev-perl/Test-MockObject-1.09
-	>=dev-perl/Test-Script-1.07
-	>=dev-perl/Test-Exception-0.27
-	>=dev-perl/Test-NoWarnings-0.084
-	>=virtual/perl-Test-Simple-0.88
-	>=dev-perl/Test-Warn-0.240.0
-"
-
-# Depend on perl-5.10.1 but it only needs
-# a modern EU::MM
-#	>=virtual/perl-Pod-Perldoc-3.15
-RDEPEND="
-	>=dev-lang/perl-5.10.1
-	>=dev-perl/Algorithm-Diff-1.190.0
-	>=dev-perl/Capture-Tiny-0.06
-	>=dev-perl/Class-Adapter-1.05
-	>=dev-perl/Class-Inspector-1.22
-	>=dev-perl/Class-XSAccessor-1.130.0
-	>=dev-perl/DBD-SQLite-1.350.0
-	>=dev-perl/DBI-1.58
-	>=dev-perl/Devel-Dumpvar-0.04
-	>=dev-perl/Debug-Client-0.200.0
-	>=dev-perl/Devel-Refactor-0.05
-	>=dev-perl/File-Copy-Recursive-0.37
-	>=dev-perl/File-Find-Rule-0.30
-	>=dev-perl/File-HomeDir-0.91
-	>=virtual/perl-File-Path-2.08
-	>=dev-perl/File-Remove-1.40
-	>=dev-perl/File-ShareDir-1.00
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-File-Temp-0.20
-	>=dev-perl/File-Which-1.08
-	dev-perl/File-pushd
-	virtual/perl-Getopt-Long
-	>=dev-perl/HTML-Parser-3.58
-	>=dev-perl/IO-stringy-2.110
-	virtual/perl-IO
-	>=dev-perl/IO-String-1.08
-	>=dev-perl/IPC-Run-0.83
-	>=dev-perl/JSON-XS-2.2.9
-	>=virtual/perl-Scalar-List-Utils-1.18
-	>=dev-perl/libwww-perl-5.815
-	>=dev-perl/List-MoreUtils-0.22
-	>=dev-perl/Locale-Msgfmt-0.15
-	>=dev-perl/Module-Manifest-0.07
-	>=dev-perl/ORLite-1.960.0
-	>=dev-perl/ORLite-Migrate-1.100.0
-	>=dev-perl/PAR-0.989
-	>=dev-perl/Params-Util-0.33
-	>=dev-perl/Parse-ErrorString-Perl-0.14
-	>=dev-perl/Parse-ExuberantCTags-1.00
-	>=dev-perl/Pod-Abstract-0.16
-	>=dev-perl/Pod-POM-0.17
-	>=virtual/perl-Pod-Simple-3.07
-	>=dev-perl/PPI-1.205
-	>=dev-perl/PPIx-EditorTools-0.130.0
-	>=dev-perl/PPIx-Regexp-0.011
-	dev-perl/Probe-Perl
-	>=dev-perl/Sort-Versions-1.500.0
-	>=virtual/perl-Storable-2.16
-	>=dev-perl/Template-Tiny-0.11
-	>=virtual/perl-Text-Balanced-0.80
-	>=dev-perl/Text-Diff-1.410.0
-	>=dev-perl/Text-FindIndent-0.10
-	>=dev-perl/Text-Patch-1.800.0
-	>=virtual/perl-threads-1.71
-	>=virtual/perl-threads-shared-1.33
-	>=virtual/perl-Time-HiRes-1.97.18
-	>=dev-perl/URI-0
-	>=dev-perl/Wx-0.990.100
-	>=dev-perl/Wx-Perl-ProcessStream-0.28
-	>=dev-perl/Wx-Scintilla-0.340.0
-	>=dev-perl/YAML-Tiny-1.32
-	>=virtual/perl-version-0.79
-"
-DEPEND="${RDEPEND}"
-#	test? (
-#		${TDEPEND}
-#	)
-#"
-
-#SRC_TEST=do
-
-src_configure() {
-	unset DISPLAY
-	perl-module_src_configure
-}
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install/use lib q[.];\n use inc::Module::Install/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/app-editors/pluma-1.12.2-r1 b/app-editors/pluma-1.12.2-r1
new file mode 100644
index 000000000000..d1b74c417ce2
--- /dev/null
+++ b/app-editors/pluma-1.12.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor ~app-text/docbook-xml-dtd-4.1.2 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* >=sys-devel/libtool-2.2.6:2 >=sys-devel/gettext-0.17:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.12 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Pluma text editor for the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=gtk3 python spell python_targets_python2_7 test
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-2
+RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor
+REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.12/pluma-1.12.2.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d5549e0bb728370bfd872f04639c912f
diff --git a/app-editors/pluma-1.14.1 b/app-editors/pluma-1.14.1
new file mode 100644
index 000000000000..a1c7fb09d4ad
--- /dev/null
+++ b/app-editors/pluma-1.14.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor ~app-text/docbook-xml-dtd-4.1.2 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* >=sys-devel/libtool-2.2.6:2 >=sys-devel/gettext-0.17:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.14 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Pluma text editor for the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=gtk3 python spell python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor
+REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.14/pluma-1.14.1.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3ca5d52c7b21ff73bd9c97ed56a8def1
diff --git a/app-editors/pluma-1.16.2 b/app-editors/pluma-1.16.2
new file mode 100644
index 000000000000..d591ec3b713a
--- /dev/null
+++ b/app-editors/pluma-1.16.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor ~app-text/docbook-xml-dtd-4.1.2 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* >=sys-devel/libtool-2.2.6:2 >=sys-devel/gettext-0.17:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Pluma text editor for the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=gtk3 python spell python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[gtk3(-)=]
+REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/pluma-1.16.2.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=35d32634098bef51cb8614e0551e86b9
diff --git a/app-editors/pluma-1.18.3 b/app-editors/pluma-1.18.3
new file mode 100644
index 000000000000..5751b1cd1884
--- /dev/null
+++ b/app-editors/pluma-1.18.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) !!app-editors/mate-text-editor ~app-text/docbook-xml-dtd-4.1.2 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* >=sys-devel/libtool-2.2.6:2 >=sys-devel/gettext-0.17:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.18 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Pluma text editor for the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=+introspection spell python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[introspection?]
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.18/pluma-1.18.3.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fe23885230ce15aa0bc0833378669d69
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
deleted file mode 100644
index ba91b956655e..000000000000
--- a/app-editors/pluma/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST pluma-1.12.2.tar.xz 3397280 BLAKE2B 23af095549ff944b0936889deda6576717a6376aa2f2be8ed9b7d8ad70f8bb0524aff7314f9c335a42d80951c047c8008278144f45c2c5edb09a259b298c0024 SHA512 db2878161903868703514531ba214fc34dad1789885f18756e9192d6ba17950c8be03141ada72f8c386b515d8b0f9d58a0ee94a33fe3ffe00f360ea667c2b275
-DIST pluma-1.14.1.tar.xz 3415364 BLAKE2B 9449fc6b5e98d8ecb25f70df6c114c13cc32a8c0348ed2047eb874e85c7d448d3d7f0b4d7dd6e2fada3de847ded425651dc6d0ca92ce3c784fd32948735f3b25 SHA512 5d04e053ab2eb0f90e34d9af541004867c7317fd9386229c4e702e95a80420df16b20e4ae4c30bbee79fe904282f6134f7c361971be07cd6952612d975c88d11
-DIST pluma-1.16.2.tar.xz 3428472 BLAKE2B c3b543fb11678269fbbc2d049686b2a553aa1fede4ef1bab8abbc7fed316f27ba67cbb366908966b6c844f8ad0c4899499e52b4720378364555ef9156c80ae95 SHA512 bf91a7e4e1cfb92f9fd9a1d5b4ac9f0fd2704785b2da5d7a3aa360b4c217a57653d6f7bf509c156b8711bc5164e022c685331c93a139f55ea41431bc72e848fe
-DIST pluma-1.18.3.tar.xz 3355188 BLAKE2B d53f381aa9c74cad0df82ccc73aaab9f87347cb8e3886471a2531bdd4d49a84ee97a50f2333b2e375f9bc2a634c25dc69b36659dcb589ace716e523a9d0b4544 SHA512 62ad57a8d7626e34c15610e121869ee9b06a2498acb40ec0a60839ca0273d146bd59682d352c3e98d892460c444c5442d32673c2f63897bb8c3e9e595e771dc1
-EBUILD pluma-1.12.2-r1.ebuild 1957 BLAKE2B 439ee1e569e161b2227abc7dffcb3815582f4f2a597b4d1769f1d0d1d2308361156cbaba558bd8e760499f129dade20a987e66dc94a7caf3cf530f3ead64a997 SHA512 fc460f11527c2a5cdced694b8c59ede5931f2ecf452e7a862791fe93fa18b2c260a51d8f6fca17c58445a59357efe48a6431d5824c8c045fd719ebaca5730860
-EBUILD pluma-1.14.1.ebuild 1999 BLAKE2B 179b831656292280771e6d4244ff24f8a4cf3285e82ba021ec73a32e6047cc9db2ce3ee9da226fb70d674e9b183c07ed55fe6cdb151b891b9b00a4199e4c4ac9 SHA512 095ec46f710d2ad58819291e28a560a4fadcab2790142604d025c69bfd1842ae78f7dca3ff5098062b2bf63f2448b5e96d66a64504edee21e9ba43a84a4e4c7e
-EBUILD pluma-1.16.2.ebuild 1999 BLAKE2B e301396e062768616a2c775d8fe644340eaaa4b085f2e8faf697f0aade4494b86cb4d5b3ad7218caec0677458f43ff27d80aa1f64cc5c40b07296127f8479ca9 SHA512 3394730f3248e8eaae6703aa472a4916e68e3aa96cc01dbe77df11786a48b95ba8a6936948fd3e2d6b921d8465f3ad05e98226802bdc8a198fee1a9aa66b31b6
-EBUILD pluma-1.18.3.ebuild 1764 BLAKE2B bad2f6fada432458399f17e3de3c467ad99662c7ecfcf06217e19e39349f1e283b88f31955ebff44fb243d4ca24de6a0f4c9e5b9b15237a3ab9b2cbd920cfd46 SHA512 edfcedeebe9b8a8ac20531ed4a6ebda38d9cc2b93873de10c535de146c0ffb5a7004d0a79cb8de2031090c638f24c64042bcb9321adcf9a80c0fba48ca655c4d
-MISC metadata.xml 410 BLAKE2B b9e15ebb574ba3482e7317f89fd1bd599a0ba5d42a27e0c0da34f86ed64830819f23fca50865cdba6081daea8313b82a58cf98fa46e3ccc61eb389222cd1bfd4 SHA512 0e79ae54838d841d9e4d65b82af5042223e07585808bcdbf9c26ae7b59cfc7b66d1bb24b39e1835ca75dd724d34854fd12d881b7edb20850fa434cf1db2b2e14
diff --git a/app-editors/pluma/metadata.xml b/app-editors/pluma/metadata.xml
deleted file mode 100644
index e740906c492d..000000000000
--- a/app-editors/pluma/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>mate@gentoo.org</email>
-		<name>Gentoo MATE Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">mate-desktop/pluma</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/pluma/pluma-1.12.2-r1.ebuild b/app-editors/pluma/pluma-1.12.2-r1.ebuild
deleted file mode 100644
index a9646a9a642b..000000000000
--- a/app-editors/pluma/pluma-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libX11:0
-	>=x11-libs/libSM-1.0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/gtksourceview-2.9.7:2.0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/gtksourceview-2.9.7:3.0
-	)
-	spell? (
-		>=app-text/enchant-1.2:0
-		>=app-text/iso-codes-0.35:0
-	)
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.9.2:2
-	)
-	!!app-editors/mate-text-editor"
-
-DEPEND="${RDEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python) \
-		$(use_enable spell)
-}
-
-src_test() {
-	# FIXME: This should be handled at eclass level.
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/pluma/pluma-1.14.1.ebuild b/app-editors/pluma/pluma-1.14.1.ebuild
deleted file mode 100644
index a1c96eaebad6..000000000000
--- a/app-editors/pluma/pluma-1.14.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libX11:0
-	>=x11-libs/libSM-1.0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/gtksourceview-2.9.7:2.0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/gtksourceview-2.9.7:3.0
-	)
-	spell? (
-		>=app-text/enchant-1.2:0
-		>=app-text/iso-codes-0.35:0
-	)
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.9.2:2
-	)
-	!!app-editors/mate-text-editor"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python) \
-		$(use_enable spell)
-}
-
-src_test() {
-	# FIXME: This should be handled at eclass level.
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/pluma/pluma-1.16.2.ebuild b/app-editors/pluma/pluma-1.16.2.ebuild
deleted file mode 100644
index 801ac0a47337..000000000000
--- a/app-editors/pluma/pluma-1.16.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libX11:0
-	>=x11-libs/libSM-1.0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/gtksourceview-2.9.7:2.0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/gtksourceview-2.9.7:3.0
-	)
-	spell? (
-		>=app-text/enchant-1.2:0
-		>=app-text/iso-codes-0.35:0
-	)
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.9.2:2
-	)
-	!!app-editors/mate-text-editor"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]"
-
-DEPEND="${COMMON_DEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python) \
-		$(use_enable spell)
-}
-
-src_test() {
-	# FIXME: This should be handled at eclass level.
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/pluma/pluma-1.18.3.ebuild b/app-editors/pluma/pluma-1.18.3.ebuild
deleted file mode 100644
index 07b75492fa3b..000000000000
--- a/app-editors/pluma/pluma-1.18.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+introspection spell"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libpeas-1.2.0[gtk]
-	>=dev-libs/libxml2-2.5:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14.0:3[introspection?]
-	>=x11-libs/gtksourceview-3.0.0:3.0
-	x11-libs/libICE:0
-	x11-libs/libX11:0
-	>=x11-libs/libSM-1.0
-	x11-libs/pango:0
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	spell? (
-		>=app-text/enchant-1.2:0
-		>=app-text/iso-codes-0.35:0
-	)
-	!!app-editors/mate-text-editor"
-
-RDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.9[introspection?]"
-
-DEPEND="${COMMON_DEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable introspection) \
-		$(use_enable spell)
-}
-
-src_test() {
-	# FIXME: This should be handled at eclass level.
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/qemacs-0.4.1_pre20150916 b/app-editors/qemacs-0.4.1_pre20150916
new file mode 100644
index 000000000000..0642cc28148a
--- /dev/null
+++ b/app-editors/qemacs-0.4.1_pre20150916
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( >=media-libs/libpng-1.2:0= ) >=app-text/texi2html-5
+DESCRIPTION=QEmacs is a very small but powerful UNIX editor
+EAPI=5
+HOMEPAGE=https://savannah.nongnu.org/projects/qemacs
+IUSE=X png unicode xv
+KEYWORDS=amd64 arm ~ppc x86
+LICENSE=LGPL-2.1+ GPL-2+
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( >=media-libs/libpng-1.2:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/qemacs-0.4.1_pre20150916.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=070cb467b37e0010e2d314cd4d360944
diff --git a/app-editors/qemacs-0.4.1_pre20170225 b/app-editors/qemacs-0.4.1_pre20170225
new file mode 100644
index 000000000000..1f7fb136a31a
--- /dev/null
+++ b/app-editors/qemacs-0.4.1_pre20170225
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( >=media-libs/libpng-1.2:0= ) >=app-text/texi2html-5 X? ( x11-base/xorg-proto )
+DESCRIPTION=QEmacs is a very small but powerful UNIX editor
+EAPI=6
+HOMEPAGE=https://savannah.nongnu.org/projects/qemacs/
+IUSE=X png unicode xv
+KEYWORDS=amd64 arm ~ppc x86
+LICENSE=LGPL-2.1+ GPL-2+
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( >=media-libs/libpng-1.2:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/qemacs-0.4.1_pre20170225.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4c0f0d12cb8dd3d8d1d31f1c7bf4f99a
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
deleted file mode 100644
index d5ecadf246c2..000000000000
--- a/app-editors/qemacs/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX qemacs-0.4.1_pre20150916-Makefile.patch 799 BLAKE2B 1a75b0b1f6ec433bb130fa3fcd142eacfdd2665117e6efdaa28dee0d2bbf394e5c270241be5719d64f49facb115febb8f99de399b4561e6921bc7f1293ff59a0 SHA512 1bb412ffc530b8d00569618b8a7d87d65b2baa9a3aacf83b377c41ea29b976ea0f84161d979f06d79a27b6b5b1192135917772c3af2bab66fb28a58c3006dd18
-AUX qemacs-0.4.1_pre20150916-nostrip.patch 1162 BLAKE2B a84d798d0a2d97b6413b10c075daa9f28b952ee655192e01cf6fd788e003785c0ad243bacbda16be071ac2e2a3ff38e7e005a008c88e475483e74d67291f8f4f SHA512 9495ea9799a6b728a2f25545dd2216758247b70985bbf8d1d0cccff1d152ee1f14575e4ca02799cfe105ea0ac799c1865414f30270c3f2373601ac02b1e44770
-AUX qemacs-0.4.1_pre20170225-Makefile.patch 954 BLAKE2B 16fce167962370753730dbe61ee5cbfa4d1e7b208bd350e433eeeb1bfe9eef2892a4532e83675b6c40344aed04df38c8236a01a7ff3db5fa6ec5592ec1225c18 SHA512 8146d383e53df6a5c540581925d85c2eff3dafe5cd78a23a784f3fc4fd41e23804f1287dc68597b33582f9beacef57df4a80a1930399b66566c77ff5e17eb227
-AUX qemacs-0.4.1_pre20170225-manpage.patch 372 BLAKE2B 68e2d415700e576c5706788036665271cffee46a4b896573de3691c3e8cc96db9972fd0f170033b9d85fb048578c8cf3502a53a5c4ad8b7c9858c0771e195a42 SHA512 1c81e3570a2d00df04fa9a4dfae404be2f1c684b9b86ef67aa3f13a4b6f734d99d768350d41c75dc8c2874ccf853d021e497c87c751d86e2df1015f42fe97889
-AUX qemacs-0.4.1_pre20170225-nostrip.patch 1771 BLAKE2B af8ad554ea5dbdcd8e7a3df32a4ff5402e84f56642a74f228b0c5be8166895b82b90e291f043a5e18a757b6e6de69ed50af3950c719f2b40be1e3d1e031c2031 SHA512 9ad3c3cd4a7744894718099ff8df2648e11385c6926a137f3f04ed33ef449d658cfb873476276bc52de7a7cee5ed2a2319893d8f47e7a2413d00d61378123656
-DIST qemacs-0.4.1_pre20150916.tar.xz 1136592 BLAKE2B aff8875b81bd51f77bebcb4dfe60ed0d4396a05af1f42e6b8765e15f9e04e00162924c3514a9ea1e8cb8c0b9ecd2a4112b9d7a46b7d156c032d37d381f2ae0f0 SHA512 e9775ff3dfef6d6b6b263029a620e6575f9f4718b94c0acfcddc8e5da8cd835e57dfbd5fbd948778135b609ae0588924fc9a727b2e763a25148aa27886a9f467
-DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99
-EBUILD qemacs-0.4.1_pre20150916.ebuild 1664 BLAKE2B 9bb83316a5059a92c0eb04a1c07336ac0976b11778f60b0898bc79ba1a3edc1eb722327b08ba3bf766b67cf5a5f33d3407cfe86329aca377a62234f69b083b8b SHA512 9ca5f4c41d4232051070547d8591235c1ac4d3e5dbba738d58b5668690935f9e106ce1a4921d7004cf4bbc7ef33f717b782a8246d7f402fc9c35a356baa720f9
-EBUILD qemacs-0.4.1_pre20170225.ebuild 1519 BLAKE2B 625375983bba8a8fe37511edbc3d4d07fb7fabc4bf5bf0ef9e87a4f816d7c4a6ad9cc71c24fecd9e37dc038a70c5f37fc04c08d1c4b01605f7fbe153139852fd SHA512 02d99ab6f3e2800694886d463ebcf1534b12fea705a3f5e0dc5a3d05cce43d2947edb04049979c91d55f8c2825327d3a10339078cc208d68b8a12bb691ed4907
-MISC metadata.xml 1937 BLAKE2B 1367de4b5e027102ce6a7720129bf21bd6d9556d748f0770d005ee0b9a4454f5ad0d27d0d25e8c7b97bc3c0bb796a78df636479d33bf6bd5acee36498e8a8a81 SHA512 a26f40107a0616980d3722685b1491eee4c606a685e78bbc23a62de6c9b67cf15ff3ac92cbc935a38d280844a0d15c21f92ee7bdbb28218f8ae664bbc526feac
diff --git a/app-editors/qemacs/files/qemacs-0.4.1_pre20150916-Makefile.patch b/app-editors/qemacs/files/qemacs-0.4.1_pre20150916-Makefile.patch
deleted file mode 100644
index 53c71f21580d..000000000000
--- a/app-editors/qemacs/files/qemacs-0.4.1_pre20150916-Makefile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Removes forced march setting and align-functions on x86, as they would
-override user's CFLAGS.
-
---- qemacs-orig/Makefile
-+++ qemacs/Makefile
-@@ -29,32 +29,6 @@
-     cmd   := 
- endif
- 
--ifeq ($(CC),gcc)
--  CFLAGS   += -Wall -g -O2 -funsigned-char
--  # do not warn about zero-length formats.
--  CFLAGS   += -Wno-format-zero-length
--  LDFLAGS  := -g
--endif
--
--#include local compiler configuration file
---include $(DEPTH)/cflags.mk
--
--ifdef TARGET_GPROF
--  CFLAGS  += -p
--  LDFLAGS += -p
--endif
--
--TLDFLAGS := $(LDFLAGS)
--
--ifdef TARGET_ARCH_X86
--  #CFLAGS+=-fomit-frame-pointer
--  ifeq ($(GCC_MAJOR),2)
--    CFLAGS+=-m386 -malign-functions=0
--  else
--    CFLAGS+=-march=i386 -falign-functions=0
--  endif
--endif
--
- DEFINES=-DHAVE_QE_CONFIG_H
- 
- ########################################################
diff --git a/app-editors/qemacs/files/qemacs-0.4.1_pre20150916-nostrip.patch b/app-editors/qemacs/files/qemacs-0.4.1_pre20150916-nostrip.patch
deleted file mode 100644
index 2ee40c6d2fdb..000000000000
--- a/app-editors/qemacs/files/qemacs-0.4.1_pre20150916-nostrip.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Suppress stripping.
-
---- qemacs-orig/Makefile
-+++ qemacs/Makefile
-@@ -168,7 +168,6 @@
- qe$(EXE): qe_g$(EXE) Makefile
- 	@rm -f $@
- 	cp $< $@
--	-$(STRIP) $@
- 	@ls -l $@
- 	@echo `size $@` `wc -c $@` qe $(OPTIONS) \
- 		| cut -d ' ' -f 7-10,13,15-40 >> STATS
-@@ -183,7 +182,6 @@
- tqe$(EXE): tqe_g$(EXE) Makefile
- 	@rm -f $@
- 	cp $< $@
--	-$(STRIP) $@
- 	@ls -l $@
- 	@echo `size $@` `wc -c $@` tqe $(OPTIONS) \
- 		| cut -d ' ' -f 7-10,13,15-40 >> STATS
-@@ -386,7 +384,7 @@
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/qe
--	$(INSTALL) -m 755 -s qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
-+	$(INSTALL) -m 755 qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
- 	ln -sf qemacs $(DESTDIR)$(prefix)/bin/qe$(EXE)
- ifdef CONFIG_FFMPEG
- 	ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/ffplay$(EXE)
-@@ -394,7 +392,7 @@
- 	$(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(datadir)/qe
- 	$(INSTALL) -m 644 qe.1 $(DESTDIR)$(mandir)/man1
- ifdef CONFIG_HTML
--	$(INSTALL) -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin
-+	$(INSTALL) -m 755 html2png$(EXE) $(DESTDIR)$(prefix)/bin
- endif
- 
- uninstall:
diff --git a/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-Makefile.patch b/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-Makefile.patch
deleted file mode 100644
index 0540bcd767c4..000000000000
--- a/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Removes forced march setting and align-functions on x86, as they would
-override user's CFLAGS.
-
---- qemacs-orig/Makefile
-+++ qemacs/Makefile
-@@ -29,35 +29,11 @@
-     cmd  := 
- endif
- 
--ifeq ($(CC),gcc)
--  CFLAGS  += -Wall -g -O2 -funsigned-char
--  # do not warn about zero-length formats.
--  CFLAGS   += -Wno-format-zero-length
--  LDFLAGS  += -g
--endif
--
--#include local compiler configuration file
---include $(DEPTH)/cflags.mk
--
--ifdef TARGET_GPROF
--  CFLAGS  += -p
--  LDFLAGS += -p
--endif
--
- #TCFLAGS := -DCONFIG_TINY -m32 $(CFLAGS) -Os
- #TLDFLAGS := -m32 $(LDFLAGS)
--TCFLAGS := -DCONFIG_TINY $(CFLAGS) -Os
-+TCFLAGS := -DCONFIG_TINY $(CFLAGS)
- TLDFLAGS := $(LDFLAGS)
- 
--ifdef TARGET_ARCH_X86
--  #CFLAGS+=-fomit-frame-pointer
--  ifeq ($(GCC_MAJOR),2)
--    CFLAGS += -m386 -malign-functions=0
--  else
--    CFLAGS += -march=i386 -falign-functions=0
--  endif
--endif
--
- DEFINES=-DHAVE_QE_CONFIG_H
- 
- ########################################################
diff --git a/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-manpage.patch b/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-manpage.patch
deleted file mode 100644
index b73f3ee356b2..000000000000
--- a/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-manpage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qemacs-orig/qe.1
-+++ qemacs/qe.1
-@@ -44,7 +44,7 @@
- anti aliased font display.
- .PP
- For more information and a list of key bindings please see
--/usr/share/doc/qemacs/README.gz.
-+the README file in /usr/share/doc/@PF@/.
- .SH AUTHOR
- This manual page was written by Edmund GRIMLEY EVANS <edmundo@rano.org>,
- for the Debian GNU/Linux system (but may be used by others).
diff --git a/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-nostrip.patch b/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-nostrip.patch
deleted file mode 100644
index 60519dca5c36..000000000000
--- a/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-nostrip.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Suppress stripping.
-
---- qemacs-orig/Makefile
-+++ qemacs/Makefile
-@@ -203,7 +203,6 @@
- qe$(EXE): qe_g$(EXE) Makefile
- 	@rm -f $@
- 	cp $< $@
--	-$(STRIP) $@
- 	@ls -l $@
- 	@echo `size $@` `wc -c $@` qe $(OPTIONS) \
- 		| cut -d ' ' -f 7-10,13,15-40 >> STATS
-@@ -218,7 +217,6 @@
- xqe$(EXE): xqe_g$(EXE) Makefile
- 	@rm -f $@
- 	cp $< $@
--	-$(STRIP) $@
- 	@ls -l $@
- 	@echo `size $@` `wc -c $@` xqe $(OPTIONS) \
- 		| cut -d ' ' -f 7-10,13,15-40 >> STATS
-@@ -233,7 +231,6 @@
- tqe$(EXE): tqe_g$(EXE) Makefile
- 	@rm -f $@
- 	cp $< $@
--	-$(STRIP) $@
- 	@ls -l $@
- 	@echo `size $@` `wc -c $@` tqe $(OPTIONS) \
- 		| cut -d ' ' -f 7-10,13,15-40 >> STATS
-@@ -245,7 +242,6 @@
- t1qe$(EXE): t1qe_g$(EXE) Makefile
- 	@rm -f $@
- 	cp $< $@
--	-$(STRIP) $@
- 	@ls -l $@
- 	@echo `size $@` `wc -c $@` t1qe $(OPTIONS) \
- 		| cut -d ' ' -f 7-10,13,15-40 >> STATS
-@@ -478,12 +474,12 @@
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/qe
- ifdef CONFIG_X11
--	$(INSTALL) -m 755 -s xqe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
-+	$(INSTALL) -m 755 xqe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
- else
-   ifdef CONFIG_TINY
--	$(INSTALL) -m 755 -s tqe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
-+	$(INSTALL) -m 755 tqe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
-   else
--	$(INSTALL) -m 755 -s qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
-+	$(INSTALL) -m 755 qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
-   endif
- endif
- 	ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/qe$(EXE)
-@@ -493,7 +489,7 @@
- 	$(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(datadir)/qe
- 	$(INSTALL) -m 644 qe.1 $(DESTDIR)$(mandir)/man1
- ifdef CONFIG_HTML
--	$(INSTALL) -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin
-+	$(INSTALL) -m 755 html2png$(EXE) $(DESTDIR)$(prefix)/bin
- endif
- 
- uninstall:
diff --git a/app-editors/qemacs/metadata.xml b/app-editors/qemacs/metadata.xml
deleted file mode 100644
index a725e273d20d..000000000000
--- a/app-editors/qemacs/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-  QEmacs (for Quick Emacs) is a very small but powerful text editor. It has
-  the following features:
-   * Full screen editor with an Emacs look and feel with all Emacs common
-     features: multi-buffer, multi-window, command mode, universal argument,
-     keyboard macros, config file with C like syntax, minibuffer with
-     completion and history.
-   * Can edit files of hundreds of megabytes quickly by using a highly
-     optimized internal representation and by mmaping the file.
-   * Full UTF8 support, including bidirectional editing respecting the Unicode
-     bidi algorithm. Arabic and Indic scripts handling (in progress).
-   * WYSIWYG HTML/XML/CSS2 mode graphical editing. Also supports lynx like
-     rendering on VT100 terminals. WYSIWYG DocBook mode based on XML/CSS2
-     renderer.
-   * C mode: coloring with immediate update. Emacs like auto-indent.
-   * Shell mode: colorized VT100 emulation so that your shell work exactly as
-     you expect. You can run interactive terminal apps directly in the process
-     buffer: mc, MenuConfig, or even qemacs itself! Compile mode with
-     next/prev error.
-   * Input methods for most languages, including Chinese (input methods come
-     from the Yudit editor).
-   * Hexadecimal editing mode with insertion and block commands. Unicode hexa
-     editing of UTF8 files also supported.
-   * Works on any VT100 terminals without termcap. UTF8 VT100 support included
-     with double width glyphs.
-   * X11 support. Support multiple proportionnal fonts at the same time (as
-     XEmacs).
-   * Small! Full version is about 150KB. Smaller custom versions can be built
-     by removing modules.
-</longdescription>
-</pkgmetadata>
diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20150916.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20150916.ebuild
deleted file mode 100644
index e2b107ccb13f..000000000000
--- a/app-editors/qemacs/qemacs-0.4.1_pre20150916.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="QEmacs is a very small but powerful UNIX editor"
-HOMEPAGE="https://savannah.nongnu.org/projects/qemacs"
-# snapshot of http://cvs.savannah.gnu.org/viewvc/?root=qemacs
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
-IUSE="X png unicode xv"
-RESTRICT="test"
-
-RDEPEND="
-	X? ( x11-libs/libX11
-		x11-libs/libXext
-		xv? ( x11-libs/libXv ) )
-	png? ( >=media-libs/libpng-1.2:0= )"
-
-DEPEND="${RDEPEND}
-	>=app-text/texi2html-5"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-
-	# Change the manpage to reference a /real/ file instead of just an
-	# approximation.  Purely cosmetic!
-	sed -i -e "s,^/usr/share/doc/qemacs,&-${PVR}," qe.1 || die
-}
-
-src_configure() {
-	# when using any other CFLAGS than -O0, qemacs will segfault on startup,
-	# see bug 92011
-	replace-flags "-O?" -O0
-
-	# Home-grown configure script, doesn't support most standard options
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--cc="$(tc-getCC)" \
-		$(use_enable X x11) \
-		$(use_enable png) \
-		$(use_enable xv) || die
-}
-
-src_compile() {
-	# Does not support parallel building.
-	emake -j1
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc Changelog README TODO.org config.eg
-	docinto html
-	dodoc qe-doc.html
-
-	# Install headers so users can build their own plugins.
-	insinto /usr/include/qe
-	doins *.h
-	insinto /usr/include/qe/libqhtml
-	doins libqhtml/*.h
-}
diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
deleted file mode 100644
index 33bd0f7ba89a..000000000000
--- a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="QEmacs is a very small but powerful UNIX editor"
-HOMEPAGE="https://savannah.nongnu.org/projects/qemacs/"
-# snapshot of http://cvs.savannah.gnu.org/viewvc/?root=qemacs
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
-IUSE="X png unicode xv"
-RESTRICT="test"
-
-RDEPEND="
-	X? ( x11-libs/libX11
-		x11-libs/libXext
-		xv? ( x11-libs/libXv ) )
-	png? ( >=media-libs/libpng-1.2:0= )"
-
-DEPEND="${RDEPEND}
-	>=app-text/texi2html-5
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-Makefile.patch"
-	eapply "${FILESDIR}/${P}-nostrip.patch"
-	eapply_user
-
-	# Change the manpage to reference a /real/ file instead of just an
-	# approximation.  Purely cosmetic!
-	eapply "${FILESDIR}/${P}-manpage.patch"
-	sed -i -e "s:@PF@:${PF}:" qe.1 || die
-}
-
-src_configure() {
-	# Home-grown configure script, doesn't support most standard options
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--cc="$(tc-getCC)" \
-		$(use_enable X x11) \
-		$(use_enable png) \
-		$(use_enable xv) || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc Changelog README TODO.org config.eg
-	docinto html
-	dodoc qe-doc.html
-
-	# Install headers so users can build their own plugins
-	insinto /usr/include/qe
-	doins *.h
-	insinto /usr/include/qe/libqhtml
-	doins libqhtml/*.h
-}
diff --git a/app-editors/qhexedit2-0.8.4 b/app-editors/qhexedit2-0.8.4
new file mode 100644
index 000000000000..485c4dab5cdc
--- /dev/null
+++ b/app-editors/qhexedit2-0.8.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Hex editor library, Qt application written in C++ with Python bindings
+EAPI=6
+HOMEPAGE=https://github.com/lancos/qhexedit2/
+IUSE=doc +gui python python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/lancos/qhexedit2/archive/v0.8.4.tar.gz -> qhexedit2-0.8.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=05d1b6096a36248bb9368b73ab65df49
diff --git a/app-editors/qhexedit2-0.8.4_p20170719 b/app-editors/qhexedit2-0.8.4_p20170719
new file mode 100644
index 000000000000..aa58c269d94f
--- /dev/null
+++ b/app-editors/qhexedit2-0.8.4_p20170719
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Hex editor library, Qt application written in C++ with Python bindings
+EAPI=6
+HOMEPAGE=https://github.com/lancos/qhexedit2/
+IUSE=doc +gui python python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/lancos/qhexedit2/archive/5f3ca79dbe8c765b685636a1751d242a6bfabb7d.tar.gz -> qhexedit2-0.8.4_p20170719.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=05c80a270cedfc60be25f4cc9f0b6365
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
deleted file mode 100644
index 8e2fb5667abd..000000000000
--- a/app-editors/qhexedit2/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX qhexedit2-0.8.4-fixtest.patch 479 BLAKE2B 1359815f0c072a4f8a036b8168796e22f8522c5e311220d6dd76b12df5c138693582f26a9d09ab33ca5e10a1e9d8dd6bb7b668d6bee09785b163dee6048a39af SHA512 6f72dc45c91da43a27bb66f7a81f33f810eef45711e6d84675bf761dda3a296aca7931e955526504c53a173a6ef65ef4712f378f8d4a1fbdd2437829aa2f49e6
-AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
-DIST qhexedit2-0.8.4.tar.gz 340766 BLAKE2B af24031fdd9f8d677f7e8ab8fd69667852dd971db30f5406b9aaaa08bf7f2dc692c87e99c141f355adc82c8226b5b29f53ce07ba63656d866f8688cb2cbc67f2 SHA512 8ed831d75c8ec1897dfd7ef497423908b26b0f56e6577928ed035654e52b437f64edd61cfcc1de6eaf5d1f29f9dc97da84d2edd7f427e3c09c9d75d7bc6504ff
-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
diff --git a/app-editors/qhexedit2/files/qhexedit2-0.8.4-fixtest.patch b/app-editors/qhexedit2/files/qhexedit2-0.8.4-fixtest.patch
deleted file mode 100644
index 339ef99477ee..000000000000
--- a/app-editors/qhexedit2/files/qhexedit2-0.8.4-fixtest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- qhexedit2-0.8.4/test/testchunks.cpp-	2017-01-17 02:32:54.000000000 +0300
-+++ qhexedit2-0.8.4/test/testchunks.cpp	2018-01-03 21:34:24.988555308 +0300
-@@ -1,8 +1,7 @@
- #include "testchunks.h"
- #include <cstdlib>
-
--
--TestChunks::TestChunks(QTextStream &log, QString tName, int size, bool random, int saveFile)
-+TestChunks::TestChunks(QTextStream &log, QString tName, int size, bool random, int saveFile): _chunks(nullptr)
- {
-     char hex[] = "0123456789abcdef";
-     srand(0);
diff --git a/app-editors/qhexedit2/files/qhexedit2-0.8.4-setup.py.patch b/app-editors/qhexedit2/files/qhexedit2-0.8.4-setup.py.patch
deleted file mode 100644
index 83d9183fcdbe..000000000000
--- a/app-editors/qhexedit2/files/qhexedit2-0.8.4-setup.py.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qhexedit2-0.8.4/setup.py-	2018-01-02 19:40:57.542961661 +0300
-+++ qhexedit2-0.8.4/setup.py	2017-01-17 02:32:54.000000000 +0300
-@@ -98,7 +98,7 @@
-                                       lib + ".framework", "Headers")]
- else:
-     if PyQt_Version == 'PyQt5':
--        for qt_inc_dir in ('/usr/include/qt', '/usr/include/x86_64-linux-gnu/qt5'):
-+        for qt_inc_dir in ('/usr/include/qt', '/usr/include/qt5'):
-             include_dirs.append(qt_inc_dir)
-             include_dirs += [os.path.join(qt_inc_dir, lib) for lib in qt_libs]
-         libraries = ["Qt5" + lib[2:] for lib in qt_libs]
diff --git a/app-editors/qhexedit2/metadata.xml b/app-editors/qhexedit2/metadata.xml
deleted file mode 100644
index 67f1531f77a7..000000000000
--- a/app-editors/qhexedit2/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>coyote@bks.tv</email>
-        <name>Victor Kustov</name>
-    </maintainer>
-    <maintainer type="person">
-        <email>zlogene@gentoo.org</email>
-        <name>Mikle Kolyada</name>
-    </maintainer>
-    <maintainer type="person">
-        <email>maksbotan@gentoo.org</email>
-        <name>Maxim Koltsov</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <use>
-        <flag name="gui">Install Qt5 hex editor</flag>
-    </use>
-    <longdescription lang="en">
-        QHexEdit is a hex editor widget written in C++ for the Qt5 framework.
-        It is a simple editor for binary data, and has bindings to PyQt
-        with python 2 and 3.
-    </longdescription>
-    <upstream>
-        <remote-id type="github">lancos/qhexedit2</remote-id>
-        <remote-id type="github">Simsys/qhexedit2</remote-id>
-    </upstream>
-</pkgmetadata>
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
deleted file mode 100644
index 1de535b4cde6..000000000000
--- a/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2017-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 qmake-utils
-
-DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
-HOMEPAGE="https://github.com/lancos/qhexedit2/"
-SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +gui python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fixtest.patch"
-	"${FILESDIR}/${P}-setup.py.patch"
-)
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	python? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-			dev-python/sip[${PYTHON_USEDEP}]
-			${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \
-		-e "\$aINSTALLS += target" src/qhexedit.pro \
-		|| die "src/qhexedit.pro: sed failed"
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	eqmake5 src/qhexedit.pro
-	if use gui; then
-		cd example || die "can't cd example"
-		eqmake5 qhexedit.pro
-	fi
-}
-
-src_compile() {
-	default
-	use python && distutils-r1_src_compile
-	if use gui; then
-		cd example || die "can't cd example"
-		emake
-	fi
-}
-
-python_compile() {
-	use python && distutils-r1_python_compile build_ext --library-dirs="${S}"
-}
-
-src_test() {
-	cd test || die "can't cd test"
-	mkdir logs || die "can't create logs dir"
-	eqmake5 chunks.pro
-	emake
-	./chunks || die "test run failed"
-	grep -q "^NOK" logs/Summary.log && die "test failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	use python && distutils-r1_src_install
-	use gui && dobin example/qhexedit
-	if use doc; then
-		dodoc -r doc/html
-		dodoc doc/release.txt
-	fi
-}
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.4_p20170719.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.4_p20170719.ebuild
deleted file mode 100644
index e4e30e3c8f45..000000000000
--- a/app-editors/qhexedit2/qhexedit2-0.8.4_p20170719.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 qmake-utils
-
-EGIT_COMMIT="5f3ca79dbe8c765b685636a1751d242a6bfabb7d"
-DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
-HOMEPAGE="https://github.com/lancos/qhexedit2/"
-SRC_URI="https://github.com/lancos/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +gui python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.4-fixtest.patch"
-	"${FILESDIR}/${PN}-0.8.4-setup.py.patch"
-)
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	python? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-		)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-src_prepare() {
-	default
-	sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \
-		-e "\$aINSTALLS += target" src/qhexedit.pro \
-		|| die "src/qhexedit.pro: sed failed"
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	eqmake5 src/qhexedit.pro
-	if use gui; then
-		cd example || die "can't cd example"
-		eqmake5 qhexedit.pro
-	fi
-}
-
-src_compile() {
-	default
-	use python && distutils-r1_src_compile
-	use gui && emake -C example
-}
-
-python_compile() {
-	use python && distutils-r1_python_compile build_ext --library-dirs="${S}"
-}
-
-src_test() {
-	cd test || die "can't cd test"
-	mkdir logs || die "can't create logs dir"
-	eqmake5 chunks.pro
-	emake
-	./chunks || die "test run failed"
-	grep -q "^NOK" logs/Summary.log && die "test failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	doheader src/*.h
-	use python && distutils-r1_src_install
-	use gui && dobin example/qhexedit
-	if use doc; then
-		dodoc -r doc/html
-		dodoc doc/release.txt
-	fi
-}
diff --git a/app-editors/qxmledit-0.9.10 b/app-editors/qxmledit-0.9.10
new file mode 100644
index 000000000000..c375ea75550f
--- /dev/null
+++ b/app-editors/qxmledit-0.9.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
+DESCRIPTION=Simple Qt-based XML editor
+EAPI=6
+HOMEPAGE=http://qxmledit.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.10-src.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1fa00380103498f1c5fd8407397e31c
diff --git a/app-editors/qxmledit-0.9.7 b/app-editors/qxmledit-0.9.7
new file mode 100644
index 000000000000..063dfbf3b062
--- /dev/null
+++ b/app-editors/qxmledit-0.9.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
+DESCRIPTION=Simple Qt-based XML editor
+EAPI=6
+HOMEPAGE=http://qxmledit.org/
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.7-1-src.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a9204d17a506e4ced61cc6fcf00696dc
diff --git a/app-editors/qxmledit-0.9.8 b/app-editors/qxmledit-0.9.8
new file mode 100644
index 000000000000..491c8bd949c4
--- /dev/null
+++ b/app-editors/qxmledit-0.9.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
+DESCRIPTION=Simple Qt-based XML editor
+EAPI=6
+HOMEPAGE=http://qxmledit.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.8-src.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=844580256685c22d5a7cfd6bbe58c0cf
diff --git a/app-editors/qxmledit-0.9.9 b/app-editors/qxmledit-0.9.9
new file mode 100644
index 000000000000..9dc4785c8940
--- /dev/null
+++ b/app-editors/qxmledit-0.9.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
+DESCRIPTION=Simple Qt-based XML editor
+EAPI=6
+HOMEPAGE=http://qxmledit.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.9-src.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=44d2929b80e5e3c5f1c6f0a5492ab807
diff --git a/app-editors/qxmledit-0.9.9.2 b/app-editors/qxmledit-0.9.9.2
new file mode 100644
index 000000000000..ab18184a6969
--- /dev/null
+++ b/app-editors/qxmledit-0.9.9.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
+DESCRIPTION=Simple Qt-based XML editor
+EAPI=6
+HOMEPAGE=http://qxmledit.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.9.2-src.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1fa00380103498f1c5fd8407397e31c
diff --git a/app-editors/qxmledit/Manifest b/app-editors/qxmledit/Manifest
deleted file mode 100644
index 56ef793d5234..000000000000
--- a/app-editors/qxmledit/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST qxmledit-0.9.10-src.tgz 21105988 BLAKE2B 6d1f4dcc8b3c2fdd5ef12b5e426dc32ada24c104387f6a8aab12aa778e3a5cb58c1f1f97fea746dcaa60ca2de72a98dad38902b939025ee2f7d4f8ed4c701856 SHA512 ac96b086e9bcb6140c66521c71a303a12ab806b133fc769472e23e6b473cb5f6d6dc85cac990b6c0182a1f98201a84835042f7fdfc1843c00bd98b445e47ff35
-DIST qxmledit-0.9.7-1-src.tgz 20151952 BLAKE2B ea3af07aa9cae37456a55d3dbc5e3330f1dec85702b1b0bbaa033316e7fb4deb1030af70196440e9b39e58a131a51906071843569a543546cbe27cd6461b7f25 SHA512 c2304c0d46925f36ae2e411bae805406df60339bbce1f030ebbbe42b203133770ff011cb9751e79ac6807f21425e73f3f66f7081a5b14d6701522c2aa1e9a9df
-DIST qxmledit-0.9.8-src.tgz 22814833 BLAKE2B 13b2888b1feb95222f9912e1ff6367c86f29b939987293ad325fcd89784357daa9fe67add24e9ca7879181f0a3344a127f3e99486054ed0d7bfdef6cddc2f546 SHA512 41caf161de1efd3c210104f362b1ef50ecfbec0c50d4efc98aae03f40ee0c8f51f0b8c322b3017b797f19c7ed668b456a850dea0b4adf7106557eeb9ea58a78e
-DIST qxmledit-0.9.9-src.tgz 23502055 BLAKE2B 63ee7615b7633d1385aa84a37138180963a124d2cf1d678e1f75e6629d402b5a40a5f18565aa671a005e760d1bb955666f1c8c37589689a052bb098e708f59ac SHA512 1c7c4f14471103ae1a05c28da9a84de626ca367af232eaa6998fbb14c8aff18108e486f47592f869e91af2722c7b197073877fa3a4e8bff8d8aca6b3d8b400db
-DIST qxmledit-0.9.9.2-src.tgz 23502125 BLAKE2B 4b3997d231ac9217a469b6dc2f828dde525b5e314ebf300624a5fdcef9b300b3b9f56c958de81ab8b07f5f02bd370a52b521b8a9440ddea997f83a81844de7f7 SHA512 2f3c1f8c58592fe09b2740833e0a1b581916f3f43bb6d50fefc5ea388f1331b9cd4093b3953bcecc33a947ff0ae1baf3e462e41d4dc5dd4789ec1b9dcaeac9a8
-EBUILD qxmledit-0.9.10.ebuild 1501 BLAKE2B fd41601b23a5df78b211ca26a1159c9d77a82a4b5cf46ee1e79811a7828131f1da9e1b92013ffed1dd8f2e5828f5a9cad112d4f060d72676d07d64b75f70acb8 SHA512 fd7f7a3c10327c6ee8e2260df94c790aaefa82ef9d9cb6335c675a346334020f3ada3695e5fc00a8591d097814b848d5e1567c6b260257e6eb45aa0422493d2c
-EBUILD qxmledit-0.9.7.ebuild 1626 BLAKE2B 0e5765a479747ee6f71d8561cfcb9bf436069cd6b06cf99987e6d31416ddd9e5059028432226bb84b5f6cf1f82fdec6d90c8a0b55911c20fd2bff94f33b6fe8c SHA512 d6e2b380de9fbeaf7409f5c84f0e77306b93482fdca7d92117f9467c29cd30ee32e58670bd2b43e11bd323ba7c864c8444d4133048a3e58719cbf9d71fdc1b6b
-EBUILD qxmledit-0.9.8.ebuild 1605 BLAKE2B e53568260de89369dc82e8dcd400a06cba0462e309ad166c9f9814fb3371dbaefd3ed1d7f4cf1beb5988994f3128fc041845ba3a20693f0485d7c9e7bfb6c055 SHA512 a6104331447473700fbaf4c50afd7c0ca8b9808bbd964a0e24f7dee2e84e81168ed4d1b8b278246b8f5479bfdb15c8f3036501b8886d37133eb9c9e6f47b1c07
-EBUILD qxmledit-0.9.9.2.ebuild 1501 BLAKE2B fd41601b23a5df78b211ca26a1159c9d77a82a4b5cf46ee1e79811a7828131f1da9e1b92013ffed1dd8f2e5828f5a9cad112d4f060d72676d07d64b75f70acb8 SHA512 fd7f7a3c10327c6ee8e2260df94c790aaefa82ef9d9cb6335c675a346334020f3ada3695e5fc00a8591d097814b848d5e1567c6b260257e6eb45aa0422493d2c
-EBUILD qxmledit-0.9.9.ebuild 1501 BLAKE2B b4ce57ddbc6a2f98466e27004d68ffd11aae41ebe909099d8ff6f4c811895a4b96163221bbfaf979f857d76633c11b08393ab2b83e9c463955874b6465203354 SHA512 921f42b2f09bcc3d1083b11475d05a6a6245de402625d963d88dade48a9349efeba6d64add0853c383700d2b22416e1f34b92b0f530000f100ae821d94b40c14
-MISC metadata.xml 866 BLAKE2B c60136947b44f87b59bfbe827ac1739ec06aaec646dbb3c6e815a83529465eb7a43e61b4b03c559ae05f1232f1aabad5d55775734c58fb4847be4f0e76331964 SHA512 c97f333d504c0dd0d08ef5b9b20520a89596e2b11c140bd1b15414c44e5685c109b245a34e150581d2a1ba4ba940f6aec5d2e55dcb61e4a7283ec17a2e85aa3d
diff --git a/app-editors/qxmledit/metadata.xml b/app-editors/qxmledit/metadata.xml
deleted file mode 100644
index 304a2d714ea9..000000000000
--- a/app-editors/qxmledit/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		QXmlEdit is a simple XML editor based on Qt libraries. Its main features are
-		unusual data visualization modes, nice XML manipulation and presentation
-		features, and it is multi-platform. It can split very big XML files into
-		fragments, and compare XML files. It is one of the few graphical Open Source
-		XSD viewers.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">lbellonda/qxmledit</remote-id>
-		<remote-id type="sourceforge">qxmledit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/qxmledit/qxmledit-0.9.10.ebuild b/app-editors/qxmledit/qxmledit-0.9.10.ebuild
deleted file mode 100644
index adeb17ec6d81..000000000000
--- a/app-editors/qxmledit/qxmledit-0.9.10.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils xdg-utils
-
-DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscxml:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	media-libs/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	default
-
-	# bug 568746
-	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
-		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-}
-
-src_configure() {
-	export \
-		QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
-		QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
-		QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
-		QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-
-	# avoid internal compiler errors
-	use x86 && export QXMLEDIT_INST_AVOID_PRECOMP_HEADERS=Y
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doicon install_scripts/environment/icon/qxmledit.png
-	domenu install_scripts/environment/desktop/QXmlEdit.desktop
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/qxmledit/qxmledit-0.9.7.ebuild b/app-editors/qxmledit/qxmledit-0.9.7.ebuild
deleted file mode 100644
index 08e35d79954d..000000000000
--- a/app-editors/qxmledit/qxmledit-0.9.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils xdg-utils
-
-DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-1-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscxml:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	media-libs/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-S=${WORKDIR}/${P}-1
-
-src_prepare() {
-	default
-
-	# bug 568746
-	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
-		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-
-	# bug 629624
-	sed -i -e 's/LIBS += -lGL -lGLU -lglut/LIBS += -lGL -lGLU/' \
-		src/QXmlEdit.pro || die
-}
-
-src_configure() {
-	export \
-		QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
-		QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
-		QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
-		QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-
-	# avoid internal compiler errors
-	use x86 && export QXMLEDIT_INST_AVOID_PRECOMP_HEADERS=Y
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doicon install_scripts/environment/icon/qxmledit.png
-	domenu install_scripts/environment/desktop/QXmlEdit.desktop
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/qxmledit/qxmledit-0.9.8.ebuild b/app-editors/qxmledit/qxmledit-0.9.8.ebuild
deleted file mode 100644
index 75018c0bb845..000000000000
--- a/app-editors/qxmledit/qxmledit-0.9.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils xdg-utils
-
-DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscxml:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	media-libs/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	default
-
-	# bug 568746
-	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
-		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-
-	# bug 629624
-	sed -i -e 's/LIBS += -lGL -lGLU -lglut/LIBS += -lGL -lGLU/' \
-		src/QXmlEdit.pro || die
-}
-
-src_configure() {
-	export \
-		QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
-		QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
-		QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
-		QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-
-	# avoid internal compiler errors
-	use x86 && export QXMLEDIT_INST_AVOID_PRECOMP_HEADERS=Y
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doicon install_scripts/environment/icon/qxmledit.png
-	domenu install_scripts/environment/desktop/QXmlEdit.desktop
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/qxmledit/qxmledit-0.9.9.2.ebuild b/app-editors/qxmledit/qxmledit-0.9.9.2.ebuild
deleted file mode 100644
index adeb17ec6d81..000000000000
--- a/app-editors/qxmledit/qxmledit-0.9.9.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils xdg-utils
-
-DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscxml:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	media-libs/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	default
-
-	# bug 568746
-	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
-		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-}
-
-src_configure() {
-	export \
-		QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
-		QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
-		QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
-		QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-
-	# avoid internal compiler errors
-	use x86 && export QXMLEDIT_INST_AVOID_PRECOMP_HEADERS=Y
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doicon install_scripts/environment/icon/qxmledit.png
-	domenu install_scripts/environment/desktop/QXmlEdit.desktop
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/qxmledit/qxmledit-0.9.9.ebuild b/app-editors/qxmledit/qxmledit-0.9.9.ebuild
deleted file mode 100644
index c6849889189d..000000000000
--- a/app-editors/qxmledit/qxmledit-0.9.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils xdg-utils
-
-DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscxml:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	media-libs/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	default
-
-	# bug 568746
-	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
-		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-}
-
-src_configure() {
-	export \
-		QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
-		QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
-		QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
-		QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-
-	# avoid internal compiler errors
-	use x86 && export QXMLEDIT_INST_AVOID_PRECOMP_HEADERS=Y
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doicon install_scripts/environment/icon/qxmledit.png
-	domenu install_scripts/environment/desktop/QXmlEdit.desktop
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/retext-7.0.0 b/app-editors/retext-7.0.0
new file mode 100644
index 000000000000..23944649d48d
--- /dev/null
+++ b/app-editors/retext-7.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Simple editor for Markdown and reStructuredText
+EAPI=6
+HOMEPAGE=https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki
+IUSE=+spell python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-python/docutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markdown[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/markups-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[gui,network,printsupport,webkit,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] spell? ( dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/R/ReText/ReText-7.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=50e54e5a7809f0773e4b2a0ec8737945
diff --git a/app-editors/retext-7.0.0-r2 b/app-editors/retext-7.0.0-r2
new file mode 100644
index 000000000000..e3a58c4ee417
--- /dev/null
+++ b/app-editors/retext-7.0.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Simple editor for Markdown and reStructuredText
+EAPI=6
+HOMEPAGE=https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki
+IUSE=+spell python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/docutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markdown[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/markups-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[gui,network,printsupport,webengine,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] spell? ( dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/R/ReText/ReText-7.0.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=546594bac20f1c05a2e18bdd547624b5
diff --git a/app-editors/retext-7.0.1-r2 b/app-editors/retext-7.0.1-r2
new file mode 100644
index 000000000000..b327bb4c46a7
--- /dev/null
+++ b/app-editors/retext-7.0.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Simple editor for Markdown and reStructuredText
+EAPI=6
+HOMEPAGE=https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki
+IUSE=+spell python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/docutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markdown[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/markups-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[gui,network,printsupport,webengine,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] spell? ( dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/R/ReText/ReText-7.0.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=546594bac20f1c05a2e18bdd547624b5
diff --git a/app-editors/retext-7.0.3 b/app-editors/retext-7.0.3
new file mode 100644
index 000000000000..446fcf2572da
--- /dev/null
+++ b/app-editors/retext-7.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Simple editor for Markdown and reStructuredText
+EAPI=6
+HOMEPAGE=https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki
+IUSE=+spell python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/chardet-2.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markdown[pygments,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/markups-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[gui,network,printsupport,webengine,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] spell? ( dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/R/ReText/ReText-7.0.3.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d697b47f4e1df65c572e1a82ac0cca7d
diff --git a/app-editors/retext-9999 b/app-editors/retext-9999
new file mode 100644
index 000000000000..b20205fe5179
--- /dev/null
+++ b/app-editors/retext-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Simple editor for Markdown and reStructuredText
+EAPI=6
+HOMEPAGE=https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki
+IUSE=+spell python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+LICENSE=GPL-2
+RDEPEND=dev-python/docutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markdown[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/markups-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[gui,network,printsupport,webengine,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] spell? ( dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=546594bac20f1c05a2e18bdd547624b5
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
deleted file mode 100644
index 54deef8ce11e..000000000000
--- a/app-editors/retext/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST ReText-7.0.0.tar.gz 203294 BLAKE2B 613004d9e2aaba52e25dec49270ecaf429f5c9dd27041cf09c8b1eefca59e2116b9904b49f260c6bc2528d65fa846a0cd11930d05297b8567e69086376d411a6 SHA512 0a2e430659e7d87d50780fecbf5f04f852f144d143ec83b90126ab9e7b8006756cbc8710c9cec192ddad2cba9f7236e684fa207e308c565388ede308da3c1a35
-DIST ReText-7.0.1.tar.gz 266582 BLAKE2B 9a2bf5ee433550b9df777fc65254bf52097730143e491fa52b2312709473905caf45fc63fe96ac04adb94bdbc9ea8e8840c4e5d65cb0da25727d3cdd198d2f97 SHA512 eb6b1f6df1e490d9058f3431c023119afff05e81917bb5402a35a100538283a157d2853d10c015a415a5d7e78aac4a2489307a0ef60004d48d8b1f9207a07567
-DIST ReText-7.0.3.tar.gz 396334 BLAKE2B f40ffb159f94d28f1649561a41f557a5d11c2d00e4a01a99493ecac9795bca41c4675bc364c3c58e557bd78c2803f774793042426921436b4be43129f3c88170 SHA512 67b16dc2d7207cc72a58a5ede7440b191c8afdd08e6d4b21159e781585ca16ddfb4d0d16052fc50d716e2edfd983559e25c22ac80dd408cdb3fdb82a2f6bce57
-EBUILD retext-7.0.0-r2.ebuild 1457 BLAKE2B 4047fa55e80de792a92f4214d3f2cbc0b6c40e61e729d7978e965f38577e9851b2fd205761329377a0ee753086452dd19a510afc3a9b14ef0de819883af811e7 SHA512 5bf8e31a91384b7644d8e85ef43d7a5cd9b74b7cbfafc80f28d2a21a6c6397d1febb3c25b74be2c3d672f21fb852b1acbd137e921977b8a9df84d9969e5117d5
-EBUILD retext-7.0.0.ebuild 1369 BLAKE2B c5d82c6765b7b5d66d44ab3a71221b764be3694207256ee922a08911c34eb6d2ab8e6648ee483da73c171ea66c91c9e8677ce83421a7bdc7361136d5c6bae37c SHA512 6c5bed210a70800b32ae1ae9e57e36c47a622982b505ec195e4120e2dfc5f08863bc6e070c8a3f1978430f3473d2a9ed7f54fed474c6caac50ede0141df8afc4
-EBUILD retext-7.0.1-r2.ebuild 1457 BLAKE2B 4047fa55e80de792a92f4214d3f2cbc0b6c40e61e729d7978e965f38577e9851b2fd205761329377a0ee753086452dd19a510afc3a9b14ef0de819883af811e7 SHA512 5bf8e31a91384b7644d8e85ef43d7a5cd9b74b7cbfafc80f28d2a21a6c6397d1febb3c25b74be2c3d672f21fb852b1acbd137e921977b8a9df84d9969e5117d5
-EBUILD retext-7.0.3.ebuild 1466 BLAKE2B 2e853c57b11f88e2b46d443e241ed10b881e6358dccb73c46bf110748bb231223d3ba936bc273a364248042da4444a7eb7f8bd8187d3c372c43bd9cc09d2804b SHA512 1c6004a4cb11cdcaffb8b8974329c3231ed48f80615acf0cdefc98f0ca6f4b9bc01d9d2614a3c13f737fb07e16eb91edf53dd9f91e7640d745c3b64ceaabe5e0
-EBUILD retext-9999.ebuild 1457 BLAKE2B 4047fa55e80de792a92f4214d3f2cbc0b6c40e61e729d7978e965f38577e9851b2fd205761329377a0ee753086452dd19a510afc3a9b14ef0de819883af811e7 SHA512 5bf8e31a91384b7644d8e85ef43d7a5cd9b74b7cbfafc80f28d2a21a6c6397d1febb3c25b74be2c3d672f21fb852b1acbd137e921977b8a9df84d9969e5117d5
-MISC metadata.xml 496 BLAKE2B ad4453602e60bdaf37553cd2fe8c9ea8abc163a86fded505e69bfa06f40d503b0cc58651068a4c52a6ffd0c8368f855512ec83aefff4a64a696e1b042a129e6a SHA512 0e182c5ddf9ac27dd9b6eb70c9a3ebdf711552e4e00db2d66696bdd992dc7824f51c86acb60f044342534b230c9884d45c55177d05f7ea92be81297994b7f559
diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml
deleted file mode 100644
index f5c4f2cfa494..000000000000
--- a/app-editors/retext/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>holgersson@posteo.de</email>
-		<name>Nils Freydank</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">retext-project/retext</remote-id>
-		<remote-id type="pypi">ReText</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/retext/retext-7.0.0-r2.ebuild b/app-editors/retext/retext-7.0.0-r2.ebuild
deleted file mode 100644
index b69ab5bac2a4..000000000000
--- a/app-editors/retext/retext-7.0.0-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
-
-inherit distutils-r1 virtualx l10n xdg-utils
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-DESCRIPTION="Simple editor for Markdown and reStructuredText"
-HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-
-if [[ ${PV} == *9999 ]]
-	then
-		inherit git-r3
-		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
-	else
-		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-		KEYWORDS="~amd64 ~x86"
-		S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+spell"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	>=dev-python/markups-2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,printsupport,webengine,widgets,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-remove_locale() {
-	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/retext/retext-7.0.0.ebuild b/app-editors/retext/retext-7.0.0.ebuild
deleted file mode 100644
index 526562e3fad2..000000000000
--- a/app-editors/retext/retext-7.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
-
-inherit distutils-r1 virtualx l10n eutils
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-DESCRIPTION="Simple editor for Markdown and reStructuredText"
-HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+spell"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	>=dev-python/markups-2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-remove_locale() {
-	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
-	l10n_for_each_disabled_locale_do remove_locale
-
-	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
-}
diff --git a/app-editors/retext/retext-7.0.1-r2.ebuild b/app-editors/retext/retext-7.0.1-r2.ebuild
deleted file mode 100644
index b69ab5bac2a4..000000000000
--- a/app-editors/retext/retext-7.0.1-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
-
-inherit distutils-r1 virtualx l10n xdg-utils
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-DESCRIPTION="Simple editor for Markdown and reStructuredText"
-HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-
-if [[ ${PV} == *9999 ]]
-	then
-		inherit git-r3
-		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
-	else
-		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-		KEYWORDS="~amd64 ~x86"
-		S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+spell"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	>=dev-python/markups-2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,printsupport,webengine,widgets,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-remove_locale() {
-	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/retext/retext-7.0.3.ebuild b/app-editors/retext/retext-7.0.3.ebuild
deleted file mode 100644
index 3893b4a6128f..000000000000
--- a/app-editors/retext/retext-7.0.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
-
-inherit distutils-r1 virtualx l10n xdg-utils
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-DESCRIPTION="Simple editor for Markdown and reStructuredText"
-HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-
-if [[ ${PV} == *9999 ]]
-	then
-		inherit git-r3
-		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
-	else
-		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-		KEYWORDS="~amd64 ~x86"
-		S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+spell"
-
-RDEPEND="
-	>=dev-python/chardet-2.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[pygments,${PYTHON_USEDEP}]
-	>=dev-python/markups-2.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,printsupport,webengine,widgets,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-remove_locale() {
-	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
deleted file mode 100644
index b69ab5bac2a4..000000000000
--- a/app-editors/retext/retext-9999.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
-
-inherit distutils-r1 virtualx l10n xdg-utils
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-DESCRIPTION="Simple editor for Markdown and reStructuredText"
-HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-
-if [[ ${PV} == *9999 ]]
-	then
-		inherit git-r3
-		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
-	else
-		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-		KEYWORDS="~amd64 ~x86"
-		S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+spell"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	>=dev-python/markups-2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,printsupport,webengine,widgets,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-remove_locale() {
-	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/sandy-0.4 b/app-editors/sandy-0.4
new file mode 100644
index 000000000000..83d7bb8a659e
--- /dev/null
+++ b/app-editors/sandy-0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=an ncurses text editor with an easy-to-read, hackable C source
+EAPI=5
+HOMEPAGE=https://tools.suckless.org/sandy
+KEYWORDS=~amd64
+LICENSE=MIT-with-advertising
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://git.suckless.org/sandy/snapshot/sandy-0.4.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2923eabf5405fe4a796aa8e725c0fbea
diff --git a/app-editors/sandy/Manifest b/app-editors/sandy/Manifest
deleted file mode 100644
index 9441cf85577f..000000000000
--- a/app-editors/sandy/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX sandy-0.4-gentoo.patch 1019 BLAKE2B 8aafad7b55d55fee1e48105f77b321929e306341cb318a89cc500089249988de33fba50a67a24a7868f1d6737a3130717cd38b40a132a28f36da1e1248da4053 SHA512 06e3e4dd2979e3589f9f1205eee13c56006ea4f2d8d8ead61faadebcdc9b590c82b645dc93b6ed6693cd15cd8d7e45491812fa3fb0819cfd088e5e231da7f7ab
-DIST sandy-0.4.tar.bz2 18409 BLAKE2B bb10bc7def440d436ffa0304c8f009d722b23159fdd8f2b559f768476391ba2ddda9083ef6fd7e0cec32b231d3c6fa9578214e5027b8a4cd490d338b384ea83a SHA512 6f28588e15ccdc467dd9d0de8b221508333defefe5866005d82292583db9f296284f233271af5e85b648c194dff117f94752cc364ed6c1409dae5c3af755b530
-EBUILD sandy-0.4.ebuild 680 BLAKE2B d7133d25632aa6f321dbf51970b2bb8c629e9be3b0fbeedacf7e11d93e065b1b11f2896251676d34e31acfc334e7577236036297a76cdf8621581f50693a8056 SHA512 1bd2f870bca21d66e7d53ede12c92bea99fcec61c970b7ba885f438f9e43584bbe340ee780e0e0410d2c9e5701088db9db06331e65156bc925c8a680ef709695
-MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/app-editors/sandy/files/sandy-0.4-gentoo.patch b/app-editors/sandy/files/sandy-0.4-gentoo.patch
deleted file mode 100644
index 877c96805ef4..000000000000
--- a/app-editors/sandy/files/sandy-0.4-gentoo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/config.mk
-+++ b/config.mk
-@@ -9,19 +9,19 @@
- 
- # includes and libs (ncurses)
- INCS = -I. -I/usr/include
--LIBS = -L/usr/lib -lc -lncursesw
-+LIBS = $(shell ${PKG_CONFIG} --libs ncurses)
- 
- # flags
--CPPFLAGS = -DVERSION=\"${VERSION}\"
-+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
- #CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
- #LDFLAGS = -s ${LIBS}
--CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
--LDFLAGS = ${LIBS}
-+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
-+LDFLAGS += ${LIBS}
- 
- # Solaris
- #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
- #LDFLAGS = ${LIBS}
- 
- # compiler and linker
--CC = cc
-+CC ?= cc
- 
---- a/Makefile
-+++ b/Makefile
-@@ -15,8 +15,7 @@
- 	@echo "CC       = ${CC}"
- 
- .c.o:
--	@echo CC $<
--	@${CC} -c ${CFLAGS} $<
-+	${CC} -c ${CFLAGS} $<
- 
- ${OBJ}: config.h config.mk
- 
-@@ -25,8 +24,7 @@
- 	@cp config.def.h $@
- 
- sandy: ${OBJ}
--	@echo CC -o $@
--	@${CC} -o $@ sandy.o ${LDFLAGS}
-+	${CC} ${CFLAGS} -o $@ sandy.o ${LDFLAGS}
- 
- clean:
- 	@echo cleaning
diff --git a/app-editors/sandy/metadata.xml b/app-editors/sandy/metadata.xml
deleted file mode 100644
index 5ba62861f1c4..000000000000
--- a/app-editors/sandy/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/app-editors/sandy/sandy-0.4.ebuild b/app-editors/sandy/sandy-0.4.ebuild
deleted file mode 100644
index d401639ce641..000000000000
--- a/app-editors/sandy/sandy-0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="an ncurses text editor with an easy-to-read, hackable C source"
-HOMEPAGE="https://tools.suckless.org/sandy"
-SRC_URI="https://git.suckless.org/${PN}/snapshot/${P}.tar.bz2"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.4-gentoo.patch
-}
-
-src_compile() {
-	tc-export CC PKG_CONFIG
-	append-cflags -D_DEFAULT_SOURCE
-	emake PREFIX=/usr ${PN}
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-}
diff --git a/app-editors/scite-3.5.5 b/app-editors/scite-3.5.5
new file mode 100644
index 000000000000..28b012d7d46a
--- /dev/null
+++ b/app-editors/scite-3.5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:0= ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A very powerful editor for programmers
+EAPI=5
+HOMEPAGE=https://www.scintilla.org/SciTE.html
+IUSE=lua
+KEYWORDS=amd64 ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=HPND lua? ( MIT )
+RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:0= )
+SLOT=0
+SRC_URI=mirror://sourceforge/scintilla/scite355.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3c1405c10a7b0f5379a14cc7d1c237f6
diff --git a/app-editors/scite-3.6.5-r1 b/app-editors/scite-3.6.5-r1
new file mode 100644
index 000000000000..e0cbc8f6e8ad
--- /dev/null
+++ b/app-editors/scite-3.6.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/glib:= x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:= ) virtual/pkgconfig
+DESCRIPTION=A very powerful editor for programmers
+EAPI=6
+HOMEPAGE=https://www.scintilla.org/SciTE.html
+IUSE=lua
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=HPND lua? ( MIT )
+RDEPEND=dev-libs/glib:= x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:= )
+SLOT=0
+SRC_URI=mirror://sourceforge/scintilla/scite365.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a110f74f86d1a9a296c8b464434790e3
diff --git a/app-editors/scite-4.0.2 b/app-editors/scite-4.0.2
new file mode 100644
index 000000000000..ef699d5429cc
--- /dev/null
+++ b/app-editors/scite-4.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:= x11-libs/cairo x11-libs/gtk+:3= x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:= ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A very powerful, highly configurable, small editor with syntax coloring.
+EAPI=6
+HOMEPAGE=https://www.scintilla.org/SciTE.html
+IUSE=lua
+KEYWORDS=amd64 ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=HPND lua? ( MIT )
+RDEPEND=dev-libs/glib:= x11-libs/cairo x11-libs/gtk+:3= x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:= )
+SLOT=0
+SRC_URI=mirror://sourceforge/scintilla/scite402.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=55c0808e5f600f2355e33f995c60de1e
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
deleted file mode 100644
index 29a828b7295d..000000000000
--- a/app-editors/scite/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX scite.desktop 138 BLAKE2B f0cc28779504c505e8876fadaffc979939c48088e5cb5c1d0a8b2cd499ecc21806655415ba34b2ca5351a31a588c5818ed21e38c19233055386c0246c5aae4be SHA512 9e226e4207ccaf0ae654e0456906547d9eaa77d5f09e057e56a657ae06fe909a759a8ae30bb625ec556f72a3a7105fc1f4407f1f51c05c40ba2cc1ec08469da6
-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
-MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/files/scite.desktop b/app-editors/scite/files/scite.desktop
deleted file mode 100644
index 757e9f4e71d0..000000000000
--- a/app-editors/scite/files/scite.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=SciTE Text Editor
-Comment=Text Editor
-Exec=scite
-Icon=Sci48M
-Terminal=false
-Type=Application
-Categories=Development;
diff --git a/app-editors/scite/metadata.xml b/app-editors/scite/metadata.xml
deleted file mode 100644
index 860834e39909..000000000000
--- a/app-editors/scite/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ervin.peters@ervnet.de</email>
-		<name>Ervin Peters</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scintilla</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/scite/scite-3.5.5.ebuild b/app-editors/scite/scite-3.5.5.ebuild
deleted file mode 100644
index 7e0335715573..000000000000
--- a/app-editors/scite/scite-3.5.5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs eutils xdg-utils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-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"
-IUSE="lua"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/${PN}/gtk"
-
-src_prepare() {
-	cd "${WORKDIR}/scintilla/gtk"
-	sed -i makefile \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-
-	cd "${WORKDIR}/scite/gtk"
-	sed -i makefile \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		|| die "error patching makefile"
-
-	cd "${S}"
-	sed -i makefile \
-		-e 's#usr/local#usr#g' \
-		-e 's#/gnome/apps/Applications#/applications#' \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e 's#${D}##' \
-		-e 's#-g root#-g 0#' \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-}
-
-src_compile() {
-	emake -C ../../scintilla/gtk AR="$(tc-getAR)"
-	if use lua; then
-		emake
-	else
-		emake NO_LUA=1
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/{pixmaps,applications}
-
-	emake prefix="${ED}/usr" install
-
-	# we have to keep this because otherwise it'll break upgrading
-	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
-	dosym scite /usr/bin/SciTE
-
-	# replace .desktop file with our own working version
-	rm -f "${ED}/usr/share/applications/SciTE.desktop" || die
-	domenu "${FILESDIR}/scite.desktop"
-
-	doman ../doc/scite.1
-	dodoc ../README
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/scite/scite-3.6.5-r1.ebuild b/app-editors/scite/scite-3.6.5-r1.ebuild
deleted file mode 100644
index 94ef7659ec7d..000000000000
--- a/app-editors/scite/scite-3.6.5-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs eutils flag-o-matic
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-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"
-IUSE="lua"
-
-RDEPEND="dev-libs/glib:=
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}/gtk"
-
-src_prepare() {
-	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e "s#-Os##" \
-		|| die "error patching /scintilla/gtk/makefile"
-
-	sed -i "${WORKDIR}/scite/gtk/makefile" \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		|| die "error patching /scite/gtk/makefile"
-
-	# repair and enhance the .desktop file
-	sed -i "${WORKDIR}/scite/gtk/SciTE.desktop" \
-		-e "s/^Encoding/#Encoding/" \
-		-e "s#text/plain#text/\*;application/xhtml+xml#" \
-		-e "s#^Categories=\(.*\)#Categories=Development;#" \
-		|| die "error patching /scite/gtk/SciTe.desktop"
-
-	sed -i "${S}/makefile" \
-		-e 's#usr/local#usr#g' \
-		-e 's#/gnome/apps/Applications#/applications#' \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e 's#${D}##' \
-		-e 's#-g root#-g 0#' \
-		-e "s#-Os##" \
-		|| die "error patching gtk/makefile"
-
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-			LDFLAGS="$(raw-ldflags)" AR="$(tc-getAR)" \
-			-C "${WORKDIR}/scintilla/gtk"
-
-	if use lua; then
-		emake
-	else
-		emake NO_LUA=1
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/{pixmaps,applications}
-
-	emake DESTDIR="${ED}" install
-
-	# we have to keep this because otherwise it'll break upgrading
-	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
-	dosym scite /usr/bin/SciTE
-
-	doman ../doc/scite.1
-	dodoc ../README
-}
diff --git a/app-editors/scite/scite-4.0.2.ebuild b/app-editors/scite/scite-4.0.2.ebuild
deleted file mode 100644
index 8ef73fdbb392..000000000000
--- a/app-editors/scite/scite-4.0.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic gnome2-utils xdg-utils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful, highly configurable, small editor with syntax
-coloring."
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-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"
-IUSE="lua"
-
-RDEPEND="dev-libs/glib:=
-	x11-libs/cairo
-	x11-libs/gtk+:3=
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}/gtk"
-
-src_prepare() {
-	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e "s#-Os##" \
-		|| die "error patching scintilla/gtk/makefile"
-
-	sed -i "${S}/makefile" \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		-e 's#usr/local#usr#g' \
-		-e 's#/gnome/apps/Applications#/applications#' \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e 's#${D}##' \
-		-e 's#-g root#-g 0#' \
-		-e "s#-Os##" \
-		|| die "error patching scite/gtk/makefile"
-
-	# repair and enhance the .desktop file
-	sed -i "${S}/SciTE.desktop" \
-		-e "s#text/plain#text/\*;application/xhtml+xml#" \
-		-e "s#^Categories=\(.*\)#Categories=Development;#" \
-		|| die "error patching scite/gtk/SciTe.desktop"
-
-	#  add the ebuild suffix as shell type for working with ebuilds
-	sed -i "${WORKDIR}/scite/src/perl.properties" \
-		-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-		|| die "error patching scite/src/perl.properties"
-
-	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
-	# Bug #576162
-
-	cd "${WORKDIR}"
-	eapply_user
-}
-
-src_compile() {
-	# prepare make options
-	local emake_pars="GTK3=1"
-	if ! use lua; then
-		emake_pars+=" NO_LUA=1"
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-			LDFLAGS="$(raw-ldflags)" AR="$(tc-getAR)" \
-			-C "${WORKDIR}/scintilla/gtk" $emake_pars
-	emake $emake_pars
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# we have to keep this because otherwise it'll break upgrading
-	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
-	dosym scite /usr/bin/SciTE
-
-	doman ../doc/scite.1
-	dodoc ../README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/shed-1.12 b/app-editors/shed-1.12
new file mode 100644
index 000000000000..6bfae792ed90
--- /dev/null
+++ b/app-editors/shed-1.12
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile
+DESCRIPTION=Simple Hex EDitor
+EAPI=4
+HOMEPAGE=http://shed.sourceforge.net/
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses
+SLOT=0
+SRC_URI=mirror://sourceforge/shed/shed-1.12.tar.gz
+_md5_=fb70f0bebc978c11d02d54beef7e2593
diff --git a/app-editors/shed-1.13 b/app-editors/shed-1.13
new file mode 100644
index 000000000000..3f9760cf499d
--- /dev/null
+++ b/app-editors/shed-1.13
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile
+DESCRIPTION=Simple Hex EDitor
+EAPI=4
+HOMEPAGE=http://shed.sourceforge.net/
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses
+SLOT=0
+SRC_URI=mirror://sourceforge/shed/shed-1.13.tar.gz
+_md5_=d80f4e8856201e65f942895cba08b11a
diff --git a/app-editors/shed-1.15 b/app-editors/shed-1.15
new file mode 100644
index 000000000000..b0ad7e5a6aed
--- /dev/null
+++ b/app-editors/shed-1.15
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Simple Hex EDitor
+EAPI=5
+HOMEPAGE=http://shed.sourceforge.net/
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/shed/shed-1.15.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=369faf2e7a569f7cd11405e8d23f5337
diff --git a/app-editors/shed/Manifest b/app-editors/shed/Manifest
deleted file mode 100644
index 52aefa0d8fd5..000000000000
--- a/app-editors/shed/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX shed-1.15-cflags.patch 249 BLAKE2B 6249d526da1a4b1df8f456692e85bdbd275be7517d5af89619557186afdfd5fd6bc2ca50299decddcaa33408608c35c5cf7ba74e90b78aba9825d4656c1557fb SHA512 9f6f025c5fc5126357e8b763706d2a0eb53700963b0d8779f057683fc95773753eced99b26a9120b122f50c8b23db6c6bf79cb973023b11e594313c8fcf92cdf
-AUX shed-1.15-interix.patch 313 BLAKE2B 423d51410a5371ee1fa0ae2e0d4426dddd410ea060a269f6d3c6b99826aa8d57635bb9a0cfeb82fcf2f51dcf179b0815485491110df3501d1e23ff950d838475 SHA512 31d403d95ce106443ccfe8c92b9621842bfc4264c71280398bb7c0d827d98bf28b403dce3c6ae4523b7ac30a8f529aac6d7cc30a91313a2e2a3d033766469e69
-AUX shed-1.15-tinfo.patch 355 BLAKE2B 5acffe509b9174187b4383f15bed90600790ed0267ee1dbc2713a28e2b8fd0a5eb67cdb1f84a635012128abd5075f9daa0ffdc86abbdd29d170a9b48868dd52c SHA512 fab71c3e99138f7cc4844964bbc40e95c90055612e6d34ff59c72b505b2c12c6244c4a25091de283f4615475652c202a4404273c0718b73b9f928c4bf0a74710
-DIST shed-1.12.tar.gz 57934 BLAKE2B 33c6096b60142e3a893827b68dc81cca03b53e0d558041d7042cd0e32450b1c5898218c9141683dbd50e49d6e03c8f0cc4090146de4762fedc22157c1d4d3914 SHA512 f668245478b88e74911a5f6bc13629b1be9412056bfb42860554979904451b20cb468ae7a9b2daa8bea83d7f78d3d0c016170767dd80f0a93ba140a51ad02097
-DIST shed-1.13.tar.gz 78699 BLAKE2B ee7651a3ec22184579ca692756c3deb52aef8aed3222d810e234b0ec5e70b599c36e25da8b2330d6a201aab88598df399b506e93bac672ae4ba5b1cb3cad1888 SHA512 abea90115820c50bba140a486d74e28cd20704905bb868aa75b94a346faf8d1a0e0739f9558131cff9c5250ac9ef2505cc375f2bdf24c75b6ff464ba767c1832
-DIST shed-1.15.tar.gz 87777 BLAKE2B 7c23f01e649de6ad15b870ef3786bd1747b6ab765f19a748d08bad878325f11e38483b957ed6a791ae4a7de752e96cca2057fd69838625c3fe660d2ba3fbc984 SHA512 fe401303e686fb11975b71de0f84d0cdb84dc5a48e1094356d012f95d8c956ed05bd6b39bf65af924212e83c1db45bbfe556342489150bb0e10fb4c832fb6c78
-EBUILD shed-1.12.ebuild 393 BLAKE2B 3da73fe8d3dbbdb2113c8fec5304e6aaa78be4f3ab0e992c52acdc2cc412e82ef351c3ca55316f8e1aafe0e0973f50d3886a18e1091f6e5482345587853b3c79 SHA512 9ba910b953384f033f2319faaf2b127885b01db2b072b41319e61481c4105c1386eac83f9f8be038b39048c5f64195511dd43d5893e4fc083644443e173b09bf
-EBUILD shed-1.13.ebuild 394 BLAKE2B c2fa013da3716dc70c6b722f5c3d0bce5b49ef8c5cc84b15bb9fed9c4d2652f80d23a3d688e26cf992cffaf28632e290084f6c6f894f3d44d41a9d943065f1bc SHA512 3b0a2552b02ddbf2731be96b4ba09e2415b1bfd4ed5a06ff6a917b34f7dc7097dbe97c7a829b76619f115cca527899d9e096a1e2242f61d08a7e460667dbb849
-EBUILD shed-1.15.ebuild 577 BLAKE2B a2c23bf9320732dd011b61080034f2ff27801145bea5134fdfd22ed60468d033c3d54f7f46a446ce2fa3309889e90c1e0fa6fee73291ee0540fea53b5afa9c0b SHA512 0449db95171f837f78a4492753ab5e62ac84bde74ed126f1c79f5b0d2dddfc5525a4ee8fc81a008f19d2ded33d080f7b3a43366a57d3b53a274656dfac0132fb
-MISC metadata.xml 299 BLAKE2B ae48e2797586095e3e0d22645c036826b7165079cda4be2499cdf201e37806f0600086f9b0a6d52217b63f63e759c5d2ce02bddb2f828d1d4719898b0ad7f3a9 SHA512 ed903a7f91fa008f63e358253d7e66988cb57b616a8bf6e546f8a1d874e92524b29ef671a96f0e8fc56410619ff541d50e65ab788cf5373164d58b7afa625868
diff --git a/app-editors/shed/files/shed-1.15-cflags.patch b/app-editors/shed/files/shed-1.15-cflags.patch
deleted file mode 100644
index 2b675f7449f7..000000000000
--- a/app-editors/shed/files/shed-1.15-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -2,7 +2,7 @@
- AM_INIT_AUTOMAKE(shed,1.15)
- AC_PROG_CC
- AC_PROG_INSTALL
--CFLAGS="-Wall"
-+CFLAGS="$CFLAGS -Wall"
- AC_SUBST(CFLAGS)
- 
- AC_ARG_ENABLE(debug,   [  --enable-debug          gcc -g],enable_debug=yes)
diff --git a/app-editors/shed/files/shed-1.15-interix.patch b/app-editors/shed/files/shed-1.15-interix.patch
deleted file mode 100644
index 46c5eb6b26b1..000000000000
--- a/app-editors/shed/files/shed-1.15-interix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3554634&group_id=21862&atid=374571
---- a/shed.c
-+++ b/shed.c
-@@ -31,6 +31,10 @@
- #include <ctype.h>     /* tolower    */
- #include <unistd.h>    /* dup, dup2  */
- 
-+#ifdef __INTERIX
-+# include <sys/time.h>
-+#endif
-+
- #include "util.h"
- 
- /* function prototypes */
diff --git a/app-editors/shed/files/shed-1.15-tinfo.patch b/app-editors/shed/files/shed-1.15-tinfo.patch
deleted file mode 100644
index d1a406521c0f..000000000000
--- a/app-editors/shed/files/shed-1.15-tinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -41,8 +41,7 @@
- fi
- 
- ERR="Required package missing!"
--AC_CHECK_HEADER(ncurses.h,:,AC_MSG_ERROR([$ERR]))
-+PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],AC_MSG_ERROR([$ERR]))
- AC_CHECK_HEADER(getopt.h,:,AC_MSG_ERROR([$ERR]))
--AC_CHECK_LIB(ncurses,initscr)
- AC_CHECK_LIB(m,pow)
- AC_OUTPUT(Makefile)
diff --git a/app-editors/shed/metadata.xml b/app-editors/shed/metadata.xml
deleted file mode 100644
index d14e7209041c..000000000000
--- a/app-editors/shed/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>hattya@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">shed</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-editors/shed/shed-1.12.ebuild b/app-editors/shed/shed-1.12.ebuild
deleted file mode 100644
index 55cedd512278..000000000000
--- a/app-editors/shed/shed-1.12.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Simple Hex EDitor"
-HOMEPAGE="http://shed.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses"
-DPEND="${RDEPEND}"
-
-src_compile() {
-	emake AM_CFLAGS="${CFLAGS}"
-}
diff --git a/app-editors/shed/shed-1.13.ebuild b/app-editors/shed/shed-1.13.ebuild
deleted file mode 100644
index fb93dffe4ab2..000000000000
--- a/app-editors/shed/shed-1.13.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Simple Hex EDitor"
-HOMEPAGE="http://shed.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses"
-DPEND="${RDEPEND}"
-
-src_compile() {
-	emake AM_CFLAGS="${CFLAGS}"
-}
diff --git a/app-editors/shed/shed-1.15.ebuild b/app-editors/shed/shed-1.15.ebuild
deleted file mode 100644
index 6d1bfdeb8c3d..000000000000
--- a/app-editors/shed/shed-1.15.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Simple Hex EDitor"
-HOMEPAGE="http://shed.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-interix.patch \
-		"${FILESDIR}"/${P}-tinfo.patch
-	eautoreconf
-}
diff --git a/app-editors/sublime-text-3_p3143 b/app-editors/sublime-text-3_p3143
new file mode 100644
index 000000000000..acf72a6555dd
--- /dev/null
+++ b/app-editors/sublime-text-3_p3143
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Sophisticated text editor for code, markup and prose
+EAPI=6
+HOMEPAGE=http://www.sublimetext.com
+IUSE=dbus
+KEYWORDS=~amd64 ~x86
+LICENSE=Sublime
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 dbus? ( sys-apps/dbus )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://download.sublimetext.com/sublime_text_3_build_3143_x64.tar.bz2 ) x86? ( https://download.sublimetext.com/sublime_text_3_build_3143_x32.tar.bz2 )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eeda45d1ec00f1e258d1cf57239633e5
diff --git a/app-editors/sublime-text-3_p3176 b/app-editors/sublime-text-3_p3176
new file mode 100644
index 000000000000..281f69990b44
--- /dev/null
+++ b/app-editors/sublime-text-3_p3176
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Sophisticated text editor for code, markup and prose
+EAPI=6
+HOMEPAGE=https://www.sublimetext.com
+IUSE=dbus
+KEYWORDS=~amd64 ~x86
+LICENSE=Sublime
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 dbus? ( sys-apps/dbus )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://download.sublimetext.com/sublime_text_3_build_3176_x64.tar.bz2 ) x86? ( https://download.sublimetext.com/sublime_text_3_build_3176_x32.tar.bz2 )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e98e5ccdd2cf553386c2620dfcdc847c
diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest
deleted file mode 100644
index 637df7ef6bd1..000000000000
--- a/app-editors/sublime-text/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST sublime_text_3_build_3143_x32.tar.bz2 9847438 BLAKE2B bca62736e3dbaae5aa5318af5aca4c78c5abff1189a58b354205351f21ba1caa8a6b479e9a7e01fdb4a56dec68d50e0e43522918b461463cdada7e6dbda6441c SHA512 471716815a171f786ad5f12b743ec3c17dcde2fc165522e523d338c9184af7789095e2de41e89d0c4b0dc58bfe409f116662016e7014c528650ce074c101084b
-DIST sublime_text_3_build_3143_x64.tar.bz2 9857381 BLAKE2B bf69810574eda5bb3afaa82dcbf8b68f9bef1db19af2382e0ee4b93cb87f08caa3f7bdc754419284b3902e0e715a97d211adcd234f35d8038071818368b3fb54 SHA512 db6375cbcaf1cb6e1d583aa043abeaeecf0236e1d2e23b965b6c2dd616ec2277d73786d2a9c273329c1a94890edc7ddce1551292b5170dc5b558cd7246c5093f
-DIST sublime_text_3_build_3176_x32.tar.bz2 10352060 BLAKE2B 97d6e7bcc838ecac53ffa68cc3d355b01d06ea1903fd92b9894f27cf402d0506728be69f27d91dccbcba1bab876f94fd619bcf4877a9d935fb5517e91d2be4ac SHA512 640920a92995aac4af711cb4eb58d142d1afe2cbcbc485a111bc407ce464e81b984cd2110074072cc3805ed8656a4a60acce6f1a014f8a3f27f1b340222b0071
-DIST sublime_text_3_build_3176_x64.tar.bz2 10314226 BLAKE2B 98b0cda71b8a859614a1a6510afa073ca1aae6b9ac5d4b6db259723e8aa057a8b2bf22a0d26f0b6ccce31f39e047293ed84c4a63b8739a6d08c05af5791967bd SHA512 c37bd0d6d7fbbe2757f4244ae2803086d5fe1e25b32a1dd2de4241dc55f66f7c4588f3f9d56059c9d0ef7fe2ae69e76005f16dad60060f38fe10b92fd8eda969
-EBUILD sublime-text-3_p3143.ebuild 1653 BLAKE2B 163c25b87e4207dc087cb911fde79001ecce08e274543546e82a32516701f42e615c4d958447a078b1d711f4fce2f0774ac1a53e6d8789cc47de21611c2cb98f SHA512 f7932e941a48edfceabd790b3316939af5f5381134a3063072753a1f6a6ec080f5e70d79b56d78583cf3992efa105f4a275000c2593ae26090da23cac36704a5
-EBUILD sublime-text-3_p3176.ebuild 1655 BLAKE2B 9c224d920d1e2928c70c46b6709c579b7e17df4b8f50b06355f4336b730f8341a5a64bcfa31b9be3db94c436aaf6d9f4765241f8f7087774fe970cf3577c812a SHA512 d536fa15fcbad6e804c339f9ab13896020ae92579069fd4e1dddf4337777760fc0b8874f098b73091a5867a3c74ceb5da295df1f893d4b2bf3b0b1ee99269193
-MISC metadata.xml 215 BLAKE2B e5b704d936932650ad333b6ee575d0f6fb54f7b01e62f59912a5d88c8a76bfff888e9de639a9a4d6ec5882a3e9a57874eb89935bb3d1a3c3a79a4b1f58b944fb SHA512 d803656f1527d3fc8a2b3474c0ff52d86170950b70057a65ab412ce1adc926545393fe1cfb71731d573f057de2145edd90d642c644ef26222a2b413cd8922d47
diff --git a/app-editors/sublime-text/metadata.xml b/app-editors/sublime-text/metadata.xml
deleted file mode 100644
index 3c5abf825aef..000000000000
--- a/app-editors/sublime-text/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>soap@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-editors/sublime-text/sublime-text-3_p3143.ebuild b/app-editors/sublime-text/sublime-text-3_p3143.ebuild
deleted file mode 100644
index af2f782ca955..000000000000
--- a/app-editors/sublime-text/sublime-text-3_p3143.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils
-
-# get the major version from PV
-MV=${PV:0:1}
-MY_PV=${PV#*_p}
-
-DESCRIPTION="Sophisticated text editor for code, markup and prose"
-HOMEPAGE="http://www.sublimetext.com"
-SRC_URI="
-	amd64? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x64.tar.bz2 )
-	x86? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x32.tar.bz2 )"
-
-LICENSE="Sublime"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	dbus? ( sys-apps/dbus )"
-
-QA_PREBUILT="*"
-S="${WORKDIR}/sublime_text_${MV}"
-
-# Sublime bundles the kitchen sink, which includes python and other assorted
-# modules. Do not try to unbundle these because you are guaranteed to fail.
-
-src_install() {
-	insinto /opt/${PN}${MV}
-	doins -r Packages Icon
-	doins changelog.txt sublime_plugin.py sublime.py python3.3.zip
-
-	exeinto /opt/${PN}${MV}
-	doexe crash_reporter plugin_host sublime_text
-	dosym ../../opt/${PN}${MV}/sublime_text /usr/bin/subl
-
-	local size
-	for size in 32 48 128 256; do
-		dosym ../../../../../../opt/${PN}${MV}/Icon/${size}x${size}/sublime-text.png \
-			/usr/share/icons/hicolor/${size}x${size}/apps/subl.png
-	done
-
-	make_desktop_entry "subl" "Sublime Text ${MV}" "subl" \
-		"TextEditor;IDE;Development" "StartupNotify=true"
-
-	# needed to get WM_CLASS lookup right
-	mv "${ED%/}"/usr/share/applications/subl{-sublime-text,}.desktop || die
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
diff --git a/app-editors/sublime-text/sublime-text-3_p3176.ebuild b/app-editors/sublime-text/sublime-text-3_p3176.ebuild
deleted file mode 100644
index 89e271833a01..000000000000
--- a/app-editors/sublime-text/sublime-text-3_p3176.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils
-
-# get the major version from PV
-MV=${PV:0:1}
-MY_PV=${PV#*_p}
-
-DESCRIPTION="Sophisticated text editor for code, markup and prose"
-HOMEPAGE="https://www.sublimetext.com"
-SRC_URI="
-	amd64? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x64.tar.bz2 )
-	x86? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x32.tar.bz2 )"
-
-LICENSE="Sublime"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	dbus? ( sys-apps/dbus )"
-
-QA_PREBUILT="*"
-S="${WORKDIR}/sublime_text_${MV}"
-
-# Sublime bundles the kitchen sink, which includes python and other assorted
-# modules. Do not try to unbundle these because you are guaranteed to fail.
-
-src_install() {
-	insinto /opt/${PN}${MV}
-	doins -r Packages Icon
-	doins changelog.txt sublime_plugin.py sublime.py python3.3.zip
-
-	exeinto /opt/${PN}${MV}
-	doexe crash_reporter plugin_host sublime_text
-	dosym ../../opt/${PN}${MV}/sublime_text /usr/bin/subl
-
-	local size
-	for size in 32 48 128 256; do
-		dosym ../../../../../../opt/${PN}${MV}/Icon/${size}x${size}/sublime-text.png \
-			/usr/share/icons/hicolor/${size}x${size}/apps/subl.png
-	done
-
-	make_desktop_entry "subl" "Sublime Text ${MV}" "subl" \
-		"TextEditor;IDE;Development" "StartupNotify=true"
-
-	# needed to get WM_CLASS lookup right
-	mv "${ED%/}"/usr/share/applications/subl{-sublime-text,}.desktop || die
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
diff --git a/app-editors/tea-44.1.1 b/app-editors/tea-44.1.1
new file mode 100644
index 000000000000..0d1199edf00a
--- /dev/null
+++ b/app-editors/tea-44.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-libs/zlib aspell? ( app-text/aspell ) djvu? ( app-text/djvu ) hunspell? ( app-text/hunspell:= ) pdf? ( app-text/poppler[qt5] ) qml? ( dev-qt/qtdeclarative:5 ) hunspell? ( virtual/pkgconfig ) >=sys-apps/sed-4
+DESCRIPTION=Small, lightweight Qt text editor
+EAPI=6
+HOMEPAGE=https://tea.ourproject.org/
+IUSE=aspell djvu hunspell pdf +qml
+KEYWORDS=amd64 x86 ~x86-fbsd
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-libs/zlib aspell? ( app-text/aspell ) djvu? ( app-text/djvu ) hunspell? ( app-text/hunspell:= ) pdf? ( app-text/poppler[qt5] ) qml? ( dev-qt/qtdeclarative:5 )
+SLOT=0
+SRC_URI=https://tea.ourproject.org/dloads/tea-44.1.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=455318ae5863e333c63d139ecef36f51
diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest
deleted file mode 100644
index 040ce6e0c60f..000000000000
--- a/app-editors/tea/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tea-44.1.1.tar.bz2 425326 BLAKE2B e674456c428bbecd5afb256280bccb61b6385492153955625c158dcfebba0ed31caebdcc06bc1f809517badddef3d97245a4bc873bcc0593957647becdebf62b SHA512 fc7bf6f76ac3a48767a39ff5bcada4c7dae40950bfd9aca4021b3581e1b702c73f2608b070306dd528932d5eaa73bf01632a4376bbb71deaf1189a0f790c05a9
-EBUILD tea-44.1.1.ebuild 1366 BLAKE2B ed9163609bb1041fce04663549f72f500744983b064d3aabf2d85540aed1770b13c36ab877364b7c7209cfa92dabce0a0e7aa826f1fb8278273364cc87c99354 SHA512 42c773cc51d323faf9e4546398bf37258795583ad17699f0de5a6dcb2e9f469df172b38f1d0cdc50af8f081e1356d57f3e0f31fb31abe28530157147f92411fa
-MISC metadata.xml 737 BLAKE2B 891e84e0d4bef855f64e09d795bb57c8dbac9906529d311716047b2aabd08f1ec93a28d0f61652a5d7af21fae8ac8e920bca68492ddc79db6e3d0d02d091b2cf SHA512 f253f80583e79be7b0e03ec3515e2e1e48425fd7bb520422e0c2883fc2da07b7e1b5f83d6c7d4e6317a47b2179f7627b8975493b82e800241530aa2b42efd6a6
diff --git a/app-editors/tea/metadata.xml b/app-editors/tea/metadata.xml
deleted file mode 100644
index a3b87502efe6..000000000000
--- a/app-editors/tea/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<longdescription>
-		A very small Qt text editor. It has lots of extra features including syntax
-		highlighting and a built in file manager as well as a built in image viewer.
-		It can also read lots of 'other' filetypes.
-	</longdescription>
-	<use>
-		<flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
-		<flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
-		<flag name="qml">Enable support for plugins using QML</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-editors/tea/tea-44.1.1.ebuild b/app-editors/tea/tea-44.1.1.ebuild
deleted file mode 100644
index e2cc47fd239b..000000000000
--- a/app-editors/tea/tea-44.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="Small, lightweight Qt text editor"
-HOMEPAGE="https://tea.ourproject.org/"
-SRC_URI="https://tea.ourproject.org/dloads/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="aspell djvu hunspell pdf +qml"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	aspell? ( app-text/aspell )
-	djvu? ( app-text/djvu )
-	hunspell? ( app-text/hunspell:= )
-	pdf? ( app-text/poppler[qt5] )
-	qml? ( dev-qt/qtdeclarative:5 )
-"
-DEPEND="${RDEPEND}
-	hunspell? ( virtual/pkgconfig )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS-RU TODO )
-
-src_configure() {
-	eqmake5 src.pro \
-		PREFIX="/usr" \
-		$(use aspell || echo CONFIG+=noaspell) \
-		$(use djvu && echo CONFIG+=usedjvu) \
-		$(use hunspell || echo CONFIG+=nohunspell) \
-		$(use pdf && echo CONFIG+=usepoppler) \
-		$(use qml || echo CONFIG+=noqml)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	docinto html
-	dodoc manuals/*.html
-
-	insinto /usr/share/qt5/translations
-	doins translations/${PN}_*.qm
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/teco-1.00-r4 b/app-editors/teco-1.00-r4
new file mode 100644
index 000000000000..8664675e5628
--- /dev/null
+++ b/app-editors/teco-1.00-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
+DESCRIPTION=Classic TECO editor, Predecessor to EMACS
+EAPI=5
+HOMEPAGE=http://www.ibiblio.org/pub/linux/apps/editors/tty/ http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco
+IUSE=doc
+KEYWORDS=alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=freedist
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz doc? ( mirror://gentoo/tecolore.txt.gz mirror://gentoo/tech.txt.gz mirror://gentoo/teco.doc.gz mirror://gentoo/tecoprog.doc.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6028d318a98195c814e4d907b4488607
diff --git a/app-editors/teco/Manifest b/app-editors/teco/Manifest
deleted file mode 100644
index 1db9cb4dd135..000000000000
--- a/app-editors/teco/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX teco-double-free.diff 936 BLAKE2B ee7151518462ac20bb5cca7ed74970696dcac9d5dae245286e56f0b87e5d7350319d2394750f263ca033760f2c7c82f92bbf68643a6bbb6ba554dfc319ef1376 SHA512 da914d198a057138c43d3fc7f3bd0f2b9577287c0c37319c09e128bf76af771dbd23301c2630eb4f7884d2298672632cec382fe2bddd06e2a315872023b05583
-AUX teco-gcc4.patch 336 BLAKE2B 851886f3697c4e5a087acd459af69e2687ca403f1b0b3ff9b600e9ee786832cdc7a31235b38186bbc63a09c9a1f126beedceebd16f8feda35cc417faf2e6779f SHA512 8eb39de57df5f234c38d69c6b89c0422575113b9568336b8f726a2ae733c4af3e54c0e9da06d23c2ec34281fba7899df4a3af046d05d486a2c3d07eb7b55bf28
-AUX teco-warnings.patch 1206 BLAKE2B f9f8312c66e506d86cdd7544288965927895822eac3ad6f49dd0f1280ddc72f9d2cb2c6e4e7eca7c36c435677559e25bd4c9f6816a9e41816d23a39d64ee445b SHA512 7294ef66917eb549d9437327b32160317313d343c731423e34a07ed407e5595e7ac52d57c55bc1e5c6732f5ed0840533aa9c546ee32f4ea2bef54adf5a91b249
-DIST tech.txt.gz 1971 BLAKE2B 327f9b860a3550e5e56ec1524dbc7ccfec31a4a58646f5a191f0867bdd94b97ecdad694cd5205be2896cef013ef63a52fe91859fe00db17da02160ad3a00384c SHA512 8c74d813d7e1bcd2f911982a8b49fa8b97ff85475a4798ea23d9a25ef30ad7243cfc851525aea895eec1a2f69aad84b6cce890ee6a29763a63c1a6d1358a200f
-DIST teco.doc.gz 129896 BLAKE2B 0372d5a697f432e41b138de9a5faff8c1032d7843ece1d1b54c325852280f51ef76d0d891e8747270b0c364edcbd731bfa849bd692afffc09041212325d010a2 SHA512 ea294aaa0d54de5b58ef645fbaf5c9512f5a27fb2b49b1120b4a712d01c6482f01a53ac2dac7c8eabdf110823a4556563cde828fc7416479b9c23157282e76da
-DIST teco.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
-DIST tecolore.txt.gz 7039 BLAKE2B db19af3081c4c9129d8298709fe77bb8acaf1c0b19e87d4d313cf65a9426449d9fc864378c85712b5716bc6b535c36bc1b9371a212b43ff4cff6d3aca290146c SHA512 f8b66637dd140057331bb950b639f755b7d2a58c6d9feb5c89c062350f3213b40f4e955c586643312b4bcdcfd5ce67c621c8f7351e08a4303be35af967ce206e
-DIST tecoprog.doc.gz 15629 BLAKE2B c47ce219e6b7e98b4cd3332f78ea48bb9d98b7beadb0a11de0361ee680a014da4997e0657ad12052ebef02d1b3dbd234330be9f7c198b5645cc0dc6290aa01f6 SHA512 f49de461d6411345e9e72b51bf39bc1155acc07901b54d8fda94b99a4a573005ccffc475ef8aac3bfc0b8bd246dc0077399d4bcef70e8a5e753c45995df7ad55
-EBUILD teco-1.00-r4.ebuild 1700 BLAKE2B 850055702cfc33f0fd155562d5c6b3d126a830e78bef02461cdbb31480f44c7163302ada80271fec203c433d2c16ef0f37eb1aee78b83d59035e36488d918cae SHA512 53257dd5f8ce362efc3b2be0885135c58df3866f3c9275c0db086ed7d9d035c0de001cdcc6f5a316320681b481d36757fb67c984d0e95c51e328cf0c6683f304
-MISC metadata.xml 1356 BLAKE2B a433a260d80042f9a4e034f93e94793b8ae3e9725d44cf4369f5baf506d6dcf9be045d3a4ccbefa842004c8bccd629d55f947ef591ce37a662c4199d4f27f2ca SHA512 3e8680b16e6de3e239f453d13d4b0cb41545aace84af0e9cf8103c0f605cec29467bb0b5feebd592dbded84cd109360c42f63da69115870fb57c97f8137dfdc0
diff --git a/app-editors/teco/files/teco-double-free.diff b/app-editors/teco/files/teco-double-free.diff
deleted file mode 100644
index 5a62b23d90be..000000000000
--- a/app-editors/teco/files/teco-double-free.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- te_exec2.c	1993-11-12 21:12:47.000000000 +0000
-+++ te_exec2.c.new	2005-08-21 18:31:26.495907720 +0100
-@@ -197,7 +197,7 @@
- 		{
- 		if (eisw)       /* if ending a file execute, restore the previous "old command string" */
- 		    {
--		    fclose(eisw);               /* return the file descriptor */
-+		    fclose(eisw), eisw = NULL;     /* return the file descriptor */
- 		    dly_free_blist(cbuf.f);     /* return the command string used by the file (after execution done) */
- 		    cbuf.f = oldcstring.f;
- 		    cbuf.z = oldcstring.z;
-@@ -214,7 +214,7 @@
- 		oldcstring.z = cbuf.z;
- 		cbuf.f = NULL;              /* and make it inaccessible to "rdcmd" */
- 		}
--	    if (eisw) fclose(eisw);         /* if a command file had been open, close it */
-+	    if (eisw) fclose(eisw), eisw = NULL;  /* if a command file had been open, close it */
- 	    esp->val1 = (eisw = t_eisw) ? -1 : 0;
- 	    esp->flag1 = colonflag;
- 	    colonflag = 0;
diff --git a/app-editors/teco/files/teco-gcc4.patch b/app-editors/teco/files/teco-gcc4.patch
deleted file mode 100644
index fe4d8d3759b4..000000000000
--- a/app-editors/teco/files/teco-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- te_subs.c.orig	2007-03-18 19:58:40 +0100
-+++ te_subs.c	2007-03-18 19:58:57 +0100
-@@ -231,7 +231,7 @@
-     char c;
-     {
-     if (isdigit(c)) return(c - '0' + 1);
--    else if isalpha(c) return(mapch_l[c] - 'a' + 11);
-+    else if (isalpha(c)) return(mapch_l[c] - 'a' + 11);
-     else if (fors)
- 	{
- 	if (c == '_') return (SERBUF);
diff --git a/app-editors/teco/files/teco-warnings.patch b/app-editors/teco/files/teco-warnings.patch
deleted file mode 100644
index f8bbfbfff181..000000000000
--- a/app-editors/teco/files/teco-warnings.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Include stdlib.h for exit(3).
-Fix conflicting type for malloc(3).
-Avoid casting pointers from/to int.
-
---- teco-orig/te_defs.h
-+++ teco/te_defs.h
-@@ -6,6 +6,7 @@
- /* version for multiple buffers 04/19/89 11.25                              */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
- #include <setjmp.h>
- 
---- teco-orig/te_rdcmd.c
-+++ teco/te_rdcmd.c
-@@ -94,7 +94,8 @@
- 			qreg[i].f = cbuf.f;         /* put the old command string in its place */
- 			if (qreg[i].f) qreg[i].f->b = (struct buffcell *) &qreg[i];
- 			qreg[i].z = cbuf.z;
--			cbuf.f = (struct buffcell *) (cbuf.z = 0);      /* no old command string */
-+			cbuf.f = NULL;              /* no old command string */
-+			cbuf.z = 0;
- 			err = 0;                    /* no previous error */
- 			goto restart;
- 			}
---- teco-orig/te_utils.c
-+++ teco/te_utils.c
-@@ -13,7 +13,6 @@
- 
- struct buffcell *get_bcell()
-     {
--    char *malloc();
-     struct buffcell *p;
-     int i;
- 
---- teco-orig/te_window.c
-+++ teco/te_window.c
-@@ -1051,7 +1051,7 @@
- 	pp->c = loc % CELLSIZE;
- 	pp->dot = loc;
- 	}
--    return( (int) pb0->f);
-+    return(pb0->f != NULL);
-     }
- 
- /* routine to move N lines (back, forward, or 0)                */
diff --git a/app-editors/teco/metadata.xml b/app-editors/teco/metadata.xml
deleted file mode 100644
index df81ef45c27c..000000000000
--- a/app-editors/teco/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>ulm@gentoo.org</email>
-  <name>Ulrich Müller</name>
-</maintainer>
-<longdescription lang="en">
-  TECO /tee'koh/ /n.,v. obs./ 1. [originally an acronym for `[paper]
-  Tape Editor and COrrector'; later, `Text Editor and COrrector'] /n./
-  A text editor developed at MIT and modified by just about everybody.
-  With all the dialects included, TECO may have been the most prolific
-  editor in use before EMACS, to which it was directly ancestral.
-  Noted for its powerful programming-language-like features and its
-  unspeakably hairy syntax. It is literally the case that every string
-  of characters is a valid TECO program (though probably not a useful
-  one); one common game used to be mentally working out what the TECO
-  commands corresponding to human names did.
-
-  In mid-1991, TECO is pretty much one with the dust of history,
-  having been replaced in the affections of hackerdom by EMACS.
-  Descendants of an early (and somewhat lobotomized) version adopted
-  by DEC can still be found lurking on VMS and a couple of crufty
-  PDP-11 operating systems, however, and ports of the more advanced
-  MIT versions remain the focus of some antiquarian interest.
-</longdescription>
-</pkgmetadata>
diff --git a/app-editors/teco/teco-1.00-r4.ebuild b/app-editors/teco/teco-1.00-r4.ebuild
deleted file mode 100644
index cf8e0ec22eb5..000000000000
--- a/app-editors/teco/teco-1.00-r4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic readme.gentoo
-
-DESCRIPTION="Classic TECO editor, Predecessor to EMACS"
-HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/editors/tty/ http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco"
-SRC_URI="http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz
-	doc? ( mirror://gentoo/tecolore.txt.gz
-		mirror://gentoo/tech.txt.gz
-		mirror://gentoo/teco.doc.gz
-		mirror://gentoo/tecoprog.doc.gz )"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="sys-libs/ncurses:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack teco.tar.gz
-	if use doc; then
-		mkdir doc
-		cd doc || die
-		unpack tecolore.txt.gz tech.txt.gz teco.doc.gz tecoprog.doc.gz
-	fi
-}
-
-src_prepare() {
-	local pkg_config=$("$(tc-getPKG_CONFIG)" --libs ncurses)
-	sed -i -e "s:\$(CC):& \$(LDFLAGS):;s:-ltermcap:${pkg_config}:" \
-		Makefile || die
-	# bug 103257
-	epatch "${FILESDIR}"/${PN}-double-free.diff
-	epatch "${FILESDIR}"/${PN}-gcc4.patch
-	epatch "${FILESDIR}"/${PN}-warnings.patch
-}
-
-src_compile() {
-	append-flags -ansi
-	append-cppflags -D_POSIX_SOURCE
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin te
-	doman te.1
-	dodoc sample.tecorc sample.tecorc2 READ.ME MANIFEST
-	if use doc; then
-		cd doc
-		dodoc tecolore.txt tech.txt teco.doc tecoprog.doc
-	fi
-
-	DOC_CONTENTS="The TECO binary is called te.
-		\nSample configurations	and documentation are available
-		in /usr/share/doc/${PF}/."
-	readme.gentoo_create_doc
-}
diff --git a/app-editors/ted-2.23 b/app-editors/ted-2.23
new file mode 100644
index 000000000000..c6f5cff643bf
--- /dev/null
+++ b/app-editors/ted-2.23
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=x11-libs/gtk+:2 media-libs/tiff:= virtual/jpeg:= media-libs/libpng:= x11-libs/libXft x11-libs/libXpm virtual/pkgconfig
+DESCRIPTION=X-based rich text editor
+EAPI=5
+HOMEPAGE=https://www.nllgg.nl/Ted/
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 media-libs/tiff:= virtual/jpeg:= media-libs/libpng:= x11-libs/libXft x11-libs/libXpm
+SLOT=0
+SRC_URI=ftp://ftp.nluug.nl/pub/editors/ted/ted-2.23.src.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=371add749fef968ed832c875fe3dae78
diff --git a/app-editors/ted/Manifest b/app-editors/ted/Manifest
deleted file mode 100644
index ac65d98a718b..000000000000
--- a/app-editors/ted/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ted-2.23-freetype261.patch 273 BLAKE2B 3a9b52da5de4b8d991298c438a5589b1c70e70b0733d561f0a0c259b7eb1cd39b418d6f472bfb24534b24f19bfe83623827c16a371dece16dd33171369006da7 SHA512 f8523865ad47a552d000ee14380c40ffe22cdd5287cb6fd6f79b7afe4a6ae4742aaa999c9c4d2d79e00b538f5b83106ebeb24f1aa25cabb656418759db9c0921
-AUX ted-2.23-make.patch 418 BLAKE2B 2bc3a66a99f00caa793c81b4f3beb8935deff183cc0ddba613348010547e2b715eae169309acfc286b5690550fc892b9f1ff99bcdad673779b2c23b192da22db SHA512 a1dc77b4788a71445cb30db010d1413e11c06861c692137747d2d02d1cd16b07fb3dd05e702fd37aad600432a985c86d785465a2fe6ddbe6f506b16cafb80b01
-DIST ted-2.23.src.tar.gz 4672208 BLAKE2B ca5f0e0a6a1d00a50da6986455faedbb20cc1246737233c8a3a161b4f653c53b1647c7fb41c774082116ed3e4a0736f8dd35504a54a92dd8e6a6e9124e6e9850 SHA512 c6541e5a07545a08b30cb9b33429d9a7675f9252df32ccca5cdb4f2ff09978085d28d015a42922baf8c95db1ea6379a9d1088541aafd9ce45b8870212496849f
-EBUILD ted-2.23.ebuild 1587 BLAKE2B 737fbbda5830145238cc1afa8b3b513f39851ad51056098b383d6fd6d3007d058b296ecc3aa188f0120a62480b773499f22600aacfb47321aba498b9a764d946 SHA512 8e0375a58299211f86b4dfd0140b315337c1d83693ad7154fd2d79a629357e2a8ccb757ae541d1cbb5db39a6e6a35a48068a85d6737ec649a36ebbe0662864e8
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/ted/files/ted-2.23-freetype261.patch b/app-editors/ted/files/ted-2.23-freetype261.patch
deleted file mode 100644
index 7e185b367194..000000000000
--- a/app-editors/ted/files/ted-2.23-freetype261.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Ted-2.23/appFrame/appFontConfig.c
-+++ Ted-2.23/appFrame/appFontConfig.c
-@@ -889,7 +889,7 @@
- 
-     static const n2s xftn2s[]=
-     {
--#   include <freetype/fterrdef.h>
-+#   include FT_ERROR_DEFINITIONS_H
-     };
- 
-     for ( i= 0; i < sizeof(xftn2s)/sizeof(n2s); i++ )
diff --git a/app-editors/ted/files/ted-2.23-make.patch b/app-editors/ted/files/ted-2.23-make.patch
deleted file mode 100644
index f97093b47648..000000000000
--- a/app-editors/ted/files/ted-2.23-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2013-04-01 13:24:45.854051804 +0400
-+++ Makefile	2013-04-01 13:25:02.618052336 +0400
-@@ -246,7 +246,7 @@
- 	: To install Ted, you can now run 'make install' AS ROOT
- 
- package.shared: compile.shared tedPackage/makefile
--	cd tedPackage && make package.shared
-+	cd tedPackage && $(MAKE) package.shared
- 	:
- 	: Dynamically linked package ready.
- 	: To install Ted, you can now run 'make install' AS ROOT
diff --git a/app-editors/ted/metadata.xml b/app-editors/ted/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-editors/ted/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-editors/ted/ted-2.23.ebuild b/app-editors/ted/ted-2.23.ebuild
deleted file mode 100644
index 9d89f2ecb765..000000000000
--- a/app-editors/ted/ted-2.23.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs xdg-utils
-
-DESCRIPTION="X-based rich text editor"
-HOMEPAGE="https://www.nllgg.nl/Ted/"
-SRC_URI="ftp://ftp.nluug.nl/pub/editors/ted/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/tiff:=
-	virtual/jpeg:=
-	media-libs/libpng:=
-	x11-libs/libXft
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/Ted-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch \
-		"${FILESDIR}"/${P}-freetype261.patch
-
-	sed -i -e 's|/Ted/|/share/Ted/|' \
-		"${S}"/appFrame/appFrameConfig.h.in \
-		"${S}"/Ted/tedConfig.h.in || die
-
-	# bug #461256
-	find . -name makefile.in -exec sed -i -e '/ar r/s/ar/$(AR)/' {} \; || die
-
-	# force to build dynamic binary, do not strip it
-	sed -i \
-		-e 's/.static//g' \
-		-e '/strip/d' \
-		tedPackage/makefile.in || die 'sed failed on tedPackage/makefile.in'
-
-	# Fix build with freetype-2.5
-	sed -i "s|^\(#[ \t]*include[ \t]*<\)freetype/|\1|" appFrame/appFontConfig.c || die
-
-	mkdir lib || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local dir
-	for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage; do
-		cd "${S}"/${dir}
-		econf --cache-file=../config.cache || die "configure in ${dir} failed"
-	done
-}
-
-src_compile() {
-	emake package.shared
-}
-
-src_install() {
-	default
-	dosym ../share/Ted/examples/rtf2pdf.sh /usr/bin/rtf2pdf.sh
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/uemacs-pk-4.0.15_p20141208 b/app-editors/uemacs-pk-4.0.15_p20141208
new file mode 100644
index 000000000000..1e405e1e146c
--- /dev/null
+++ b/app-editors/uemacs-pk-4.0.15_p20141208
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
+DESCRIPTION=uEmacs/PK is an enhanced version of MicroEMACS
+EAPI=5
+HOMEPAGE=https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK
+KEYWORDS=amd64 x86 ~x86-fbsd
+LICENSE=free-noncomm
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/uemacs-4.0.15_p20141208.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bac1a68554588066f4df56dea36dd180
diff --git a/app-editors/uemacs-pk-4.0.15_p20180117 b/app-editors/uemacs-pk-4.0.15_p20180117
new file mode 100644
index 000000000000..5e7e8388d745
--- /dev/null
+++ b/app-editors/uemacs-pk-4.0.15_p20180117
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
+DESCRIPTION=uEmacs/PK is an enhanced version of MicroEMACS
+EAPI=6
+HOMEPAGE=https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK
+KEYWORDS=amd64 x86 ~x86-fbsd
+LICENSE=free-noncomm
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/uemacs-4.0.15_p20180117.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f56e395aa1efe5f7d357bb962ea05947
diff --git a/app-editors/uemacs-pk/Manifest b/app-editors/uemacs-pk/Manifest
deleted file mode 100644
index 604ab48e233e..000000000000
--- a/app-editors/uemacs-pk/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-EBUILD uemacs-pk-4.0.15_p20180117.ebuild 937 BLAKE2B f1ff9da5a0484ab9e5fca3573859766afc30cedf46d35ab77dff19c8850072c4e591145dec35f9b790dd0c8ccaa1107712ac6be1ad25c1c1ddd2f48959f21283 SHA512 ce04f47cf3d809ff8ae2b92514d7c032be5630165c5d000cbebee9ff0fae2588ab881c0d3009941752a8187c690d41b6d08dcfdc9e49cfe10f030171432626f2
-MISC metadata.xml 1038 BLAKE2B 78d5d45edaf021f6be2ecb46cfc2c8538a14f7589d16a1891481633e23c272f8d76905b27535baedb4af0be51b7e1e9a2ea1bc286dd79c6c06d7b6658a856df8 SHA512 303232f4886511f0731e699a8c29a1925f506a037cebc60669c02aa060b2d555bdb2378919f5d66e61859e18a3b2ede21204edc5fce37a9220ab9dcf2f23c1b0
diff --git a/app-editors/uemacs-pk/files/uemacs-pk-4.0.15_p20110825-gentoo.patch b/app-editors/uemacs-pk/files/uemacs-pk-4.0.15_p20110825-gentoo.patch
deleted file mode 100644
index 8ec03062f922..000000000000
--- a/app-editors/uemacs-pk/files/uemacs-pk-4.0.15_p20110825-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- uemacs-orig/epath.h
-+++ uemacs/epath.h
-@@ -25,10 +25,8 @@
- #if	V7 | BSD | USG
- {
- 	".emacsrc", "emacs.hlp",
--#if	PKCODE
--	    "/usr/global/lib/", "/usr/local/bin/", "/usr/local/lib/",
--#endif
--"/usr/local/", "/usr/lib/", ""};
-+	"/etc/uemacs-pk/", "/usr/share/uemacs-pk/", ""
-+};
- #endif
- 
- #if	VMS
diff --git a/app-editors/uemacs-pk/metadata.xml b/app-editors/uemacs-pk/metadata.xml
deleted file mode 100644
index 4f52d2d2e249..000000000000
--- a/app-editors/uemacs-pk/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-  WHAT IS uEmacs/PK?
-
-  uEmacs/PK 4.0 is an enhanced version of MicroEMACS 3.9e. Enhancements have
-  been incorporated by Petri H. Kutvonen, University of Helsinki, Finland,
-  kutvonen@cs.Helsinki.FI.
-
-  WHY IS IT BASED ON AN OLD VERSION OF MicroEMACS?
-
-  In my opinion 3.9e was the best of all MicroEMACSes. Creeping featurism,
-  growing size, and reduced portability made versions 3.10 and 3.11 less
-  attractive. MicroEMACS 3.9e was one of the few editors that were truly
-  portable between different flavours of UNIX, PC/MS-DOS, and VAX/VMS. It was
-  pretty robust - although not flawless. uEmacs/PK 4.0 includes numerous bug
-  fixes, adds some new functionality and comfort but does not sacrifice the
-  best things (small size and portability).
-</longdescription>
-</pkgmetadata>
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild
deleted file mode 100644
index fb2d7f37ef7a..000000000000
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="uEmacs/PK is an enhanced version of MicroEMACS"
-HOMEPAGE="https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary
-	ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK"
-# snapshot from git repo
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-
-RDEPEND="sys-libs/ncurses:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/uemacs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.15_p20110825-gentoo.patch
-}
-
-src_compile() {
-	emake V=1 \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_install() {
-	dobin em
-	insinto /usr/share/${PN}
-	doins emacs.hlp
-	newins emacs.rc .emacsrc
-	dodoc README readme.39e emacs.ps UTF-8-demo.txt
-}
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
deleted file mode 100644
index 33a4432c46d9..000000000000
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="uEmacs/PK is an enhanced version of MicroEMACS"
-HOMEPAGE="https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary
-	ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK"
-# snapshot from git repo
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/uemacs"
-PATCHES=("${FILESDIR}"/${PN}-4.0.15_p20110825-gentoo.patch)
-
-src_compile() {
-	emake V=1 \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_install() {
-	dobin em
-	insinto /usr/share/${PN}
-	doins emacs.hlp
-	newins emacs.rc .emacsrc
-	dodoc README readme.39e emacs.ps UTF-8-demo.txt
-}
diff --git a/app-editors/vile-9.8r b/app-editors/vile-9.8r
new file mode 100644
index 000000000000..8b3fb9f40297
--- /dev/null
+++ b/app-editors/vile-9.8r
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=sys-libs/ncurses-5.2:0= perl? ( dev-lang/perl ) sys-devel/flex app-eselect/eselect-vi
+DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
+EAPI=6
+HOMEPAGE=https://invisible-island.net/vile/
+IUSE=perl
+KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2:0= perl? ( dev-lang/perl )
+SLOT=0
+SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8r.tgz
+_md5_=aed5abcf660d852682da06a91fdc3b87
diff --git a/app-editors/vile-9.8s b/app-editors/vile-9.8s
new file mode 100644
index 000000000000..59ed6ef56f05
--- /dev/null
+++ b/app-editors/vile-9.8s
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=sys-libs/ncurses-5.2:0= perl? ( dev-lang/perl ) sys-devel/flex app-eselect/eselect-vi
+DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
+EAPI=6
+HOMEPAGE=https://invisible-island.net/vile/
+IUSE=perl
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2:0= perl? ( dev-lang/perl )
+SLOT=0
+SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8s.tgz
+_md5_=f4ba1117614da8d15896b0dc1e57cd15
diff --git a/app-editors/vile/Manifest b/app-editors/vile/Manifest
deleted file mode 100644
index 37d9d6afd5bf..000000000000
--- a/app-editors/vile/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vile-9.8r.tgz 2322132 BLAKE2B ec477afbf927b527a484dd6ec2cf596a3f97ee1a523e7254aaaf88b98c1b353c82358a0e80408bcbe270ec6eb7b958fb8e9d517801705cf8bbcb4e58bea94026 SHA512 4f610c8c8f491d8d630d042166cbbdc12b89513d40d14dd70526d6cb5d7ebf603a99b19ce2fc42f7143d674e6d5155fcd305da297e03e46caa862ff40e2bbdd4
-DIST vile-9.8s.tgz 2328441 BLAKE2B 35b5cbec671347eb81503b70a2061395e3c8c904cd304acc83feda2baed71ede7936143ea554bb3bba0cda8056b1a6d76c5ee6473b244a8a05d113a8e613ead0 SHA512 06bfa64e5908aa31351068c5509e6fcc98bde202b814aa6abe5c449f841378c897df1fdbb8b20bdb5e71578238e1e9d11dac08e66159317276a01a9ac96ae9ab
-EBUILD vile-9.8r.ebuild 929 BLAKE2B b38f6c50355c583c94402b177b080717b5be247b7ee1529d2f9061710980dc2c15393d38761757d2b172a7b8594ce6b29270249c6dbc896ff151ea705cf1aefd SHA512 1f7c1cf24460343f03aec0586179d2de838b8157586cb435e290b876a5817ba763a81a0148e76206351d40c08e5d1aebd5b71a5b223bb94bdc87ac2fabf47fd7
-EBUILD vile-9.8s.ebuild 935 BLAKE2B 2e39d45ac596d5ed15731099f3563959757ac4c096e8a20648899a7259198eef6e10e8e28207e60c61a42039a8d1e549981decee3d97d8b1ed3cabb0c02c9ae9 SHA512 59698fe545f9a40a6718f755b84b15d527853a34835279ff839ad767543aa8ae0a843b64f6d6f7549631fe70b81df32ad047b38b1074733d67ef0bfff89018d2
-MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-editors/vile/metadata.xml b/app-editors/vile/metadata.xml
deleted file mode 100644
index 5c000c763084..000000000000
--- a/app-editors/vile/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vim@gentoo.org</email>
-		<name>Gentoo Vim Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-editors/vile/vile-9.8r.ebuild b/app-editors/vile/vile-9.8r.ebuild
deleted file mode 100644
index 2d322f16d0ad..000000000000
--- a/app-editors/vile/vile-9.8r.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="https://invisible-island.net/vile/"
-SRC_URI="ftp://invisible-island.net/vile/current/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="perl"
-
-RDEPEND=">=sys-libs/ncurses-5.2:0=
-	perl? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	app-eselect/eselect-vi"
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		$(use_with perl )
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_OPT_S="" install
-	dodoc CHANGES* README doc/*.doc
-	docinto html
-	dodoc doc/*.html
-}
-
-pkg_postinst() {
-	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
diff --git a/app-editors/vile/vile-9.8s.ebuild b/app-editors/vile/vile-9.8s.ebuild
deleted file mode 100644
index 8463b992ab33..000000000000
--- a/app-editors/vile/vile-9.8s.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="https://invisible-island.net/vile/"
-SRC_URI="ftp://invisible-island.net/vile/current/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="perl"
-
-RDEPEND=">=sys-libs/ncurses-5.2:0=
-	perl? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	app-eselect/eselect-vi"
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		$(use_with perl )
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_OPT_S="" install
-	dodoc CHANGES* README doc/*.doc
-	docinto html
-	dodoc doc/*.html
-}
-
-pkg_postinst() {
-	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
diff --git a/app-editors/vim-8.0.1298 b/app-editors/vim-8.0.1298
new file mode 100644
index 000000000000..4456de9e5682
--- /dev/null
+++ b/app-editors/vim-8.0.1298
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1298 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1298 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1298.tar.gz -> vim-8.0.1298.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=e85bf788be58c38fe55c688482e2c7d9
diff --git a/app-editors/vim-8.0.1428 b/app-editors/vim-8.0.1428
new file mode 100644
index 000000000000..b84cb59cfc65
--- /dev/null
+++ b/app-editors/vim-8.0.1428
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1428 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1428 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1428.tar.gz -> vim-8.0.1428.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=0fa9515434cb324136229e0e2ab0ad3d
diff --git a/app-editors/vim-8.0.1645 b/app-editors/vim-8.0.1645
new file mode 100644
index 000000000000..0a8750136d36
--- /dev/null
+++ b/app-editors/vim-8.0.1645
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1645 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1645 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1645.tar.gz -> vim-8.0.1645.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=4e7218ef57ce47be2f5f74980b9c2c11
diff --git a/app-editors/vim-8.0.1699 b/app-editors/vim-8.0.1699
new file mode 100644
index 000000000000..d62f6e02848b
--- /dev/null
+++ b/app-editors/vim-8.0.1699
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1699 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1699 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1699.tar.gz -> vim-8.0.1699.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=afed47f5984834953221e33d99627e58
diff --git a/app-editors/vim-8.1.0034 b/app-editors/vim-8.1.0034
new file mode 100644
index 000000000000..ff75750202bd
--- /dev/null
+++ b/app-editors/vim-8.1.0034
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.1.0034 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.1.0034 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.1.0034.tar.gz -> vim-8.1.0034.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=f8ed57a036b344f607abf197a4c1d51d
diff --git a/app-editors/vim-9999 b/app-editors/vim-9999
new file mode 100644
index 000000000000..6a30f7cd069b
--- /dev/null
+++ b/app-editors/vim-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=afed47f5984834953221e33d99627e58
diff --git a/app-editors/vim-core-8.0.1298 b/app-editors/vim-core-8.0.1298
new file mode 100644
index 000000000000..b885fa3f3301
--- /dev/null
+++ b/app-editors/vim-core-8.0.1298
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-devel/autoconf
+DESCRIPTION=vim and gvim shared files
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=nls acl minimal
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1298.tar.gz -> vim-8.0.1298.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=940ab938f93e34a02ee63c39e41795e8
diff --git a/app-editors/vim-core-8.0.1428 b/app-editors/vim-core-8.0.1428
new file mode 100644
index 000000000000..c278033d8c46
--- /dev/null
+++ b/app-editors/vim-core-8.0.1428
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-devel/autoconf
+DESCRIPTION=vim and gvim shared files
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=nls acl minimal
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1428.tar.gz -> vim-8.0.1428.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=270757509200029d6bc809620769bf83
diff --git a/app-editors/vim-core-8.0.1645 b/app-editors/vim-core-8.0.1645
new file mode 100644
index 000000000000..ac4eb3732567
--- /dev/null
+++ b/app-editors/vim-core-8.0.1645
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-devel/autoconf
+DESCRIPTION=vim and gvim shared files
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=nls acl minimal
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1645.tar.gz -> vim-8.0.1645.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=270757509200029d6bc809620769bf83
diff --git a/app-editors/vim-core-8.0.1699 b/app-editors/vim-core-8.0.1699
new file mode 100644
index 000000000000..710c0106950c
--- /dev/null
+++ b/app-editors/vim-core-8.0.1699
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-devel/autoconf
+DESCRIPTION=vim and gvim shared files
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=nls acl minimal
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1699.tar.gz -> vim-8.0.1699.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=270757509200029d6bc809620769bf83
diff --git a/app-editors/vim-core-8.1.0034 b/app-editors/vim-core-8.1.0034
new file mode 100644
index 000000000000..63df47fc4468
--- /dev/null
+++ b/app-editors/vim-core-8.1.0034
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-devel/autoconf
+DESCRIPTION=vim and gvim shared files
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=nls acl minimal
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.1.0034.tar.gz -> vim-8.1.0034.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=7d531716359d739145efb6f2ed2fb600
diff --git a/app-editors/vim-core-9999 b/app-editors/vim-core-9999
new file mode 100644
index 000000000000..4ba87aa5e80b
--- /dev/null
+++ b/app-editors/vim-core-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=sys-devel/autoconf >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=vim and gvim shared files
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=nls acl minimal
+LICENSE=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+SLOT=0
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=7d531716359d739145efb6f2ed2fb600
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
deleted file mode 100644
index 85ec54463e23..000000000000
--- a/app-editors/vim-core/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX vimrc-r5 7337 BLAKE2B 3f28db016b3956b4c5e2833ff4440417d3ccdc446618a776119513549c0b9831d0eb4bfb9abf992e436508b95f0586f2b4fc30ddba7f2b595574a5c2ccc257c8 SHA512 b9cc07386b97e6042166b11cd6270d4c3134eb816ff396ad544cfb14b349d79b32b5a07b5995580aea607b7936eef0dfd5ab1dc7e158dea26afc0c944fae8e3c
-AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e29513da8caa6c28c27e44131b2873258e3ff5a0ab232d66f75a8f051ccf7a4d940b3b0102e6967dd SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c
-DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
-DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
-DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
-DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085
-DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7
-DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19
-EBUILD vim-core-8.0.1298.ebuild 6637 BLAKE2B 929e33024cfd7e70410c4cd4602b6b6360b6bb5fc0cb55de5a037952a900830c5350e86ff14f136c1e79c16c89cb792f8d20f0dec8830de1ee60ebe6b47ae744 SHA512 93e032f7cf32131090f25850e44ed5c519d7a586133086102c8ab8e5163dbf49d196817129ab3ff8ac103f1de85a603b0823f6ebe970ec1402fbe5ba7f414350
-EBUILD vim-core-8.0.1428.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
-EBUILD vim-core-8.0.1645.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
-EBUILD vim-core-8.0.1699.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
-EBUILD vim-core-8.1.0034.ebuild 6648 BLAKE2B 2ac8f5d559cd74e720dacacc8b609d1646882f8efa98fc8320d7c0296095718ca3ed9846cbf04212ee99fa36dd8de610ffa0a757cb36d9f5c879653d01fb42d4 SHA512 02dfb22e3bc4044270d1828b6df5f772b42fd06f8af0ddaac07ca34068651da5718cb13e2c97322d7ad9f2099e34bae7f5a18ca50a1c79a9cc577d6a3eb835de
-EBUILD vim-core-9999.ebuild 6648 BLAKE2B 2ac8f5d559cd74e720dacacc8b609d1646882f8efa98fc8320d7c0296095718ca3ed9846cbf04212ee99fa36dd8de610ffa0a757cb36d9f5c879653d01fb42d4 SHA512 02dfb22e3bc4044270d1828b6df5f772b42fd06f8af0ddaac07ca34068651da5718cb13e2c97322d7ad9f2099e34bae7f5a18ca50a1c79a9cc577d6a3eb835de
-MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
diff --git a/app-editors/vim-core/files/vimrc-r5 b/app-editors/vim-core/files/vimrc-r5
deleted file mode 100644
index 2409822e628c..000000000000
--- a/app-editors/vim-core/files/vimrc-r5
+++ /dev/null
@@ -1,214 +0,0 @@
-scriptencoding utf-8
-" ^^ Please leave the above line at the start of the file.
-
-" Default configuration file for Vim
-
-" Written by Aron Griffis <agriffis@gentoo.org>
-" Modified by Ryan Phillips <rphillips@gentoo.org>
-" Modified some more by Ciaran McCreesh <ciaranm@gentoo.org>
-" Added Redhat's vimrc info by Seemant Kulleen <seemant@gentoo.org>
-
-" You can override any of these settings on a global basis via the
-" "/etc/vim/vimrc.local" file, and on a per-user basis via "~/.vimrc". You may
-" need to create these.
-
-" {{{ General settings
-" The following are some sensible defaults for Vim for most users.
-" We attempt to change as little as possible from Vim's defaults,
-" deviating only where it makes sense
-set nocompatible        " Use Vim defaults (much better!)
-set bs=2                " Allow backspacing over everything in insert mode
-set ai                  " Always set auto-indenting on
-set history=50          " keep 50 lines of command history
-set ruler               " Show the cursor position all the time
-
-set viminfo='20,\"500   " Keep a .viminfo file.
-
-" Don't use Ex mode, use Q for formatting
-map Q gq
-
-" When doing tab completion, give the following files lower priority. You may
-" wish to set 'wildignore' to completely ignore files, and 'wildmenu' to enable
-" enhanced tab completion. These can be done in the user vimrc file.
-set suffixes+=.info,.aux,.log,.dvi,.bbl,.out,.o,.lo
-
-" When displaying line numbers, don't use an annoyingly wide number column. This
-" doesn't enable line numbers -- :set number will do that. The value given is a
-" minimum width to use for the number column, not a fixed size.
-if v:version >= 700
-  set numberwidth=3
-endif
-" }}}
-
-" {{{ Modeline settings
-" We don't allow modelines by default. See bug #14088 and bug #73715.
-" If you're not concerned about these, you can enable them on a per-user
-" basis by adding "set modeline" to your ~/.vimrc file.
-set nomodeline
-" }}}
-
-" {{{ Locale settings
-" Try to come up with some nice sane GUI fonts. Also try to set a sensible
-" value for fileencodings based upon locale. These can all be overridden in
-" the user vimrc file.
-if v:lang =~? "^ko"
-  set fileencodings=euc-kr
-  set guifontset=-*-*-medium-r-normal--16-*-*-*-*-*-*-*
-elseif v:lang =~? "^ja_JP"
-  set fileencodings=euc-jp
-  set guifontset=-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*
-elseif v:lang =~? "^zh_TW"
-  set fileencodings=big5
-  set guifontset=-sony-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-1,-taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0
-elseif v:lang =~? "^zh_CN"
-  set fileencodings=gb2312
-  set guifontset=*-r-*
-endif
-
-" If we have a BOM, always honour that rather than trying to guess.
-if &fileencodings !~? "ucs-bom"
-  set fileencodings^=ucs-bom
-endif
-
-" Always check for UTF-8 when trying to determine encodings.
-if &fileencodings !~? "utf-8"
-  " If we have to add this, the default encoding is not Unicode.
-  " We use this fact later to revert to the default encoding in plaintext/empty
-  " files.
-  let g:added_fenc_utf8 = 1
-  set fileencodings+=utf-8
-endif
-
-" Make sure we have a sane fallback for encoding detection
-if &fileencodings !~? "default"
-  set fileencodings+=default
-endif
-" }}}
-
-" {{{ Syntax highlighting settings
-" Switch syntax highlighting on, when the terminal has colors
-" Also switch on highlighting the last used search pattern.
-if &t_Co > 2 || has("gui_running")
-  syntax on
-  set hlsearch
-endif
-" }}}
-
-" {{{ Terminal fixes
-if &term ==? "xterm"
-  set t_Sb=^[4%dm
-  set t_Sf=^[3%dm
-  set ttymouse=xterm2
-endif
-
-if &term ==? "gnome" && has("eval")
-  " Set useful keys that vim doesn't discover via termcap but are in the
-  " builtin xterm termcap. See bug #122562. We use exec to avoid having to
-  " include raw escapes in the file.
-  exec "set <C-Left>=\eO5D"
-  exec "set <C-Right>=\eO5C"
-endif
-" }}}
-
-" {{{ Filetype plugin settings
-" Enable plugin-provided filetype settings, but only if the ftplugin
-" directory exists (which it won't on livecds, for example).
-if isdirectory(expand("$VIMRUNTIME/ftplugin"))
-  filetype plugin on
-
-  " Uncomment the next line (or copy to your ~/.vimrc) for plugin-provided
-  " indent settings. Some people don't like these, so we won't turn them on by
-  " default.
-  " filetype indent on
-endif
-" }}}
-
-" {{{ Fix &shell, see bug #101665.
-if "" == &shell
-  if executable("@GENTOO_PORTAGE_EPREFIX@/bin/bash")
-    set shell=@GENTOO_PORTAGE_EPREFIX@/bin/bash
-  elseif executable("@GENTOO_PORTAGE_EPREFIX@/bin/sh")
-    set shell=@GENTOO_PORTAGE_EPREFIX@/bin/sh
-  endif
-endif
-"}}}
-
-" {{{ Our default /bin/sh is bash, not ksh, so syntax highlighting for .sh
-" files should default to bash. See :help sh-syntax and bug #101819.
-if has("eval")
-  let is_bash=1
-endif
-" }}}
-
-" {{{ Autocommands
-if has("autocmd")
-
-augroup gentoo
-  au!
-
-  " Gentoo-specific settings for ebuilds.  These are the federally-mandated
-  " required tab settings.  See the following for more information:
-  " http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml
-  " Note that the rules below are very minimal and don't cover everything.
-  " Better to emerge app-vim/gentoo-syntax, which provides full syntax,
-  " filetype and indent settings for all things Gentoo.
-  au BufRead,BufNewFile *.e{build,class} let is_bash=1|setfiletype sh
-  au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab
-
-  " In text files, limit the width of text to 78 characters, but be careful
-  " that we don't override the user's setting.
-  autocmd BufNewFile,BufRead *.txt
-        \ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") |
-        \     setlocal textwidth=78 |
-        \ endif
-
-  " When editing a file, always jump to the last cursor position
-  autocmd BufReadPost *
-        \ if ! exists("g:leave_my_cursor_position_alone") |
-        \     if line("'\"") > 0 && line ("'\"") <= line("$") |
-        \         exe "normal! g'\"" |
-        \     endif |
-        \ endif
-
-  " When editing a crontab file, set backupcopy to yes rather than auto. See
-  " :help crontab and bug #53437.
-  autocmd FileType crontab set backupcopy=yes
-
-  " If we previously detected that the default encoding is not UTF-8
-  " (g:added_fenc_utf8), assume that a file with only ASCII characters (or no
-  " characters at all) isn't a Unicode file, but is in the default encoding.
-  " Except of course if a byte-order mark is in effect.
-  autocmd BufReadPost *
-        \ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" && 
-        \    ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
-        \       set fileencoding= |
-        \ endif
-
-augroup END
-
-endif " has("autocmd")
-" }}}
-
-" We don't want VIM to load their own built-in defaults, preferring ours here
-" instead:
-let g:skip_defaults_vim = 1
-
-" Enable Omni completion when opening a file only if a specific plugin does
-" not already exist for that filetype. This allows Omni completion
-" (Ctrl-x/Ctrl-o) to work with any programming language if and only if a syntax
-" file exists for the said language.
-if exists("+omnifunc")
-   autocmd Filetype *
-	      \	if &omnifunc == "" |
-	      \		setlocal omnifunc=syntaxcomplete#Complete |
-	      \	endif
-endif
-
-" {{{ vimrc.local
-if filereadable("@GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local")
-  source @GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local
-endif
-" }}}
-
-" vim: set fenc=utf-8 tw=80 sw=2 sts=2 et foldmethod=marker :
-
diff --git a/app-editors/vim-core/files/xxd-completion b/app-editors/vim-core/files/xxd-completion
deleted file mode 100644
index 174a4093f39f..000000000000
--- a/app-editors/vim-core/files/xxd-completion
+++ /dev/null
@@ -1,25 +0,0 @@
-# Author: Ciaran McCreesh <ciaranm@gentoo.org>
-#
-# completion for xxd
-
-_xxd()
-{
-    local cur prev cmd args
-
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-    cmd=${COMP_WORDS[0]}
-
-    if [[ "${cur}" == -* ]] ; then
-        args='-a -b -c -E -g -h -i -l -ps -r -s -u -v'
-        COMPREPLY=( $( compgen -W "${args}" -- $cur ) )
-    else
-        _filedir
-    fi
-}
-
-complete -F _xxd xxd
-
-# vim: set ft=sh sw=4 et sts=4 :
-
diff --git a/app-editors/vim-core/metadata.xml b/app-editors/vim-core/metadata.xml
deleted file mode 100644
index ef998248ce9d..000000000000
--- a/app-editors/vim-core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vim@gentoo.org</email>
-		<name>Gentoo Vim Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">vim/vim</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/vim-core/vim-core-8.0.1298.ebuild b/app-editors/vim-core/vim-core-8.0.1298.ebuild
deleted file mode 100644
index dfe364e6cab2..000000000000
--- a/app-editors/vim-core/vim-core-8.0.1298.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
diff --git a/app-editors/vim-core/vim-core-8.0.1428.ebuild b/app-editors/vim-core/vim-core-8.0.1428.ebuild
deleted file mode 100644
index 004a0a1c69e6..000000000000
--- a/app-editors/vim-core/vim-core-8.0.1428.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
diff --git a/app-editors/vim-core/vim-core-8.0.1645.ebuild b/app-editors/vim-core/vim-core-8.0.1645.ebuild
deleted file mode 100644
index 004a0a1c69e6..000000000000
--- a/app-editors/vim-core/vim-core-8.0.1645.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
diff --git a/app-editors/vim-core/vim-core-8.0.1699.ebuild b/app-editors/vim-core/vim-core-8.0.1699.ebuild
deleted file mode 100644
index 004a0a1c69e6..000000000000
--- a/app-editors/vim-core/vim-core-8.0.1699.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
diff --git a/app-editors/vim-core/vim-core-8.1.0034.ebuild b/app-editors/vim-core/vim-core-8.1.0034.ebuild
deleted file mode 100644
index d753611af14d..000000000000
--- a/app-editors/vim-core/vim-core-8.1.0034.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.1"
-inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
deleted file mode 100644
index d753611af14d..000000000000
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.1"
-inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
deleted file mode 100644
index b7f8e7b56371..000000000000
--- a/app-editors/vim/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e987cb287d802c964baa502da4d08f09cb8684307481fec503c1d8cae7f4f6e61500f1cb06033a2c4 SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41
-DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
-DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
-DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
-DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085
-DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7
-DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19
-EBUILD vim-8.0.1298.ebuild 8771 BLAKE2B 8a54e01107594a2caa36617ee05ad02085a9a35e958b0194b25b5ed5f8cc25ae4fd61029354a5cac4dda4152dbc5affee7c73b71388d3135a647cd2ae1e45810 SHA512 d1baab794dd39eca9bacc268ad445c7638d7711045389b62fb6c434574a313216263002a8a865d2f2595d508375abefb6eaa0898bb023664156d882392563162
-EBUILD vim-8.0.1428.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065
-EBUILD vim-8.0.1645.ebuild 8800 BLAKE2B 1eb5e4864b0e83c4c820b45e5791c2c22e8667799d9296d83f59b5cf07c263f2873deec04f6586e32bdca9dbd958876a971b67cc73b8f8bf3fd897692e60bcf0 SHA512 60d07415e38176b2ee9f16dc5c4f0d4da821e8505c0723791d1a38342bc1d1ab59ad8348f81950367859392849d69b385514fc16b1741cf95357f75291a84d83
-EBUILD vim-8.0.1699.ebuild 8788 BLAKE2B 6f30fc561bc164d54c8b45d56f6589e4bd88bbaa87c419120ed5ae08a0821d4415062eb3e8002352f97faca2901048ff0ad9368485df95f0f41f6ee7bc55ebc2 SHA512 afa9c34b8bee7f3e5c066c48a70b61ef991e8ba56082254eb4796a62aef0bb01a250d813660d699c3814da1b343f97e69373474c9b0bb44064e1c841ca0de9a0
-EBUILD vim-8.1.0034.ebuild 8788 BLAKE2B 88526e07cc126b669a4665f8287541fdd5b80cfb02d942074aa5b6354c8e3971bbb21b1b83964f522a1c1521d6522789a24c63da3e56b8e00fa5dbfd3f8f2d5f SHA512 45f841ab68ca9180af8b6a555dfa1cf5a65ab49a12d1feb60d9d40102b3ca0a127e7445bc4b6edd60b44786c1f5f696f2f91a97c298acbcc3927b25078e7dd48
-EBUILD vim-9999.ebuild 8788 BLAKE2B 6f30fc561bc164d54c8b45d56f6589e4bd88bbaa87c419120ed5ae08a0821d4415062eb3e8002352f97faca2901048ff0ad9368485df95f0f41f6ee7bc55ebc2 SHA512 afa9c34b8bee7f3e5c066c48a70b61ef991e8ba56082254eb4796a62aef0bb01a250d813660d699c3814da1b343f97e69373474c9b0bb44064e1c841ca0de9a0
-MISC metadata.xml 752 BLAKE2B 91fa465837da7fef20719826bbee3592d1d0f72f0015accaf425dad3999ee5f6d6f1ff6cdaa539dc1621d9735e1e97156824fb2e74e8707bae9c213719b20d4e SHA512 e49f531537dc14352cfd1550f77e830599addc6cfc9bc9f4a3a20449b0bab2ec5bfeb8923eab15a0585ff156c4b61cfcb5795caf0b9f6fcf14054559a1cd5476
diff --git a/app-editors/vim/files/vim-completion b/app-editors/vim/files/vim-completion
deleted file mode 100644
index 67537d63101d..000000000000
--- a/app-editors/vim/files/vim-completion
+++ /dev/null
@@ -1,36 +0,0 @@
-# Author: Ciaran McCreesh <ciaranm@gentoo.org>
-#
-# completion for vim
-
-_vim()
-{
-    local cur prev cmd args
-
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-    cmd=${COMP_WORDS[0]}
-
-    if [[ "${prev}" == "--servername" ]] ; then
-        local servers
-        servers=$(gvim --serverlist )
-        COMPREPLY=( $( compgen -W "${servers}" -- $cur ) )
-
-    elif [[ "${prev}" == -[uUi] ]] ; then
-        COMPREPLY=( $( compgen -W "NONE" ) \
-                $( compgen -f -X "!*vim*" -- "$cur" ) )
-
-    elif [[ "${cur}" == -* ]] ; then
-        args='-t -q -c -S --cmd -A -b -C -d -D -e -E -f --nofork \
-            -F -g -h -H -i -L -l -m -M -N -n -nb -o -R -r -s \
-            -T -u -U -V -v -w -W -x -X -y -Y -Z --echo-wid \
-            --help --literal --noplugin --version'
-        COMPREPLY=( $( compgen -W "${args}" -- $cur ) )
-    else
-        _filedir
-    fi
-}
-
-complete -o filenames -F _vim vim ex vi view rvim rview vimdiff
-
-# vim: set ft=sh sw=4 et sts=4 :
diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml
deleted file mode 100644
index f65afcd7454c..000000000000
--- a/app-editors/vim/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>vim@gentoo.org</email>
-    <name>Gentoo Vim Project</name>
-  </maintainer>
-  <use>
-    <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
-    <flag name="terminal">Enable terminal emulation support</flag>
-    <flag name="vim-pager">Install vimpager and vimmanpager links</flag>
-    <flag name="X">Link console vim against X11 libraries to enable title and
-      clipboard features in xterm</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:vim:vim</remote-id>
-    <remote-id type="github">vim/vim</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-editors/vim/vim-8.0.1298.ebuild b/app-editors/vim/vim-8.0.1298.ebuild
deleted file mode 100644
index ceca9c50c1cc..000000000000
--- a/app-editors/vim/vim-8.0.1298.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? (
-		~app-editors/vim-core-${PV}
-		dev-util/ctags
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-multibyte
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			--enable-multibyte
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
-			$(use_enable python python3interp)
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/vim/vim-8.0.1428.ebuild b/app-editors/vim/vim-8.0.1428.ebuild
deleted file mode 100644
index 5b4fa3b57665..000000000000
--- a/app-editors/vim/vim-8.0.1428.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? (
-		~app-editors/vim-core-${PV}
-		dev-util/ctags
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-multibyte
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			--enable-multibyte
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
-			$(use_enable python python3interp)
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/vim/vim-8.0.1645.ebuild b/app-editors/vim/vim-8.0.1645.ebuild
deleted file mode 100644
index 01f04731da4a..000000000000
--- a/app-editors/vim/vim-8.0.1645.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? (
-		~app-editors/vim-core-${PV}
-		dev-util/ctags
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-multibyte
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			--enable-multibyte
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
-			$(use_enable python python3interp)
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/vim/vim-8.0.1699.ebuild b/app-editors/vim/vim-8.0.1699.ebuild
deleted file mode 100644
index 1fdeedc42c87..000000000000
--- a/app-editors/vim/vim-8.0.1699.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads"
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? (
-		~app-editors/vim-core-${PV}
-		dev-util/ctags
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-multibyte
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			--enable-multibyte
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
-			$(use_enable python python3interp)
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/vim/vim-8.1.0034.ebuild b/app-editors/vim/vim-8.1.0034.ebuild
deleted file mode 100644
index bd6149fa03b0..000000000000
--- a/app-editors/vim/vim-8.1.0034.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.1"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads"
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? (
-		~app-editors/vim-core-${PV}
-		dev-util/ctags
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-multibyte
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			--enable-multibyte
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
-			$(use_enable python python3interp)
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
deleted file mode 100644
index 1fdeedc42c87..000000000000
--- a/app-editors/vim/vim-9999.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads"
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? (
-		~app-editors/vim-core-${PV}
-		dev-util/ctags
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-multibyte
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			--enable-multibyte
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
-			$(use_enable python python3interp)
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/vis-0.5 b/app-editors/vis-0.5
new file mode 100644
index 000000000000..ad630c239b75
--- /dev/null
+++ b/app-editors/vis-0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) tre? ( dev-libs/tre:= )
+DESCRIPTION=modern, legacy free, simple yet efficient vim-like editor
+EAPI=6
+HOMEPAGE=https://github.com/martanne/vis
+IUSE=+ncurses selinux test tre
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) tre? ( dev-libs/tre:= ) app-eselect/eselect-vi
+SLOT=0
+SRC_URI=https://github.com/martanne/vis/releases/download/v0.5/vis-v0.5.tar.gz -> vis-0.5.tar.gz test? ( https://github.com/martanne/vis-test/releases/download/v0.3/vis-test-0.3.tar.gz -> vis-test-0.3.tar.gz )
+_md5_=f45198242351316d2e3ee77dc598db0d
diff --git a/app-editors/vis-9999 b/app-editors/vis-9999
new file mode 100644
index 000000000000..c0d44213242b
--- /dev/null
+++ b/app-editors/vis-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure postinst postrm prepare unpack
+DEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) tre? ( dev-libs/tre:= ) >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=modern, legacy free, simple yet efficient vim-like editor
+EAPI=6
+HOMEPAGE=https://github.com/martanne/vis
+IUSE=+ncurses selinux test tre
+LICENSE=ISC
+RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) tre? ( dev-libs/tre:= ) app-eselect/eselect-vi
+SLOT=0
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
+_md5_=a5fcfab6ca6a58046f5d21339d376a8d
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
deleted file mode 100644
index b41762fede35..000000000000
--- a/app-editors/vis/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vis-0.5.tar.gz 390461 BLAKE2B e628891c48dbbd11ed706768a3c625ffe9edf4fea3cd77452b4b41ae0d50194a31647e4cc945b69fb3af8fe7fd76ebf5f7afd8c2baa356f5f9fd3cc04be129ca SHA512 fe6b0394006562177efdf06713d7b95cd12fabf90b171c262eb2620d2b0944e73d3d8bb61f4f0d43d32154f0490c338bbc161a89455b14bb8a9d22cd75097780
-DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
-EBUILD vis-0.5.ebuild 1594 BLAKE2B 6e2aef32562145a61f3ce5a55096d0802d8666b4d4d616c5244b4c0017f9e6d91c9fb8a53d5b2858821c8a183bf46195118e92c3c9e6fd8bfc216fc6ca9d9e64 SHA512 0dceedb365bd7543ed2f1f4462fa7020eebbc1e8cac6ac8ac83f0f52829d703f51b9faedafc73e1b4eda01aef4cb206e47703ce2702666069bd87be3d8c5bd03
-EBUILD vis-9999.ebuild 1303 BLAKE2B 929cc3a3ee02777d1802dc646487ca33fe7896e3cd794693b2291451e7fee57be7f8c9627f2821daef411ecebd0e2569e383a570540c8301910bfe804ab3933c SHA512 64992a3c8dd0bc80115739bd441c89b089873d78edd273fd36164cf6449f66ee736970ea7dd24115a714489090b9c1605c9e0372e70b01a94aca0e918758228b
-MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/metadata.xml b/app-editors/vis/metadata.xml
deleted file mode 100644
index 0226bf9ceda3..000000000000
--- a/app-editors/vis/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>contact@hacktivis.me</email>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<longdescription lang="en">
-Vis aims to be a modern, legacy free, simple yet efficient editor combining the strengths of both vi(m) and sam.
-</longdescription>
-<use>
-	<flag name="tre">more memory efficient regex search using <pkg>dev-libs/tre</pkg></flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/vis/vis-0.5.ebuild b/app-editors/vis/vis-0.5.ebuild
deleted file mode 100644
index 33e87890b268..000000000000
--- a/app-editors/vis/vis-0.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PTV=0.3
-
-DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
-HOMEPAGE="https://github.com/martanne/vis"
-SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/vis-v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz -> vis-test-${MY_PTV}.tar.gz )"
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ncurses selinux test tre"
-
-#Note: vis is reported to also work with NetBSD curses
-#TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings)
-DEPEND="dev-libs/libtermkey
-	ncurses? ( sys-libs/ncurses:0= )
-	tre? ( dev-libs/tre:= )"
-RDEPEND="${DEPEND}
-	app-eselect/eselect-vi"
-
-S="${WORKDIR}/vis-v${PV}"
-
-src_prepare() {
-	if use test; then
-		rm -r test || die
-		mv "${WORKDIR}/vis-test-${MY_PTV}" test || die
-		if ! type -P vim &>/dev/null; then
-			sed -i 's/.*vim.*//' test/Makefile || die
-		fi
-	fi
-
-	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
-	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
-	sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die
-
-	default
-}
-
-src_configure() {
-	./configure \
-		--prefix="${EROOT}usr" \
-		--docdir="${EROOT}usr/share/doc/${PF}" \
-		$(use_enable ncurses curses) \
-		$(use_enable selinux) \
-		$(use_enable tre) || die
-}
-
-update_symlinks() {
-	einfo "Calling eselect vi update --if-unset…"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	update_symlinks
-}
-
-pkg_postinst() {
-	update_symlinks
-}
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
deleted file mode 100644
index 228e63e98cd8..000000000000
--- a/app-editors/vis/vis-9999.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit git-r3
-
-DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
-HOMEPAGE="https://github.com/martanne/vis"
-EGIT_REPO_URI="https://github.com/martanne/vis.git"
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS=""
-IUSE="+ncurses selinux test tre"
-
-#Note: vis is reported to also work with NetBSD curses
-#TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings)
-DEPEND="dev-libs/libtermkey
-	ncurses? ( sys-libs/ncurses:0= )
-	tre? ( dev-libs/tre:= )"
-RDEPEND="${DEPEND}
-	app-eselect/eselect-vi"
-
-src_prepare() {
-	if use test && ! type -P vim &>/dev/null; then
-		sed -i 's/.*vim.*//' "${S}/test/Makefile" || die
-	fi
-
-	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
-	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
-	sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die
-
-	default
-}
-
-src_configure() {
-	./configure \
-		--prefix="${EROOT}usr" \
-		--docdir="${EROOT}usr/share/doc/${PF}" \
-		$(use_enable ncurses curses) \
-		$(use_enable selinux) \
-		$(use_enable tre) || die
-}
-
-update_symlinks() {
-	einfo "Calling eselect vi update --if-unset…"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	update_symlinks
-}
-
-pkg_postinst() {
-	update_symlinks
-}
diff --git a/app-editors/wily-1.0-r1 b/app-editors/wily-1.0-r1
new file mode 100644
index 000000000000..30cf7f0c03a2
--- /dev/null
+++ b/app-editors/wily-1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/9libs >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0
+DESCRIPTION=An emulation of ACME, Plan9's hybrid window system, shell and editor
+EAPI=0
+HOMEPAGE=http://www.netlib.org/research/9libs/
+KEYWORDS=x86
+LICENSE=Artistic
+RDEPEND=dev-libs/9libs >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0
+SLOT=0
+SRC_URI=ftp://www.netlib.org/research/9libs/wily-9libs.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4e7c2e0d0349764504793e87eb62dc67
diff --git a/app-editors/wily/Manifest b/app-editors/wily/Manifest
deleted file mode 100644
index 7787ee90c940..000000000000
--- a/app-editors/wily/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wily-9libs.tar.gz 125247 BLAKE2B 94f93d081c90f6543bb26d17f8fe053135be2df983a2280fdd15243c5e448f5f3265666692e0635156217b0e759e0d6f3bbc123cb857f1d7880ee3ee4f913a37 SHA512 3c06ef1d9c6e77a00037570f8b8bdbcdfc7648f691675db679ba83ac0ce092762a4020b0483acd325aa57810e9a386800a94c5e6e2b5002a963b4751a4d30a5b
-EBUILD wily-1.0-r1.ebuild 836 BLAKE2B 6717232ddcf0cd6bc64d92e6818fe357bf314070be79ac475961e8020c8177b21b758497fe2e22de1ce3fb5402e5948e4198f260f23677c5b59a2b0f5ac5d260 SHA512 b3d14f3578e8916f0a8fc5e89cbaf9c9ba9187fb73395de796bfd7f52ea524b3d63f6a4e721dd988f928488981c3b8dde7a5f1759257ea984fa71d18367edf67
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/wily/metadata.xml b/app-editors/wily/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-editors/wily/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-editors/wily/wily-1.0-r1.ebuild b/app-editors/wily/wily-1.0-r1.ebuild
deleted file mode 100644
index f9093824c539..000000000000
--- a/app-editors/wily/wily-1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-MY_P="${P/1.0/9libs}"
-
-DESCRIPTION="An emulation of ACME, Plan9's hybrid window system, shell and editor"
-HOMEPAGE="http://www.netlib.org/research/9libs/"
-SRC_URI="ftp://www.netlib.org/research/9libs/${MY_P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="dev-libs/9libs
-	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0
-	>=x11-libs/libICE-1.0.0
-	>=x11-libs/libSM-1.0.0"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	econf --includedir="/usr/include/9libs" || die "configure failed."
-	emake || die "make failed."
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed."
-	dodoc README
-	insinto /usr/share/${PN}
-	doins "${S}"/misc/*
-}
diff --git a/app-editors/wxhexeditor-0.24 b/app-editors/wxhexeditor-0.24
new file mode 100644
index 000000000000..352a0e34c21b
--- /dev/null
+++ b/app-editors/wxhexeditor-0.24
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare pretend setup
+DEPEND=app-crypt/mhash dev-libs/udis86 x11-libs/wxGTK:3.0-gtk3[X]
+DESCRIPTION=A cross-platform hex editor designed specially for large files
+EAPI=6
+HOMEPAGE=http://www.wxhexeditor.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-crypt/mhash dev-libs/udis86 x11-libs/wxGTK:3.0-gtk3[X]
+SLOT=0
+SRC_URI=mirror://sourceforge/wxhexeditor/wxHexEditor-v0.24-src.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=3d1fef9e2df4e80637eef72398a9a0da
diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
deleted file mode 100644
index 9c01e27e7d72..000000000000
--- a/app-editors/wxhexeditor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX wxhexeditor-0.24-syslibs.patch 2458 BLAKE2B 65dc8a710fb33826b5ae9a9ae2b31cdf58e58252aa4be8df37a4e18495faaaee066c95f1b527d91c71b9b38d8123cc1cac91e9e0386a67ed77b0b8e24ad43016 SHA512 658526b38bb3e3313174ac464711ccceb3606e38e6826c62b4dcb5dca79c6ef32c6d7c84e883035572431eebaf0b7e2ace154df406f2338f39aace84d9fe9403
-DIST wxHexEditor-v0.24-src.tar.xz 900868 BLAKE2B 6748249d75e7570197a6c78378a8f3109bfa4c72bf32fe63e2abd31734d97fda3d56ecddb52ac5f9a18cc77b2c727f8277688f1bf75ef8f665a3a9cefd1cb8a6 SHA512 8589da169c90cca5abf6ba957d5c5e17e4211123dbdbaf0e04d31757113e7e302d40df58144ec25d431c7c4ce2fa2721b16621d03630ac8b90478c704a8c5b09
-EBUILD wxhexeditor-0.24.ebuild 780 BLAKE2B f956a2b44390a6a3d673778d06f63af8747cd200dd01858ca8b3de527e52b2c19d4cee9dabffce2fd6827e9336fca1076ae56fef4282160686163748be067407 SHA512 a8027cecbedf4a9ace1d163bbc14d29941f53f20844b4eea0a845076b9d8440376c4c87728bd88d53a5dd5a470f0279a0cea639e54a37a4786ad06e566606732
-MISC metadata.xml 352 BLAKE2B 6b049a05b438e20e604ed3c93e89e66d5f18cb0dc7322a9f4d5cdd976ba074b625b162baa30ff8b2276429826caec1d22a757945e14a845be3b6bfe9eaeb69b3 SHA512 918e551de8f159920d7d98010dc748efb0e9a79c9a11f6d6fcd44127d3779a66510da18cbccc69a974472bf3f230fd5cadbc15665a4a3710b8c1b92237725f6a
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch
deleted file mode 100644
index af874128eac1..000000000000
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Use system copies of mhash and udis86.
-Also pass -fopenmp when linking to avoid build errors.
-Remove -O2 from forced CXXFLAGS.
-
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,9 @@
- WXCONFIG ?= wx-config
- HOST=
--WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp -Wall -O2
-+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp -Wall
- WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core`
- WXCXXFLAGS += -fopenmp
--LDFLAGS += -lgomp
-+LDFLAGS += -fopenmp -lgomp
- #add this ldflags for WinConsole  "-Wl,--subsystem,console -mconsole" for win-debug
- #LDFLAGS += -Wl,--subsystem,console -mconsole
- RC = `$(WXCONFIG) --rescomp`
-@@ -22,7 +22,7 @@ SOURCES= src/HexEditorGui.cpp \
- 			src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
- 			src/HexEditorCtrl/HexEditorCtrlGui.cpp\
- 			src/HexEditorFrame.cpp
--LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a
-+LIBS = -ludis86 -lmhash
- OBJECTS=$(SOURCES:.cpp=.o)
- DEPENDS=$(OBJECTS:.o=.d)
- LANGUAGEDIRS=`ls -l ./locale | grep ^d | sed s/.*\ //g;`
-@@ -68,15 +68,6 @@ langs: $(MOBJECTS)
- %.mo : %.po
- 	$(MSGFMT) $< -o $@
- 
--udis86/libudis86/.libs/libudis86.a:
--	cd udis86;./autogen.sh
--	cd udis86;./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}" CPPFLAGS="$(CPPFLAGS)"
--	cd udis86/libudis86; $(MAKE) $(MFLAGS)
--
--mhash/lib/.libs/libmhash.a:
--	cd mhash; ./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}" CPPFLAGS="$(CPPFLAGS)"
--	cd mhash; $(MAKE) $(MFLAGS)
--
- src/windrv.o:
- 	$(CXX) $(LIBS) ${CXXFLAGS} ${OPTFLAGS} $(WXCXXFLAGS) $(WXLDFLAGS) ${LDFLAGS} -c src/windrv.cpp -o src/windrv.o
- 
---- a/src/HexDialogs.cpp
-+++ b/src/HexDialogs.cpp
-@@ -24,7 +24,7 @@
- #define NANINT 0xFFFFFFFFFFFFFFFFLL
- #include "HexDialogs.h"
- #include <wx/progdlg.h>
--#include "../mhash/include/mhash.h"
-+#include <mhash.h>
- 
- #ifdef __SSE2__
- 	#include <emmintrin.h>
---- a/src/HexEditor.h
-+++ b/src/HexEditor.h
-@@ -25,7 +25,7 @@
- #ifndef _wxHexEditor_h_
- #define _wxHexEditor_h_
- 
--#include "../mhash/include/mhash.h"
-+#include <mhash.h>
- 
- #include <wx/ffile.h>
- #include <wx/clipbrd.h>
---- a/src/HexPanels.h
-+++ b/src/HexPanels.h
-@@ -27,7 +27,7 @@
- #include "HexEditorFrame.h"
- #include "HexEditorCtrl/HexEditorCtrl.h"
- #include "HexEditorCtrl/wxHexCtrl/wxHexCtrl.h"
--#include "../udis86/udis86.h"
-+#include <udis86.h>
- 
- #ifdef WX_GCH
- #include <wx_pch.h>
diff --git a/app-editors/wxhexeditor/metadata.xml b/app-editors/wxhexeditor/metadata.xml
deleted file mode 100644
index 9065be762a9d..000000000000
--- a/app-editors/wxhexeditor/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>wxwidgets@gentoo.org</email>
-    <name>Gentoo wxWidgets Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">wxhexeditor</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
deleted file mode 100644
index 517f24a35eb8..000000000000
--- a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0-gtk3
-
-inherit toolchain-funcs wxwidgets
-
-MY_PN="wxHexEditor"
-
-DESCRIPTION="A cross-platform hex editor designed specially for large files"
-HOMEPAGE="http://www.wxhexeditor.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	app-crypt/mhash
-	dev-libs/udis86
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-syslibs.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-src_prepare() {
-	setup-wxwidgets
-	default
-}
diff --git a/app-editors/xemacs-21.4.24 b/app-editors/xemacs-21.4.24
new file mode 100644
index 000000000000..23a8f9802ae3
--- /dev/null
+++ b/app-editors/xemacs-21.4.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare unpack
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15 >=sys-apps/texinfo-5 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
+DESCRIPTION=highly customizable open source text editor and application development system
+EAPI=5
+HOMEPAGE=http://www.xemacs.org/
+IUSE=eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb
+KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
+LICENSE=GPL-2+
+PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.24.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=87b51b693ea3ee7f2329e741d84be721
diff --git a/app-editors/xemacs-21.4.24-r1 b/app-editors/xemacs-21.4.24-r1
new file mode 100644
index 000000000000..c14cf9d1edbb
--- /dev/null
+++ b/app-editors/xemacs-21.4.24-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare unpack
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15 >=sys-apps/texinfo-5 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
+DESCRIPTION=highly customizable open source text editor and application development system
+EAPI=5
+HOMEPAGE=http://www.xemacs.org/
+IUSE=eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb
+KEYWORDS=alpha amd64 hppa ppc ppc64 sparc ~x86
+LICENSE=GPL-2+
+PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.24.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2ac85dff007794a223bd37c21a3b7b33
diff --git a/app-editors/xemacs-21.5.34-r4 b/app-editors/xemacs-21.5.34-r4
new file mode 100644
index 000000000000..386b3442f070
--- /dev/null
+++ b/app-editors/xemacs-21.5.34-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) >=sys-libs/zlib-1.1.4 !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15 virtual/pkgconfig
+DESCRIPTION=highly customizable open source text editor and application development system
+EAPI=5
+HOMEPAGE=http://www.xemacs.org/
+IUSE=alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-3+
+PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
+RDEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) >=sys-libs/zlib-1.1.4 !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.34.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4e3c74a7c91d5a0c5ceea1e20b74621c
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
deleted file mode 100644
index 76b547cb5f3f..000000000000
--- a/app-editors/xemacs/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX README.Gentoo 1426 BLAKE2B 00dbdbd388a01ad8288ac99eeab1d59dcdfd2309a43ef30008f5ac35fcd93855409c03c801f5c0b48455414e489f7f7c603d73efc6c618e820e8ff4fc7d67ed4 SHA512 0576235fb09ea9ad5fbe5b1bbaa41dd37913603ab40773f2c476b72e147eac9b8de62f600717d06d5366184deadb55e0002e79b9987ba215bad5ebee41fdfbb1
-AUX xemacs-21.4.19-db.patch 3157 BLAKE2B f5615179665395f36df25eedd51c1f351aaefa8afe21506ec3f096c661c1ad00602b9128de6556220835bfca1769a6a45036df6fc6970be06590008621d01fac SHA512 b4987784295c5d2335440dccca4e157d5ccece510d97fc131e33f701fc2dc48bd01080df577c6e588d926703f7b461a347d0d3e3f99931e10cdb8b11592b35be
-AUX xemacs-21.4.24-gcc5.patch 1132 BLAKE2B 2a494b756f94112ba91a9d918fa540a645dfb7cabf05b5957cafb95c890e9fd4e106c20de97edac0ea7959053eb5cd20a26698713670b3957b097e101e818207 SHA512 1b3e56804594b82209ddb6318c2bff13b8e63f189d98e5ff313022eb66267eb45683841599dadd8a4d97e5e221dd85195121246fba5c91eade905e1d7b593749
-AUX xemacs-21.4.24-glibc-macro.patch 1081 BLAKE2B 2b2aa4898e9a02402418a71abe4138f085e9177c90ee87ede767c682ec185f59cfa308284622d88c432b3e4eae9e20a05df075f7e48f73ac27e53d9f15a8d5ec SHA512 6802260f60cd8ad14f9f7f4dc156e1914cbefd7efae38837426f54f141bec6241c210c28120badfdf46d0cd2866014cf31b05ee228c407cdb0f387ea5cf56e3b
-AUX xemacs-21.4.24-ncurses-tinfo.patch 538 BLAKE2B ef09bb366ebb79cd9bd3e089098ae985568cd1b25e2d46a2149e5d712338cf8d3f69b825410d448a2dd81fe4069e3f320a3dac13a9046651d526d4b9272772b4 SHA512 61af7d1090f160802a6a5ff2ba28ff2d9d2a39ac615c692748a76f60c4f93b6d09a66fbf797467257efe1a269aa90033f5384423521b1e403defb6cbd8709bb3
-AUX xemacs-21.5.34-gcc5.patch 1194 BLAKE2B 1b042f7a7034fa7066279e91d96e6f1c2f962273b4aa26ca3a6bfb5cf737572d97c1d7f11dc87a15e44a2516e9112cb8f4ba8d916feb856bab15beeecce6cbe9 SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b
-AUX xemacs-21.5.34-glibc-macro.patch 1369 BLAKE2B cd03d4c6d3629ab186c60a869cd99483dec1192dddecb91466e72c83b3f2969a0f02ae34953da3511edc80bd17ed880168b98f661fab1a0642d4e2944cc0411c SHA512 6397267d99649f62a20a0a1f2bc380360ed7689691adde515421286b3bcad55dbb0cea246427e03f904fd829624060ad7ae66a67c63f16f3b3c1f88803022176
-AUX xemacs-21.5.34-ncurses-tinfo.patch 699 BLAKE2B 0978b118040b1399bb042efbdfa54968a701b37a5b2f505f4dd1af9971b38c0a52cbe8fb9272ecc19c030bfa79fe28d56df358484116eadf3db9396b7ce09d17 SHA512 814b01388e7eb5963307dd5cd136725dd6d0d206b1a4e8ffc2ca8dabdd0070a58122fb4faa943efead1fe70f6309819177870630e05e5c02b51dc5e2aa0bd765
-AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4eaa23c301b5d25a8c334971a1d89f8cfa551dce909891edaac6a7df956c912396fc8cfb88a720a6b SHA512 6542fc7777af888ae711d386918e712e1d106635f70e65af77d1e809156baba9831fc4c8bd2cb7e7c6f9ab0ab18ddfb92709ac2909aa613471101454599bdb69
-DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
-DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
-DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
-EBUILD xemacs-21.4.24-r1.ebuild 6734 BLAKE2B eb95f30b81f5d1305ab90089fe4feccce6b1b541949195d44c44e55b9631cc780768ecffc89b6228c540cd132e8ed2495dbe852aa264cf1080753e82553cde51 SHA512 e1bc6158ba44b478434b92a9470944a176161f57229a3fac99e15b91aa88ce1f0473eecc0cc6eb5f222ea75cde962157b9d23b4b64489ee95c1b8404eea0d052
-EBUILD xemacs-21.4.24.ebuild 6782 BLAKE2B e7a1fa73200db2829c9573d406b810b316a706cc9a9a70503ccb774a8278846348d8927e7d0005422bd79ba50ded393b72390f29b8b42987f8673cbc82ee64a4 SHA512 198a075e31cef8c28c359b56588414e0d19c317b1640e3c215aa7483f5c2782f82b6318327dc23448831a98c6a3a713242fb52d7977857db0a2ccc36b401e3a4
-EBUILD xemacs-21.5.34-r4.ebuild 7227 BLAKE2B c9e14730c039248883a8147e1deaa07d1a2937069823d1493072955bf362c4849c583b0d4b0a5d3914feb8f86ee34371b934ba5305396e12b193aad7c27df840 SHA512 89428a0b8e3ea66ef0e8418cf5fffa9ccbab351bfac48abc9c6ce479b7c88bd42dd90c1a1728a10d6dc42d7afcbbbb01bef95882e4251d56bcdce15ca1de1f62
-MISC metadata.xml 616 BLAKE2B e54bf1e7e4860e0de6e017e5456ebfbb392b33e8f768928f051f75b3e1c3431cdfeee8c4da5b8618b623585127cf2a5b2990f42d7b68dfe930db7c1bd15c09b3 SHA512 8c6e5e61099adf6af109681bf6ce31408ff468dec60403155e5998574dfd095b77156d669e8f54b09bfee5ba71346f4657e15b7d8c4cc34511696a5e97370522
diff --git a/app-editors/xemacs/files/README.Gentoo b/app-editors/xemacs/files/README.Gentoo
deleted file mode 100644
index abb71cc90988..000000000000
--- a/app-editors/xemacs/files/README.Gentoo
+++ /dev/null
@@ -1,45 +0,0 @@
-README.Gentoo
--------------
-
-This is a quick tutorial on how to configure the XEmacs package user
-interface (package-ui). After you configure package-ui, you will be
-able to download and install XEmacs packages and dependencies while in
-XEmacs. For the complete documentation, see
-/usr/share/doc/xemacs-21.4.*/README.packages.gz
-
-Once XEmacs is emerged onto a Gentoo Linux system, you will only have
-the following elisp modules installed: xemacs-base, efs and
-(optionally if you had mule in USE) mule-base. This guide will show
-how to use package-ui to download and install your own preference in
-elisp modules to ~/.xemacs/xemacs-packages.
-
-First, start XEmacs and load the package-ui elisp module.
-
-  M-x load-library RET package-ui RET
-
-The first thing to set is the download site (package-ui installs via
-network).
-
-  M-x customize-variable RET package-get-remote RET
-
-Insert a new value, then:
-
-  Choice: Remote
-  Host: ibiblio.org
-  Directory: /pub/packages/editors/xemacs/packages/
-
-Make sure you set and save the change. Note, other host/directories
-are possible. The the documentation for package-ui for more
-information. Hint: ibiblio.org is *fast*.
-
-Then set the location package-ui should install to:
-
-  M-x customize-variable RET pui-package-install-dest-dir RET
-
-  Directory: ~/.xemacs/xemacs-packages
-
-Make sure you set and save the change.
-
-At this point you can install your modules:
-
-  M-x pui-list-packages
diff --git a/app-editors/xemacs/files/xemacs-21.4.19-db.patch b/app-editors/xemacs/files/xemacs-21.4.19-db.patch
deleted file mode 100644
index cf87d60e628a..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.19-db.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-This patch fixes several database-related problems.
-
-dbm_open has been moved into gdbm_compat, so we check for that and include it.
-
-ndbm.h is located in /usr/include/gdbm on Gentoo, so we only check
-there, given that we don't support normal dbm installations, and we
-patch database.c as well. Not portable beyond Gentoo, but will work
-for us.
-
-The checks for Berkeley DB only took into account up to version
-3. Added checks to deal with several versions 4 as well.
-
---- xemacs-21.4.19/configure.in	2005-12-24 01:48:14.000000000 +0100
-+++ xemacs-21.4.19-db/configure.in	2006-06-11 22:43:52.000000000 +0200
-@@ -4502,7 +4502,7 @@
- 
- dnl Check for ndbm.h, required for either kind of DBM support.
- if test "$with_database_gdbm $with_database_dbm" != "no no"; then
--  AC_CHECK_HEADER(ndbm.h, [:], [
-+  AC_CHECK_HEADER(gdbm/ndbm.h, [:], [
-     test "$with_database_gdbm" = "yes" -o \
-          "$with_database_dbm"  = "yes" && \
-       XE_DIE("Required DBM support cannot be provided.")
-@@ -4513,10 +4513,13 @@
- if test "$with_database_gdbm" != "no"; then
-   AC_CHECK_LIB(gdbm, dbm_open, [
-    with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [
-+	AC_CHECK_LIB(gdbm_compat, dbm_open, [
-+	with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
-    if test "$with_database_gdbm" = "yes"; then
-      XE_DIE("Required GNU DBM support cannot be provided.")
-    fi
--   with_database_gdbm=no])
-+   with_database_gdbm=no], -lgdbm)
-+  ])
- fi
- 
- dnl Check for DBM support in libc and libdbm.
-@@ -4614,11 +4617,30 @@
- #if DB_VERSION_MAJOR > 2
- yes
- #endif
--], [AC_MSG_RESULT(3); dbfunc=db_create],[
--    AC_MSG_RESULT(2); dbfunc=db_open])],[
--    AC_MSG_RESULT(1); dbfunc=dbopen])
-+], [AC_EGREP_CPP(yes,
-+[#include <$db_h_file>
-+#if DB_VERSION_MAJOR > 3
-+yes
-+#endif
-+], [AC_MSG_RESULT(4); dbfunc=db_create; dbver=4],[
-+    AC_MSG_RESULT(3); dbfunc=db_create; dbver=3])],[
-+    AC_MSG_RESULT(2); dbfunc=db_open; dbver=2])],[
-+    AC_MSG_RESULT(1); dbfunc=dbopen; dbver=1])
-     AC_CHECK_FUNC($dbfunc,     with_database_berkdb=yes need_libdb=no, [
--    AC_CHECK_LIB(db, $dbfunc,  with_database_berkdb=yes need_libdb=yes)])
-+    AC_CHECK_LIB(db, db_create_4002,  with_database_berkdb=yes need_libdb=yes)])
-+  fi
-+
-+  dnl Berk db 4.1 decorates public functions with version information
-+  if test "$have_database_berkdb" != "yes" -a "$dbver" = "4"; then
-+    rm -f $tempcname
-+    echo "#include <$db_h_file>" > $tempcname
-+    echo "configure___ dbfunc=db_create" >> $tempcname
-+    define(TAB, [       ])dnl
-+    eval `$CPP -Isrc $tempcname \
-+        | sed -n -e "s/[[ TAB]]*=[[ TAB\"]]*/='/" -e "s/[[ TAB\"]]*\$/'/" -e "s/^configure___//p"`
-+    rm -f $tempcname
-+    AC_MSG_WARN("db_create is really $dbfunc")
-+    AC_CHECK_LIB(db, $dbfunc,  have_database_berkdb=yes need_libdb=yes)
-   fi
- 
-   if test "$with_database_berkdb" = "yes"; then
---- xemacs-21.4.19/src/database.c	2005-12-24 01:52:35.000000000 +0100
-+++ xemacs-21.4.19-db/src/database.c	2006-06-13 21:00:01.000000000 +0200
-@@ -82,7 +82,7 @@
- #endif /* HAVE_BERKELEY_DB */
- 
- #ifdef HAVE_DBM
--#include <ndbm.h>
-+#include <gdbm/ndbm.h>
- Lisp_Object Qdbm;
- #endif /* HAVE_DBM */
- 
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
deleted file mode 100644
index 494fc51c3b88..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -r e2da872593c0 configure.in
---- a/configure.in	Tue Mar 24 22:15:53 2015 -0400
-+++ b/configure.in	Sun Mar 13 13:48:24 2016 +0100
-@@ -1939,6 +1939,8 @@
-     CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes"
-     dnl Yuck, bad compares have been worth at least 3 crashes!
-     CFLAGS="$CFLAGS -Wsign-compare"
-+    dnl Use old gnu inline semantics until we fix the source
-+    CFLAGS="$CFLAGS -fgnu89-inline"
-     dnl XEmacs is known not to be strict-aliasing-safe.
-     case "`gcc -v --help 2>&1`" in
-       *-fstrict-aliasing* ) CFLAGS="$CFLAGS -fno-strict-aliasing" ;;
-diff -r e2da872593c0 src/lisp.h
---- a/src/lisp.h	Tue Mar 24 22:15:53 2015 -0400
-+++ b/src/lisp.h	Sun Mar 13 13:48:24 2016 +0100
-@@ -193,6 +193,8 @@
- # endif /* GNUC */
- #endif
- 
-+#ifndef _GCC_MAX_ALIGN_T
-+#define _GCC_MAX_ALIGN_T
- /* No type has a greater alignment requirement than max_align_t.
-    (except perhaps for types we don't use, like long double) */
- typedef union
-@@ -202,6 +204,7 @@
-   struct { void (*f)(void); } f;
-   struct { double d; } d;
- } max_align_t;
-+#endif
- 
- #ifndef ALIGNOF
- # if defined (__GNUC__) && (__GNUC__ >= 2)
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch
deleted file mode 100644
index 62d26ccc053c..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Don't define deprecated glibc symbol
-
-Avoid defining the deprecated symbols _BSD_SOURCE and _SVID_SOURCE
-that xmkmf thinks are needed to compile X programs.
-
-diff -r 09d56098ea2c -r 32a8151f8af7 configure.in
---- a/configure.in	Sat Feb 11 01:24:06 2017 +0100
-+++ b/configure.in	Sat Feb 11 01:59:40 2017 +0100
-@@ -2868,10 +2868,15 @@
- 	  *     ) val=1 ;;
- 	esac
- dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
--	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
--	  if test "$val" = "1"
--	    then AC_DEFINE_UNQUOTED($sym)
--	    else AC_DEFINE_UNQUOTED($sym,$val)
-+dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
-+dnl likes us to define; ignore them if appropriate.
-+	if grep "^#define $sym " confdefs.h >/dev/null          || \
-+           test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
-+           test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
-+        then :; else
-+ 	  if test "$val" = "1"
-+ 	    then AC_DEFINE_UNQUOTED($sym)
-+ 	    else AC_DEFINE_UNQUOTED($sym,$val)
- 	  fi
- 	fi  ;;
-       esac
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
deleted file mode 100644
index 19b8984db2d0..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r e2da872593c0 configure.in
---- a/configure.in	Tue Mar 24 22:15:53 2015 -0400
-+++ b/configure.in	Mon Apr 17 10:13:05 2017 +0200
-@@ -4449,7 +4449,7 @@
-     AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h)
-     AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h)
-     XE_ADD_OBJS(terminfo.o)
--    XE_PREPEND(-lncurses, LIBS)
-+    XE_PREPEND($(pkg-config ncurses --libs), LIBS)
- 
-     if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
-       dnl Try again, and check for the bogus ncurses/ include bug.
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
deleted file mode 100644
index 025a390f3335..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/lisp.h b/src/lisp.h
---- a/src/lisp.h
-+++ b/src/lisp.h
-@@ -1154,6 +1154,8 @@
- 
- /* ------------------------ alignment definitions ------------------- */
- 
-+#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \
-+    (!defined (__cplusplus) || __cplusplus < 201103L)
- /* No type has a greater alignment requirement than max_align_t.
-    (except perhaps for types we don't use, like long double) */
- typedef union
-@@ -1163,6 +1165,7 @@
-   struct { void (*f)(void); } f;
-   struct { double d; } d;
- } max_align_t;
-+#endif
- 
- /* ALIGNOF returns the required alignment of a type -- i.e. a value such
-    that data of this type must begin at a memory address which is a
-@@ -1170,7 +1173,11 @@
-    as the type itself. */
- 
- #ifndef ALIGNOF
--# if defined (__GNUC__) && (__GNUC__ >= 2)
-+# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-+#  define ALIGNOF(type) _Alignof(type)
-+# elif defined (__cplusplus) && __cplusplus >= 201103L
-+#  define ALIGNOF(type) alignof(type)
-+# elif defined (__GNUC__) && (__GNUC__ >= 2)
- /* gcc has an extension that gives us exactly what we want. */
- #  define ALIGNOF(type) __alignof__ (type)
- # elif ! defined (__cplusplus)
-
-
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
deleted file mode 100644
index b611b15fd8b1..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -r f412e9f093d4 configure
---- a/configure	Wed Jan 25 00:47:06 2017 +0000
-+++ b/configure	Sun Jan 29 19:32:47 2017 +0100
-@@ -13507,7 +13507,10 @@
- 	  -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
- 	  *     ) val=1 ;;
- 	esac
--	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
-+	if grep "^#define $sym " confdefs.h >/dev/null          || \
-+           test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
-+           test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
-+        then :; else
- 	  if test "$val" = "1"
- 	    then cat >>confdefs.h <<_ACEOF
- #define $sym 1
-diff -r f412e9f093d4 configure.ac
---- a/configure.ac	Wed Jan 25 00:47:06 2017 +0000
-+++ b/configure.ac	Sun Jan 29 19:32:47 2017 +0100
-@@ -3136,7 +3136,12 @@
- 	  *     ) val=1 ;;
- 	esac
- dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
--	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
-+dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
-+dnl likes us to define; ignore them if appropriate.
-+	if grep "^#define $sym " confdefs.h >/dev/null          || \
-+           test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
-+           test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
-+        then :; else
- 	  if test "$val" = "1"
- 	    then AC_DEFINE_UNQUOTED($sym)
- 	    else AC_DEFINE_UNQUOTED($sym,$val)
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch
deleted file mode 100644
index a08eda3c8a83..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r 6355de501637 configure
---- a/configure	Thu Jan 23 15:03:16 2014 +0000
-+++ b/configure	Fri Jan 31 23:55:12 2014 +0100
-@@ -19699,7 +19699,8 @@
-     extra_objs="$extra_objs terminfo.o" &&  if test "$verbose" = "yes"; then
-    echo "    xemacs will be linked with \"terminfo.o\""
-  fi
--    LIBS="-lncurses $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lncurses\" to \$LIBS"; fi
-+    ncurses_libs=$(pkg-config ncurses --libs)
-+    LIBS="$ncurses_libs $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"$ncurses_libs\" to \$LIBS"; fi
- 
-     if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
-                         save_c_switch_site="$c_switch_site"
diff --git a/app-editors/xemacs/files/xemacs.desktop b/app-editors/xemacs/files/xemacs.desktop
deleted file mode 100644
index 93f14a731f2b..000000000000
--- a/app-editors/xemacs/files/xemacs.desktop
+++ /dev/null
@@ -1,33 +0,0 @@
-[Desktop Entry]
-Name=XEmacs Text Editor
-Name[bg]=редактор XEmacs
-Name[ca]=Editor XEmacs
-Name[cs]=Editor XEmacs
-Name[da]=XEmacs tekstredigerer
-Name[de]=XEmacs Texteditor
-Name[eo]=La redaktilo XEmakso
-Name[es]=Emacs para X
-Name[et]=Emacs X'i kasutajaliidesega
-Name[fi]=XEmacs editori
-Name[fr]=Éditeur XEmacs
-Name[hu]=XEmacs szövegszerkesztő
-Name[is]=XEmacs-ritill
-Name[it]=Emacs per X
-Name[ja]=XEmacs テキスト・エディター
-Name[mk]=Софистицираниот XEmacs уредувач
-Name[no]=XEmacs-tekstredigerer
-Name[pt]=Editor XEmacs
-Name[ro]=Editorul XEmacs
-Name[ru]=Редактор XEmacs
-Name[sk]=Editor XEmacs
-Name[sl]=Urejevalnik XEmacs
-Name[uk]=Редактор XEmacs
-GenericName=Text Editor
-Comment=Edit text
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=xemacs %f
-Icon=xemacs
-Type=Application
-Terminal=false
-Categories=Utility;TextEditor;
-StartupWMClass=Emacs
diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
deleted file mode 100644
index 435eda5f8675..000000000000
--- a/app-editors/xemacs/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xemacs@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="athena">Chooses the MIT Athena widget set</flag>
-    <flag name="dnd">Enables support for the <pkg>x11-libs/dnd</pkg>
-      drag-n-drop library</flag>
-    <flag name="eolconv">Support detection and translation of newline
-      conventions</flag>
-    <flag name="pop">Support POP for mail retrieval</flag>
-    <flag name="xim">Enable X11 XiM input method</flag>
-  </use>
-</pkgmetadata>
diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
deleted file mode 100644
index 475f8682263c..000000000000
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI="5"
-
-WANT_AUTOCONF="2.1"
-inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc ~x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
-	canna? ( app-i18n/canna )
-	!amd64? ( freewnn? ( app-i18n/freewnn ) )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-5"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-	# see bug 58350, 102540 and 143580
-	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
-	# see bug 576512
-	epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
-	epatch "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
-	# see bug 615544
-	epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-
-	# Run autoconf. XEmacs tries to be smart by providing a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac || die
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_configure() {
-	local myconf=""
-
-	# Can't build with pie. See bug #75028
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		myconf="${myconf} $(use_with tiff ) $(use_with png )"
-		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm && mydb="gdbm"
-
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	# Enabling modules will cause segfaults outside the XEmacs build directory
-	use ia64  && myconf="${myconf} --without-modules"
-
-	einfo "${myconf}"
-
-	# see bug 576512
-	append-cflags -fgnu89-inline
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--compiler=$(tc-getCC) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-system-malloc \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die "The configure script failed to run properly"
-}
-
-src_install() {
-	emake prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die "emake install failed"
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild
deleted file mode 100644
index 08d08cdd1233..000000000000
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI="5"
-
-WANT_AUTOCONF="2.1"
-inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
-	canna? ( app-i18n/canna )
-	!amd64? ( freewnn? ( app-i18n/freewnn ) )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-5"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-	# see bug 58350, 102540 and 143580
-	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
-	# see bug 576512
-	epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
-	# see bug 615544
-	epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-
-	# Run autoconf. XEmacs tries to be smart by providing a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac || die
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_configure() {
-	local myconf=""
-
-	# Can't build with pie. See bug #75028
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		myconf="${myconf} $(use_with tiff ) $(use_with png )"
-		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm && mydb="gdbm"
-
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	# Enabling modules will cause segfaults outside the XEmacs build directory
-	use ia64  && myconf="${myconf} --without-modules"
-
-	# fixes #552044, deprecation warnings fools header detection in configure
-	myconf="${myconf} --cppflags=-Wno-cpp"
-
-	einfo "${myconf}"
-
-	# see bug 576512
-	append-cflags -std=gnu89
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--compiler=$(tc-getCC) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-system-malloc \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die "The configure script failed to run properly"
-}
-
-src_install() {
-	emake prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die "emake install failed"
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
deleted file mode 100644
index 9747f72b358e..000000000000
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib xdg-utils
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
-	>=sys-libs/zlib-1.1.4
-	!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-	libressl? ( dev-libs/libressl )
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
-	alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0[xft=] )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
-	canna? ( app-i18n/canna )
-	freewnn? ( app-i18n/freewnn )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-	default_src_unpack
-
-	use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
-	epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
-	epatch "${FILESDIR}/${P}-gcc5.patch"
-	epatch "${FILESDIR}/${P}-glibc-macro.patch"
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# bug #639642
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena or use Xaw3d ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		myconf="${myconf} $(use_with tiff )"
-		myconf="${myconf} $(use_with png )"
-		myconf="${myconf} $(use_with jpeg )"
-		myconf="${myconf} $(use_with xface )"
-
-		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
-			myconf="${myconf} --with-xft=no"
-
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-xft=no
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		myconf="${myconf} $(use_with canna )"
-		myconf="${myconf} $(use_with freewnn wnn )"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-	use alsa && soundconf="${soundconf},alsa"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm   && mydb="gdbm"
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	use debug && myconf="${myconf} --with-debug" ||
-		myconf="${myconf} --with-optimization"
-
-	econf ${myconf} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-msw=no \
-		--with-mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		--with-newgc \
-		--with-system-malloc \
-		--enable-option-checking=no \
-		--with-last-packages=/usr/lib/xemacs \
-		|| die "configuration failed"
-}
-
-src_compile() {
-	emake EMACSLOADPATH="${S}"/lisp
-}
-
-src_install() {
-	emake prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		libdir="${D}"/usr/$(get_libdir) \
-		datadir="${D}"/usr/share \
-		install || die
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-
-	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
-	einfo "incompatibilities:"
-	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
-	einfo "- The X resource class has changed from Emacs to XEmacs,"
-	einfo "  settings in your .Xdefaults file should be updated accordingly."
-
-	if use xft;
-	then
-	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
-	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
-	fi
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
diff --git a/app-editors/xmlcopyeditor-1.2.1.3 b/app-editors/xmlcopyeditor-1.2.1.3
new file mode 100644
index 000000000000..992d8fe4e720
--- /dev/null
+++ b/app-editors/xmlcopyeditor-1.2.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=app-text/aspell dev-libs/libxml2 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre !aqua? ( x11-libs/wxGTK:3.0[X] ) aqua? ( x11-libs/wxGTK:3.0[aqua] ) dev-libs/boost dev-util/intltool >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=XML Copy Editor is a fast, free, validating XML editor
+EAPI=5
+HOMEPAGE=http://xml-copy-editor.sourceforge.net/
+IUSE=aqua nls
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=app-text/aspell dev-libs/libxml2 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre !aqua? ( x11-libs/wxGTK:3.0[X] ) aqua? ( x11-libs/wxGTK:3.0[aqua] )
+SLOT=0
+SRC_URI=mirror://sourceforge/xml-copy-editor/xmlcopyeditor-1.2.1.3.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=ed968e6bb368acd08d13e9d1b0eea240
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
deleted file mode 100644
index a9d5d6b395b5..000000000000
--- a/app-editors/xmlcopyeditor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d
-EBUILD xmlcopyeditor-1.2.1.3.ebuild 921 BLAKE2B 1011f90af104285a39642c5d8d04f8dcef32d7523f4fcd07f8c39b887aed86bd5547173aed2a700b528089df8b97e3bdc0f42f62d7ee00dfd927dfebc9418e76 SHA512 c226e815d601d6551bc97a85d731379fb627d64a49f0e8a6e3993b4667968604fa3882b7a94b75713f0ff4f417038f71ddd92a3f34e0c0abc824aa242cc0e3c2
-MISC metadata.xml 299 BLAKE2B d4eb8befeca3801e2b1c8762bc4fca6556be50259e1147ceb1f69ea9d952415e608c5c8bd117947cf1a67420ffa9a86dde85c1d1d3b388f59634764702b909e4 SHA512 8dd8d77282bf225c1d1f040808c10b766a361ac70d0c27a643d1c7a8654e2737570bd3f58238c907047decfa88ccb904ba2399d700fbbe04409c2269b89d9ef9
diff --git a/app-editors/xmlcopyeditor/metadata.xml b/app-editors/xmlcopyeditor/metadata.xml
deleted file mode 100644
index 4c003c163801..000000000000
--- a/app-editors/xmlcopyeditor/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription>
-	Fast, free, validating XML editor.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">xml-copy-editor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild
deleted file mode 100644
index f8f58ca6770f..000000000000
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-WX_GTK_VER="3.0"
-
-inherit autotools wxwidgets
-
-DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
-HOMEPAGE="http://xml-copy-editor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xml-copy-editor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="aqua nls"
-
-RDEPEND="
-	app-text/aspell
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/xerces-c[icu]
-	dev-libs/libpcre
-	!aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-	aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[aqua] )"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-util/intltool"
-
-DOCS=( AUTHORS ChangeLog README NEWS )
-
-src_prepare() {
-	# bug #440744
-	sed -i  -e 's/ -Wall -g -fexceptions//g' configure.ac || die
-	eautoreconf
-
-	need-wxwidgets unicode
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-editors/xvile-9.8r-r1 b/app-editors/xvile-9.8r-r1
new file mode 100644
index 000000000000..4630f27695bf
--- /dev/null
+++ b/app-editors/xvile-9.8r-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8r >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 x11-base/xorg-proto sys-devel/flex
+DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
+EAPI=6
+HOMEPAGE=https://invisible-island.net/vile/
+IUSE=perl
+KEYWORDS=alpha amd64 ia64 ppc sparc x86
+LICENSE=GPL-2
+RDEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8r >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2
+SLOT=0
+SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8r.tgz
+_md5_=c98850dad892e5485990f274a900052e
diff --git a/app-editors/xvile-9.8s-r1 b/app-editors/xvile-9.8s-r1
new file mode 100644
index 000000000000..0e9404d312be
--- /dev/null
+++ b/app-editors/xvile-9.8s-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8s >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 x11-base/xorg-proto sys-devel/flex
+DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
+EAPI=6
+HOMEPAGE=https://invisible-island.net/vile/
+IUSE=perl
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8s >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2
+SLOT=0
+SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8s.tgz
+_md5_=4b4502cb75d26aef35ea2e1608f23fee
diff --git a/app-editors/xvile/Manifest b/app-editors/xvile/Manifest
deleted file mode 100644
index 0f21e46eb282..000000000000
--- a/app-editors/xvile/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vile-9.8r.tgz 2322132 BLAKE2B ec477afbf927b527a484dd6ec2cf596a3f97ee1a523e7254aaaf88b98c1b353c82358a0e80408bcbe270ec6eb7b958fb8e9d517801705cf8bbcb4e58bea94026 SHA512 4f610c8c8f491d8d630d042166cbbdc12b89513d40d14dd70526d6cb5d7ebf603a99b19ce2fc42f7143d674e6d5155fcd305da297e03e46caa862ff40e2bbdd4
-DIST vile-9.8s.tgz 2328441 BLAKE2B 35b5cbec671347eb81503b70a2061395e3c8c904cd304acc83feda2baed71ede7936143ea554bb3bba0cda8056b1a6d76c5ee6473b244a8a05d113a8e613ead0 SHA512 06bfa64e5908aa31351068c5509e6fcc98bde202b814aa6abe5c449f841378c897df1fdbb8b20bdb5e71578238e1e9d11dac08e66159317276a01a9ac96ae9ab
-EBUILD xvile-9.8r-r1.ebuild 859 BLAKE2B 67c299130e8df58ac8f07eada58b100acefda284ed4627a93aea5a3edc505cce23169fd07bad8a2e9810b0d242952e2e65235650243c6e97d32425610ffc0b5e SHA512 4381e53d174eb931594a429af0930ded4a0047b3c1c18f33a3f0c97c35b9e9cbe1468279fdf04493c2794551bd8465fd1b6e5fa574d289288ae55fdf23bbd72c
-EBUILD xvile-9.8s-r1.ebuild 865 BLAKE2B 48a6a17bff4906ecf82706cc027946e6b5b1e397f08d950b02e87e131ab93a2e3c0b4fee1f854a85c54dfe1d7f873e20d59bc2c09236224bc4bb032e2a0b7684 SHA512 59e9b0fc3160f0e5b36e22fb01ba31f84f6f907dcc2362ea65994e8cd83be7ebcd89d25f289d62a57ef902327147ea7e57756905635b65d7c877aed1e9b5bdc0
-MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-editors/xvile/metadata.xml b/app-editors/xvile/metadata.xml
deleted file mode 100644
index f1abc6411341..000000000000
--- a/app-editors/xvile/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>vim@gentoo.org</email>
-	<name>Gentoo Vim Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-editors/xvile/xvile-9.8r-r1.ebuild b/app-editors/xvile/xvile-9.8r-r1.ebuild
deleted file mode 100644
index d2cd7608324f..000000000000
--- a/app-editors/xvile/xvile-9.8r-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN/x/}-${PV}"
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="https://invisible-island.net/vile/"
-SRC_URI="ftp://invisible-island.net/vile/current/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="perl"
-
-RDEPEND="perl? ( dev-lang/perl )
-	=app-editors/vile-${PV}
-	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0
-	>=x11-libs/libICE-1.0.0
-	>=x11-libs/libSM-1.0.0
-	>=x11-libs/libXaw-1.0.1
-	>=x11-libs/libXpm-3.5.4.2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	sys-devel/flex"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		--with-x \
-		$(use_with perl)
-}
-
-src_install() {
-	dobin xvile
-	dodoc CHANGES* README doc/*.doc
-	docinto html
-	dodoc doc/*.html
-}
diff --git a/app-editors/xvile/xvile-9.8s-r1.ebuild b/app-editors/xvile/xvile-9.8s-r1.ebuild
deleted file mode 100644
index 8ea94b51724e..000000000000
--- a/app-editors/xvile/xvile-9.8s-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN/x/}-${PV}"
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="https://invisible-island.net/vile/"
-SRC_URI="ftp://invisible-island.net/vile/current/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="perl"
-
-RDEPEND="perl? ( dev-lang/perl )
-	=app-editors/vile-${PV}
-	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0
-	>=x11-libs/libICE-1.0.0
-	>=x11-libs/libSM-1.0.0
-	>=x11-libs/libXaw-1.0.1
-	>=x11-libs/libXpm-3.5.4.2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	sys-devel/flex"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		--with-x \
-		$(use_with perl)
-}
-
-src_install() {
-	dobin xvile
-	dodoc CHANGES* README doc/*.doc
-	docinto html
-	dodoc doc/*.html
-}
diff --git a/app-editors/yudit-2.9.6 b/app-editors/yudit-2.9.6
new file mode 100644
index 000000000000..fda42fa0ba43
--- /dev/null
+++ b/app-editors/yudit-2.9.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/libX11 >=sys-devel/gettext-0.10
+DESCRIPTION=Free (Y)unicode text editor for all unices
+EAPI=5
+HOMEPAGE=http://www.yudit.org/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11
+SLOT=0
+SRC_URI=http://yudit.org/download/yudit-2.9.6.tar.gz
+_md5_=775047346e2c19f9449c1a30194f029b
diff --git a/app-editors/yudit/Manifest b/app-editors/yudit/Manifest
deleted file mode 100644
index 39ecd172b994..000000000000
--- a/app-editors/yudit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yudit-2.9.6.tar.gz 2797142 BLAKE2B 76fb8e0ade65c84389db71b4100e458f5b70aebba27eea4b604bfcee08974060dcd2bab2d86586b5ba729d8d5090c943e825dfe58d71c609f0ca2f2e0c3900c9 SHA512 a9a0b6f6c44451cf2fefc4fc0bb1bbd9ffccd17c4c622dc35b08113245b3bb9f3ca949f3e7b9d2aa919ebf3840295c5e63c0297576e74a5f2d1fb99cfc97c46b
-EBUILD yudit-2.9.6.ebuild 604 BLAKE2B 1aa89fd7b8a9aec721fa4b8a411b141ddcd4004b3bbc64b79ef558ebc76dae2ed8f3abf448a33f4647878aa820e1c7f49cc72d7cf810aaf43eab7e0e104f109b SHA512 44d0e87fb7aebb5b50b69d21179b83d3ff46b6ccb7f454f30dd7b8834d15699bd49446cdcbc6ee56e2cfd8de5a397d08069bac6c27247fe091a1283af5c32963
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/yudit/metadata.xml b/app-editors/yudit/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-editors/yudit/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-editors/yudit/yudit-2.9.6.ebuild b/app-editors/yudit/yudit-2.9.6.ebuild
deleted file mode 100644
index e46388fb702c..000000000000
--- a/app-editors/yudit/yudit-2.9.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Free (Y)unicode text editor for all unices"
-HOMEPAGE="http://www.yudit.org/"
-SRC_URI="http://yudit.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.10"
-
-src_prepare() {
-	#Don't strip binaries, let portage do that.
-	sed -i "/^INSTALL_PROGRAM/s: -s::" Makefile.conf.in || die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc {BUGS,CHANGELOG,NEWS,TODO,XBUGS}.TXT
-}
diff --git a/app-editors/zile-2.3.24-r2 b/app-editors/zile-2.3.24-r2
new file mode 100644
index 000000000000..bef5a23b45e1
--- /dev/null
+++ b/app-editors/zile-2.3.24-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install test
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig test? ( valgrind? ( dev-util/valgrind ) )
+DESCRIPTION=Zile is a small Emacs clone
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/zile/
+IUSE=test valgrind
+KEYWORDS=alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-3+
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=mirror://gnu/zile/zile-2.3.24.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=3df0de92ae5a0e3ffad8d08176b08cf3
diff --git a/app-editors/zile-2.4.11 b/app-editors/zile-2.4.11
new file mode 100644
index 000000000000..30d61da5475e
--- /dev/null
+++ b/app-editors/zile-2.4.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/boehm-gc-7.2 sys-libs/ncurses:0 acl? ( virtual/acl ) test? ( dev-lang/perl )
+DESCRIPTION=Zile is a small Emacs clone
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/zile/
+IUSE=acl test
+KEYWORDS=alpha amd64 arm ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/boehm-gc-7.2 sys-libs/ncurses:0 acl? ( virtual/acl )
+SLOT=0
+SRC_URI=mirror://gnu/zile/zile-2.4.11.tar.gz
+_md5_=f7128d1bd12348dddb7ec38e6ff1e5e2
diff --git a/app-editors/zile-2.4.14 b/app-editors/zile-2.4.14
new file mode 100644
index 000000000000..8766897a3d59
--- /dev/null
+++ b/app-editors/zile-2.4.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install test
+DEPEND=>=dev-libs/boehm-gc-7.2:= sys-libs/ncurses:0= acl? ( virtual/acl ) virtual/pkgconfig test? ( dev-lang/perl )
+DESCRIPTION=Zile is a small Emacs clone
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/zile/
+IUSE=acl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/boehm-gc-7.2:= sys-libs/ncurses:0= acl? ( virtual/acl )
+SLOT=0
+SRC_URI=mirror://gnu/zile/zile-2.4.14.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=cf8384e34917d25dea6c457b8e62d592
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
deleted file mode 100644
index 695d0693ceaa..000000000000
--- a/app-editors/zile/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX zile-2.3.24-gets.patch 904 BLAKE2B 7d5bca1774f2a507281b17213289bbc15a75e112b7e380cdb99ae20082209fbcb05e7c837553900f507fcba6faa7cf691dd66e2f7e32b7d987dc238a80259cc6 SHA512 5ab3ba3d31288c4cb2071796144e68d85c6bf29f215714980685dce75eeac199ea32bfea2c83619e997c2c90891a254179dd6e8763651e703f4a662b7871bab2
-AUX zile-2.3.24-userhome.patch 980 BLAKE2B c72dd7bd03325b93d9ef46cd76ad6bf463821fe611396743a64e161c3268086e252651b3fc05745fcd00ce614a94c776d7305251ea971adeb80e799d7edbfca1 SHA512 b1d0e4453771d36efe6547d9c30c807af0a05866bd728a94d30f25b8e9248d880a02143c5d1d9b47fa7a5cab9174804feeb3cc0f2956474c948349581d7a25e7
-DIST zile-2.3.24.tar.gz 953962 BLAKE2B 242f0f9532a536d5ba36664031cf86eba753239c0f6dcd47c086496628a730bdd0a9112dc1ffd26965068f6d66d35d3ad3c92fc2753e129adf9a5923321e2cdf SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9
-DIST zile-2.4.11.tar.gz 1293707 BLAKE2B 30317856303cd093e767f7c057fab74cddcd49e95d8218b550e343d689914db02c82c5f35c66335e0685df9113dcbef93b4640fcf42438fb600f360b82c4e396 SHA512 dbcbae98d8b9fc7ea71abc8ad0c4248edf1498a731172e800dd4b1fd598597924cc61e24fbfce5eb44dd2b3a0b2aea416c6373843a450e19cc8c98aa83d6ae0e
-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.14.ebuild 1421 BLAKE2B 775403d85dfe22abad45ffb15395389ac49d2e1e608ce5554de7247f86e46fb69e4f08b03c9b9dc214bd4418da856412e1ba2c165c0f3223a984887476568430 SHA512 75e4e901ab09940a233d8251d62facb101e4011b4eb9f0b00e5a6190af8b91a7038b3bb89765f7caafe2ce633b69c18a62e62a2309a8ebbef28313418cb0860c
-MISC metadata.xml 638 BLAKE2B 4830ef65d641a21c208c6e856daf949d8b931c1beef92f93e5428fae095e0c81e39ca93b9d9ec4cdafc74b689b1469e86d73f8a31fd3f775d728f1f973b1b743 SHA512 f2214ca22b8c80124f264991e70ad97047a5705dda78bc59573f1c80d3ee144343502bd7f610117af263611c11cb1c7c0b732fe44b6274272a50b7cf5d595ad1
diff --git a/app-editors/zile/files/zile-2.3.24-gets.patch b/app-editors/zile/files/zile-2.3.24-gets.patch
deleted file mode 100644
index 9060c4bcf921..000000000000
--- a/app-editors/zile/files/zile-2.3.24-gets.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/623218
-Backported from gnulib in zile-2.4.11.
-
---- zile-2.3.24-orig/lib/stdio.in.h
-+++ zile-2.3.24/lib/stdio.in.h
-@@ -717,22 +717,11 @@
- # endif
- #endif
- 
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gets
--#   define gets rpl_gets
--#  endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--#  undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
diff --git a/app-editors/zile/files/zile-2.3.24-userhome.patch b/app-editors/zile/files/zile-2.3.24-userhome.patch
deleted file mode 100644
index 37f605ccf610..000000000000
--- a/app-editors/zile/files/zile-2.3.24-userhome.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://lists.gnu.org/archive/html/bug-zile/2011-08/msg00030.html
-
---- zile-2.3.24-orig/src/file.c
-+++ zile-2.3.24/src/file.c
-@@ -177,14 +177,15 @@ compact_path (astr path)
-     {
-       /* Replace `/userhome/' (if found) with `~/'. */
-       size_t homelen = strlen (pw->pw_dir);
--      if (astr_len (path) >= homelen &&
--          !strncmp (pw->pw_dir, astr_cstr (path), homelen))
-+      if (homelen > 0 && pw->pw_dir[homelen - 1] == '/')
-+        homelen--;
-+
-+      if (astr_len (path) > homelen &&
-+          !strncmp (pw->pw_dir, astr_cstr (path), homelen) &&
-+          astr_get (path, homelen) == '/')
-         {
-           astr buf = astr_new_cstr ("~/");
--          if (STREQ (pw->pw_dir, "/"))
--            astr_cat_cstr (buf, astr_cstr (path) + 1);
--          else
--            astr_cat_cstr (buf, astr_cstr (path) + homelen + 1);
-+          astr_cat_cstr (buf, astr_cstr (path) + homelen + 1);
-           astr_cpy (path, buf);
-           astr_delete (buf);
-         }
diff --git a/app-editors/zile/metadata.xml b/app-editors/zile/metadata.xml
deleted file mode 100644
index 237d50416e4f..000000000000
--- a/app-editors/zile/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-  Zile is a small, fast, and powerful Emacs clone. It is useful for small
-  footprint installations (e.g. on floppy disk), machines with little memory,
-  or quick editing sessions, especially on remote machines or as a different
-  user, e.g. root.
-</longdescription>
-<use>
-  <flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg>
-    in tests</flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/zile/zile-2.3.24-r2.ebuild b/app-editors/zile/zile-2.3.24-r2.ebuild
deleted file mode 100644
index f60cd5b9ec32..000000000000
--- a/app-editors/zile/zile-2.3.24-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Zile is a small Emacs clone"
-HOMEPAGE="https://www.gnu.org/software/zile/"
-SRC_URI="mirror://gnu/zile/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test valgrind"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( valgrind? ( dev-util/valgrind ) )"
-
-PATCHES=("${FILESDIR}"/${P}-{userhome,gets}.patch)
-
-src_configure() {
-	# --without-emacs to suppress tests for GNU Emacs #630652
-	econf \
-		--without-emacs \
-		$(use test && use_with valgrind || echo "--without-valgrind") \
-		CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_test() {
-	if tput cup 0 0 >/dev/null || tput cuu1 >/dev/null; then
-		# We have a sane terminal that can move the cursor
-		emake check
-	else
-		ewarn "Terminal type \"${TERM}\" is too stupid to run zile"
-		ewarn "Running the tests with TERM=vt100 instead"
-		TERM=vt100 emake check
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# FAQ is installed by the build system in /usr/share/zile
-	dodoc AUTHORS BUGS NEWS README THANKS
-
-	# Zile should never install charset.alias (even on non-glibc arches)
-	rm -f "${ED}"/usr/lib/charset.alias
-}
diff --git a/app-editors/zile/zile-2.4.11.ebuild b/app-editors/zile/zile-2.4.11.ebuild
deleted file mode 100644
index ca00137322ab..000000000000
--- a/app-editors/zile/zile-2.4.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Zile is a small Emacs clone"
-HOMEPAGE="https://www.gnu.org/software/zile/"
-SRC_URI="mirror://gnu/zile/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="acl test"
-
-RDEPEND=">=dev-libs/boehm-gc-7.2
-	sys-libs/ncurses:0
-	acl? ( virtual/acl )"
-
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable acl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# AUTHORS, FAQ, and NEWS are installed by the build system
-	dodoc README THANKS
-
-	# Zile should never install charset.alias (even on non-glibc arches)
-	rm -f "${ED}"/usr/lib/charset.alias
-}
diff --git a/app-editors/zile/zile-2.4.14.ebuild b/app-editors/zile/zile-2.4.14.ebuild
deleted file mode 100644
index 42fcd64fc45d..000000000000
--- a/app-editors/zile/zile-2.4.14.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Zile is a small Emacs clone"
-HOMEPAGE="https://www.gnu.org/software/zile/"
-SRC_URI="mirror://gnu/zile/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="acl test"
-
-RDEPEND=">=dev-libs/boehm-gc-7.2:=
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
-
-src_configure() {
-	# --without-emacs to suppress tests for GNU Emacs #630652
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--without-emacs \
-		--disable-valgrind-tests \
-		$(use_enable acl) \
-		CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_test() {
-	if tput cup 0 0 >/dev/null || tput cuu1 >/dev/null; then
-		# We have a sane terminal that can move the cursor
-		emake check
-	else
-		ewarn "Terminal type \"${TERM}\" is too stupid to run zile"
-		ewarn "Running the tests with unset TERM instead"
-		( unset TERM; emake check )
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# AUTHORS, FAQ, and NEWS are installed by the build system
-	dodoc README THANKS
-
-	# Zile should never install charset.alias (even on non-glibc arches)
-	rm -f "${ED}"/usr/lib/charset.alias
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 20:56:41 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 20:56:41 +0100
commit	d87262dd706fec50cd150aab3e93883b6337466d (patch)
tree	246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-editors
parent	71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff)