gentoo resync : 18.05.2019

23 files changed, 1032 insertions, 208 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 23444e60b030..c60d4603914e 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index bc95824c3349..16c43d7319ae 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST gedit-plugins-3.28.1.tar.xz 1350468 BLAKE2B 4fd50ad7358581f5e27f0c3a7e127d4e2c0e7189c039daee1d8d7ddf7062846e1aebb634b3edd998c9a7c11840c71f56fe4eeca78ea2e91ae18db814e4fd79e5 SHA512 6258c627cd3fa2948375c30e87061375c0d09ce2c70301c2d10a403e6075d1df09e928a2d95b72f6d7950a31a720af645fff2f7f59a281d2999948beb56c1dc9
 DIST gedit-plugins-3.30.1.tar.xz 1354644 BLAKE2B ee42fb2fe47c9219442e0bbdaf21a14a834b8bc38558713ccf0ad384814812fd71f4d318624b4d2c149b26d304203a2b954ef49c3299877f4d067ae181bfe1d5 SHA512 0e777779288b51015d7ab539bf896a00d5226560f2cc2211daf777da87824eed858255318c421524933a540135e4bfdcc294ba7ed89f680a35aa48f7279cbc94
 EBUILD gedit-plugins-3.28.1.ebuild 2289 BLAKE2B bc21d5558cfd5c3888463dfe5faf64d7daf85313280110b739d8e2377f4397243191a7b4113660fb4f8b2a3a0d350fe4ac53bcdf4c02f7282cfff45cdbc3c0a7 SHA512 b4527975193e5fbe40348632c9abf2f0a3e563ffbd972a1e6b11288a558e83d070f24e62c690d1c958bc3ab4a3b779494f97c311c8050e90e25c54f4c4a9156d
-EBUILD gedit-plugins-3.30.1.ebuild 2343 BLAKE2B 4f8373974ec9a5a7695d8846c3c12a1d38701b37f5de9fbb4de7580337a46e10789eae9f8e3e738ecf38c468040e6abc955ba610717860ef3e20c4bace356a47 SHA512 31a6222448c12fe204fb6c3fec0b5786e4a4a6aba3809c3549981cae5bc45f0edf78fb054e476e25506d7f9b22d03e1ad00394733533ac8fa29bb2ae05e4a42c
+EBUILD gedit-plugins-3.30.1.ebuild 2341 BLAKE2B c582963908681011ddfda5a61d7c2e3ef0747f150ac7724c3d1ef300429d17ea426ad8d72729ecf2c8dda2e660e4ba8260dc27488b921dbce13d96866d881684 SHA512 44b51f949bb6e6e6b0341c65c9637093db96326c443312ca697cd21426db7f99ea40cd6aec59256793426dc5970e4981781b1d7c0e016dd885f9c9a62e16b046
 MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild
index 57f0d770a66c..21af002545cc 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.30.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 5cf6eeccaeb1..acdbfaa1aacd 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -2,6 +2,6 @@ DIST gedit-3.28.1.tar.xz 3149684 BLAKE2B 6afedcc5de0bd249af3d0fd02339acc2d993aae
 DIST gedit-3.30.2.tar.xz 3155628 BLAKE2B 96736adbce987af89b37a712448f42b2a2eeed72d52aa16377d961c9e929fa4e75205eac5987bfc067cc2fecb35aec720d85483c4e2e824a6e8248cc652d2fbe SHA512 58ae7a4c27aeabad670718e39e1860df112d0be00ea622cc8adc185cb5d0e16ac4af65cb3aa45423c7b1b94c88d04d081fe05f3647b054a3e3291abc73c41f6f
 DIST gedit-3.32.0.tar.xz 14793216 BLAKE2B b1d9af7882063a622fe27f8e5aa322e2a1724410c4419d538712fdda2cab10aa59014a82cc1a41b35966dceb1b75ce2613d9c5c98400743b31df76b0114e84e8 SHA512 f25ed05f5d3b7ab7711be32c6516479c8b515d6d5983e3bc3a00407740fb8ec42b1e9a3005473671fc144f4437b9e98355a3669210eefb5bf8288f171188f387
 EBUILD gedit-3.28.1.ebuild 2323 BLAKE2B 4fa5600d7163ce9fb6670a89d9151343cc7c256cbb0219f3150f94acdb2ff4b53e85dc116eec708ebf12b0fd5926325fdcd1d725c956b8c7001db89c643ceddc SHA512 a0c3b76b6f6454678d50a6f60bb8dae830023dabc22de5581848bf42932a25db9fa8c32b753e6747c486badcaa7c3f679b58a0874c26f99f69f1c7a2049a217e
-EBUILD gedit-3.30.2.ebuild 2325 BLAKE2B ab39c2a96771d4a996a51a9f4e8af7ee4e913d5ec7aeff548afa5732f80237cd367b3035b43230589d77efe37ded2a88e8d75cbf934954d9b83f1c199b2139d7 SHA512 6e49fb42e4715a404380e9fb01e9757f2a39a3372d2d1988672dfa25819bb980770050fc9197c2dec3e4d91d343e7f71b61125463a3412a0af4215d5d739176d
+EBUILD gedit-3.30.2.ebuild 2323 BLAKE2B 4fa5600d7163ce9fb6670a89d9151343cc7c256cbb0219f3150f94acdb2ff4b53e85dc116eec708ebf12b0fd5926325fdcd1d725c956b8c7001db89c643ceddc SHA512 a0c3b76b6f6454678d50a6f60bb8dae830023dabc22de5581848bf42932a25db9fa8c32b753e6747c486badcaa7c3f679b58a0874c26f99f69f1c7a2049a217e
 EBUILD gedit-3.32.0-r1.ebuild 1922 BLAKE2B 6dd9b4ad92a3190dd099f9fbd32b72bae48165e1aeb00d10bbf7b573177ed449dbb162cf06e324c85220576cfc7f995324935b41754e7f63d2e8abbe5bfb0eb1 SHA512 6492ed41a81a5ea20b8437e0206e1ea1db9e62787eac906e01131b317768457be0878f9f9b9e0b3cf40f4cbe733e32e7c06222c1ecff3ed483fcc3d55c97c44c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/gedit-3.30.2.ebuild b/app-editors/gedit/gedit-3.30.2.ebuild
index 8384d66214d0..70d241ee4cee 100644
--- a/app-editors/gedit/gedit-3.30.2.ebuild
+++ b/app-editors/gedit/gedit-3.30.2.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/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index a5747cc9c81a..cc9580351586 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -3,5 +3,5 @@ DIST latexila-3.22.1.tar.xz 1111820 BLAKE2B 8a3e375ba048112565f6b074ec62a243fb34
 DIST latexila-3.24.3.tar.xz 1112940 BLAKE2B 2410276574f02735dde9ce77a9bba257e3732784664b302870957fc3f8603bedddaebed4da3f6da1e1f6fc30e3dc233146b65dbf7589a8776c653018a4129355 SHA512 c7c8996704e68ed136d3d2a04c839faf5497a78ad459411daaabfba38ac883f253325f07a8c126cc4b2f1d553fe08b39f1d6a51d1b6944540dc13142173e4361
 EBUILD gnome-latex-3.22.1.ebuild 1154 BLAKE2B e4f81e261162228ac4f9781a0f260ab1e1a47b7cd0738e9b401b15db62d8a984aadfe5325b03753550ec04b84ce981e624c033a656220bde4b44eb7e5ef8181c SHA512 05ab925862df774d905ca8b4903ad1487c6a4ab94ab83d8b47bd6d674831dc971c3a4baa5ffd20e949c83cb46c1e9ebd2bc9e1a170756e765d0521279183ef6f
 EBUILD gnome-latex-3.24.3.ebuild 1205 BLAKE2B 75006f26492e8b56f8cab58879d35356dbf44c5fb20d937ece78a4e0b825826e4d704f7960e2b1a7878c0356aff1c1470fc39667a4dfcaff87ce20ee076a3b06 SHA512 142dc7d67bea203d9f6990f77ef40da7981f973e2e2474ec23e4619e623dfdeec748a7beb82c2e96b17cb154ab55c79046ca223d4706d759fd1c229b4a1039e8
-EBUILD gnome-latex-3.28.1.ebuild 1078 BLAKE2B 20508192b9337114200820de886e64054292adcc31670d0f65f9dd3166d9963279a72534559e6fdfcb9dac9ec034bf85e1ecebbe77daa2296c88f9f8942db9eb SHA512 e431fe7e1d2844a47f109e01229e4f6b4e43465828c0c1d60677ae5c6a8e84925fe08185dcec4e163e991bfb3408a12beeaad361570132c95ffd0c08918690d3
+EBUILD gnome-latex-3.28.1.ebuild 1081 BLAKE2B 5aa3a45f7ac589c90d6be2e9ac812b74e99eca0992adcdc6b0d6e7eaa905f9c73e1258b08979ed084ad7661d0e116093e69bf047731e3b803775ca02ce6a9982 SHA512 3327ed208e9b74061ef604906248314bc5449f955e77a842703131329c7aabc3b122b21c7fa013204e205a798c9d02d42c2303207242843f192b6d61754051c7
 MISC metadata.xml 464 BLAKE2B 8d70a6283779236162f7d0838ca7e97ae90ae5641cfb2fa551426238ce06b64a22f368ddec6a13fea472b2aa038a7854a7c53fc3bdf5c0a13cc9cbefa042fe39 SHA512 2015c3aac4abb5275c45db624fb6ee841e55ca1fd4e976d60528b04b5084a0cbae7fc625369d03e2ca2ee3ee16719df1740246a06208b10e5a99ea3c6612a0b1
diff --git a/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild b/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild
index 67673e7585d8..b62f1edfdf10 100644
--- a/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 x86"
 IUSE="+introspection +latexmk rubber"
 
 COMMON_DEPEND="
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 7b1db53ab967..25b1dc38f018 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -8,6 +8,7 @@ DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e
 DIST vim-8.1.0412.tar.gz 13857501 BLAKE2B 6925184359b8b36cb546c9fcba4bb01755455aa87171ea7328ece411a5a5ced45096b8bef8561059bbff9a3ade565e0648fd18dd091d6faad0eb8a67321337a5 SHA512 3f458c039a636d7d3e398f8aa9cba4b4ae650c00038618c4776959b6feb0a1e3ac56be2912c3d85cba8e8f301661a62d71acd34a4dd75dc4dc000a94bf1b237e
 DIST vim-8.1.0648.tar.gz 14061964 BLAKE2B 79bf52d8574167471c93942904dc2b4ad5648ec365561494bbad45c779154b75b0fff1d90229516e938371f1eaa5808659cb2181b150c4c13bf8501bd9987b38 SHA512 d41676a6bb6bc442f4946ca021b2835d7ea0e54fbefe1bfc728241e1bf203cc696b707fcca6f25c877660283a790cefa4259fbd14de88fd4db7390701189c454
 DIST vim-8.1.1155.tar.gz 14141750 BLAKE2B f15470768fbdc4e02552b8711626c3ad9647ec5b74ebaa3f82a4f32c050405ef0cf3f29d1e5bdbb4de008bf16262b8cdc81ff153e2694a184523cd913624e8e0 SHA512 0cdc42090958f4c91c13aeeefac0abc4feaa629d8b90c04bd01d5e23efefe21e6316e1b2c3b6015ecf9577573faea9a1b6660de8a2959642e65582dbe9c7f5c6
+DIST vim-8.1.1312.tar.gz 14167114 BLAKE2B a69688023ccb2b22028ae6b5387ae45ee8755bb22d82c91525a22e81c1d9bef253b43d2c56c3e70fb330a348612067df9d4c5edf043cb8555c319141e52b716d SHA512 8f38a73c8971199da3477cf291a13e180c99616f0e75b48e9cf68fbf301c91384690666a662f1800afc65241237378ca174cfd0efaa71cbb11932a0ff425b91e
 EBUILD gvim-8.0.1298.ebuild 10444 BLAKE2B ed698613b90b4780010a79905cbc2b1ad7a8b30f01b5267fddf4709c4c6b82b950574090d91faf541380254c88651aa1d3e10cd15c7fb5d650854608fcd51e0e SHA512 996bbb0fc297b59267277d10998deb42a9bd1ca86799d1c210c1ad960525fcd7f583ff4126c30930291b643891a08b15081ee1a622eb94c6d8d5c2412afcf75a
 EBUILD gvim-8.0.1699-r1.ebuild 10434 BLAKE2B 627d0fca80743893576f803da34f2f98eef363a59d701cf30b7d1a355881e83a2f94ab7025cf3f72ce885696312cc53445d4871a1abb3688abdd336e5fad463c SHA512 067c1d7d67e9dc569accf09e192093ce0ae6d147c8183d2ca3b450afbbf4cddfd55f812babd105356f9b19ea57f14a943120a93f768665eb4a38603400f8079e
 EBUILD gvim-8.1.0034.ebuild 10433 BLAKE2B fe9544211335687de25c9343c5e3cb8e93531b71b22ac7d7d7b4e78b0d3a8e15c5618f9f5076c33a8e9c399e2f6d5f52afc073e076d51535750cd74bdc7d39c8 SHA512 0cbd399823d7d68167989b1085211ae547b0d47acae63becc03ad2c162065b0c8e7c8fa9f1bd5253f4f89252441d81be475ac8bf44d6359e7b93de09d9fbb3c0
@@ -15,5 +16,6 @@ EBUILD gvim-8.1.0412.ebuild 10421 BLAKE2B 5a4360134c7b5dbb7e259ee00df65fa6e3fce4
 EBUILD gvim-8.1.0648-r1.ebuild 10634 BLAKE2B 42f688ff29f33c0735ba25c1a52553639a6f8144f138ea0631d54adaaedf35330439d4d6d8ccbdb71fd0bc6d5f5ec60bb5bfdf8f5417299a2a16929638339ac3 SHA512 952a3452db2bdc6a4bfdae62bf077ef7688babb381aa3cf50b04ac01998a249d35fd002bea92d7a58660440c973e26a0cd3f7863818f3186a29851aa163af74e
 EBUILD gvim-8.1.0648.ebuild 10478 BLAKE2B 55940a35ad7a05d0f2c72be20ed295512a590922ea6d20112e1d8389395bcb75cd3e423a64cce546bbe8a2232355ddecaea09f9d08074e55f0b75dae75af8501 SHA512 e98878e117997c5723017ffdc88f0bff4a382a9acfb96699a318329def6ed83bfe18286a86dc8fce324fb55fdb844183e18ec65055a2962a7567fa559cd243f3
 EBUILD gvim-8.1.1155.ebuild 10536 BLAKE2B fd459e63131aa9abef29d5a0321e0a8a7fd90da88fd0c3c1dcc88616e1541c074e9b6075de88b7b92aff0b5bb460f4142efd0d17137bb8e59c73d774e63d3a53 SHA512 34eb03c379705026561228ff55d4bc8fac9c2c85baa9ee1547f63d0839009eb5fe1161dd9d94d1bae9b2aadd2332e9b56f69393e9437835512e125411562724e
+EBUILD gvim-8.1.1312.ebuild 10498 BLAKE2B 2431a9e0f66e14289d7502bc57ed716b808fad253526aff29ef52fba38c4e5193fcf5298006af667e05a6f32d761bca5bf9d2c9bca6029d5d2d7e95effa60329 SHA512 0ecc7a2e7d4a497b9274c7f3433f1fd2f9d370bcfba2df9380fc77749f04bceb2dcebe5f615dbdaf188b862569e8d4320027fc9c9a0279df2321df76b1668955
 EBUILD gvim-9999.ebuild 10407 BLAKE2B 1f0865de240b0e88ab55dc27f2f4ea230dc0eed0bf63d6551fd3bc4adb9bdb00e04ac09925e9d5a42dfaf900667a584f44b3cd2fd7fe711833ec96198bacc545 SHA512 c23d892f772dd4db9d612f8ce822192f9f136b41be207fd467ceef9d9997b0dc7154918ce7418257046e58c40f411e3518a6612f5203cecee8068dfa536d223f
 MISC metadata.xml 685 BLAKE2B cf087e797855063edceee8dae21691a6ada5783ebb3712ff2f2440813e4bc6c78a0077be9d2f7302ee0b0270f19e32dd5edef661f884ad595fe39b7160101d84 SHA512 074b08bb8f604315f3c69731c1fa4c130ddbd45dd15305c6e09004424c2a914cb18e2c756714967abc6663654cbe03a19f586b1de64ce264c58ed7daec1ecfa2
diff --git a/app-editors/gvim/gvim-8.1.1312.ebuild b/app-editors/gvim/gvim-8.1.1312.ebuild
new file mode 100644
index 000000000000..58687ec4e798
--- /dev/null
+++ b/app-editors/gvim/gvim-8.1.1312.ebuild
@@ -0,0 +1,368 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.1"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit vim-doc flag-o-matic xdg-utils gnome2-utils 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 gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=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? (
+		gtk? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk? (
+			gtk2? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+			)
+			!gtk2? (
+				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}
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880
+PDEPEND="~app-editors/vim-core-${PV}"
+
+# various failures (bugs #630042 and #682320)
+RESTRICT="test"
+
+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
+		--with-gnome=no
+		$(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_with python python-command $(type -P $(eselect python show --python2)))
+		$(use_with python python3-command $(type -P $(eselect python show --python3)))
+		$(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 gtk                    GTK3
+	# -aqua -gtk gtk2              GTK2
+	# -aqua -gtk -gtk motif        MOTIF
+	# -aqua -gtk -gtk -motif neXt  NEXTAW
+	# -aqua -gtk -gtk -motif -neXt ATHENA
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk2; then
+		myconf+=( --enable-gtk2-check )
+		einfo "Building gvim with the gtk+-2 GUI"
+		myconf+=( --enable-gui=gtk2 )
+	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() {
+	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
+
+	# 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
+
+	# 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/pluma/Manifest b/app-editors/pluma/Manifest
index 21cac4dc54f6..8ead1244be21 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,3 +1,5 @@
 DIST pluma-1.22.0.tar.xz 3235612 BLAKE2B a0cda23a6ee73e562cb32c3f1430590042248b6a6e7cbf021103db507450b2a594506f3d8283eeed08e2ba5006ff51376eb6db5e94ea5ac9d5707b29e0efc2c4 SHA512 7c74c2ce0a89ec3813c936449d3114957e7b319433875ef567ecc508a28a1d3ddc3d0da418b2eb1278b6dc9dbaa3c75a279524f5a061b5aecb52955edcf28f51
+DIST pluma-1.22.1.tar.xz 3236724 BLAKE2B f571ccb79ffac11122dad1888a9804fdb1671f2c73b28c216e0ec593ffc4dac3fec3053b83fd1503e0c951e032f6e4c22fb4f3d6a1d23477a54e06de2659222e SHA512 0d3f07b2e8c736c9e1ad64ed5cb749db6088868e9bc27aa786cbb0c3fe72715f0fd4dd53999502a4333ec82110148b772c0dde81433d0936d2d3c2d04804026a
 EBUILD pluma-1.22.0.ebuild 1743 BLAKE2B 40c26b28de7ba18f07cb417ebf2b94e02dae42b5a3f81f9954c2c018056424755ec3e3d7233198f258beeb690be86fd96ccca9a30c254e9059c42e2edb812d97 SHA512 596cffd23ece2b64af7afd0d75d416b1a23757ed4a868e3247c8d188f06ab79c6bc7ec7cafd0ac331d650968771100e980471ece1f933c9ed990cf327e586a4a
+EBUILD pluma-1.22.1.ebuild 1745 BLAKE2B 9cd06ff881e7aeaf69386f083108914cf2df1fb9bdc5e003dd5b191ea1ae6467c440dc2d0f5f680db659d41825669062a28db3e92b0c267d7f48fa0c040fed9f SHA512 b8f68d58fdb0cdbfdd29f28a120b20353c7cbcf0c08f30cd0cfaeaced09b3e56cbea0ed40e7e38d1555017b59908aba6f80500426727a1bf394655089faa1202
 MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/pluma-1.22.1.ebuild b/app-editors/pluma/pluma-1.22.1.ebuild
new file mode 100644
index 000000000000..aa932ba522f3
--- /dev/null
+++ b/app-editors/pluma/pluma-1.22.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate 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
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libpeas-1.2.0[gtk]
+	>=dev-libs/libxml2-2.5:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/gtksourceview-3.0.0:3.0
+	x11-libs/libICE
+	x11-libs/libX11
+	>=x11-libs/libSM-1.0
+	x11-libs/pango
+	virtual/libintl
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	spell? (
+		>=app-text/enchant-1.6
+		>=app-text/iso-codes-0.35
+	)
+	!!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
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-util/glib-utils
+	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/retext/Manifest b/app-editors/retext/Manifest
index cf0c828d827a..c024ad635bdc 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,11 +1,6 @@
-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 1452 BLAKE2B 2166f6a0ddcfc4db1ec772819b479420e6e2c04da8a94cd75933b1f34c21b00d46d83f0cc09558e437b16a73e0dd398ffc1a8cc4126b9d40b4053db134ff1058 SHA512 9ed383aecf7328810d7dd1915389b15d3419d144e10228f0cd4992bdf293ca28f621fc07cc6927019a4679b3c6b1e9a20fe1ce8bd73bd2af3c0f35e9e6808873
-EBUILD retext-7.0.0.ebuild 1364 BLAKE2B 98e671d8fcac8d2d2074acfb5ac45ae377df5d1db8149ab514e7af6fa1c2890d5812b23f841d29eb618a23ae8c32317c07c3387ee60f3135346300eb7e1e956e SHA512 60468a723500702ff1d723e2c3b95a81d375a707b6807fb5c4d3603bc2761012134342630838015932af2d3c3acd4ad2a8d20e5514a6e7468ddc42df671cc1cf
-EBUILD retext-7.0.1-r2.ebuild 1452 BLAKE2B 2166f6a0ddcfc4db1ec772819b479420e6e2c04da8a94cd75933b1f34c21b00d46d83f0cc09558e437b16a73e0dd398ffc1a8cc4126b9d40b4053db134ff1058 SHA512 9ed383aecf7328810d7dd1915389b15d3419d144e10228f0cd4992bdf293ca28f621fc07cc6927019a4679b3c6b1e9a20fe1ce8bd73bd2af3c0f35e9e6808873
 EBUILD retext-7.0.3.ebuild 1459 BLAKE2B 558340a8f50de7cb2b8f93039eb36e9db3780bc234cde9215c5591cfe0f4f3e164c79aecf11d1fa1a65bdcb177e6f3eec4ec65e51a476e5cde068627029ec898 SHA512 b6ea0348d90949be4ab5e3b387dea4658664337c71770490e31194c89be3cbd4addfa32c3849e211bf50cc80831058abf7bfe6e4ab975d5aad6e249435720731
-EBUILD retext-7.0.4.ebuild 1814 BLAKE2B 4ad4a8c595d84d63fb10f4abe8e11e84ef502988daef15991c667dfe263900d9d4df17b42d6b5e8a1acfaf322bb9db84c53fedf99fdf770339408d6f75028c36 SHA512 322db19500aa869baac062a6965d8a24c35fa926175840d233c4c51fc1b67fcdd02b308f052b178fbf3ad7f469e1575fa9a3f1d2feee59f6363c478a6a4eeb49
-EBUILD retext-9999.ebuild 1814 BLAKE2B 4ad4a8c595d84d63fb10f4abe8e11e84ef502988daef15991c667dfe263900d9d4df17b42d6b5e8a1acfaf322bb9db84c53fedf99fdf770339408d6f75028c36 SHA512 322db19500aa869baac062a6965d8a24c35fa926175840d233c4c51fc1b67fcdd02b308f052b178fbf3ad7f469e1575fa9a3f1d2feee59f6363c478a6a4eeb49
+EBUILD retext-7.0.4-r1.ebuild 1850 BLAKE2B 1f8d204ad1607417ed640cb6d87bf03f7579526b588d6d3895a892d52535101f83df506b445cf91b39bb0a69dfad831dc84996098b06c2d1725b6db6b8dcbd80 SHA512 031f6207f65aaa133dac663ccc316864d89b7f52b3dfec1289d36b391176a4333c1b25bffcbfccd64f745dc808e38396c8c6936f45208f92d9b36ae805660427
+EBUILD retext-9999.ebuild 1850 BLAKE2B 1f8d204ad1607417ed640cb6d87bf03f7579526b588d6d3895a892d52535101f83df506b445cf91b39bb0a69dfad831dc84996098b06c2d1725b6db6b8dcbd80 SHA512 031f6207f65aaa133dac663ccc316864d89b7f52b3dfec1289d36b391176a4333c1b25bffcbfccd64f745dc808e38396c8c6936f45208f92d9b36ae805660427
 MISC metadata.xml 496 BLAKE2B ad4453602e60bdaf37553cd2fe8c9ea8abc163a86fded505e69bfa06f40d503b0cc58651068a4c52a6ffd0c8368f855512ec83aefff4a64a696e1b042a129e6a SHA512 0e182c5ddf9ac27dd9b6eb70c9a3ebdf711552e4e00db2d66696bdd992dc7824f51c86acb60f044342534b230c9884d45c55177d05f7ea92be81297994b7f559
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 6a54d0289889..000000000000
--- a/app-editors/retext/retext-7.0.0-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{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 b85feedbdb43..000000000000
--- a/app-editors/retext/retext-7.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{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 6a54d0289889..000000000000
--- a/app-editors/retext/retext-7.0.1-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{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.4.ebuild b/app-editors/retext/retext-7.0.4-r1.ebuild
index 0e48d2b2a8cf..21b6ece05bcf 100644
--- a/app-editors/retext/retext-7.0.4.ebuild
+++ b/app-editors/retext/retext-7.0.4-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# no pypy{,3} support as PyQt5 does not support it at 2018-11-18
+# no pypy{,3} support as PyQt5 does not support it at 2019-05-15
 # https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
+inherit distutils-r1 virtualx xdg-utils
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
@@ -36,13 +36,18 @@ RDEPEND="
 	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}]
+	dev-python/PyQt5[gui,network,printsupport,widgets,${PYTHON_USEDEP}]
+	|| (
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		<dev-python/PyQt5-5.12[webengine]
+		)
 	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( x11-base/xorg-server[xvfb] )
 "
 
 src_test() {
@@ -55,7 +60,7 @@ python_test() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_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."
@@ -64,6 +69,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 0e48d2b2a8cf..21b6ece05bcf 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# no pypy{,3} support as PyQt5 does not support it at 2018-11-18
+# no pypy{,3} support as PyQt5 does not support it at 2019-05-15
 # https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
+inherit distutils-r1 virtualx xdg-utils
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
@@ -36,13 +36,18 @@ RDEPEND="
 	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}]
+	dev-python/PyQt5[gui,network,printsupport,widgets,${PYTHON_USEDEP}]
+	|| (
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		<dev-python/PyQt5-5.12[webengine]
+		)
 	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( x11-base/xorg-server[xvfb] )
 "
 
 src_test() {
@@ -55,7 +60,7 @@ python_test() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_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."
@@ -64,6 +69,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index c715ad8ba0da..2dcd02c18dc0 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -8,11 +8,13 @@ DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e
 DIST vim-8.1.0412.tar.gz 13857501 BLAKE2B 6925184359b8b36cb546c9fcba4bb01755455aa87171ea7328ece411a5a5ced45096b8bef8561059bbff9a3ade565e0648fd18dd091d6faad0eb8a67321337a5 SHA512 3f458c039a636d7d3e398f8aa9cba4b4ae650c00038618c4776959b6feb0a1e3ac56be2912c3d85cba8e8f301661a62d71acd34a4dd75dc4dc000a94bf1b237e
 DIST vim-8.1.0648.tar.gz 14061964 BLAKE2B 79bf52d8574167471c93942904dc2b4ad5648ec365561494bbad45c779154b75b0fff1d90229516e938371f1eaa5808659cb2181b150c4c13bf8501bd9987b38 SHA512 d41676a6bb6bc442f4946ca021b2835d7ea0e54fbefe1bfc728241e1bf203cc696b707fcca6f25c877660283a790cefa4259fbd14de88fd4db7390701189c454
 DIST vim-8.1.1155.tar.gz 14141750 BLAKE2B f15470768fbdc4e02552b8711626c3ad9647ec5b74ebaa3f82a4f32c050405ef0cf3f29d1e5bdbb4de008bf16262b8cdc81ff153e2694a184523cd913624e8e0 SHA512 0cdc42090958f4c91c13aeeefac0abc4feaa629d8b90c04bd01d5e23efefe21e6316e1b2c3b6015ecf9577573faea9a1b6660de8a2959642e65582dbe9c7f5c6
+DIST vim-8.1.1312.tar.gz 14167114 BLAKE2B a69688023ccb2b22028ae6b5387ae45ee8755bb22d82c91525a22e81c1d9bef253b43d2c56c3e70fb330a348612067df9d4c5edf043cb8555c319141e52b716d SHA512 8f38a73c8971199da3477cf291a13e180c99616f0e75b48e9cf68fbf301c91384690666a662f1800afc65241237378ca174cfd0efaa71cbb11932a0ff425b91e
 EBUILD vim-core-8.0.1298.ebuild 6637 BLAKE2B 929e33024cfd7e70410c4cd4602b6b6360b6bb5fc0cb55de5a037952a900830c5350e86ff14f136c1e79c16c89cb792f8d20f0dec8830de1ee60ebe6b47ae744 SHA512 93e032f7cf32131090f25850e44ed5c519d7a586133086102c8ab8e5163dbf49d196817129ab3ff8ac103f1de85a603b0823f6ebe970ec1402fbe5ba7f414350
 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-8.1.0412.ebuild 6636 BLAKE2B 64e3ba609a0406f60155721cf63cdd76728c0af844eae5cfe3791e8f713156ed28aff0e74e6adb00a335c05844aaf3c2d6c7f655cd91ce48388885ed7c71de7c SHA512 408da952f378be9b70bda9373df51d3a1a060e9daae80caae4910453e82fbebd0dd726ddc1b7b5bd417b28018fe0233213d84de86e780076022c3a555488424e
 EBUILD vim-core-8.1.0648.ebuild 6934 BLAKE2B c687849029c7e73199f71834b774b8778e32ea6dfd14d5ef6f85aa7becdead323e86908ae8eaf7fcc42e2d6fb9380467f995c92f23bb2b49dfc9515b26ea07d0 SHA512 68e92df938d3cf6f345c55560020416e3d900e00fd9e491591ef63cc0ce33192948889a78426d7554fba3f77c00056a7f1ec50d4b06a46044c9f0c8508f6f829
 EBUILD vim-core-8.1.1155.ebuild 6948 BLAKE2B 7e9f614484bf8598c5240159d4ea0fed4b41cb98bbb1fea86b57a370918a50c730388c1cf7d5c26689d31edd1b0e2687c8aa1b6767db65d5208500796a171588 SHA512 b806c11fee9e7d5456df7d2d1785ec60699921ff95c769a3827d69422472528836af94d68a0484a468a31ab2010b8f66cd9e9ac9557fd735c0599c2505897e43
-EBUILD vim-core-9999.ebuild 6941 BLAKE2B 54128cadb3fb475dd2d023778eb1c96260f7eeb0e7f1618f6602f845cc3f159bba8e3cc208de425e4139bfdc1cb0aeac8f6672874e79b913cfb0d430a7d34a16 SHA512 93855f390bc44197b63ac8e26f0f7efc53ceebc6624b3c2a99af83586defaedda0fb7d634f609a0b7312810ca11e6d388dc94f3ee365c449bf449af2346bbaf1
+EBUILD vim-core-8.1.1312.ebuild 6948 BLAKE2B 7e9f614484bf8598c5240159d4ea0fed4b41cb98bbb1fea86b57a370918a50c730388c1cf7d5c26689d31edd1b0e2687c8aa1b6767db65d5208500796a171588 SHA512 b806c11fee9e7d5456df7d2d1785ec60699921ff95c769a3827d69422472528836af94d68a0484a468a31ab2010b8f66cd9e9ac9557fd735c0599c2505897e43
+EBUILD vim-core-9999.ebuild 6948 BLAKE2B 7e9f614484bf8598c5240159d4ea0fed4b41cb98bbb1fea86b57a370918a50c730388c1cf7d5c26689d31edd1b0e2687c8aa1b6767db65d5208500796a171588 SHA512 b806c11fee9e7d5456df7d2d1785ec60699921ff95c769a3827d69422472528836af94d68a0484a468a31ab2010b8f66cd9e9ac9557fd735c0599c2505897e43
 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
diff --git a/app-editors/vim-core/vim-core-8.1.1312.ebuild b/app-editors/vim-core/vim-core-8.1.1312.ebuild
new file mode 100644
index 000000000000..08bf83307d75
--- /dev/null
+++ b/app-editors/vim-core/vim-core-8.1.1312.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.1"
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils
+
+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 ~riscv ~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"
+# avoid icon file collision bug #673880
+RDEPEND="!!<app-editors/gvim-8.1.0648"
+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
+
+	# install gvim icon since both vim/gvim desktop files reference it
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	gnome2_icon_cache_update
+}
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index c1ea615374c3..08bf83307d75 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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"
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 75d1091925b1..70ee0bcfaefd 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -6,6 +6,7 @@ DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e
 DIST vim-8.1.0412.tar.gz 13857501 BLAKE2B 6925184359b8b36cb546c9fcba4bb01755455aa87171ea7328ece411a5a5ced45096b8bef8561059bbff9a3ade565e0648fd18dd091d6faad0eb8a67321337a5 SHA512 3f458c039a636d7d3e398f8aa9cba4b4ae650c00038618c4776959b6feb0a1e3ac56be2912c3d85cba8e8f301661a62d71acd34a4dd75dc4dc000a94bf1b237e
 DIST vim-8.1.0648.tar.gz 14061964 BLAKE2B 79bf52d8574167471c93942904dc2b4ad5648ec365561494bbad45c779154b75b0fff1d90229516e938371f1eaa5808659cb2181b150c4c13bf8501bd9987b38 SHA512 d41676a6bb6bc442f4946ca021b2835d7ea0e54fbefe1bfc728241e1bf203cc696b707fcca6f25c877660283a790cefa4259fbd14de88fd4db7390701189c454
 DIST vim-8.1.1155.tar.gz 14141750 BLAKE2B f15470768fbdc4e02552b8711626c3ad9647ec5b74ebaa3f82a4f32c050405ef0cf3f29d1e5bdbb4de008bf16262b8cdc81ff153e2694a184523cd913624e8e0 SHA512 0cdc42090958f4c91c13aeeefac0abc4feaa629d8b90c04bd01d5e23efefe21e6316e1b2c3b6015ecf9577573faea9a1b6660de8a2959642e65582dbe9c7f5c6
+DIST vim-8.1.1312.tar.gz 14167114 BLAKE2B a69688023ccb2b22028ae6b5387ae45ee8755bb22d82c91525a22e81c1d9bef253b43d2c56c3e70fb330a348612067df9d4c5edf043cb8555c319141e52b716d SHA512 8f38a73c8971199da3477cf291a13e180c99616f0e75b48e9cf68fbf301c91384690666a662f1800afc65241237378ca174cfd0efaa71cbb11932a0ff425b91e
 EBUILD vim-8.0.1298.ebuild 8746 BLAKE2B d512bc2b44dec308484be54897bac6cae8156e7865410537878872b9134a0a609d1747fe1e4cb45fdff6356ebb5886307ceb2fdbd56351ee25ce84b9a7569daf SHA512 ce82d01b9aca3ba3dc83d4671025b65b1cee66afc871c55d4e7ee8d248fcd5373080adebacb9119693daef3f9e316955fb9767554c9d9e80f3273fd524a4c942
 EBUILD vim-8.0.1699.ebuild 8774 BLAKE2B 5b78a98b06bac14fc32663a1d7dba6ec989aeedd19b812ae2579b26d52e002434c2b8328179bbd8c03df9ba0255a933e977a129b97ff077d99151c25b9ece2bf SHA512 bce569183e17b58be9580718f86e96fac861f2edf33f9d5fa1db14268e8027d26ca2f6717d2f05b1910b652cbd5cc482c492036fd3b02c0e8d89458071cc715d
 EBUILD vim-8.1.0034.ebuild 8774 BLAKE2B 52b9881612decb1a4be1882a1d1ed3d10de232d117b53dd77371a0841c06a64baf934e250d6dd61d5cace9409835f7095f78d9046d30643798d29a0461e82bb1 SHA512 9241434ec0f489ffb1867fcda61e378e59aef5ed513de70b28746a73985ff9f82803c9798b3d2f95c8de86fa2168b9a9ddc4515aea9fee556cb0f14330a6f658
@@ -14,5 +15,6 @@ EBUILD vim-8.1.0412.ebuild 8799 BLAKE2B e7e2fcf92942d132707dfbb0ac784ee463160d9b
 EBUILD vim-8.1.0648-r1.ebuild 9100 BLAKE2B aa77faf578c82380f3b38e05d4e4585cd7fcf3aa06ceb613e5839bd52e43a1eb20ae9810f0f8fa9dc0fcfee166e974d28a3b8f05b39ada4551a45fa2bd7ad50b SHA512 aa7f64fa384b856412f07a6e867af783ac71a41283ff70d1d2ed82256f113d8df248d1421c021abfe82d7cff213ed5c3d913e7213d7720365cfbc9e26f5cf3b8
 EBUILD vim-8.1.0648.ebuild 8944 BLAKE2B 0675f5fb1cc79cf241c07042c84daf12fb4f8cfa4ccf52033a72c932fea7f5e568b1e3459d18ee2aaee1e7a66fef239cbace63477ea6b22e599a9b0ca0f1ff30 SHA512 eb4f5e0386783d1098b91025e7df994660ed99e0fd8b77adddb9c2a09b4f0558abb9482e3aef6d0fc749367acc4bcdb856e4f496025ac9e26d75e0ae89edcd78
 EBUILD vim-8.1.1155.ebuild 9141 BLAKE2B 1e2e986f61695a08451d5e42df15e0e6362dff718936b669a9bdf31c8d613f9010917151f97d9563100bbc7a30a711efe28a851e94bf3d22fe07047ac560baac SHA512 df1834ce678d58695682ce0619464aada099ecef60a07c78de34a32400cc0756ce88adef4087650e5c7fe943faf24c26464bf2c45da103939b9d77825c918536
-EBUILD vim-9999.ebuild 9097 BLAKE2B 071c9a8ad081b255833ff53811acd1f652c625bcc97985bdd5b0b7a463bb204a662515d2d090d711b193c224f0379d2dea3271a5fabbcebe5d997be7b4c55a0b SHA512 b8aa4d0446c910a88e724a7b233a075f5e51d47db4ec9d8a349c8dad5b188ef5774a6ed02ef7a477dd3e69439546f8bae2d2a98bb18aad1b4e5ffb7aa7441b34
+EBUILD vim-8.1.1312.ebuild 9104 BLAKE2B 23bb8fe36b201249da7357654dc600321b908db48118afcd82c6f037410c9f4f6c3746c45dd485a217ec65bbe05bca688e0e375487d7829830f23384d5c40101 SHA512 c35b426d97269f5c48b14ac3baddf4205ae4212fff76c15edd7c3553d3c26a940632bbcee459442863bc31c8707b16d7ca2b5cb4aeff63ed779b1c5bc0fd91fe
+EBUILD vim-9999.ebuild 9104 BLAKE2B 23bb8fe36b201249da7357654dc600321b908db48118afcd82c6f037410c9f4f6c3746c45dd485a217ec65bbe05bca688e0e375487d7829830f23384d5c40101 SHA512 c35b426d97269f5c48b14ac3baddf4205ae4212fff76c15edd7c3553d3c26a940632bbcee459442863bc31c8707b16d7ca2b5cb4aeff63ed779b1c5bc0fd91fe
 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
diff --git a/app-editors/vim/vim-8.1.1312.ebuild b/app-editors/vim/vim-8.1.1312.ebuild
new file mode 100644
index 000000000000..aa0c429fd159
--- /dev/null
+++ b/app-editors/vim/vim-8.1.1312.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.1"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils
+
+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 ~riscv ~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="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vim-pager? ( !minimal )
+"
+
+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} )
+	vim-pager? ( app-editors/vim-core[-minimal] )
+	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-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
+			$(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_with python python-command $(type -P $(eselect python show --python2)))
+			$(use_with python python3-command $(type -P $(eselect python show --python3)))
+			$(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
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index d4037bd79419..aa0c429fd159 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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"