gentoo resync : 24.12.2018

43 files changed, 878 insertions, 248 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 50114af2507b..b28c564207d7 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bvi/Manifest b/app-editors/bvi/Manifest
index ec1cfbe74c3b..bc09d398f17e 100644
--- a/app-editors/bvi/Manifest
+++ b/app-editors/bvi/Manifest
@@ -4,6 +4,6 @@ DIST bvi-1.3.2.src.tar.gz 170444 BLAKE2B 5726fe730b6751a768247581cfd4dce0a40a9ce
 DIST bvi-1.4.0.src.tar.gz 139202 BLAKE2B 151d86214aa93bb0a7f383c8de13b8a15fe2cfe7f5892dff52b80e362c049b49082abe846ffaf68ec69201bbffba2fdcc5d00f744756c49ecb26e16ab93bb13d SHA512 119cfc7350f81c324e77243f948cfb91cd9a3122fef307616e4756a99732f69131aed2a26ebe48048698b9c211a0214255f3e6605ad2cbf479a14a4a0f88923c
 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.ebuild 479 BLAKE2B a159b21ae853cb0ae42abc09e3a61538d88e3421bd9814bd09c185e6eaae1282858e47148562ad86591c5884cfa8aa252d28c02f69f57ae8388a96d5c3e7de08 SHA512 985f30bb894311c7b7d291ce81819963208c89e5a7f11ed9d1ccc037874dd696bdb2855f10f0c1e1b7ab6cfaccb708e0523a00b2b63c49d91000151799c73105
+EBUILD bvi-1.4.0.ebuild 476 BLAKE2B 8828fe7012383599a427032ec9d3fc89457e82cd7d6beaae56a9f2883c960c8c71e1ba6cbe57d4122f1440b2a650193f5bdde6e889358429e1ed90412bbedacc SHA512 642d892af5285215170595beb35aa9957fef14cf67230a8a79e03d1ac0bc92e836b84f7e2a30545f085376346b9571201fa7fec05acd37b8e8e0fea56f75f7db
 EBUILD bvi-1.4.0_alpha.ebuild 1058 BLAKE2B fe2efcc9311f8b1945710f5b7c1705f909b8a5eea9b6f29acc65a845a175f3bf17214c32539941318e1bb877066b8cd91c0716d220b865984a14336663eb07a2 SHA512 065cad807372427e57158a12ec5ca095dd7a63a54db8e3a79a607766f79edd05e589b82606261d963eebdac37c3dfb87404bfc4b09106e299d435ef925b3b9cf
 MISC metadata.xml 436 BLAKE2B ae30a6fe4365b8954c5ae093014aa1ed918f0d79f7a3f2a4a7a40992465b6b06ec22bcb9335dcde96328cd9c366a7dafbeed295089b286aae3ebeda06f77f09d SHA512 456ff0bd21bb62b2f6d98d9e50db4dd7d8924c48f19358aecf8b35f935478f59ce0fecbda47d8272f6785ef49e9eff5b82eb565a0dd0b0e928c091f86861e958
diff --git a/app-editors/bvi/bvi-1.4.0.ebuild b/app-editors/bvi/bvi-1.4.0.ebuild
index c1c5bf10bccf..10e665561d24 100644
--- a/app-editors/bvi/bvi-1.4.0.ebuild
+++ b/app-editors/bvi/bvi-1.4.0.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 29980214ee5d..1d72d4c98cab 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,7 +1,7 @@
-DIST emacs-27.0.50_pre20180731.tar.xz 28569892 BLAKE2B 03988ee559f53ce54da2bc610bfb8cb9daab583610de419485c6cd76bd85d990ba18360b5cb12623c6a248471b5846620ce5c7deba03074c0bcdea4dc7db5e22 SHA512 35036de6748b0d63524172c4535676d330b917ca478c36aed227af4a04a82da2b32ed8e7d75e388f7182ebbe476775c48c1234a08eeea18561b43411a20dfb05
+DIST emacs-26.1.90.tar.xz 43892340 BLAKE2B 8ee12a6f8d6dd1a8084864d53818cd9127a95b7da632db14c831d2f9d4848aa11bb8a9d92bf8bf0348ea4e2fa75de45408d284680255e5a2b9845ada1acbc7fc SHA512 b2e7e9c1015c221e8665426528703bfe336734b7830d731d5f3a7c50ce423b2a8bdada7f934e5f31dbe81b4f06623bddafe48e9da4727cb728564d569ff0b188
 DIST emacs-27.0.50_pre20180831.tar.xz 28668124 BLAKE2B fae74d9885889b042142f580e971c73c193306dca26b42dd87ac3d3d765312ce6695511d7d31a047d79803982f6345c4c319a3d83cea1313080170da97482fa2 SHA512 43b32d8943dc897dfc0c1fddb4261a196d3a604add5bcf87a93748125f15db2cac762d3550d6593b80e961ae35d543adc4d5937bac77970c658f93dba26f17e4
-EBUILD emacs-vcs-26.1.9999.ebuild 12962 BLAKE2B bce5a77debbee884361bfff779d89f6176fa7b22725a8bd631a4c253bab0dd998874d5cbbbc3493d9e5cf51bf96d9245e24b9c3bf81430babba55a1e0a75d44b SHA512 403ec1d674a3f5c42c5c92bc954359b62ae89b3cca5831f73482ec9f69d9c934c3f04690b9c444d3f8250210e6cd9681f31140c95954d134cdb402c710446cee
-EBUILD emacs-vcs-27.0.50_pre20180731.ebuild 13014 BLAKE2B 049af61869ac06ad151f958f607d7bf2d8218a80dc559b8b780f89bd8c2295c600af3418717fe1b34ed9d5131dafdb291772c7dc648813bac8eabb4bf1ebeafc SHA512 2a4de491be8eb1d1badc5efe2f22d078b3d47ca2190b6d2569c9a783c5b705184f2c6d2f3110b7a0c6dca51884fdc4d1d21e4cdc6feb19ea2c2b9d46a4ebfbf7
+EBUILD emacs-vcs-26.1.90.ebuild 13001 BLAKE2B d433baf07357bbd5db2f0704e7effa3c62f4306f5ad95a801949da3fe7d5de15ec6d276324118ffece09fc51c279dacec5fc7943d9d912f2eba2591d0070e5ee SHA512 39634f8ad92db5115a360bf43bbafa230b3e94462d51a311b5a1ef49bf2f762b05fb9c35e36cd378c427d095aba18b446b2fcef668f903972b4ce72bda6acd44
+EBUILD emacs-vcs-26.1.9999.ebuild 13017 BLAKE2B e7e174b5712fffdb63dd0861ed290c9217305122e54ae307a42ba9c01daf71273585bdb289ad1719e9fad5342386de0e7941b409ee7b1d2a525a7e589ebd86ce SHA512 edf01baf808072452b9544d569276c9fd49018458a1b57368c5477147dc597854bf327c81216905d798ad616fac57c4f0b6a7ad2fc415abc0c308b449d9767c7
 EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 13050 BLAKE2B 9c43fc10140cf72d7bf9909775d3b81ecc346e9d8d02e7c4548748f5f808375adc22078ec85d2647d61a9c1dc02c4e34d29b26be739b315c87f5f4d751f24bfd SHA512 f7aee0a0e3d5c5071df9e1da1c8bf15dd94ab2fc7dbf802bbe44b6bc8cd3770fcc27c1b2139f015d9d2952f66906fbf4eb40fb1d366045c81d638c299d4370ad
-EBUILD emacs-vcs-27.0.9999.ebuild 13050 BLAKE2B 9c43fc10140cf72d7bf9909775d3b81ecc346e9d8d02e7c4548748f5f808375adc22078ec85d2647d61a9c1dc02c4e34d29b26be739b315c87f5f4d751f24bfd SHA512 f7aee0a0e3d5c5071df9e1da1c8bf15dd94ab2fc7dbf802bbe44b6bc8cd3770fcc27c1b2139f015d9d2952f66906fbf4eb40fb1d366045c81d638c299d4370ad
+EBUILD emacs-vcs-27.0.9999.ebuild 13105 BLAKE2B 6dc87a2e7add4e493b8d8eae49855b548a29d94ce3e61747bc91cfd13317e6876fdf2d328c9b527d476ebe06a472df06dd717d18e0d818a77f542c1dd993a5a3 SHA512 c7bbff98a510320683f7f7b0be14c93a6e5c85379b96aa51fe45ea3311245a06ca7fddaad4a26b703a1c04fc1bc78b145168f0102e43fafd8e16bf099a45e5ac
 MISC metadata.xml 2897 BLAKE2B 9913cc3b37864559eb273338b02dd202b51820d2614fee5e17f1fe8fa98c691374443d68f29cca5172034c15dfa321390e2624087b3cdb4779364b12711c2a8d SHA512 1764fb9b8da95a3c3469c896808fe4e29b6b0bcb8b9986ccfd4756e451005f2f1f47b0fdcd5243dac7e70aa83f67fef25ac5ebfecf20e5fbd3e5c93851ad7eba
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.90.ebuild
index 2702df13aa10..bd29a0514013 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,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_BRANCH="emacs-26"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
 	S="${EGIT_CHECKOUT_DIR}"
 else
@@ -27,10 +27,9 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 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 gtk2 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+SLOT="26"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
-RESTRICT="test"
 
 RDEPEND="sys-libs/ncurses:0=
 	>=app-eselect/eselect-emacs-1.16
@@ -40,7 +39,6 @@ RDEPEND="sys-libs/ncurses:0=
 	dbus? ( sys-apps/dbus )
 	gpm? ( sys-libs/gpm )
 	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	json? ( dev-libs/jansson )
 	kerberos? ( virtual/krb5 )
 	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
@@ -252,6 +250,7 @@ src_configure() {
 
 	econf \
 		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
 		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
 		--localstatedir="${EPREFIX}"/var \
 		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
@@ -264,7 +263,6 @@ src_configure() {
 		$(use_with dynamic-loading modules) \
 		$(use_with games gameuser ":gamestat") \
 		$(use_with gpm) \
-		$(use_with json) \
 		$(use_with kerberos) $(use_with kerberos kerberos5) \
 		$(use_with lcms lcms2) \
 		$(use_with libxml2 xml2) \
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
index f2a9bef0754a..8c8c1e0e0c82 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -251,6 +251,7 @@ src_configure() {
 
 	econf \
 		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
 		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
 		--localstatedir="${EPREFIX}"/var \
 		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index 2862235ef56e..5450edeeb08a 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -253,6 +253,7 @@ src_configure() {
 
 	econf \
 		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
 		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
 		--localstatedir="${EPREFIX}"/var \
 		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
diff --git a/app-editors/fe/Manifest b/app-editors/fe/Manifest
index c2de097bbafa..b0e11b19136a 100644
--- a/app-editors/fe/Manifest
+++ b/app-editors/fe/Manifest
@@ -2,5 +2,5 @@ AUX fe-1.8-makefile.patch 370 BLAKE2B f0bfc2c97e30ce35a904394a871b275043ee479392
 DIST fe-1.9.tar.gz 178678 BLAKE2B 144d8edf2f6bf38f75b7e5593d0fb9d9e3fc4a7e91d974f49fa5f7974ee1e077dbdee4ee25931b34691032c0d4e676ab6b03e4de646947a4ea133876213285d9 SHA512 38121a21c1539ff8ad4f61b92ddfd0582c100f1bc1c5524faf7a60a162c5f8a0b2d1528da7719e522e9b75a527166223c2636f78c9f516abbb33434a9f6e6251
 DIST fe-2.0.tar.gz 217430 BLAKE2B bbc886abdb54d5fe05f031a5e5700907586c4bae8812f4edd5bf6d35fa0ce16edb93a6f988a597e1b4aba69bde4019f3044091ab9285ee6138d913498816453b SHA512 85afa800466376e59aa8de4af06db51c5df8566109a1f632b30a366f944be3237f88a639329d44114360747836ed75c31746c7d6bf1568b7b4ff3e11d595a6e7
 EBUILD fe-1.9.ebuild 694 BLAKE2B b97c8855f82cf71d6f84358c07f3a3f4e24023db119fc357a01b36ca604b5634330333dae1d2a047107564f6406395a4e78fbd18a7aba40a23aae64d6649ad3f SHA512 987ee3a593b521916c12c40823840d593766c31bf4bcb47d5f082092d3a95078915d8180b6a482c6afc0c014faf88c79076823153f42a64a5aa6789f24243767
-EBUILD fe-2.0.ebuild 676 BLAKE2B c5a0aba3d854c8f279273b96409d0c5863d8220bc4e1f19c8acd667acfbfb7efead798023504901995e81b6c5756fa01a7d964c55b62ccf021df83715108dec5 SHA512 7b2d896a4671bef53d8661c8a8b89bc0bff00933fe59bb15df59bb2cdbaa3456c5b356e61415c7d38c4a977513b400e25518fbc56c1a47b8b28aa58c41276a22
+EBUILD fe-2.0.ebuild 784 BLAKE2B f4639eb6e54589ba2c6b3b6cac195859585d8b422eee73062f0bda9d95eb6ae340d6f35165a20c32402814b9fcb9c49678f6925658b8a252e6ada23a940b7ed0 SHA512 1f7dc3bdd3a7c04c3ee0bbb0f90dabfc0814edaee82e97cc3aacd5633337e5a42660b1ac45d03080af38bee522184f76731d91304d4b513301b9bb4be28403a1
 MISC metadata.xml 1259 BLAKE2B e393bad45601c7e357aa4c4e5e6ede35cdd6758a1cc251cfc3acca0e8526ffb696c0ca484b312be14d23a05d8996ce7fb3bee37fe7a8c9bc72d5c507c26729df SHA512 6539d808d3cd85bab1985dbfb69ddbd01166a4e6dcf66d0f138d1ff1e52d9b7342ff3b468e031f9372308533296e28eb978b00954624890a897b5f41c222f701
diff --git a/app-editors/fe/fe-2.0.ebuild b/app-editors/fe/fe-2.0.ebuild
index 9e1866c107ce..ca6658d94079 100644
--- a/app-editors/fe/fe-2.0.ebuild
+++ b/app-editors/fe/fe-2.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 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"
@@ -15,11 +17,14 @@ IUSE="sendmail"
 RDEPEND="sys-libs/ncurses:0=
 	sendmail? ( virtual/mta )"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=("${FILESDIR}"/${PN}-1.8-makefile.patch)
 
 src_configure() {
-	econf $(use_enable sendmail)
+	econf \
+		$(use_enable sendmail) \
+		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
 }
 
 src_install() {
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 6ae14abfb39e..49ae4da8bba8 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST gedit-plugins-3.22.0.tar.xz 1314512 BLAKE2B 2910a101da94112b4190d96111013675234c109bfc37e05ff98d53e87e0a4db8e5a4a6823017153d65a9d554cfb95fed000d56d9e721faebfeeb033fc7be2901 SHA512 5560b48c0b21b535de7247c39653c111439f9cb138025d7e3a600b94babbe060777c2095160b7e5ea39b8ba8be520ea3966b0ffc2ec15d17ea0bf814bf58748d
 DIST gedit-plugins-3.28.1.tar.xz 1350468 BLAKE2B 4fd50ad7358581f5e27f0c3a7e127d4e2c0e7189c039daee1d8d7ddf7062846e1aebb634b3edd998c9a7c11840c71f56fe4eeca78ea2e91ae18db814e4fd79e5 SHA512 6258c627cd3fa2948375c30e87061375c0d09ce2c70301c2d10a403e6075d1df09e928a2d95b72f6d7950a31a720af645fff2f7f59a281d2999948beb56c1dc9
-EBUILD gedit-plugins-3.22.0.ebuild 2297 BLAKE2B 74878dee069c2eeed548f80084f2bf1b63cedeab159ab84b54bd2bde7ae5446b5b6facb77e0cc08184a6bfd7502508bd0e5e6130c412247b822233fdae060ada SHA512 dce1562f0c1882d55feec31b82f3261d5e026f1e7fc1eb295941769c2da57d4feba03637f266f2a370fa5efb9f33b90253900eb40ad1d065b2762a6f08ea9ad2
-EBUILD gedit-plugins-3.28.1.ebuild 2293 BLAKE2B df9bf21c8fc974dccaee52172e87cb5854f90418c0634fe5f55448c411b409cae2067a0f605a891c41765b2466d0d8b8ef0a24f91bcb0f2a59e120c3be6352e0 SHA512 c56a1079043be69cdb1cf17c37b9194cfc6e09e5e0a8a2559a0c63747d6a7dcaa6bb8f9d2f77158b26c342398921256b2d23343ca8ff86d8210435feecd6271a
+EBUILD gedit-plugins-3.28.1.ebuild 2291 BLAKE2B 760bdfb31112d8fa8c620022cdaa5d879fb5ee9ec64fade4c5cf91a85d2b22caff4aaa2a86e0cd612bae6de049ce8b0b2de5c4c4b0b3fe6a6a2229e4f2df5951 SHA512 2cb1b9213a8d00ddd96ada96dae546f48856daec2b6811494b9addec47bc5f9279d494da32872f81eb9d68268ebead14c6f175155e7a93da82a81863a1ddbd53
 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/gedit-plugins-3.28.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.28.1.ebuild
index 336d04a0a897..9591c5c7d907 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.28.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.28.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Official plugins for gedit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 
 IUSE_plugins="charmap git terminal vala"
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index dbf29575dbef..dda5eb4033e4 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +1,3 @@
-DIST gedit-3.22.1.tar.xz 2948048 BLAKE2B aa23b261bc0a463febf5affbd0dca647df8d1db9553356f145784b1ebed43ed15dfede12f62b3fcb6f00aac59e2d3a84c31627be32000830523a805d46d2e4ab SHA512 7251732f353b1d9dab0fe447fe90b2259df34ff0694d8731ce3be531c21ac82ab6e7f4a07090aeef364640154f4ba6103539a253bc7942952dcf1e331418f0eb
 DIST gedit-3.28.1.tar.xz 3149684 BLAKE2B 6afedcc5de0bd249af3d0fd02339acc2d993aae083dcbfda9212745ab810b81cdb9da655273cb7ccc556644c29d69429d3587fcc9e1faf7aa1c2cee57af09a4b SHA512 f5931ac562cb5005a83eec43048b718ef431e6006b72470fea54ad0e94bd64940ebdec160ee0459ceb5adb235ab111711a2f9fbdc74104d2edd8f287d7474815
-EBUILD gedit-3.22.1.ebuild 2310 BLAKE2B d792c14afb2d9d87950afe72f2a0887564a7c6a6d6d7fb553ade64f4cde9e841a03bf2157fefb2e26923ae07da12b3527a65142bc6318b1781d1388dc12bbce2 SHA512 5ecdcb8f259361b27743fc29052e0c0a751367f46c6688a31f66942013aca448afd4113d41f7cf923b82bed61fa226e44943aef3dc795fbe3fced74d70663d78
-EBUILD gedit-3.28.1.ebuild 2330 BLAKE2B 5d7a9fafc3fb89e7aa7db115cb74657a809780e5e9b02954599592f725dde9ed2083eeabf34b858728da3ba15657579bc2b37652bb8c49e45bf4731ef8a8836b SHA512 105d6ea96961a2de1d9e201a281bc9df76d45f239d1b471836befec4b276c95a05e4c498d26e0fd3ece305e6316698c1209e6931a3d45fe49c5f5fefd1e019d3
+EBUILD gedit-3.28.1.ebuild 2328 BLAKE2B 5ab0617039b6337ef6700fd0af86aedadfee9f03571fbcd1dbaa9c74d9ecff234aaefa5ac2e2bf85d999ffac099f9e725cd896f7d37a253ca082f0e2fcb8e8ae SHA512 86b378ecb0f1831d0c9815953571cb0895dd9fabe905af8d080c542e5188fed1cfaaa5ddd1b36de03a9b1088f74a79e2c5382fb04866b8fcf30ba7e4aac0bf7e
 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/gedit-3.28.1.ebuild b/app-editors/gedit/gedit-3.28.1.ebuild
index 5887754c0694..375e1ea0070b 100644
--- a/app-editors/gedit/gedit-3.28.1.ebuild
+++ b/app-editors/gedit/gedit-3.28.1.ebuild
@@ -18,7 +18,7 @@ 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"
+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="
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index 578866076b56..44aa6309eb55 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -1,5 +1,7 @@
 DIST ghostwriter-1.5.0.tar.gz 620301 BLAKE2B 07af6c6b176f15a7b6bee0594936a346160783c553dfd91cd69bde3975ada5c125920c1029ab19aee21c89576c6fab311f7a893447c457ff5a174149e57f67bb SHA512 4b6e1430342069b224f7aece30d5a592a43e9f702cb93fc073fded741771ea74b8478203aeaecdabb791aa7ddd8055d5c36346518adc7dd19b61e5f2e2cbe219
 DIST ghostwriter-1.7.3.tar.gz 673328 BLAKE2B 5304f5218da5fe535dea1ed9d43c4358212d9b1025dcc7102a77852c833ba1301d59539df4e2a44fd8a46abe7dfbdc7c6ab490d3f9e8ed5f7b4571b604c3bbb6 SHA512 a6f7e64078bdb3ecd9ea48ead8e96811e62215292a1c4a269f23efb6c0403c62fb0aab3e1303397b08036a7f3507d04a8eb8c14baafd78f64fea20805bb24a5a
+DIST ghostwriter-1.7.4.tar.gz 1195162 BLAKE2B 6339161b73b6e8cf9fce37da5133416512a61289189fb3f574af96753e62e8e364d610dd277542bd18b4ec44692dc149d4b3d5a6cd89894536d4dc898994c667 SHA512 b09e0f8152cd8bdd4465f20d94134ea6ef840b4ccd6d9f75bce8452917d98adc89093c661ecde0400fba7d68f832633c8fe0b19a1607ce79e3f400caa573da8f
 EBUILD ghostwriter-1.5.0.ebuild 1202 BLAKE2B dc409552f8019194c5181aba6b2a2b2ae428d087a141c4855ebe184ec716f61453ea2f4e3f99db4cfabf67b9fd880cb6d8d95b960aeade8ccfccb07478d14a68 SHA512 1c6a3bb5c8cd0f6d32d36f2e7efccc163182c719c79c1a6b071f7ff1ed53aef613073f7657626b1a8edf3db253a1ffe88b3f81d60b647a2c05ebb704f250421c
 EBUILD ghostwriter-1.7.3.ebuild 1037 BLAKE2B 1fa98245dbf504b414d93e5de88b5eefc92610f40a6ebd18bf07920e2c009b645637482b6d54e0871b5dd4a6ad7c4c952fd37408c198b2d9ea436d167512b4ef SHA512 4c7e9ddd53af239c598a47a6997104c30737b8f550bb1298edd9fd9c311d5a98cf4ac750d01744c915023847c504f6efd74aa0e9c36ddbb38963425d83a11a48
+EBUILD ghostwriter-1.7.4-r1.ebuild 1050 BLAKE2B 7a5e483cc9c9d352f6e19b20ad48d30c14b22a1326b51d6a276b08557b0ec84ca35d8c992a9f7312a86578755083dc06eb4ea87b788b4ee55b1920fc081cc99f SHA512 8f69c952167d15bcd4eac0ea74ed44d442027228cdd448a6e0045cca93c021c92288874dd95e95061dc9e0ffa60f12110a68a0810bebbe796f84042223d71ebc
 MISC metadata.xml 563 BLAKE2B 0f231e68a0335b4e4578d5ec28d8b202a26e7cf5c9f48fe9f4d430b01532aac1cb6022e13ef72c91a3ff68a86ecee0ec780a5bfe7e0c1ac1f158d8cbef84f7bd SHA512 585e39bd37abab4db3422b91a342aac06bcb76b3a6447a60c4607e3ac6edadbbbcabc1480828094d480c241a44d07ba81fbb5a4502f71da75c20e28db4583fe3
diff --git a/app-editors/ghostwriter/ghostwriter-1.7.4-r1.ebuild b/app-editors/ghostwriter/ghostwriter-1.7.4-r1.ebuild
new file mode 100644
index 000000000000..fd47f3279447
--- /dev/null
+++ b/app-editors/ghostwriter/ghostwriter-1.7.4-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor"
+HOMEPAGE="https://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/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+"
+
+DOCS=( CREDITS.md README.md )
+
+src_prepare() {
+	default
+
+	sed -i -e "/^VERSION =/s/\$.*/${PV}/" ghostwriter.pro || die "failed to override version"
+}
+
+src_configure() {
+	eqmake5 \
+		CONFIG+=$(usex debug debug release) \
+		PREFIX="${EPREFIX}"/usr
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 21379fdf184d..a846f075418a 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -11,4 +11,4 @@ EBUILD gvim-8.0.1699-r1.ebuild 10441 BLAKE2B 2a57da613526835bace267032a7c8d24375
 EBUILD gvim-8.1.0034.ebuild 10440 BLAKE2B feab87a2dda8d2e59c79179f3736963e645da9d6045ad591b8b4141181c9d52dcc417e0569cd4b60e91bedb662b2be84cffa053848108cf23973a150b8878036 SHA512 1f7b34f98fac3c68b0aa866e7c6cdb50a3f2a3cb6be2b24bf1b9006e01131b3d1d88576c6195ddafe5ee3e234c4b39d45c94fc5d81a2b2bb83de9a26e019fa53
 EBUILD gvim-8.1.0412.ebuild 10428 BLAKE2B 69352c472327a455a501766af33297e991f85bb6521e35df2e2e9615bb415c744a5579e7367582fee7d93e637afeb169f68b2de8d595005d5bbd636c3d76364b SHA512 67b6e99586afadefe1b48c93f76526a52f47d619bcfb7e33f3ec93032e976c30209ac9f42ad4000fb3b45c6ea335598bd6e664bbdc09acb4bce56f9f01a9348e
 EBUILD gvim-9999.ebuild 10428 BLAKE2B 69352c472327a455a501766af33297e991f85bb6521e35df2e2e9615bb415c744a5579e7367582fee7d93e637afeb169f68b2de8d595005d5bbd636c3d76364b SHA512 67b6e99586afadefe1b48c93f76526a52f47d619bcfb7e33f3ec93032e976c30209ac9f42ad4000fb3b45c6ea335598bd6e664bbdc09acb4bce56f9f01a9348e
-MISC metadata.xml 578 BLAKE2B a0b7e41324455706748f79109affec89e72dece0b41346d0cc804742cc7e5aa88f89556623b1aac4f53387afe6e6145049079b1cd44d3411bcf2f8ee8c7c2bfd SHA512 b2db961a6e59b803e2371c4e6dda496917d6c5e332f36062be8dbfa4fb47b4b640d8deb6871c9ff3c5a527fdf9c16aa13f14b9e0a37f93a3a10c6f6b57808126
+MISC metadata.xml 633 BLAKE2B adc5dc111999d95087e2ef224b82e931b2baa638eb377a08197bcc1114a83efd6c09bd6ce09e821dc1534fe0dc925116bc48dba74cee4579c414a99da09d8dd6 SHA512 f6388b8d254f166dd5c8a03117f3f0448a7e5ac196577aed5c05081d702cf611733f1ca9ad6e93e026c025e73132066dff5b75e3ada68d83746d6519e99e3036
diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml
index aa4ea747bcc9..e0d65e43e29b 100644
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Vim Project</name>
   </maintainer>
   <use>
+    <flag name="cscope">Enable cscope interface</flag>
     <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>
diff --git a/app-editors/jupp/Manifest b/app-editors/jupp/Manifest
index 4856a0fb4774..f704f5c6ad4d 100644
--- a/app-editors/jupp/Manifest
+++ b/app-editors/jupp/Manifest
@@ -1,3 +1,5 @@
 DIST joe-3.1jupp30.tgz 468421 BLAKE2B 630ef1cd3f3c73060b331126ec8e6a24d7277b3f2bfb293eb6110d1dade34ffe6efc502d0985e603b2c86a10bf27faa6151e28b777189332b805e387b756dea6 SHA512 673d48da41f61797d6aeb548e62720d1a60e3e000445558be88fb0d7ca8a1a7ce7c8bdd5b5bd58ac2c16d46dd4541da7922999256669f693a570a11562d6550f
+DIST joe-3.1jupp38.tgz 498068 BLAKE2B 46909c5f0f14b1d0ec30219b8ddfe9c0ad76b726f7178f7527ad5fad0cec40b7ac663e93645187220280572fa3bbde9bcb621f8816672e69c36587410fd98c7f SHA512 1d21ee5bbd1a042c58a89dd2bed8ec711c59fc383ff0dfd94d3a0eaccb999734915abc202e2112c5d573d8073e748b8024cd710b21803fed7422f5a8bccbc0c5
 EBUILD jupp-3.1_p30.ebuild 655 BLAKE2B acb7eb09ef67338fd151402e1d2eb5cd1973754e444b949dcfb0686e595bedeb51580a931fbd3f233cc376380dce84303d5457de6a02421ddfeb69c1ffd37036 SHA512 2d6c88d083f3f60ca6ae05db950ce05a87742546ac675baae43abb96d3b73f52843c82bdee795b782e3e7c36c27a6f6baefd11cf20027bdb2e3641a6cbdeeb37
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+EBUILD jupp-3.1_p38.ebuild 650 BLAKE2B bd62a9e485d8b17baf7ac7a91bb945d3fa791a4f21b2cfba23fbe3c1907a0c1d3b46126be869ef4d384c9ed2791d33bb8851c3ef8673797121f240d9a2cc02ee SHA512 9d7172bb82fcbea8700e2bdbe4076097f6a6d230b3d2fad4938b0f61e19b6f3f72cb070c24a873c2c13a6a088e4a406df7d3f9f1ba4e154be6358fabd610d46d
+MISC metadata.xml 251 BLAKE2B bb5fdd6fc58b43ac34ba535ab822795cb5579f40ff49cf5f5a8f3e3f248e101c4a9c97b608f6496d9cf48a4bbfcf93d665c8ca6b8bde9e41623238ea084a379b SHA512 65b7ed1e032f046e0afbc0d0d9da9fcfc4df47d68cd3076cc1f1f645ba0d9a9bce16265dc9b26e666190cd574ee4ac6203b4d7e01a55c5d79081377a52f2860d
diff --git a/app-editors/jupp/jupp-3.1_p38.ebuild b/app-editors/jupp/jupp-3.1_p38.ebuild
new file mode 100644
index 000000000000..d8bdab27bf57
--- /dev/null
+++ b/app-editors/jupp/jupp-3.1_p38.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}"
+DOCS="HINTS INFO LIST NEWS README TODO"
+
+src_prepare() {
+	default
+	chmod +x configure || die
+}
+
+src_configure() {
+	econf \
+		--enable-search_libs \
+		--enable-termcap \
+		$(use_enable ncurses curses)
+}
diff --git a/app-editors/jupp/metadata.xml b/app-editors/jupp/metadata.xml
index a535b8852829..a1a37697cb80 100644
--- a/app-editors/jupp/metadata.xml
+++ b/app-editors/jupp/metadata.xml
@@ -1,8 +1,8 @@
 <?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 type="project">
+  <email>emacs@gentoo.org</email>
+  <name>Gentoo Emacs project</name>
 </maintainer>
 </pkgmetadata>
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 419501e76d41..47a5cf147ba0 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,3 +1,10 @@
+AUX kile-2.9.92-cmake.patch 999 BLAKE2B bf5b9987b4d10ca91bfe86a87ce3748d614d926b757dc075544ac0af99943dc46089e1451067748387a56c7c85d63d7923bef3a045c95365403547712fc47de3 SHA512 e8d975111ca60e21e8d1392de7d78a161c400254fce6ec471c8cf7506b1b5311db8548d7cd54a52979f1e175b453e1131c6e36ff2f6b655d636262e9493c51d4
+AUX kile-2.9.92-desktopfile.patch 846 BLAKE2B c10dd9ad61ee1d8a112b39305ffbfb6d8c7d6013e1a597e301303e3fd2dbb6444d832dc8cdbf6ca4b5805fbcb412b09476570976c2fcdcfc7df2c8e83e5ebb54 SHA512 bf79943bbcbefa1e153da9371d813bb45e0650cf0499afce9dafe23074e4a92e944839eeef4c91520ab47daa12b2e1c6831d72e03901b00d35583b49c7ebc2ba
+AUX kile-2.9.92-kcrash.patch 1273 BLAKE2B f1198468a4222004b62b2cefa2186dd9841c7d10aec2830a871e602f1dd8e889bb6207d88f9740a4aa92b415015983cc462f838e31c47a4ca5e9c7d53b40491a SHA512 65874abdc06071c81ca10b090c3d535fb79facf22687aeb37d8631c490676ce3ae19adcf560d62f7bcffcf9d74a191664a35fefb079c47b9bc00ec37390cb8ae
+AUX kile-2.9.92-no-empty-filename.patch 964 BLAKE2B c540d8cb219590bc5b9083e713fad6829a28b32a5ea1cd831f30f739d15e2f5d10a8db6e21127cde5835d548080e938c7c26b11229c282c2a83f1f551117f842 SHA512 2bfd95057cec7de2050b0615df8b49a016a8aedc0ae793eeb33c0f299465faa6b5e1507c926aaa9d735c8bcc3c80160fcf764cfb82a3a5c28c3a0a1def64c014
+AUX kile-2.9.92-nodocfiles.patch 769 BLAKE2B 7eb69764dddea17ef0fbcd989dcc3d2631f0bb95e462ac6729027c2a07630a40d6648525833dd3bde7ab1981ac4bbcd4018efffaf528920816a2ef3a007f8e9f SHA512 4823047cd7bc820c9366275ef76faef72e223fc2f86e3e3e145c3c8e926b00d7778b4a4b147e587bbeb96ef6a55c4a5282aef486cfba1b752e5809fb93def21b
+AUX kile-2.9.92-viewtab-crash.patch 3460 BLAKE2B fe9af35f51633644709e70b5b09abf094ce8515909b62a81575931c40ba7dd09f84f618416e640839cfcdf46003c55c1e672f541309b0a3f08433438a618152b SHA512 e8a64a7820749c18cc75a9002ccdc539b22e5e0fa3ebf18ca3edd011508ba887db58c38e3d8823baf32887da0435938606c40e9b2e7bfd9d6c1164a926b1dcbd
 DIST kile-2.9.92.tar.bz2 8556142 BLAKE2B dd18ece7394439de3c0037fbea7c66316c5ee457bd4ad8c35f8519713f917e1c1641c806290303c26dd9e31e2f39346bc35091b211ca23a2d342332388d18c3f SHA512 e3af0c2cb1a0970428e2d772ef5025ead67aee94cdc03b6ec173de5628e8d4619f74296a1734eac8241939d40a05b805b8bd33bb4c27a1c19ad47fb35087cf7d
+EBUILD kile-2.9.92-r1.ebuild 1738 BLAKE2B b59c0ef0e699210e0e2b15ab848846ce540335be3b8d64c2dd187c02f7ff0f6b7f6e73c1c60c52c7385c875b23e5eedb9099926401345c9304be70081ae74245 SHA512 97c8577dedf65fcc1038f0155e1c01748bab4c81629231fa330267fa3f20600ca05f68919f99e83fccbab9e835069b7669ff833353b9fa1fe12b22e622dccb47
 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/files/kile-2.9.92-cmake.patch b/app-editors/kile/files/kile-2.9.92-cmake.patch
new file mode 100644
index 000000000000..8b4837f32b9c
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-cmake.patch
@@ -0,0 +1,25 @@
+From 2ec4c207d380bf3b97435fdf66cdb00975a1aff3 Mon Sep 17 00:00:00 2001
+From: Michel Ludwig <michel.ludwig@kdemail.net>
+Date: Sun, 13 May 2018 11:59:06 +0200
+Subject: Silence CMake's CMP0071 policy warning
+
+---
+ src/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e1fdeb3..1398384 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -188,6 +188,9 @@ set(kile_KCFG_SRCS kileconfig.kcfgc)
+ 
+ kconfig_add_kcfg_files(kile_SRCS ${kile_KCFG_SRCS})
+ 
++set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/kileconfig.h" PROPERTIES SKIP_AUTOMOC ON)   # otherwise we get a warning about
++set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/kileconfig.cpp" PROPERTIES SKIP_AUTOMOC ON) # the CMP0071 policy (with CMake 3.11)
++
+ # add icon to executable on windows and mac;
+ # workaround: as ecm_add_app_icon and kf5_add_kdeinit_executable don't work well together,
+ # we use a variable named 'kile' at this point
+-- 
+cgit v1.1
diff --git a/app-editors/kile/files/kile-2.9.92-desktopfile.patch b/app-editors/kile/files/kile-2.9.92-desktopfile.patch
new file mode 100644
index 000000000000..25ce2d9b4239
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-desktopfile.patch
@@ -0,0 +1,24 @@
+From 166f57db638dd6bd06363bc207939cabb1df9c81 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 14 May 2018 09:51:24 +0200
+Subject: Remove X-DBUS-StartupType from desktop file
+
+Fixes "KInit could not launch /usr/bin/kile" error when trying to open a tex file when kile is already running
+
+Differential Revision: https://phabricator.kde.org/D8080
+---
+ src/org.kde.kile.desktop | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/org.kde.kile.desktop b/src/org.kde.kile.desktop
+index 790bb5e..6d4fe9c 100644
+--- a/src/org.kde.kile.desktop
++++ b/src/org.kde.kile.desktop
+@@ -177,5 +177,4 @@ GenericName[zh_CN]=LaTeX 前端
+ GenericName[zh_TW]=LaTeX 前端介面
+ MimeType=text/x-tex;text/x-kilepr;
+ Categories=Qt;KDE;Office;Publishing;
+-X-DBUS-StartupType=Multi
+ X-DBUS-ServiceName=net.sourceforge.kile
+-- 
+cgit v1.1
diff --git a/app-editors/kile/files/kile-2.9.92-kcrash.patch b/app-editors/kile/files/kile-2.9.92-kcrash.patch
new file mode 100644
index 000000000000..6dcc869fd9d0
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-kcrash.patch
@@ -0,0 +1,49 @@
+From 21d62face41ffd9e858108f2d45a9abe50ba0db3 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Mon, 19 Nov 2018 14:00:56 +0100
+Subject: actually initialize kcrash properly
+
+Summary:
+to successfully use kcrash when linking with as-needed (which is a default
+flag on many linux distros) one also needs to call KCrash::initialize.
+
+without this kcrash handling is not available for most users.
+
+https://markmail.org/thread/zv5pheijaze72bzs
+
+Reviewers: mludwig
+
+Reviewed By: mludwig
+
+Subscribers: #kile
+
+Tags: #kile
+
+Differential Revision: https://phabricator.kde.org/D17011
+---
+ src/main.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 3b02716..bd7fef6 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -25,6 +25,7 @@
+ #include <QUrl>
+ 
+ #include <KAboutData>
++#include <KCrash>
+ #include <KDBusService>
+ #include <KEncodingProber>
+ #include <KLocalizedString>
+@@ -128,6 +129,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+ 
+     KAboutData::setApplicationData(aboutData);
+ 
++    KCrash::initialize();
++
+     app.setApplicationDisplayName(aboutData.displayName());
+     app.setOrganizationDomain(aboutData.organizationDomain());
+     app.setApplicationVersion(aboutData.version());
+-- 
+cgit v1.1
diff --git a/app-editors/kile/files/kile-2.9.92-no-empty-filename.patch b/app-editors/kile/files/kile-2.9.92-no-empty-filename.patch
new file mode 100644
index 000000000000..ff742921046b
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-no-empty-filename.patch
@@ -0,0 +1,26 @@
+From 7cfc3f74f00d13cfb1a43f01a7dbc0be486c0d47 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Mon, 8 Oct 2018 07:42:41 +0200
+Subject: User menu: do not attempt to load an empty file name
+
+Do not try to install m_currentXmlFile in case it is empty, otherwise
+QFile will (rightfully) warn that an empty file was passed.
+---
+ src/usermenu/usermenu.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/usermenu/usermenu.cpp b/src/usermenu/usermenu.cpp
+index 7d1d5f5..f9e3d3c 100644
+--- a/src/usermenu/usermenu.cpp
++++ b/src/usermenu/usermenu.cpp
+@@ -190,7 +190,7 @@ void UserMenu::updateGUI()
+     clear();
+ 
+     // then install
+-    if(installXml(m_currentXmlFile)) {
++    if(!m_currentXmlFile.isEmpty() && installXml(m_currentXmlFile)) {
+         // add changed context menu to all existing views
+         KileView::Manager* viewManager = m_ki->viewManager();
+         int views = viewManager->textViewCount();
+-- 
+cgit v1.1
diff --git a/app-editors/kile/files/kile-2.9.92-nodocfiles.patch b/app-editors/kile/files/kile-2.9.92-nodocfiles.patch
new file mode 100644
index 000000000000..6687e4f0e9fc
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-nodocfiles.patch
@@ -0,0 +1,29 @@
+From 03e7b00321c5474330c97812b4e6a6550e54931c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 19 Dec 2018 13:36:12 +0100
+Subject: [PATCH] Disable install misc files by cmake
+
+AUTHORS, README, Changelog etc. are handled by distribution packages.
+---
+ CMakeLists.txt | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f4a278e1..bb78d839 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,11 +117,4 @@ install(
+ 	DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update)
+ 
+-install(FILES
+-		AUTHORS
+-		ChangeLog
+-		README
+-		README.cwl
+-		kile-remote-control.txt
+-	DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
+ 
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-- 
+2.20.1
+
diff --git a/app-editors/kile/files/kile-2.9.92-viewtab-crash.patch b/app-editors/kile/files/kile-2.9.92-viewtab-crash.patch
new file mode 100644
index 000000000000..2167e75cbf18
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-viewtab-crash.patch
@@ -0,0 +1,98 @@
+From f9de688e223be3b77268d36e237a838555d0f533 Mon Sep 17 00:00:00 2001
+From: Michel Ludwig <michel.ludwig@kdemail.net>
+Date: Sun, 28 Oct 2018 19:58:22 +0100
+Subject: Search for the 'file_save_copy_as' action inside 'KTextEditor::View'
+ now
+
+In that way, Kile doesn't crash after right-clicking on a view tab
+
+BUG: 400191
+---
+ src/kileviewmanager.cpp | 47 +++++++++++++++++++++++++++++------------------
+ 1 file changed, 29 insertions(+), 18 deletions(-)
+
+diff --git a/src/kileviewmanager.cpp b/src/kileviewmanager.cpp
+index c0b8254..34f8439 100644
+--- a/src/kileviewmanager.cpp
++++ b/src/kileviewmanager.cpp
+@@ -506,39 +506,52 @@ void Manager::tabContext(const QPoint &pos)
+ 
+     // 'action1' can become null if it belongs to a view that has been closed, for example
+     QPointer<QAction> action1 = m_ki->mainWindow()->action("move_view_tab_left");
+-    action1->setData(qVariantFromValue(view));
+-    tabMenu.addAction(action1);
++    if(action1) {
++        action1->setData(qVariantFromValue(view));
++        tabMenu.addAction(action1);
++    }
+ 
+     QPointer<QAction> action2 = m_ki->mainWindow()->action("move_view_tab_right");
+-    action2->setData(qVariantFromValue(view));
+-    tabMenu.addAction(action2);
++    if(action2) {
++        action2->setData(qVariantFromValue(view));
++        tabMenu.addAction(action2);
++    }
+ 
+     tabMenu.addSeparator();
+ 
+     QPointer<QAction> action3;
+     if(view->document()->isModified()) {
+         action3 = view->actionCollection()->action(KStandardAction::name(KStandardAction::Save));
+-        action3->setData(qVariantFromValue(view));
+-        tabMenu.addAction(action3);
++        if(action3) {
++            action3->setData(qVariantFromValue(view));
++            tabMenu.addAction(action3);
++        }
+     }
+ 
+     QPointer<QAction> action4 = view->actionCollection()->action(KStandardAction::name(KStandardAction::SaveAs));
+-    action4->setData(qVariantFromValue(view));
+-    tabMenu.addAction(action4);
++    if(action4) {
++        action4->setData(qVariantFromValue(view));
++        tabMenu.addAction(action4);
++    }
+ 
+-    QPointer<QAction> action5 = m_ki->mainWindow()->action("file_save_copy_as");
+-    action5->setData(qVariantFromValue(view));
+-    tabMenu.addAction(action5);
++    QPointer<QAction> action5 = view->action("file_save_copy_as");
++    if(action5) {
++        tabMenu.addAction(action5);
++    }
+ 
+     tabMenu.addSeparator();
+ 
+     QPointer<QAction> action6 = m_ki->mainWindow()->action("file_close");
+-    action6->setData(qVariantFromValue(view));
+-    tabMenu.addAction(action6);
++    if(action6) {
++        action6->setData(qVariantFromValue(view));
++        tabMenu.addAction(action6);
++    }
+ 
+     QPointer<QAction> action7 = m_ki->mainWindow()->action("file_close_all_others");
+-    action7->setData(qVariantFromValue(view));
+-    tabMenu.addAction(action7);
++    if(action7) {
++        action7->setData(qVariantFromValue(view));
++        tabMenu.addAction(action7);
++    }
+     /*
+     	FIXME create proper actions which delete/add the current file without asking stupidly
+     	QAction* removeAction = m_ki->mainWindow()->action("project_remove");
+@@ -562,9 +575,7 @@ void Manager::tabContext(const QPoint &pos)
+     if(action4) {
+         action4->setData(QVariant());
+     }
+-    if(action5) {
+-        action5->setData(QVariant());
+-    }
++    // action5 doesn't need to be given extra data
+     if(action6) {
+         action6->setData(QVariant());
+     }
+-- 
+cgit v1.1
diff --git a/app-editors/kile/kile-2.9.92-r1.ebuild b/app-editors/kile/kile-2.9.92-r1.ebuild
new file mode 100644
index 000000000000..98f5a152873c
--- /dev/null
+++ b/app-editors/kile/kile-2.9.92-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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=( AUTHORS ChangeLog kile-remote-control.txt README README.cwl )
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-desktopfile.patch"
+	"${FILESDIR}/${P}-no-empty-filename.patch"
+	"${FILESDIR}/${P}-viewtab-crash.patch"
+	"${FILESDIR}/${P}-kcrash.patch"
+	"${FILESDIR}/${P}-nodocfiles.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pdf Poppler)
+	)
+
+	kde5_src_configure
+}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 86b477818939..830296cbc056 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -7,5 +7,5 @@ EBUILD neovim-0.2.0-r1.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c
 EBUILD neovim-0.2.2-r1.ebuild 1878 BLAKE2B 8f2ddcdb916fe4ce6e83626c1b86ddad10253e1cf5ebc5f41789fc52d2a002e7ed8f07cac17a5551aae1050fa6f5e3b3214436d8f9a63afd67cadb982f974db5 SHA512 095e7760a09f76e1940dfd06b02a786b29c7647d123232287da673677b27b613c320507dc206d74fe9ad6420e2bc3115b266488529d83719f1f0105d692afb20
 EBUILD neovim-0.3.0.ebuild 2001 BLAKE2B cfd33059aafd48996a178d0955f0311b0cc85e4e902de22866b8e3e0bded37f0b33ceb7a52db869267d4f9cb8117b80474fe088f2e5a425eed847b0687b3890e SHA512 4096e62bfebfc2e23a89d569e4c841039515aeb451ba3620e8bc860befb710c061b31b2f3ae2be69ee8db404e08ca2a2959604eb806c57c9a609cef2ba29ea25
 EBUILD neovim-0.3.1.ebuild 1972 BLAKE2B 8510f3a3fc8bda84eae188e6b1e8286ccd646703a1f1a85dd7e3ccecd5d0203c35e24221b94cbfebfc4bcbf8eb069a7d22bd581f94b3f179c9952fd54198fbac SHA512 9315a6c2d61b554f8638bbbe5ddc4e4307123965b8b18d3c7de1da07d5cc1baf32855f68bd85db9ce30253da7ee4584dbbe12a1cd3aa4cfd5175548ef27ed169
-EBUILD neovim-9999.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c8ff092651032731a6548778820805e8a4e4c0a2e40d463a11d1898e8c0e47ca76f38802df2119b70cf250932dba SHA512 3bd497e867430446993f46ad6eb038a57e0915703e8ce800040f76ae6b57e9c015241cdc8eff9a08d45f9ff71cbce2e99fc5bd7c91541e751817a54ad99498c5
+EBUILD neovim-9999.ebuild 1873 BLAKE2B fa9b279b3696a4c656d7769082628cf9d189868e870ba7f77d5a3a80f9201d596e7377aa613f36de0a20f99bd978673ab7b3cbd46b0a3af0bda0e7aaf9742f66 SHA512 4854bb106e28fdded9ef74efe6cfc0b59915e815f5cc6d16a04d819bb6ed69f2954e4b430a56e635a10879cc668bed72a7087a7c10787a422a2a1a00fe6e344b
 MISC metadata.xml 638 BLAKE2B 04414f861c324475a2884bfb4d06aee0a81bc4d934702102826c0ee7a2ec4da1a6ee40fd8369031e0d1bb8c4102d7d9ec60cc375ca83e32f895cbd5556bf06e6 SHA512 9c037165687b9a6959cdbbf9583c1ac8974a58ed0ef34b9f6ba2fdb157be895823c1956ee1bc0a6dd8cbba405399847377ce860c2d2740160f7b2475d34323b9
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 12fbcafd7b64..28da413392a7 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 	)
 	tui? (
 		>=dev-libs/libtermkey-0.19
-		>=dev-libs/unibilium-1.1.1
+		>=dev-libs/unibilium-2.0.0
 	)
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index f831bf0c2103..d6c7ac14a412 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -4,4 +4,4 @@ DIST qhexedit2-0.8.4.tar.gz 340766 BLAKE2B af24031fdd9f8d677f7e8ab8fd69667852dd9
 DIST qhexedit2-0.8.4_p20170719.tar.gz 342037 BLAKE2B 667a7c3e93ed3422f21da53b6811fca53b210cfaf2603cf2a61e377e68f295b5024a9fa73d444c1e50af274bdbc6faa62bc2ab4aad176a8b3a6d7540117c5a30 SHA512 3c412b9bbe4f84f6f445b6ad530fc51dc5422a0a5bb6184edc7df92595aa5215c345e2b16effae8de758b299c5f7f7d44cf54dd65a180941c30790194679baa8
 EBUILD qhexedit2-0.8.4.ebuild 1824 BLAKE2B bf51b60fa58333b2fa727adadd3bb35b0215a77773b51d856dafc1cda3702834e074735dc5a908dadd41134d767e81e8ec6f7fb83cad2de139dd9023df890fb1 SHA512 610257b125661932965e7f6a2a4e6db53bb552382b0f34eca35729da9179d3668629d30e70f07a6c29b6aadcf45c123a28b05c066603079f6669f9ae6e52b5b4
 EBUILD qhexedit2-0.8.4_p20170719.ebuild 1918 BLAKE2B e20d884970da32077ca574299b8efef94ad827290270521933d716e67be5dd90c317740d7870756bd4b56b9c06bf3b344e59304b7d909f3109f67f6f272ec14a SHA512 17f03387ad5f06dd448ce344759c67cbf33267b5f7c6c7637566c17d5b683c0d1f6dffb7de1320e41b7725b5b7f1b3bfa840b402777a6e4f5e76f8bd11621094
-MISC metadata.xml 1117 BLAKE2B 621185810a8a4056134580d1eb5c693d97eff4259b224e88562a5b72f6e41820f0e03e989baa3ae52ca88eae03466c1359ab75307a3bdb38049ac8fa5a77d59a SHA512 6736c1248f273abf02d648f1537f35196c70b3f4bade31f06edf437866c07924c11ade351ba1e6a7593b05349d3b0cecb38b9e5f7bdd01487cb3b7b5dc025534
+MISC metadata.xml 991 BLAKE2B 7faabbd43f1bdebee332845029ceef0824e380b70b7abe2adc9840391bba736941851433d58324886d4821f55ac83c67ff604b32d648acfd4c7e420662c5e155 SHA512 b079492a11df201b941d91991aef6161971ef15f80e7ca3ea71df2a0dbf2f193bc2514502e179321c7f688eb4f129401775bca9d9b657e3eec45e13c4c0948bb
diff --git a/app-editors/qhexedit2/metadata.xml b/app-editors/qhexedit2/metadata.xml
index ff7a03cc6afe..e3782cf655af 100644
--- a/app-editors/qhexedit2/metadata.xml
+++ b/app-editors/qhexedit2/metadata.xml
@@ -6,10 +6,6 @@
         <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>
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index bc69df8aab60..7cce4dc51ccc 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,9 +1,11 @@
 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
+DIST ReText-7.0.4.tar.gz 402934 BLAKE2B bae66a5fb8e81192d692d1a239706e2feee6ee940685cffdf3498880b2c9bd67cc85c6150e372a383e4bad13da210426fff95c06b2861b58020c2c6d298cf5d2 SHA512 cb12666b15414f4bf83f3b07c94d3bcba13dd3e6c3832c66520bfe8caafeeb87cc083a1e74530d98d6e00a00363add55fdf873e6de385e637876454130deebb3
 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 1464 BLAKE2B a8339b12f9b95f80dea21c98bdee6f75d6a22764f7c6e0b682bc244c99f7debd94816a01abe4671f90a2429a56da22177b01c9e00ec949c5a08b9329ac8dfb5d SHA512 a678e0ec70572140db56c5a0fa03917dbdecf6dd279a41e2824ceb158398846dd12ffca00adb451d9a5c98e77d96860a29c87748821c24879fd916f8110ec9ad
-EBUILD retext-9999.ebuild 1457 BLAKE2B 4047fa55e80de792a92f4214d3f2cbc0b6c40e61e729d7978e965f38577e9851b2fd205761329377a0ee753086452dd19a510afc3a9b14ef0de819883af811e7 SHA512 5bf8e31a91384b7644d8e85ef43d7a5cd9b74b7cbfafc80f28d2a21a6c6397d1febb3c25b74be2c3d672f21fb852b1acbd137e921977b8a9df84d9969e5117d5
+EBUILD retext-7.0.4.ebuild 1816 BLAKE2B 299e9d6cdab2a606b1ef48053fff9e925c8d648a8a2782c35adff33c4bc9d0264c636716cdc865c9ce6a5efb14b8ba74d86116c24e3cd6a2d3e1eb50bf5f0451 SHA512 d7aaa29d3f26b0aab9bab21d5877bcf5b9f21f94b37dcc3855b7132c6ed56175fe0bc2d3d3b45793ebd520f5c7d2164970c020a8a5f0a0f0ab3fa6148232513c
+EBUILD retext-9999.ebuild 1816 BLAKE2B 299e9d6cdab2a606b1ef48053fff9e925c8d648a8a2782c35adff33c4bc9d0264c636716cdc865c9ce6a5efb14b8ba74d86116c24e3cd6a2d3e1eb50bf5f0451 SHA512 d7aaa29d3f26b0aab9bab21d5877bcf5b9f21f94b37dcc3855b7132c6ed56175fe0bc2d3d3b45793ebd520f5c7d2164970c020a8a5f0a0f0ab3fa6148232513c
 MISC metadata.xml 496 BLAKE2B ad4453602e60bdaf37553cd2fe8c9ea8abc163a86fded505e69bfa06f40d503b0cc58651068a4c52a6ffd0c8368f855512ec83aefff4a64a696e1b042a129e6a SHA512 0e182c5ddf9ac27dd9b6eb70c9a3ebdf711552e4e00db2d66696bdd992dc7824f51c86acb60f044342534b230c9884d45c55177d05f7ea92be81297994b7f559
diff --git a/app-editors/retext/retext-7.0.4.ebuild b/app-editors/retext/retext-7.0.4.ebuild
new file mode 100644
index 000000000000..9067cf820ea2
--- /dev/null
+++ b/app-editors/retext/retext-7.0.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# no pypy{,3} support as PyQt5 does not support it at 2018-11-18
+# https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit distutils-r1 gnome2-utils virtualx 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[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/markups[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/python-markdown-math[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,printsupport,webengine,widgets,${PYTHON_USEDEP}]
+	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( x11-base/xorg-server[xvfb] )
+"
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
+	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
+	einfo "For more details take a look at:"
+	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index b69ab5bac2a4..9067cf820ea2 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+# no pypy{,3} support as PyQt5 does not support it at 2018-11-18
+# https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
-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
+inherit distutils-r1 gnome2-utils virtualx xdg-utils
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
@@ -25,38 +25,45 @@ if [[ ${PV} == *9999 ]]
 		S="${WORKDIR}"/${MY_P}
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+spell"
 
 RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
 	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/markups[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/python-markdown-math[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,printsupport,webengine,widgets,${PYTHON_USEDEP}]
 	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 "
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( x11-base/xorg-server[xvfb] )
+"
 
-remove_locale() {
-	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
+src_test() {
+	virtx distutils-r1_src_test
 }
 
 python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	l10n_for_each_disabled_locale_do remove_locale
+	esetup.py test
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
+	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
+	einfo "For more details take a look at:"
+	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 3a129dd12f4f..d6339571fd7e 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -7,6 +7,7 @@ DIST vim-8.1.0412.tar.gz 13857501 BLAKE2B 6925184359b8b36cb546c9fcba4bb01755455a
 EBUILD vim-8.0.1298.ebuild 8753 BLAKE2B 5c95b03cda0fde94832d50a8a65ec907f7e066a9467f0f58ceb704b84e88298b474cd94600403823a925dbb6ea49f83bc3bf6c6e614551fc11317f739cf6a651 SHA512 cded1fbf2cdee05f45a1030bb209b3a1004ca5adf16876f292c74b50c278c840f9081f08556f276ceccf635073d86931f0ee2d67afeda0f03ea2b83b8e1c0062
 EBUILD vim-8.0.1699.ebuild 8781 BLAKE2B b03fe734f6acb466b5573d4dad7a36f5415c3c8b14ba4f5a033cee8d43e12accb8c8cf3fbdb59fc193ae72803a749fe6745d6106d9fd0542c189414feb17a59c SHA512 e0b6806114a6995f9be2e7a2c10fa4c93df972a0096203f205e907e6257415f47e44dd16c5bbdc3ae2fc457373214e6a92605ab26c1a808ddb653fbfed33e4ae
 EBUILD vim-8.1.0034.ebuild 8781 BLAKE2B 8a40f45dc7395141259e1cf7339c815a3526159181f8c3d9e61e451fd743593171bba5ccd58251ef4f57bbae45457c2612bb4d52369bffb3ac672276ce662dea SHA512 7f45c30ad45f9abdd1cfb2186c021c4f203a94ec8f9dda7d5522c7688c6b803c18baab774edae20278ce726e5eb2368cace3dd1ee79fb7e8e534aa9e6e14e6e8
+EBUILD vim-8.1.0412-r1.ebuild 8810 BLAKE2B d3054b24602947f829bf3bae1f10e8b2acbf5a05eb3fb0fd7f3da589177ceeb54aa75124521229c343ad8bd747ac2e8450dbf9d7f22c91cf24f1130e639bfd05 SHA512 691a483673566d53b887159d094113758393b01347362e26601cbda91693ea72906bc2a346fa2d1b7e709b6d47428a95b53550580ef5ab9cea7d43327683c374
 EBUILD vim-8.1.0412.ebuild 8806 BLAKE2B 23bdf54e6bb94d325be60c6512fe7f750bfc2f0073c566d5db499179bf70b8590f9ceb494cf41bf25cd88f6f647f199dfaa8431e6d61dd17860b5b6e06a15d59 SHA512 227b7214e1301312d98ae6400f0a53351e95ab902c46e37aede8496d67f879bed70ba47f403842374aac8e520d2d949e7656706a99734d8cc63f77d53cc54dce
-EBUILD vim-9999.ebuild 8806 BLAKE2B 23bdf54e6bb94d325be60c6512fe7f750bfc2f0073c566d5db499179bf70b8590f9ceb494cf41bf25cd88f6f647f199dfaa8431e6d61dd17860b5b6e06a15d59 SHA512 227b7214e1301312d98ae6400f0a53351e95ab902c46e37aede8496d67f879bed70ba47f403842374aac8e520d2d949e7656706a99734d8cc63f77d53cc54dce
-MISC metadata.xml 752 BLAKE2B 91fa465837da7fef20719826bbee3592d1d0f72f0015accaf425dad3999ee5f6d6f1ff6cdaa539dc1621d9735e1e97156824fb2e74e8707bae9c213719b20d4e SHA512 e49f531537dc14352cfd1550f77e830599addc6cfc9bc9f4a3a20449b0bab2ec5bfeb8923eab15a0585ff156c4b61cfcb5795caf0b9f6fcf14054559a1cd5476
+EBUILD vim-9999.ebuild 8810 BLAKE2B d3054b24602947f829bf3bae1f10e8b2acbf5a05eb3fb0fd7f3da589177ceeb54aa75124521229c343ad8bd747ac2e8450dbf9d7f22c91cf24f1130e639bfd05 SHA512 691a483673566d53b887159d094113758393b01347362e26601cbda91693ea72906bc2a346fa2d1b7e709b6d47428a95b53550580ef5ab9cea7d43327683c374
+MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml
index f65afcd7454c..acc712bdb241 100644
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Vim Project</name>
   </maintainer>
   <use>
+    <flag name="cscope">Enable cscope interface</flag>
     <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>
diff --git a/app-editors/vim/vim-8.1.0412-r1.ebuild b/app-editors/vim/vim-8.1.0412-r1.ebuild
new file mode 100644
index 000000000000..0b199842bec1
--- /dev/null
+++ b/app-editors/vim/vim-8.1.0412-r1.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIM_VERSION="8.1"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop
+
+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
+
+	domenu runtime/vim.desktop
+
+	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
index 542c71f1871f..0b199842bec1 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 VIM_VERSION="8.1"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 76b547cb5f3f..62b446bffb5d 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -13,4 +13,4 @@ DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31
 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
+MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index 435eda5f8675..78bf15a9cc75 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@@ -10,6 +10,7 @@
       drag-n-drop library</flag>
     <flag name="eolconv">Support detection and translation of newline
       conventions</flag>
+    <flag name="mule">Add multi-language support to XEmacs</flag>
     <flag name="pop">Support POP for mail retrieval</flag>
     <flag name="xim">Enable X11 XiM input method</flag>
   </use>