Sync with portage [Mon Jul 29 21:44:54 MSK 2019].

5 years ago · 7f22d61866
parent ff65a62ca9
commit 7f22d61866
2249 changed files with 5577 additions and 25269 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29655 BLAKE2B 1b1da808925de6cda04b793fd9e149d6b0509266ed04cc1a9ea68cc0192ca14ca7738ad8a9655baecad88b4546be250987ca986473a968770db67bdf15bd2ef3 SHA512 9c20b6d9170325b8d07b714a22e15bc98ea1d3a3e9fa5acc2c6cae6663bd99875f3bb8da45dade17dd4aa9f12aeec41f28d9e59f004d01ba304633f2c2c146da
-TIMESTAMP 2019-07-29T07:09:00Z
+MANIFEST Manifest.files.gz 29637 BLAKE2B 912b729b2dfbc50cd53021ec81cb67457caecc4b6fe4bb5336a95864d6308bc0c319ece50e363095c32052f90d269588fe580ecf6a9951e86ef0a164ab6dd098 SHA512 5a85f77d6b1d7c8f4581d28478f1cc850b58da62587a59bf5e87cbfec068e8e2a38655c342c50690161f2a046263f85480efccf9d6ceb76840aa139aa84571da
+TIMESTAMP 2019-07-29T18:09:04Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl0+m4xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl0/NkBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCtdQ/+Lk2ocL4k7moJzkDxLAndgphO+mUmC20ZazviaJ0GA1Id4xoqG/Zjyrsm
-hcdtzXwu/AgmfvnjnzQUD4wyZ2XW9gNlx9kaCQ3dCrcErm8jENU8nze87seTGR2/
-mS2/tK/B/kFtdHylISKYazo/jmkidhn5AvgHekBf4X9QdCHoR2FAae12YDSiK4es
-3ysyvlR9KaENAOeQ1aTIgqARfwkZyfy0WT1QwPLFkBGF9ppRuiiBRZ0ryCF5Cd88
-GsURSPm/S/ciosGaD+SsAaTa5bMFuh6A0IhE1H2FDZpwpN5EY8eo1POX9KosR819
-tjufszA5SLqtkWYLc7nmj5fLutVDUnmTicpiqcbpPeP8bWySNzl9khIgAJ7WbwPt
-XvO5QyXFkYe8OVzFn4RGo4Drpk+pnrq9Ba6NAVhMa4wegQw7cgD7iH4jMbZacyjQ
-r5ZVjBGgrygPhLf4gzyur2V3w8suC7IZa1/Ybaah+7fJsEAf02op/x2RgWgx6t/4
-EuSRTp9prICSB6KtKkfNI4k7l7J3QgmBlAzRJ3rqi4YnhRbaBzrnWy9jQOm5c4uQ
-iZhcPXUx/WU7ZuZOgdA+v2naaXyWqNdZ3qULIR9uk7XPyHXcMCftk1Qm35aJ8mZf
-p2+lkXTGJ+pQDlNGpXa/m4mn0UmUZBddfK+59xwaRyapnlMjnM8=
-=qBJK
+klBkVw/9EMxeWXIx6+HwRrs96AjRNY5zuD0vW5F6I0sw9l4qYj/bs6Uq3svrIHlN
+VnpU+MWLrGiHUrNO4BZhy85GRA2aD2BEmlIZ9UQ56KJ5RHA1gEDWiyxVIXHdyz9A
+McWRxQVusPDIxXEOIAHPAOPNLcomH+7ZpB4R56ZANQyxX7zYZ0S1ee9HlaK5IG2S
+WnuScALroC7MrTOas6Ef3YmBPxERZ8prLvFHvpb+Q/6hx+j3XkcaOUZ0ibVy+OMZ
+uKGqa1eLjXjEyjiE44XNz2E/eJ2uv/WtGFOTjClCPOQTTaUqZzGodfL2ZnbOQulI
+8jBL53QT+J+Wboa4v3jGny4mWiHO09KOq6/tGvenZ2SsTAaS3MkJczwfa1yGNiik
+mCV28+6eFbya1tsp+/9ByXlhF97U4yr2zuQpIu1rLrjc+oAzOM9Y0+HDK+sPEHDu
+5FswI5rqTznxYjvEjwarU0uGbr8aXGppLJGfRqlpCKdRattZMHRSQeHEkd6pk78P
+t7RxhDewP9vE74hPzefuLa1DMgVfL6jNn1y9F31YdOH1Lb40x36B3Vz85KaoYlTc
+/HAq4nfEJ9ll6jMtclB43ANyKekuG1k8Bmt/73bsSoAZYPEa9SGTwgSP+bw+GxdR
+xVU7b7bBRJX9SADJ+GfAQINFQK80QgU8npLk3uRBopOJzdrMSRM=
+=3Jf+
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/adm/Manifest
+++ b/acct-group/adm/Manifest
@ -0,0 +1,2 @@
+EBUILD adm-0.ebuild 144 BLAKE2B 11939be19767c6e83739dd4f2545051e76fb9cfa0403e6ba49037ad1968585c26ff51923d5af113f82af802027e5c682a4492f0f16cd542edb805f6678f3cb3a SHA512 f714479bcb2cb8f282cf1772593ec1adc99428f8bb2be7c0422e5f07aedf6b8f49547205266f26e757ffdcd65ffbc7fbc8450ecb7bfc714b54d12d8c7d7119d7
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/adm/adm-0.ebuild
+++ b/acct-group/adm/adm-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=4
--- a/acct-group/adm/metadata.xml
+++ b/acct-group/adm/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/audio/Manifest
+++ b/acct-group/audio/Manifest
@ -0,0 +1,2 @@
+EBUILD audio-0.ebuild 145 BLAKE2B 05641feae3253d911aa09ba24661e055ede92497f47f9d6d86ca44cd694934cee20b7962688d58aae0e696d9304bf953d2eab7f63a15ad99d956a00f0374f7ef SHA512 34c406ca8a0e86ebd35eceb3563558af8f842e45f07597c43316a64a14bd104b33c2cb22975082873fb62dd1f1905f7e54310cc13b0ec238ea59151181ba930a
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/audio/audio-0.ebuild
+++ b/acct-group/audio/audio-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=18
--- a/acct-group/audio/metadata.xml
+++ b/acct-group/audio/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/cdrom/Manifest
+++ b/acct-group/cdrom/Manifest
@ -0,0 +1,2 @@
+EBUILD cdrom-0.ebuild 145 BLAKE2B cf09a0d74b577f2c9ac26bf21143a36a9034be9bab830c2fbbdb7eb378af750e9e92c19e72a3e81050694b5b0dba817350335c3455fa9df2e4dd1a07253b4939 SHA512 9f7cd44547f4412db376382598dce7c3cf0a272e336e14e8682e64686dc40b0edadb50ddd1d3dfa428492919abaa509d15c789520a12bbbe265c9a83d7323133
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/cdrom/cdrom-0.ebuild
+++ b/acct-group/cdrom/cdrom-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=19
--- a/acct-group/cdrom/metadata.xml
+++ b/acct-group/cdrom/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/dialout/Manifest
+++ b/acct-group/dialout/Manifest
@ -0,0 +1,2 @@
+EBUILD dialout-0.ebuild 145 BLAKE2B 63fb85503383f7bc78094bf20ad1a1affbe4edbe1d65792afc9736acd9eaa7c1c68c153af9ac38831006cca627d6290e54277f4fd09251bc0e8c6462b3d9b492 SHA512 f0c18381df7b2059b924518c51a6489bb0ecf233faa96ab0d2873f26bf1de70720347ff25e35652a1568c562e60c2406de8e4a4a8fa13b75b0e05c3c22291217
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/dialout/dialout-0.ebuild
+++ b/acct-group/dialout/dialout-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=20
--- a/acct-group/dialout/metadata.xml
+++ b/acct-group/dialout/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/disk/Manifest
+++ b/acct-group/disk/Manifest
@ -0,0 +1,2 @@
+EBUILD disk-0.ebuild 144 BLAKE2B b6107ee3513e20a7af82ab1a27814fb30e79865d32999301fd3bf6936a9042184b8e8a61d0933bdb0360fafe03a21dcdc05a8082d5e4b5c023d9fa2e63c9f49f SHA512 8225cfab20c134c1aa7d16d77812801b6018bf66cf05a047e17ed12870fa4a144f1f8eefeb356757ad6db75fe5dbe674ad17f7bfde7c92e288cd1b2879006641
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/disk/disk-0.ebuild
+++ b/acct-group/disk/disk-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=6
--- a/acct-group/disk/metadata.xml
+++ b/acct-group/disk/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/input/Manifest
+++ b/acct-group/input/Manifest
@ -0,0 +1,2 @@
+EBUILD input-0.ebuild 145 BLAKE2B e741a5916e0cc7f07c83f46050714a52c99291aaf59bb8620d62f95154aecaade4a21e3f20ac8692b6a2ad3b37b5a349458416c7a37050a32a84b2b160c986e1 SHA512 da1c5b14b3c919662a6c876cd892c7c1d60ae8416273a075d96cbcecfa4b1846d075243ecaa1acaf74ec2b14e4cacf6cb35e23ffb4b802f38db671092416f2d2
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/input/input-0.ebuild
+++ b/acct-group/input/input-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=97
--- a/acct-group/input/metadata.xml
+++ b/acct-group/input/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/kmem/Manifest
+++ b/acct-group/kmem/Manifest
@ -0,0 +1,2 @@
+EBUILD kmem-0.ebuild 144 BLAKE2B 095478e38bcb6f6bc36c03c216271e7c7b2e5f9f9ded8cb7b5972a3ee42300b93b046b235584cc46b19039284139ec3bfb4c78aed726ef83d143fafb7f92ed0e SHA512 ce353943efd757c054e94e7a2ebc458277110908f316c4c841b5fbe1da084c33d282b2ed42203fabd9e2cd972949b563cdfb45e40ad375e066df82cb9cb71c72
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/kmem/kmem-0.ebuild
+++ b/acct-group/kmem/kmem-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=9
--- a/acct-group/kmem/metadata.xml
+++ b/acct-group/kmem/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/kvm/Manifest
+++ b/acct-group/kvm/Manifest
@ -0,0 +1,2 @@
+EBUILD kvm-0.ebuild 145 BLAKE2B aff0b038419a527a34b6e7854884a81b77917d50529dc20fe93b6d5b8be35c4e93d6da1c9b0f66b42c3213aafa9b7b211c85ddac070db9274bb8c091d9e0abf6 SHA512 85ce71474a08a130259efb5ad52462fd8caa241b930e9b51d5a488bd89c8b26c5408705eacb41cfb7e2dbc9b903de219a8747b4fa656cc6de81cffca78fcebda
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/kvm/kvm-0.ebuild
+++ b/acct-group/kvm/kvm-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=78
--- a/acct-group/kvm/metadata.xml
+++ b/acct-group/kvm/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/lp/Manifest
+++ b/acct-group/lp/Manifest
@ -0,0 +1,2 @@
+EBUILD lp-0.ebuild 144 BLAKE2B ced72fd44e972149cff5d08d6295a6c928f1578cae5a3f0c3fa3432955af1e7631c57839a3d430974c4388233c4aa773a48f65938750f2101132f8b6e8e0f72c SHA512 1476f8c9adaca35a9aeb91899e400e82a3338aaf5376ef58a0c517e148b21817c4c828d3af3acbf6979e2ee660151100cad1be116b54f8096f8f021aca4c552b
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/lp/lp-0.ebuild
+++ b/acct-group/lp/lp-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=7
--- a/acct-group/lp/metadata.xml
+++ b/acct-group/lp/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/render/Manifest
+++ b/acct-group/render/Manifest
@ -0,0 +1,2 @@
+EBUILD render-0.ebuild 145 BLAKE2B b9e9e6847b5bfb0a80d438c4f1ef4106e5a6379d74041e4d62aa2c4d7fc163c46092eb1f705ab9d542197fcdb34d94e87b0a0f8ded2589866bd089e06585c052 SHA512 3411053e7400860c3c262f3ddc7f0534614dbbe2dd711e13de6d77e2dad8173a5a3b34ca53423f72a065cf00b04746c3b40c38dfd92748c4e8a7c1c0491391af
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/render/metadata.xml
+++ b/acct-group/render/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/render/render-0.ebuild
+++ b/acct-group/render/render-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=28
--- a/acct-group/tape/Manifest
+++ b/acct-group/tape/Manifest
@ -0,0 +1,2 @@
+EBUILD tape-0.ebuild 145 BLAKE2B d88ec5d5a07263666d90d9f3fad7816e684863162e8d2cf720baafc322925ed08e4cec637191f153c9bbcfb0e67a31bf25424869e2ea388a574acee0e5c140d3 SHA512 234610b3db23d7ad549bb7b0b3eb5f6daff641d97b417aa7dcc74d53419c4205efa90653fb6ee8d2de47f4ca5fd92e5109837f06a689dd56970a528965f5d569
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/tape/metadata.xml
+++ b/acct-group/tape/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/tape/tape-0.ebuild
+++ b/acct-group/tape/tape-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=26
--- a/acct-group/tty/Manifest
+++ b/acct-group/tty/Manifest
@ -0,0 +1,2 @@
+EBUILD tty-0.ebuild 144 BLAKE2B a7ebcce700ff1645a7fe8bdba9bcb112307ab29ab85b20338481a256acfcdfcb5528ee550c58e530e16775ae640a07c014fc5fa2bcfa6c78e442d4a6fe31f27f SHA512 c88bf5a9e8a7014cc617f1142377d1b2272b79a340af37a6be877a512102ae579d476c7f235d7f875e8dc9a71d1a966c10da8bda6f9cd91327523d68800e17cf
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/tty/metadata.xml
+++ b/acct-group/tty/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/tty/tty-0.ebuild
+++ b/acct-group/tty/tty-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=5
--- a/acct-group/utmp/Manifest
+++ b/acct-group/utmp/Manifest
@ -0,0 +1,2 @@
+EBUILD utmp-0.ebuild 146 BLAKE2B 52643d9ae5755ca25a2f2196c89602056ae66beba7a68fb2deca05a2908332fd12eded75d563cfca4384801d8f2427090d66d796e69f08fbd9ccba57c00caeac SHA512 0f6e431e735cc68922cf3b5e5a5552b16b11dc5a9e01753c98e9641a19086c1f60967f5986380d7046b9983f99e030db4a9df67b3a4e4ce76dd0d1da57807e96
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/utmp/metadata.xml
+++ b/acct-group/utmp/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/utmp/utmp-0.ebuild
+++ b/acct-group/utmp/utmp-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=406
--- a/acct-group/video/Manifest
+++ b/acct-group/video/Manifest
@ -0,0 +1,2 @@
+EBUILD video-0.ebuild 145 BLAKE2B 9798482a4ac68bbb5a9dc878192104f943c97530ef5a92c85b6e01d318fa7430f81cd6574efb08a38b62621eb02aae36f26e5c7b7dabcba2820491f3f6c138ca SHA512 fa7a1d88de5d2a7642346c16e2b590bc7a93128736703a540692724b765a3cafb50407fdacfdf51ae68ba60a4972797dbb5c392cd1982da32be3457222a681b4
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/video/metadata.xml
+++ b/acct-group/video/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/video/video-0.ebuild
+++ b/acct-group/video/video-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=27
--- a/acct-group/wheel/Manifest
+++ b/acct-group/wheel/Manifest
@ -0,0 +1,2 @@
+EBUILD wheel-0.ebuild 145 BLAKE2B 3f0188de0a1e2b2ff985329ff1a0bf19ab66ad9996691e2af4557e102064f1cfe716b27a683d0126a42b0cd37bf09ed434dd26aee969c0d9a255c22c11d86cce SHA512 f465f64943f31769f9b4590c8601ff0f18fac97009e592c36ab9e820648d0d9754912d440466a5fa4571f433501d0bcc64ed488136c281efcf8ec9162b95ae5e
+MISC metadata.xml 219 BLAKE2B 6498f172fc689a14cc6636dfd4618c342c48a78937a3862e1968983b80fbc08c7f8b8a6b8089a1e1156be2809016c01dbc6a9bccb87ba88b394c105b52280679 SHA512 db6f809f5b14dfcd53c463e06ec29d4f10aa2393ab69691330ec1aae0d2a903baf0c43841ffb57c9e714d0442a36663fc229961200115e98789e636fc3f02d1a
--- a/acct-group/wheel/metadata.xml
+++ b/acct-group/wheel/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/wheel/wheel-0.ebuild
+++ b/acct-group/wheel/wheel-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=10
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@ -5,5 +5,5 @@ AUX analog.cfg 3992 BLAKE2B 8e68cc26a59a5bbed57f84e06ac8f5c9874cf1a36bdbb5c6f914
 DIST analog-6.0.tar.gz 1553316 BLAKE2B 5363880cf65e8a4e845603a19dd30b79d4fb13b51b68d0cbcf59c2827a2c099d02c662e55b59ef9b4526ade53ca3f7401415a3bc78de3d7cc39b4e4988299241 SHA512 42b766d45f86a32d2e97cc2be35ebb5f4e0ffc2fb72d48196939027ea1ed3398a8cc0a43c47868f542bfb464199ab35bd93fa2ba5e37c4fc83ff15cfe19b9c60
 DIST analog-src-6013ce.zip 4875246 BLAKE2B 6b0663f3367faf84a8c65a778a065165ddfba6cd902e5cc6c9e0e84d94e1600629b9f9f89b87ec293f4b81f4034e21941ad45784ae5f35352f71f7b0917eb731 SHA512 8f8dbf0bd95873132414f558deeff61fbe9ac6cac40936f00515ccaead86642613c3f0a5a88046eb4d1f4e263cb01d638291c9a1596ea36098b455572b7364ed
 EBUILD analog-6.0-r4.ebuild 1324 BLAKE2B 3e8e566b541ce86cac1270c7f65fc0656e63b532777f35e022073edf9cb4123c6233a64cdcb35eaeceb55e07b7848924f54c50c9794e6d39ab22fac93026e7f8 SHA512 3d2d68366229b53000d872261a01eae6e8fe291937b6d614b7e2fb3fc29bd05742e03a0178a30b1ece779e453e3b71ec49c647727eb860bdba826b1d522d797f
-EBUILD analog-6.0.13.ebuild 1376 BLAKE2B 2fc261f284e5bff679a5b22a8c16858a4fd6c4add1755df37f85dd4bbfb31d10b2b6a145b5543e1b20bbdc7d38670424da6c743277161ed3652bf05cd7e3803a SHA512 5cf1b8008948ed9c8d4e46751a143b81ad4c526cd6b1fb20567c18fb496162e50d9387dfc5ffc56f31f36250c9310b401631812cb1f062339c44f010bcbfb058
+EBUILD analog-6.0.13.ebuild 1375 BLAKE2B 6958e8335810fe01c2803af543855edeb2f32947147db6acb392600e0b73179335af21418ddda27c91162bc91d56043c340cdbee3e0fbd47f11d56478f71011d SHA512 4a252dfa76940584f26f8e01e1b79a7f00695214c77aeaec42a2b6ec55e947ee762f157cc87d585b79a92690bdfd05d8a73f771ea9a9da9021962704f951f35c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
--- a/app-admin/analog/analog-6.0.13.ebuild
+++ b/app-admin/analog/analog-6.0.13.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://www.c-amie.co.uk/static/analog/6013/${MY_P}.zip"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 ~sparc x86"

 DEPEND="
 	app-arch/unzip
--- a/app-admin/certmgr/Manifest
+++ b/app-admin/certmgr/Manifest
@ -1,3 +1,5 @@
 DIST certmgr-1.6.0.tar.gz 31187831 BLAKE2B a1269aac2817f077fa2aae3d14f692aa5c83b0f53ffe041b9436754a93c7970dcc24bed94259e05b99105de5400b3b8c5e22bde087fe365a1c21b8eaf4b3e4a3 SHA512 65b0cb8d5b7a3b76698b3b3aa8c2b9db88d08fed209044668cb19f13eca69714a7a4bc8a20bbf60af05f5c9e39b221801a36e90c8b1c647dbf07952ac385e6ea
+DIST certmgr-2.0.1.tar.gz 2696154 BLAKE2B 0267c82dcf89297495bd46930bb53a176b0329aa933dd8a8b8a96b377133741f45e1a16e0beccb36540ef3c25d28f2af324a976ccac7c769c0cad06d2fb4d20c SHA512 b0de0fff3af435631b26ad4f3b0c1178b3f2e784545939b8dd4a90ee29918c879aea1afc774a23655e7e10526d7a8d13f95cb0740e407eb60110dabc56fdeeb5
 EBUILD certmgr-1.6.0.ebuild 636 BLAKE2B 04c13ebf4349cb36bd4df1b5f97775d6614e7666168f29b0ece03cb020d0dccb6759c4d0c77c433a789a93eb92891f720d2a06e90370cb3e09210037d7ef96d3 SHA512 6268aae4ca61265579e263ca766a6fdac438e5ef79730e10dbf467384c6040113fa31600bc149794151f7fff45c63587faeee17a33480e6761ae012c4688b5ca
+EBUILD certmgr-2.0.1.ebuild 633 BLAKE2B 33de20ac15a1868da1fb3ba6b40a63280f3d1dee05ccf86e3a9799dd55fb4336beaf42910cc032dbfaeb033c1a2dc11fe27d803d0b8519b03bb49b1b50a495fb SHA512 0b1604bc0bfc31410f8e3d33ecbb970e8b774ccdb6cdd39369ac8cef5ea807037fa4e00f2cb2f62127c5d6444e7ad341b4f524ec465082f2690f99994255a042
 MISC metadata.xml 250 BLAKE2B 267d35ba6d759d93dba62b94026d1f4219bef12cdd930e75b1bbc88e4603fe53602b0de8fb1dee62d4bf2ce778cf7ac2e241c5dc117900bb8086902a4a404df5 SHA512 35c362c6a4c181cf124fd1e86b9a06430beae594982b15bd53f6fce2c958189ff5c9cd778bb9fd9a2e9c9675af9e8efb1d5d037059b72f16ad6e6db502f886d1
--- a/app-admin/certmgr/certmgr-2.0.1.ebuild
+++ b/app-admin/certmgr/certmgr-2.0.1.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/cloudflare/${PN}"
+inherit golang-build golang-vcs-snapshot
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Automated certificate management using a CFSSL CA"
+HOMEPAGE="https://github.com/cloudflare/certmgr"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${S}" go install -v ${EGO_PN}/cmd/... || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	pushd src/${EGO_PN} || die
+	dodoc README.md
+	popd || die
+}
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@ -9,8 +9,10 @@ DIST consul-1.4.4.tar.gz 22736827 BLAKE2B a1b973a303f77d84993e4879aa92072d4f2d36
 DIST consul-1.5.0.tar.gz 20830405 BLAKE2B e64fbc22ade0c737db4f2f1b0e3966dbe617456a35d18a7a3cfa1b0f6ce2e335542b3add06c8b8e49995135b5a1576c824840030ac8dd46019bee915689bc5e2 SHA512 8cefb77b56b27995bba38517144bf42585bd1d9ad9a10fc0c9b6bc1a87bfbd042e336ed5e945cfce1fb8eb4b8162dbc8246e2b4109dea5767b8745a7b2159ef8
 DIST consul-1.5.1.tar.gz 21123963 BLAKE2B 4fe6a45f442d849196a7b9961110cdcc6f92931626ab583859efabe62038f6b2c356b27b37ea41b27755cca138c567be5c81854794a1ba0ccae3f9e0dfd10749 SHA512 7486d24bf1fa9fe94175abf9e008dc4fe4277c509381a524a9ee20e17bc4959f621e39be29e33622cb672ef3a04f9161e575009197bcd35c78b45f1d2637a2ea
 DIST consul-1.5.2.tar.gz 21697719 BLAKE2B 782d6fe02cda097db9256a7e508cf19cf4d514d7936022d339fa62db705f6c60468cea907cd22338bb61c3287bfccb3a4d435a4f9222aa7558999553909e5d40 SHA512 e0820592abc5e119f74c8bf3d11a23726ee6dda7d193864a4486d64deef0bfd6ae4c9170b57d6f978e7ddfeb425229a019c45a8edcdea0938bce9315f2444fd6
+DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9
 EBUILD consul-1.4.4-r1.ebuild 1548 BLAKE2B 65d5c22f412b28abf5c7067b5744ca2fb627f6513eca10d91055276016487f0123e6636c080d4841be9d05f4e26fe332f1867e7d540c7810ae43a187b1485988 SHA512 9ce2e18e5177ed96d005b6967d68e8df138ff18e47b28b52ea4fb971323c5cced167bc26fc08a30d39cb243bcaa275697fe7e10c6cacb87c12d969a00bd154b1
 EBUILD consul-1.5.0-r1.ebuild 1548 BLAKE2B b70a82e758c23c2c34ecd0fa5d45e56d840966135c8d578b09d702bed31b5148bffa2eb68412a0555464018ad04e62922a4e75d5c8a2fdc779b8497a6a539159 SHA512 00c8ddee82cacfaa5092bf45a37bccf7475e8fb6402579ee95188a9334f12309ba9a70771fb49f1b43bebec1e37ae68eb7d260a34c3134009f0b4507447c8504
 EBUILD consul-1.5.1-r1.ebuild 1548 BLAKE2B d1d499907ec300d216e6884fb3c31d741911a799185f8220e0f4bb1f141105781368f9cb7c98bcd8ccd790e34b667f33b0dddc8eb5f1185318bf6c70917ead33 SHA512 6ab3f29b2416dd52250589d2ccae36f86161edea4a103d16a00e21e78c630fe8a6c7a61e8a50c08e3df546698e91f577e6ed94dcaeaf766b51f97ca93f894837
 EBUILD consul-1.5.2.ebuild 1548 BLAKE2B ef17177024301747b243ac1b77fd9061cd76a661af705ca1beee37709ee03b07c2a1738a5e2277b8db93d377c442ba3831511c6df73c6096639971236b819e76 SHA512 41dd870ec80824c66139d4e44d10ec22079fbca640213f3454dee789ef535ef13605742f2999448475e5107134f436e3d8f9cb9e3d3fe3de021e45fc7ed67421
+EBUILD consul-1.5.3.ebuild 1548 BLAKE2B f8cfe586cc76eb91db2369980ad8dd3b13f305baaca3aecd69eae820a6d2dfec0927dbae152cef61f7960d8eabd508089d2441319ea1ffb2423a97809826f71c SHA512 7f046114417edd0b55be2d1800076ce735305df2dccb188e0e4a5c228d63266ec74419b55d79645f77482a1e49bf23e237bf0ffe3dbd5b91a16b99e271f3fb6c
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
--- a/app-admin/consul/consul-1.5.3.ebuild
+++ b/app-admin/consul/consul-1.5.3.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="a42ded4"
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.11:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-i "src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GOPATH="${S}" \
+	GOBIN="${S}/bin" \
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake -C "src/${EGO_PN}" dev-build
+}
+
+src_install() {
+	local x
+
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
--- a/app-admin/gentoo-perl-helpers/Manifest
+++ b/app-admin/gentoo-perl-helpers/Manifest
@ -1,5 +1,5 @@
 DIST gentoo-perl-helpers-0.3.1.tar.xz 9420 BLAKE2B dea001473832f4412ae090afbc458720ec1d40d19ac3db3a6a57b26115603f224f2f1c4155ecd3190866dfa0ab648fdd3a98a90e9ed576e7bd3ad8bdaf9a73c6 SHA512 dce6addfebbdfd16da3b580776c34346eb60b2eaef9cc7bed03d5ae0bf028de7a0175fbf7f68113d44b645c3d5ca7f5175389478655b08c115a5342ff930e096
 DIST gentoo-perl-helpers-0.4.0.tar.xz 9580 BLAKE2B daea9e3f43bcd24ea34c9448294fb730595e8a021dffcbbf7f123ff5439455aa362c623affee29341266a0494f4744df0bf195d2db422d6276eb54fdca07149c SHA512 fbbd33122028ad12cbec7adbc97faaa32aa485ef21ca38dc2e1906610fdea7709e5da7e8164f5f86afa3607928837f3b35468274b6c626e3bd843432d780701b
 EBUILD gentoo-perl-helpers-0.3.1-r1.ebuild 1255 BLAKE2B 59495c331a5363515ee725ca8ed048454023aa5b68db0d28e11d3d10df091a06b8790e5af778da55525bd04266e8107060f0a626c318582bfee92dcfe4f3aca5 SHA512 2dad7ad8fb595480d533a31e6c4b2c79b0975aec0e1782e17e3ead8e10ea3298217f66f2665977f511d9feb5aae536e74979a9d5cddca8250008a157c8aa937c
-EBUILD gentoo-perl-helpers-0.4.0.ebuild 1271 BLAKE2B c449bd661acd7dc57d9a21b3875e5fe2b893da8b265da90e279f02edd3b68f59ac46b99741d8a0ce8b014aab02034d611ff3acb5cdbb7db5225e6234b2e7f43f SHA512 9c815a5bc27803e6be4363cd911ade02d0af16d28b41e9ac5b5d9dae0ee3e0840ce7a6dddf199f01a8602b4f73d35ae481badaa7062b1c9f357cb795bbcf353f
+EBUILD gentoo-perl-helpers-0.4.0.ebuild 1276 BLAKE2B db543f194acbf5efca2e4cb3800d0b5d481d9dacb870d6c68fc29809d9ec45786d9237f7c48529cf7d082aa6b72922f2fd5b8ebc27567f64c8053ea5192ff086 SHA512 a32f1f82eaf1622abb4866ae2c29f4046729e578a2a6b1b668f62a70d7970437cac25e0b9acca224e222de94412f2f5941238dad2a18094431554657e8569da1
 MISC metadata.xml 453 BLAKE2B 0a9ea49a54e1b0ac4c4d98615b15251770556bfe672eea650b8b52ac7dc9a0492d3456b894b8724c033aa272567bb0c7ad4847451ed3f29fd5aa365ea2e2d315 SHA512 a32d375d6aa0ac38a20cdec805c887be0d6493be5d47572a0e950e1f4a8b28018ab364cd06668ff59c52fe89487853c9c4bffdf05b79913c691d99fdc848b201
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="
 "
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""

 # Assumed System:
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@ -12,6 +12,6 @@ EBUILD brotli-1.0.4.ebuild 1416 BLAKE2B b9a5f452d97b3860b4954e9fd2aae10a03260597
 EBUILD brotli-1.0.5.ebuild 1453 BLAKE2B 9859a5e12bf48136d72d8710d353635f9d4a7e7dc81c936a10bf301e8024b04050c1550dbd67b5ceeeb188b0c4ae60b761de269e28c6ee611133aa2ec7f3bfb7 SHA512 b0524cd8a7e3ca3ba862d95888fd5bf233d94a81f89e65dd4425b9b111f6cb7d1fd8080d972d79d4b9c3ad47c46853c4516719a4605f531986ddc73caf8d234c
 EBUILD brotli-1.0.6-r1.ebuild 1684 BLAKE2B 6889f76600de558a02f39c6404b2ba9385ca83efa3989cd3c458aeff0c9a9d2804afff34ee359b9c427b5a5a24bfb3a28e31dc72d47bd2979033c60edd048957 SHA512 3e09194f3ee29fd8fb61809c9e360bf617e349ab630fee5bda43824448f0ec6c7b51de095a72312db8ad0ba65f24c367f26a8b5e792cc2ca4023a9415521f8a1
 EBUILD brotli-1.0.6.ebuild 1453 BLAKE2B 9859a5e12bf48136d72d8710d353635f9d4a7e7dc81c936a10bf301e8024b04050c1550dbd67b5ceeeb188b0c4ae60b761de269e28c6ee611133aa2ec7f3bfb7 SHA512 b0524cd8a7e3ca3ba862d95888fd5bf233d94a81f89e65dd4425b9b111f6cb7d1fd8080d972d79d4b9c3ad47c46853c4516719a4605f531986ddc73caf8d234c
-EBUILD brotli-1.0.7.ebuild 1645 BLAKE2B 0fb97f08c5acba1c32dcca385c598257b809603cbe57468d16d517eb3fbd4bbe837320f61c6dd24757b18c48aee131b5236204626b78ff3e2288d49e4c212014 SHA512 4e16b5b8859bbd5de10533b07d58f0c368783adc3c90d90a83bb7dc08635ba127be62371973ee33222201b5e910c9596fe223e35d30340899805fb007434e8f3
+EBUILD brotli-1.0.7.ebuild 1644 BLAKE2B 38fa990ac9665f8cd838b52c78703a0aea6f34bfea994de580befd219d59f4bbac9ae5a3b7794b99621f5bc6ac9da081daea842a608afe20b798e7e66ee65e30 SHA512 be614799fc6180151febb40670cb59f68b0f52f269134bcc933f41e8d1660832c11f5941480f978ff1a38d556a54f46a4b50ad4fbe547b1c2cf7d0c5eaa392d3
 EBUILD brotli-9999.ebuild 1654 BLAKE2B 1e6551cfe5323ec32ea0e148398ae386d9cb07edf98d51dbc73d268bfd38472661c0cf4d987f443f749724fa7fdc851c80fc1eb9225e234a77f361409d080f1e SHA512 924f625e26b4cc7582c19ed8cf603e2ad8afbd1766e79348a73285f932ccae2012799a9f94962e118b62f14b9c96d8441586988f76ffb25902baa9fbea885849
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
--- a/app-arch/brotli/brotli-1.0.7.ebuild
+++ b/app-arch/brotli/brotli-1.0.7.ebuild
@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi

--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@ -6,5 +6,5 @@ DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba
 DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7
 EBUILD libarchive-3.3.1.ebuild 3438 BLAKE2B af5fa17a2a5ff850d88e81dbb88f2e275f4f601b1e61f7e067ff3c6806cb0bb115c307862ba5e74fb913aff9a7bda1399860e220e69c17826cae065e04a78d4a SHA512 31ae25cf9ec76a27098861dcec1a8a80fbfd132296febd7db47c10a8a34dc08a04657d41f66a3aacb0048e4154d740b8d346a287298e9067d555e8908b668194
 EBUILD libarchive-3.3.2.ebuild 3509 BLAKE2B 7338b74ba0ba1b9a120ddae5a320a834e6ce8cef981a2ad59aa26c6973a26e1088094a30334b50a013c34986dec783b872d9c57b117bddd90a11d048c7ebda02 SHA512 6affef3f8d8613fa74dedbf4788eaa103ba4bda8107084197f1790ea6ebd78ce7699dd4ee2ed718ea6c776e4a8b1572e8c00710e994f48f419374cff8d2034f4
-EBUILD libarchive-3.3.3.ebuild 3620 BLAKE2B 491afd8a0215a6b0a74b6b62217da50f5f1fa955a7abd043b82dcaba3957782f024cc77c2d4747d33ec54fd04c4fe91f6220fc21687386c94d6d6131a0fa0838 SHA512 ad67f9c432b7ed6a2fe8d0c6e866f5481ee92b62910cf5831ab368e5452aae3d0104972fa5a96775bb317ebea7f3aa4f8ff854ed19db2e9c0fcac067788a9538
+EBUILD libarchive-3.3.3.ebuild 3618 BLAKE2B 5eaceaf333d0f8edbf48853db97f1a543efdc611cec24e86fd5138b0489c721c5cc6544c37a2e73bf04cba6e623afb93dbd3541ae89a8b8e9afe4f0289f0c301 SHA512 dff0378fadb701cfa3186eb6f20f4794072759dd5bb2179fa16d5add136eddc7736c36d00b0d365502b58fd415a0e8303eb8c214ddfb7579f67cb3341f612d9b
 MISC metadata.xml 1447 BLAKE2B 342ab0c5aeb3fdae86b39228d4df3c98163b55c1fa23318b2b7a22f714303f1f0615d60d9c057b0a91f90e61e6a7357043096463ca3efe1e8d5cbcd2a5897ce9 SHA512 85b5c67f258ab07b14f15967024bd5d1f11a81bd203e67d40398b42b3728735e28cf2645a0db865c6b6ed81a64da6de470ce62c882d0f72dbceb5361f791b81d
--- a/app-arch/libarchive/libarchive-3.3.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.3.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"

 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~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 s390 sh sparc x86 ~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"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"

 RDEPEND="
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@ -4,10 +4,12 @@ DIST zstd-1.3.7.tar.gz 1825458 BLAKE2B 2a689289ec70fd510575aecebf88ad763bd150e57
 DIST zstd-1.3.8.tar.gz 1875233 BLAKE2B c9775b0e33e61d2c064df60a266246f6b9b65b70ba2cc529633cf700b5dcac795e13ec0e20bd51bdd02ee5fddbc7f2fc030902ee37a5a433c2d7828c285b3c23 SHA512 834f7b6477c1e7d70f71105ea52be15c33866b48b93b7a3c6dff4f10c761e5ad35f3903899516317690a4b768051f6eedf7c030292f57cea5613d4017fab9466
 DIST zstd-1.4.0.tar.gz 1898741 BLAKE2B 1b92a055712bb47c3d56c51f3ddddeaba00f9b746f7e47a2fa1a0afdf9798ff90f0ec734880a5d03644d47deb0e55f75c2cd3cbdab1a146dba5f49d4efeb2ae0 SHA512 8614934e25eb1e82b554c483bc9d2d055f51344697295e83b22a8d726321b12068cfa7f7d2a9fe28a2de7c9edda59733826277efc7046e13674d6f7f02af5671
 DIST zstd-1.4.1.tar.gz 1908835 BLAKE2B 564ae54a96804954c25987eb0a744b7197c17555286187f615ce8c1b0a52a0522dc8a9e0c1e4e8b7ddd2ffbf302646b7c119d2b5be4d0867e58d2ee4ff70efa4 SHA512 5bfac959dbbcfaa16fc0b5d3d5028c606e0c56d385581644a7376d6c61f2efc081efa65e7cc3d3e7b4c107646e0b67b3a75f9b3ff392624025d3a0816c45a9f2
+DIST zstd-1.4.2.tar.gz 1909790 BLAKE2B 7b420caf91bd2e9739a26e5ea61c0c5b7d9d6d8e6630612fd66fec24203bc38ae7ab527587318c09997e1e577210b748576d8cb40a0d8dd366fafc306b28c0fa SHA512 5473502093332401c83b02e4ac66b2e05f32f710121d371daf164d8b002be9c06c51578bf9fed0ffb70bb67a0c64457b0e7a02f0d1ba5d36b1f3b6dde93ff907
 EBUILD zstd-1.1.3.ebuild 902 BLAKE2B 3b5c5979aee9a7f29f1d515e605e99f4934ab0669a2b5c55055861396f1c002fcc7ac55a871b74feab38c4d48cf4f268e0d36df1b5210ddcec886a2b07ff021b SHA512 639420bd40f0f308413ea00f5803bd57db06d5a25ebab55e7a61dfbb26de721381c4cc8ecc71b22f3756be7149f27928ecbc8061f3443b2d51ad97c8a9bd5e46
 EBUILD zstd-1.3.4-r1.ebuild 1328 BLAKE2B cb6df01593f2bf6f52d0f54759aaa03fa610bd4a63b0c23f3626f7907af26fbfa038842ecb7a1b98b664f9b072e85b5318fc56f059a6b73b0c2e677aae17121b SHA512 8fd02dbc9f09143c81d90e2931812cc42877a0955960232947ba8e50dddbc55f9cbe2e2f60e4f4f53b1ed7122f43bd4976741e4a24243e0360e8e6fbc82ffe5b
 EBUILD zstd-1.3.7-r1.ebuild 1345 BLAKE2B a6162c4b43128fd005ee2ef916dbaa1b2193e5e62ac745c29a05b88b272921b8557af64cb56185d58657a9d58ad156ea9cd6ded9d2bec5938b1b749755f5278a SHA512 5209f66e534b09c1de77db8f320c8ec2878051de5a500a671d164441ec89334406c5177e18d0f0385bb734bf9052057c1d63aba461c6008811479b420f15597e
 EBUILD zstd-1.3.8.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6
 EBUILD zstd-1.4.0.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6
 EBUILD zstd-1.4.1.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6
+EBUILD zstd-1.4.2.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6
 MISC metadata.xml 457 BLAKE2B d8251ae19e395d977bd88e72fc3c666e6d6a462a7a65db0f62fe3ba9831189f0f48e9457e04028b03dadbd4d099d0b051b313b626a3aaaeb1845cee636558b8a SHA512 801938d4394220ffe8df4d8198308b0d5651ebc198711a4af48d1e6dd9aaffdd7da030a8075bcbc7c3182403aea86e56a9ddc999dcfb2556496679d835a16058
--- a/app-arch/zstd/zstd-1.4.2.ebuild
+++ b/app-arch/zstd/zstd-1.4.2.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="lz4 static-libs"
+
+RDEPEND="app-arch/xz-utils
+	lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		"${@}"
+}
+
+multilib_src_compile() {
+	mymake -C lib libzstd libzstd.a libzstd.pc
+
+	if multilib_is_native_abi ; then
+		mymake zstd
+
+		mymake -C contrib/pzstd
+	fi
+}
+
+multilib_src_install() {
+	mymake -C lib DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		mymake -C programs DESTDIR="${D}" install
+
+		mymake -C contrib/pzstd DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@ -8,6 +8,7 @@ DIST btrbk-0.27.2.tar.xz 87012 BLAKE2B 7b25ce04e088b9c3df1f5d4f41ec3e6aef7e48beb
 DIST btrbk-0.28.0.tar.xz 99336 BLAKE2B 4becaac5a34029e57345baa3c8bb787032ddfdc523882f6334e7a0985a53194956342f792dd9022cb151aacbd64497b87aafee838b5811f716de4efc7eb54a10 SHA512 f4f3118daf55a80604dafec77087851860cfab8720d3f193ac4eec804ca39e60e3bb31d7feb45dd10c8b35b2844c680462a16f2ac0bdbd71731907f511bdc358
 DIST btrbk-0.28.1.tar.xz 94740 BLAKE2B 75313aabab7208083e06a2d4bb607950c7d5d0e87188a9a8f8c97cba1549cc2d3bcfff14b2bc2d20898c44bcc0fe50d74db2e16b213dde852d89704704b70ece SHA512 0e24908b3162b2ab67e0482a38fb966bf33b3c3ee5b2f62259673af14e9309bc4707bd049403579240ec416efae6643a8b5da73f4763e3dc01b3893047e92581
 DIST btrbk-0.28.2.tar.xz 94888 BLAKE2B 4501a8bbe1c88e2449c67d3c5e2322c8b3d3bd5b855cbc0451ff59a3e9aea66de4110587f786fee8f21acfb8a7e496f80a21a91a0e0756d37130bd49a76bb26f SHA512 43e9e0dfe48b0b0c8d1b64e2ce447b9dde9c494b2ad233d68e6ad0648d746d1e950751199f72affe77e06b0c94567912b399bd0b6aa8ebc31dd8fb87ef9ae0ae
+DIST btrbk-0.28.3.tar.xz 95000 BLAKE2B 95de0eae8621b313e9dce3a90ba416a0e4553b05e7e9e1432bd740941ea4b7bdc154a6dd34c9cf7b7ef9fb98f46fd4bc99a3b37933b4c9bd21ef493a7f51e2a5 SHA512 a2919527ab14486113c075fdb2646ee70fa20c813e5a69fc8a0cd16b75bc7aaccee338b272da938f6223a4be8c2d539839426b55ce72d338c7cf20680a41a849
 EBUILD btrbk-0.24.0-r1.ebuild 755 BLAKE2B 1ee8bedbe3dd869c4afb8103763269906d4a75c5dccfebefebb851bdb4a1243d14eac3a35d5e8ac5d29660b96e7856e0421d2804f83c982c47d58f888e3b498c SHA512 2924123eeabd0b1e7a325d9b413c6ff9ee750184b85ea1f460f236aa74e978df1e5537ab77fc49e8f82148caff743724355d31cf60aa5e760d1615b60d22f7e5
 EBUILD btrbk-0.25.1-r1.ebuild 743 BLAKE2B bb707beaa6dd1dae7648262190ee05f76f70197982d6994386e9ee8bc8e885a88ba0c9f9eb33d2846f9f7b023d6a0c97a95d9bf04fbb6de72d8ff489da09d8b2 SHA512 452cdc0bbcba6b08e00bbccdc0332dc06aa59d746a0e8a608ee5da5bb5ac2047705380df2e7865fdd3a2e3d44fce6a4b1fda8e890f150a8a3d543d63fa2610eb
 EBUILD btrbk-0.26.0.ebuild 1078 BLAKE2B 9c92380e34d5005cc0d738c68e7b404a4db77fccc1a233ada610d7518e253cfaafa91135da7d9ce6cf6546150a6805f524b3a9302b680b84e63616a1f910b029 SHA512 0d22df7d376f96de76a19be8a3ce7a9e7773c02c6da7545949ce0083a32ea6e5aaeabf026ce91655af34109532fa06fbd8b074e494e591d529dbb9d6f0bd4a58
@ -19,5 +20,6 @@ EBUILD btrbk-0.27.2.ebuild 2319 BLAKE2B 56180c3685ea46964b9d4aa94f4064ba3815fcc2
 EBUILD btrbk-0.28.0.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4
 EBUILD btrbk-0.28.1.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4
 EBUILD btrbk-0.28.2.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4
+EBUILD btrbk-0.28.3.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4
 EBUILD btrbk-9999.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4
 MISC metadata.xml 1076 BLAKE2B 38beb88fb33730c665430ce275d33b231a57f02c2644b3ff89974935f93d1f0cea8b53b908019eb7bcb0ad99dca49e69475d44a506e08719270c2f8524b5e096 SHA512 20141d3aeba7ebe743ed3101af70c3f6515f11aaed4d43a73d507c18a933d30e778d10cfc17b98e33c616e80c79edd157d64fb0f54e35ad64a7e3114b3fd667f
--- a/app-backup/btrbk/btrbk-0.28.3.ebuild
+++ b/app-backup/btrbk/btrbk-0.28.3.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+pv +doc"
+
+DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
+
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	pv? ( sys-apps/pv )
+	>=sys-fs/btrfs-progs-4.12"
+
+src_compile() {
+	emake clean
+	use doc && emake -C doc
+}
+src_install() {
+	local targets="install-bin install-etc install-share install-systemd"
+	use doc && targets="${targets} install-man install-doc"
+	emake \
+		DESTDIR="${D}" \
+		DOCDIR="/usr/share/doc/${PF}" \
+		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
+		${targets}
+}
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
+		upgrade_0_26_0_warning="1"
+	fi
+	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
+		upgrade_0_27_0_warning="1"
+	fi
+}
+pkg_postinst() {
+	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
+		ewarn "If you are using raw targets, make sure to run the"
+		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
+	fi
+	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
+		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
+		ewarn 'monthly/yearly backups could get deleted when upgrading to'
+		ewarn 'btrbk-0.27.0.'
+		ewarn ''
+		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
+		ewarn 'or systemd timers calling btrbk.'
+		ewarn ''
+		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
+		ewarn 'check if any snapshots/backups would get deleted. If you want to'
+		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
+		ewarn ''
+		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
+		ewarn ''
+		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
+		ewarn '(".keep_forever" suffix in the example above).'
+		ewarn ''
+		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
+		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
+	fi
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@ -1,5 +1,5 @@
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
 DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
-EBUILD libb2-0.98.1-r1.ebuild 1729 BLAKE2B ac821bf918e4d220163fee6598416a2e0b3eb2de7bec9533e2e2276fa1fb955327bc6caf912cd0311dc44cbe817ad41450da2d1aba5494409f039ca6c636aceb SHA512 95c045e7a1e36ea4deae320ed19083ba65bcdb965e4e73c60abcc96404a11f2b662ddafb26c655545e8ac4acbb6ff0e756cf3b0c5a2914360400ee26be168717
+EBUILD libb2-0.98.1-r1.ebuild 1741 BLAKE2B b7b7b30fbb8f2a32550ca4b44d5ea4c5819fa08b9447dd0f2d06f8725dcaeec7d22fedf538c930e3b10ba92a6322603ef3ad9391c49e4c8ac99c330fec8d48bb SHA512 13995a48064628dbfc3c3df1d4e2594c72ef64b8fa7e57830439250c01092896938d3b79f523680456f068b20fede844e02660fb51ddd18995e77f31bd6c81ba
 EBUILD libb2-0.98.ebuild 1015 BLAKE2B 8f6fc70a953aea90fa5dbecd894dd5b1335fe9bf737547f8c2c42ab46cc8b718f0bf1ad941b54820b36ce62829a3d2d4d0de1d6e8c34c90c839d4019781a0765 SHA512 7d1a55ff33988e20ab4588f17dc0a1d982c02ea785e1d9535ff740b923129c5491282191e77d6a8dddcb500bce22626face82b40354fcb4da207a2bdcbbdab2b
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
--- a/app-crypt/libb2/libb2-0.98.1-r1.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g

 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs native-cflags openmp"

 DEPEND="
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@ -1,23 +1,7 @@
 AUX gvim-completion 1219 BLAKE2B 8a8d8ac5b42be0103da00ecda3445f24993df0b2762310dcc1a9e1cf892048b57c02b7da2ea19d900c40b782cabeda4c6f7b79b9b7b44b6fb7ad7ae723b46f88 SHA512 08bb32a3c9fcbdd00977b7343dda9cda44b389a13b1717ebddb462e22b6cf9d4db37d5b49ff752b931e305bf57e8f9f4a7d6e32ea25f8acd1b00e5f8320ac132
-AUX gvim.svg 4584 BLAKE2B 53d896f90404df6b185d1f4404c22e6bd6035722beb61d2223a6003e7c274cdfd4d97d7274346427d873a8e98a4ad32321c0a3ceab2b436124f90c707045b233 SHA512 78f5fb460281ab5d8b0ff6e28bf24231c1ade5ae46caab2e2d345d82b983ada7d945dd7d603b3e470c77dbd1eb329027852b6ba22afc441d64a1b66a1ee3867a
 AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d2cfc4ed9a7bded20c1a5cd1f19f41e0849e3ca08be4798ff23edd66a92bcbb31aee16c433a SHA512 f6538550f1ecadcccf74a6bbd5a6a0b71d18a234a854d1a0179144125555c42280000df9523e7c3d5a8b449f421af7bafcca1034951f085279cee0dd1160808a
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
-DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
-DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7
-DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19
-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
 DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
-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
-EBUILD gvim-8.1.0412.ebuild 10421 BLAKE2B 5a4360134c7b5dbb7e259ee00df65fa6e3fce4106865013e341324d590007c16690771b9bfa2f13c672df6236082c4ffdaf11d7c9a517de295b33bea02b2f002 SHA512 3a22f6a3268a0fd4d05dc0ec7c80c6dd6f8ab04b957ba4558ec09c9beee32d4065425c9ed6eb5a478f148e926c5076e72e879df607d5515d22dac0125a7d951f
-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-8.1.1486.ebuild 10494 BLAKE2B 51243386b3da023593d6bc76298a8eceb1bf6729af96e56e681f51c3918efb511646551c75b3948375a6e7f93b4c5a9019bb34014047aaef4d799404e0e77ae1 SHA512 9243aa4423bb4f7a728129462d6c59dfbd67eddee9f6ff2a8c3fdde0a4cacb47deef5dda4b1951c1e6c948c15d59d3f34c63c74fe63c77e95d8d79bc037b245f
 EBUILD gvim-9999.ebuild 10407 BLAKE2B 1f0865de240b0e88ab55dc27f2f4ea230dc0eed0bf63d6551fd3bc4adb9bdb00e04ac09925e9d5a42dfaf900667a584f44b3cd2fd7fe711833ec96198bacc545 SHA512 c23d892f772dd4db9d612f8ce822192f9f136b41be207fd467ceef9d9997b0dc7154918ce7418257046e58c40f411e3518a6612f5203cecee8068dfa536d223f
-MISC metadata.xml 685 BLAKE2B cf087e797855063edceee8dae21691a6ada5783ebb3712ff2f2440813e4bc6c78a0077be9d2f7302ee0b0270f19e32dd5edef661f884ad595fe39b7160101d84 SHA512 074b08bb8f604315f3c69731c1fa4c130ddbd45dd15305c6e09004424c2a914cb18e2c756714967abc6663654cbe03a19f586b1de64ce264c58ed7daec1ecfa2
+MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
--- a/app-editors/gvim/files/gvim.svg
+++ b/app-editors/gvim/files/gvim.svg
@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="256"
-   height="256"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="vim.svg">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2884"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="107.83967"
-     inkscape:cy="146.01885"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="743"
-     inkscape:window-height="605"
-     inkscape:window-x="88"
-     inkscape:window-y="321"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-796.36218)">
-    <path
-       style="fill:#19953f;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 128.02596,805.31213 8.0259779,926.7407 127.31168,1046.0264 l 120,-120.71427 -119.28572,-120 z"
-       id="path2890" />
-    <path
-       style="fill:#d0d0cf;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 26.24294,816.92274 -5,5 0,19.28572 5.446429,5.26785 7.232142,0.17858 0.178571,168.12501 7.142857,7.1429 22.142858,0 177.142853,-180.00006 0,-18.57143 -5,-5 -80,-0.71428 -5,7.14285 0,15.71429 5,6.42857 6.42857,0 -62.142855,60.00001 0.625005,-59.73215 7.14285,-10e-6 5.80357,-5.98214 0,-15.71429 -6.42857,-7.14286 -80.71428,-1.42857 0,10e-6 z"
-       id="path3664"
-       sodipodi:nodetypes="cccccccccccccccccccccccc" />
-    <path
-       style="fill:#d0d0cf;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 136.90826,933.24978 4.28572,-3.57143 12.14285,0.35715 3.92857,3.92857 -4.28571,12.14286 -3.57143,3.21428 -12.64794,-0.14794 -3.42349,-4.13777 3.57143,-11.78572 z"
-       id="path3666"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#d0d0cf;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 121.90826,956.10693 28.57143,0.35714 -15,45.00003 5.35714,0 -3.21428,8.9285 -26.78572,-0.3571 14.64286,-43.21429 -7.14286,0.35714 3.57143,-11.07142 z"
-       id="path3668" />
-    <path
-       style="fill:#d0d0cf;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 157.2654,956.46407 -3.71936,9.68618 6.82905,0 -15.25254,44.24235 23.57143,0 3.40554,-8.7193 -6.11475,-0.4005 8.42349,-26.2373 15,-0.35715 -11.07143,34.99995 23.15301,0.3572 2.91579,-8.2576 -5.56371,-0.1633 9.13777,-26.5791 12.85714,0 -11.07143,35 24.32904,0.2525 3.00508,-8.2729 -5.81626,-0.1939 11.69643,-37.14285 -4.64286,-7.5 -14.64285,0 -5.71429,5.71429 -5.71429,0 -6.07142,-6.07143 -12.5,0 -5.35715,5.35714 -6.07143,0 -6.07142,-5.71428 -18.92858,0 z"
-       id="path3670"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccc" />
-  </g>
-</svg>
--- a/app-editors/gvim/gvim-8.0.1298.ebuild
+++ b/app-editors/gvim/gvim-8.0.1298.ebuild
@ -1,371 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-				gnome? ( >=gnome-base/libgnomeui-2.6 )
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                          CARBON (not tested)
-	# -aqua gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
--- a/app-editors/gvim/gvim-8.0.1699-r1.ebuild
+++ b/app-editors/gvim/gvim-8.0.1699-r1.ebuild
@ -1,372 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="threads"
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND="
-	${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                          CARBON (not tested)
-	# -aqua gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
--- a/app-editors/gvim/gvim-8.1.0034.ebuild
+++ b/app-editors/gvim/gvim-8.1.0034.ebuild
@ -1,372 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="threads"
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                          CARBON (not tested)
-	# -aqua gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
--- a/app-editors/gvim/gvim-8.1.0412.ebuild
+++ b/app-editors/gvim/gvim-8.1.0412.ebuild
@ -1,372 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="threads"
-USE_RUBY="ruby23 ruby24 ruby25"
-
-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 gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                          CARBON (not tested)
-	# -aqua gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# Update icon cache
-	gnome2_icon_cache_update
-
-	# Call eselect vi update
-	eselect_vi_update
-}
--- a/app-editors/gvim/gvim-8.1.0648-r1.ebuild
+++ b/app-editors/gvim/gvim-8.1.0648-r1.ebuild
@ -1,373 +0,0 @@
-# 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="ruby23 ruby24 ruby25"
-
-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 gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880
-PDEPEND="~app-editors/vim-core-${PV}"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_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 gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	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
-}
--- a/app-editors/gvim/gvim-8.1.0648.ebuild
+++ b/app-editors/gvim/gvim-8.1.0648.ebuild
@ -1,371 +0,0 @@
-# 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="ruby23 ruby24 ruby25"
-
-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 gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk3? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk3? (
-			gtk? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	dev-util/ctags
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880
-PDEPEND="~app-editors/vim-core-${PV}"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--enable-multibyte
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python pythoninterp)
-		$(use_enable python python3interp)
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                          CARBON (not tested)
-	# -aqua gtk3                    GTK3
-	# -aqua -gtk3 gnome             GNOME2
-	# -aqua -gtk3 -gnome gtk        GTK2
-	# -aqua -gtk -gtk3 motif        MOTIF
-	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
-	# -aqua -gtk -gtk3 -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk3; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk; then
-		myconf+=( --enable-gtk2-check )
-		if use gnome; then
-			einfo "Building gvim with the Gnome 2 GUI"
-			myconf+=( --enable-gui=gnome2 )
-		else
-			einfo "Building gvim with the gtk+-2 GUI"
-			myconf+=( --enable-gui=gtk2 )
-		fi
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	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
-}
--- a/app-editors/gvim/gvim-8.1.1155.ebuild
+++ b/app-editors/gvim/gvim-8.1.1155.ebuild
@ -1,370 +0,0 @@
-# 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="
-	luajit? ( lua )
-	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
-		--enable-multibyte
-		--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
-}
--- a/app-editors/gvim/gvim-8.1.1312.ebuild
+++ b/app-editors/gvim/gvim-8.1.1312.ebuild
@ -1,368 +0,0 @@
-# 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
-}
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@ -8,7 +8,6 @@
  <use>
    <flag name="cscope">Enable cscope interface</flag>
    <flag name="gtk2">Enable GTK+2 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>
  </use>
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@ -1,7 +1,5 @@
-DIST nano-3.2.tar.gz 2944045 BLAKE2B 8d29d574ebf543f82608d4df26f551c0b3c77863b2ac8cfd0d3aea45340954abe6221069c9c72beab256c2c8cc4fcd3de27804404d97a98144c69ad26223de09 SHA512 33b3bbc5b5044b4003347e87926046fb5a0e83edfd6de858085526b7eaa9ea7ee26a598da00060a6b62edbd0366c7cb06b5a9878f6f0149a9501e4ada80b88f3
 DIST nano-4.2.tar.gz 2928595 BLAKE2B 42bb0ccbf4961706c6c645eb2310a646a7decd3617117a079ffe9e3718c8054ab823a5aff3e543c06c4c398f83579a679267a9ad6f113ba451b76d67e14b07cc SHA512 a5dd9ce96cd09d12c65108ea6a18b2cf1c2b055929e58d3e84beb0725607b4b5a3f8ae3fda0ab658c853cc4cac70c089fee716e1bb5a700f2506a7a3e1bea1bd
 DIST nano-4.3.tar.gz 2939418 BLAKE2B 2464118a1cd16477637a8e98c1d179cbea1f33cc1548eff09b3b77b613b5b2b628915da1d11c04064f7211a0254461eab09ddae6dda582004d77adea9dff2360 SHA512 2fb76e61079efb0a16f3ea27fdc7da749c71d61a752d96beee4f8376ad0071792ecaa5f3dc627fbcce175227ca48c60c1a4a3e17bfbc89180aa484c28fe37746
-EBUILD nano-3.2.ebuild 2291 BLAKE2B fac4dc4bd07bfcd6e699b00b120ac8482b0c7aef9920b8a05ec2b36de671b81d5ca9807614a80fcac93b4b6aa86dc28feaabf50e840ec27a7e670a8f0e3866ab SHA512 64688531543c1b7d8c9f79876c01ae3950f1c9d9ff66d08aa07f9484a18fedc0ee53396be3b6725db25f33977b7673bde6bff491a00a12c645edda413438a056
 EBUILD nano-4.2.ebuild 2189 BLAKE2B 62dcb827d9d5deb4b6f1ab8b89fea344137b78e468d29160b5873f47bd2680da952a6fa1d7ca288e0b6142f76a3d83633251465a354b1c54222bc426760b5763 SHA512 2824d4c52b92de0384d05725695d9b78e0e924b07562436dcd8963c94dc5c2aa739486e2eb96a0c410614d099efe5d8550f133d68e67b783556c4ac304857d34
 EBUILD nano-4.3.ebuild 2202 BLAKE2B 65eb35a1f56df68e380dd9f863c8299c1a9871e76d52e100e73bf9d3568cd5696195e1b8a3535809babeb0007fc84746873dbc28367e73882a23700c3238d6c9 SHA512 8f337970f9d367c891f7103ee91ee0465ba3587f7f0efc48f16662963f7d428c323974a13bdc30aa6e20bb351669667dddf6cbbf45095c121ad8dd152a8b2b55
 EBUILD nano-9999.ebuild 2202 BLAKE2B 65eb35a1f56df68e380dd9f863c8299c1a9871e76d52e100e73bf9d3568cd5696195e1b8a3535809babeb0007fc84746873dbc28367e73882a23700c3238d6c9 SHA512 8f337970f9d367c891f7103ee91ee0465ba3587f7f0efc48f16662963f7d428c323974a13bdc30aa6e20bb351669667dddf6cbbf45095c121ad8dd152a8b2b55
--- a/app-editors/nano/nano-3.2.ebuild
+++ b/app-editors/nano/nano-3.2.ebuild
@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		--disable-wrapping-as-root
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-		$(usex ncurses --without-slang $(use_with slang))
-	)
-	case ${CHOST} in
-		*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
-	esac
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D%/}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED%/}"/etc/nanorc || die
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@ -2,21 +2,7 @@ AUX gvim.svg 4584 BLAKE2B 53d896f90404df6b185d1f4404c22e6bd6035722beb61d2223a600
 AUX vimrc-r5 7337 BLAKE2B 3f28db016b3956b4c5e2833ff4440417d3ccdc446618a776119513549c0b9831d0eb4bfb9abf992e436508b95f0586f2b4fc30ddba7f2b595574a5c2ccc257c8 SHA512 b9cc07386b97e6042166b11cd6270d4c3134eb816ff396ad544cfb14b349d79b32b5a07b5995580aea607b7936eef0dfd5ab1dc7e158dea26afc0c944fae8e3c
 AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e29513da8caa6c28c27e44131b2873258e3ff5a0ab232d66f75a8f051ccf7a4d940b3b0102e6967dd SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
-DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
-DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7
-DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19
-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
 DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
-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-8.1.1312.ebuild 6948 BLAKE2B 7e9f614484bf8598c5240159d4ea0fed4b41cb98bbb1fea86b57a370918a50c730388c1cf7d5c26689d31edd1b0e2687c8aa1b6767db65d5208500796a171588 SHA512 b806c11fee9e7d5456df7d2d1785ec60699921ff95c769a3827d69422472528836af94d68a0484a468a31ab2010b8f66cd9e9ac9557fd735c0599c2505897e43
 EBUILD vim-core-8.1.1486.ebuild 6937 BLAKE2B 0409e1720c6082fca63bffe307bdfb0cf5c79325c3f61dd0d4f2360e33c03643b7e1ec0f6f8c98a3ed27fdb95f7ea50378d8063441ea594fdaec376ccbb2fa45 SHA512 b6c00c520c2d99a3325538fde47e2bb9d9088f491df6d5dc7c0802f53c2f365ff542f226f800ab0634c2b2589d456211dacc212407c70c77400c5ad80b401904
 EBUILD vim-core-9999.ebuild 6948 BLAKE2B 7e9f614484bf8598c5240159d4ea0fed4b41cb98bbb1fea86b57a370918a50c730388c1cf7d5c26689d31edd1b0e2687c8aa1b6767db65d5208500796a171588 SHA512 b806c11fee9e7d5456df7d2d1785ec60699921ff95c769a3827d69422472528836af94d68a0484a468a31ab2010b8f66cd9e9ac9557fd735c0599c2505897e43
 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
--- a/app-editors/vim-core/vim-core-8.0.1298.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.1298.ebuild
@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
--- a/app-editors/vim-core/vim-core-8.0.1699.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.1699.ebuild
@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
--- a/app-editors/vim-core/vim-core-8.1.0034.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.0034.ebuild
@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.1"
-inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
--- a/app-editors/vim-core/vim-core-8.1.0412.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.0412.ebuild
@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.1"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r5 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		eshopts_pop
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-}
--- a/app-editors/vim-core/vim-core-8.1.0648.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.0648.ebuild
@ -1,225 +0,0 @@
-# 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 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
-}
--- a/app-editors/vim-core/vim-core-8.1.1155.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.1155.ebuild
@ -1,225 +0,0 @@
-# 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
-}
--- a/app-editors/vim-core/vim-core-8.1.1312.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.1312.ebuild
@ -1,225 +0,0 @@
-# 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
-}
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@ -1,22 +1,6 @@
 AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e987cb287d802c964baa502da4d08f09cb8684307481fec503c1d8cae7f4f6e61500f1cb06033a2c4 SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
-DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
-DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7
-DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19
-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
 DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
-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
-EBUILD vim-8.1.0412-r1.ebuild 8806 BLAKE2B f4f3693e8d017862148f55b688155bd9cf85150a8013362f4051f95464f88c956452f6be79d5686f7306186a489c03ccb7ef824ead3f93b6dd7a9c4bf33d9fc6 SHA512 9cd5410aab92f9dcd24ee0d2d639add3b9a88931dedf13ac74c6ba09cbd92859c6ef7093a6400cdb02bbecfce3e3311a2d54a10ddafac5883608fc786b341ee9
-EBUILD vim-8.1.0412.ebuild 8799 BLAKE2B e7e2fcf92942d132707dfbb0ac784ee463160d9bd61c9a400ad5d9679279cca52360e242e86557d48d76a60891acb92ab16623cfff7c0439be6bf047f95a4d6e SHA512 cf0089d1dedce8a8344a66a0f65e64da86ec89e9c35eca96084059c14aa79d7526714eadd930dd83dbc58f70e5cd4c86fc64f76caeb0bd5d4896572b3d427ce1
-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-8.1.1312.ebuild 9104 BLAKE2B 23bb8fe36b201249da7357654dc600321b908db48118afcd82c6f037410c9f4f6c3746c45dd485a217ec65bbe05bca688e0e375487d7829830f23384d5c40101 SHA512 c35b426d97269f5c48b14ac3baddf4205ae4212fff76c15edd7c3553d3c26a940632bbcee459442863bc31c8707b16d7ca2b5cb4aeff63ed779b1c5bc0fd91fe
 EBUILD vim-8.1.1486.ebuild 9093 BLAKE2B dea5afe5f46f73fc190210988cbad81fa3a4d91796f4e968e9675b2e3e09eb8dd4e678a1899d57405bbaf14f70fdb9d0125d64cf0394be09ccb5cde83e347446 SHA512 d6d231bf494b2742dd3820aa7f8f7a8303d7a6edd4dc3c2e61396fba3961a134017bcd81d093dbe9ef635da524ff0adf000dc52a06c18a528781922e4bf8523b
 EBUILD vim-9999.ebuild 9104 BLAKE2B 23bb8fe36b201249da7357654dc600321b908db48118afcd82c6f037410c9f4f6c3746c45dd485a217ec65bbe05bca688e0e375487d7829830f23384d5c40101 SHA512 c35b426d97269f5c48b14ac3baddf4205ae4212fff76c15edd7c3553d3c26a940632bbcee459442863bc31c8707b16d7ca2b5cb4aeff63ed779b1c5bc0fd91fe
 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
--- a/app-editors/vim/vim-8.0.1298.ebuild
+++ b/app-editors/vim/vim-8.0.1298.ebuild
@ -1,309 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? (
-		~app-editors/vim-core-${PV}
-		dev-util/ctags
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-multibyte
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			--enable-multibyte
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
-			$(use_enable python python3interp)
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
--- a/app-editors/vim/vim-8.0.1699.ebuild
+++ b/app-editors/vim/vim-8.0.1699.ebuild
@ -1,311 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="threads"
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? (
-		~app-editors/vim-core-${PV}
-		dev-util/ctags
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-multibyte
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			--enable-multibyte
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
-			$(use_enable python python3interp)
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
--- a/app-editors/vim/vim-8.1.0034.ebuild
+++ b/app-editors/vim/vim-8.1.0034.ebuild
@ -1,311 +0,0 @@
-# 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} )
-PYTHON_REQ_USE="threads"
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? (
-		~app-editors/vim-core-${PV}
-		dev-util/ctags
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-multibyte
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			--enable-multibyte
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python pythoninterp)
-			$(use_enable python python3interp)
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-}
--- a/app-editors/vim/vim-8.1.0412-r1.ebuild
+++ b/app-editors/vim/vim-8.1.0412-r1.ebuild
@ -1,313 +0,0 @@
-# Copyright 1999-2019 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_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
-}
--- a/app-editors/vim/vim-8.1.0412.ebuild
+++ b/app-editors/vim/vim-8.1.0412.ebuild
@ -1,313 +0,0 @@
-# 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} )
-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
-}
--- a/app-editors/vim/vim-8.1.0648-r1.ebuild
+++ b/app-editors/vim/vim-8.1.0648-r1.ebuild
@ -1,321 +0,0 @@
-# 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="ruby23 ruby24 ruby25"
-
-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 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_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
-}
--- a/app-editors/vim/vim-8.1.0648.ebuild
+++ b/app-editors/vim/vim-8.1.0648.ebuild
@ -1,319 +0,0 @@
-# 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="ruby23 ruby24 ruby25"
-
-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 ~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
-
-	# 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
-}
--- a/Show More
+++ b/Show More