| 1 |
commit: 180f62b77c04cfe336aa19952cbc6af5e37329cb |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 29 12:54:43 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 29 13:02:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=180f62b7 |
| 7 |
|
| 8 |
app-editors/vim-core: slightly modernise ebuild |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
app-editors/vim-core/vim-core-8.2.3428.ebuild | 16 +++++++++------- |
| 13 |
app-editors/vim-core/vim-core-9999.ebuild | 16 +++++++++------- |
| 14 |
2 files changed, 18 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-editors/vim-core/vim-core-8.2.3428.ebuild b/app-editors/vim-core/vim-core-8.2.3428.ebuild |
| 17 |
index 6f4dbf0832a..df9cd899e38 100644 |
| 18 |
--- a/app-editors/vim-core/vim-core-8.2.3428.ebuild |
| 19 |
+++ b/app-editors/vim-core/vim-core-8.2.3428.ebuild |
| 20 |
@@ -2,6 +2,9 @@ |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
EAPI=7 |
| 24 |
+ |
| 25 |
+# Please bump with app-editors/vim and app-editors/gvim |
| 26 |
+ |
| 27 |
VIM_VERSION="8.2" |
| 28 |
inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils |
| 29 |
|
| 30 |
@@ -14,23 +17,22 @@ else |
| 31 |
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" |
| 32 |
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 33 |
fi |
| 34 |
+S="${WORKDIR}"/vim-${PV} |
| 35 |
|
| 36 |
DESCRIPTION="vim and gvim shared files" |
| 37 |
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" |
| 38 |
|
| 39 |
-SLOT="0" |
| 40 |
LICENSE="vim" |
| 41 |
+SLOT="0" |
| 42 |
IUSE="nls acl minimal" |
| 43 |
|
| 44 |
-DEPEND="sys-devel/autoconf" |
| 45 |
-# avoid icon file collision bug #673880 |
| 46 |
+BDEPEND="sys-devel/autoconf" |
| 47 |
+# Avoid icon file collision, bug #673880 |
| 48 |
RDEPEND="!!<app-editors/gvim-8.1.0648" |
| 49 |
PDEPEND="!minimal? ( app-vim/gentoo-syntax )" |
| 50 |
|
| 51 |
-S=${WORKDIR}/vim-${PV} |
| 52 |
- |
| 53 |
pkg_setup() { |
| 54 |
- # people with broken alphabets run into trouble. bug 82186. |
| 55 |
+ # people with broken alphabets run into trouble. bug #82186. |
| 56 |
unset LANG LC_ALL |
| 57 |
export LC_COLLATE="C" |
| 58 |
|
| 59 |
@@ -50,7 +52,7 @@ src_prepare() { |
| 60 |
-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ |
| 61 |
"${S}"/runtime/tools/mve.awk || die "sed failed" |
| 62 |
|
| 63 |
- # See #77841. We remove this file after the tarball extraction. |
| 64 |
+ # See bug #77841. We remove this file after the tarball extraction. |
| 65 |
rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" |
| 66 |
|
| 67 |
# Read vimrc and gvimrc from /etc/vim |
| 68 |
|
| 69 |
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild |
| 70 |
index f141342833a..1dfe65d75bd 100644 |
| 71 |
--- a/app-editors/vim-core/vim-core-9999.ebuild |
| 72 |
+++ b/app-editors/vim-core/vim-core-9999.ebuild |
| 73 |
@@ -2,6 +2,9 @@ |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
|
| 76 |
EAPI=7 |
| 77 |
+ |
| 78 |
+# Please bump with app-editors/vim and app-editors/gvim |
| 79 |
+ |
| 80 |
VIM_VERSION="8.2" |
| 81 |
inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils |
| 82 |
|
| 83 |
@@ -14,23 +17,22 @@ else |
| 84 |
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" |
| 85 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 86 |
fi |
| 87 |
+S="${WORKDIR}"/vim-${PV} |
| 88 |
|
| 89 |
DESCRIPTION="vim and gvim shared files" |
| 90 |
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" |
| 91 |
|
| 92 |
-SLOT="0" |
| 93 |
LICENSE="vim" |
| 94 |
+SLOT="0" |
| 95 |
IUSE="nls acl minimal" |
| 96 |
|
| 97 |
-DEPEND="sys-devel/autoconf" |
| 98 |
-# avoid icon file collision bug #673880 |
| 99 |
+BDEPEND="sys-devel/autoconf" |
| 100 |
+# Avoid icon file collision, bug #673880 |
| 101 |
RDEPEND="!!<app-editors/gvim-8.1.0648" |
| 102 |
PDEPEND="!minimal? ( app-vim/gentoo-syntax )" |
| 103 |
|
| 104 |
-S=${WORKDIR}/vim-${PV} |
| 105 |
- |
| 106 |
pkg_setup() { |
| 107 |
- # people with broken alphabets run into trouble. bug 82186. |
| 108 |
+ # people with broken alphabets run into trouble. bug #82186. |
| 109 |
unset LANG LC_ALL |
| 110 |
export LC_COLLATE="C" |
| 111 |
|
| 112 |
@@ -50,7 +52,7 @@ src_prepare() { |
| 113 |
-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ |
| 114 |
"${S}"/runtime/tools/mve.awk || die "sed failed" |
| 115 |
|
| 116 |
- # See #77841. We remove this file after the tarball extraction. |
| 117 |
+ # See bug #77841. We remove this file after the tarball extraction. |
| 118 |
rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" |
| 119 |
|
| 120 |
# Read vimrc and gvimrc from /etc/vim |
Archives