gentoo resync : 25.08.2020

4 files changed, 23 insertions, 42 deletions

diff --git a/app-eselect/eselect-vi/Manifest b/app-eselect/eselect-vi/Manifest
index 3e0d9b543763..f30c5029fc50 100644
--- a/app-eselect/eselect-vi/Manifest
+++ b/app-eselect/eselect-vi/Manifest
@@ -1,4 +1,3 @@
-DIST eselect-vi-1.1.9.tar.xz 6236 BLAKE2B 09853ac48d1f904de5602244306ab35cb0597d14ddfbb1865ee54adf53bf190df6574cb5d8c27e3e41b12768c79f10ed1482b7ffb66015375b0214d32d17dbe3 SHA512 618c83d1e93a6c137b1c787c9bf9df19b68b7ef6679ba6179f13582f67e494d365da778b4646aff4af7196399468204c249e59e104a69851bb411fff1b3d038f
-EBUILD eselect-vi-1.1.9-r1.ebuild 622 BLAKE2B d945046cf6f7d627e8231a8fac1fabeb824f4c397826064b726a4bdb851aeb098fdaca0c868d84b514c02b9a135953ddcbe26e7664e58daf09025bc6b5df0f02 SHA512 f53469343836844b128baeb82e22a8f99b66a73ddd784fd5343070c4b583f86b928375b77cbfba360f766ab59cdac0d792c198353204ecc3cff05d0fdb817e24
-EBUILD eselect-vi-1.1.9.ebuild 622 BLAKE2B 5184466895f5425fc3e8e1b3fa27f3e4dd9e9b612d2268cbcd77158cce20b538511dc52285f6e4723e911990483d6b95710faf04c29f9deaf27d0e1bb548052f SHA512 5b493bbe4ba4ff59d31ebf2772ea2b81c7971a48592d538696f0794077442fb78996bcb9cca2956dc6dd045e226ea34f3426639e84e92be290d710b1e27971db
+DIST eselect-vi-1.2.tar.gz 2078 BLAKE2B 0f78afe201d9db72de005e035fd044435faf76b0027ce570cad09f3b4f0f497631f57107222de5e649c8badc0cbc3172edd1f1600e5b7bee8ba6f78b2ae9277a SHA512 77ec5281a25156d4a6c4b35fb154aa5837e4d2335637ecdb66a75984419439526f2215abe39a4d08e68d8dd3e337f47947f5a8fbf89ae7ecca8631e7dbf50dc5
+EBUILD eselect-vi-1.2.ebuild 634 BLAKE2B 18ad8a2475ff84c73a33ff672e3f3d384689cb0f7ec1d7f3057bad2dee7a0b1d6c1609e4992825e98a2451b5a024029c3d9819270611c85a17e707fe7e9821e3 SHA512 15fd1a7083ae100255e814f0bd73a0c5a24c6efb603ed23fd5f136fc5a73a1f17a79fec25b58d9d833be357439530764703f8f12853de2eaef5aa64effc1e9f3
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
deleted file mode 100644
index babee4ae5969..000000000000
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Manages the /usr/bin/vi symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="app-admin/eselect"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins vi.eselect
-}
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
deleted file mode 100644
index 63b066d61b92..000000000000
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Manages the /usr/bin/vi symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.0.6"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins vi.eselect
-}
diff --git a/app-eselect/eselect-vi/eselect-vi-1.2.ebuild b/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
new file mode 100644
index 000000000000..53174634927e
--- /dev/null
+++ b/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Manages the /usr/bin/vi symlink"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Vim"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="app-admin/eselect"
+
+src_prepare() {
+	default
+	eautoreconf
+}