[gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/files/
commit: 8218305dc9dc0468081f5e0a503ed890a301c8ab
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Jan 30 19:10:01 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed Feb 1 01:13:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8218305d
app-editors/vim-core: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29345
Signed-off-by: Conrad Kostecki gentoo.org>
...m-9.0-fix-create-timer-for-cros-compiling.patch | 28 --
1 file changed, 28 deletions(-)
diff --git
a/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch
b/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch
deleted file mode 100644
index 5247a80754cc..
---
a/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bba26c9ed9d4ddc82afd0343f145dc9e14b91498 Mon Sep 17 00:00:00 2001
-From: Varsha Teratipally
-Date: Tue, 2 Aug 2022 22:18:29 +
-Subject: [PATCH] Configure check for timer_create may give wrong error.
-Give a warning instead of an error
-
-Partial solution from
github.com/vim/vim/commit/5f6cae8b8a49c435556e32f84d067cd0b4d28e4c
-
- src/configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/configure.ac b/src/configure.ac
-index e8522ec05..41f41dee3 100644
a/src/configure.ac
-+++ b/src/configure.ac
-@@ -3850,7 +3850,7 @@ static void set_flag(union sigval sv) {}
- ])],
- vim_cv_timer_create=yes,
- vim_cv_timer_create=no),
--AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create')
-+AC_MSG_WARN(cross-compiling: please set 'vim_cv_timer_create')
- )]
- )
-
---
-
-
[gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/files/, app-editors/vim-core/
commit: eaa345b54d713089f054d5bc004dc416c1fcd84b
Author: John Helmert III gentoo org>
AuthorDate: Wed Jan 25 19:51:19 2023 +
Commit: John Helmert III gentoo org>
CommitDate: Wed Jan 25 19:51:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa345b5
app-editors/vim-core: drop 9.0.0099, 9.0.0828-r1
Signed-off-by: John Helmert III gentoo.org>
app-editors/vim-core/Manifest | 3 -
.../files/vim-0.0.0828-configure-clang16.patch | 28 ---
app-editors/vim-core/vim-core-9.0.0099.ebuild | 234 -
app-editors/vim-core/vim-core-9.0.0828-r1.ebuild | 234 -
4 files changed, 499 deletions(-)
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 2953ddceb314..cc371e9489e1 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,6 +1,3 @@
-DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B
b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7
SHA512
ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
-DIST vim-9.0.0828.tar.gz 16782339 BLAKE2B
6b997c1c828338d64a8b204a1e232676ec075834b1b7e74c2fc671e315f9bf6026b0c419ebb3c31e7ce58dbca23828ca11d866b2bfcb73f8a86fb31fa0d51b00
SHA512
03f93515039a2f275a8fe6b84bbac587517768ab3201e111eba4897a2485fe4ccfe238151f393334c7a6ea77eddd8898f0b816e26dbdb884f4e6bcbd2943
DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B
85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113
SHA512
9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8
DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B
0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2
SHA512
19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271
-DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B
dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922
SHA512
7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B
3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843
SHA512
2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
diff --git a/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch
b/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch
deleted file mode 100644
index e202a9dd3caa..
--- a/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/vim/vim/pull/11496
-
-From 360b569f86b851c37e32b7cfaec079823188ff27 Mon Sep 17 00:00:00 2001
-From: Sam James
-Date: Fri, 4 Nov 2022 03:18:23 +
-Subject: [PATCH] configure.ac: Fix -Wimplicit-int
-
-Clang 16 makes -Wimplicit-int an error by default. Fixes errors like:
-```
-error: type specifier missing, defaults to 'int'; ISO C99 and later do not
support implicit int [-Werror,-Wimplicit-int]
-```
-
-We already use proper declarations with every other test anyway, so
-let's be consistent.
-
-Signed-off-by: Sam James
a/src/configure.ac
-+++ b/src/configure.ac
-@@ -3654,7 +3654,7 @@ dnl check if struct sigcontext is defined (used for SGI
only)
- AC_MSG_CHECKING(for struct sigcontext)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- #include
--test_sig()
-+int test_sig()
- {
- struct sigcontext *scont;
- scont = (struct sigcontext *)0;
-
diff --git a/app-editors/vim-core/vim-core-9.0.0099.ebuild
b/app-editors/vim-core/vim-core-9.0.0099.ebuild
deleted file mode 100644
index f754552aef6f..
--- a/app-editors/vim-core/vim-core-9.0.0099.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-editors/vim and app-editors/gvim
-
-VIM_VERSION="9.0"
-inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
-
-if [[ ${PV} == * ]] ; 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://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86
[gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/files/, app-editors/vim-core/
commit: 9f5d3532993ce5e69c1726d6cc077237801f338d
Author: Sam James gentoo org>
AuthorDate: Fri Nov 4 03:24:18 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 4 03:25:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f5d3532
app-editors/vim-core: fix configure w/ clang 16
Signed-off-by: Sam James gentoo.org>
.../files/vim-0.0.0828-configure-clang16.patch | 28 ++
...9.0.0828.ebuild => vim-core-9.0.0828-r1.ebuild} | 4
2 files changed, 32 insertions(+)
diff --git a/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch
b/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch
new file mode 100644
index ..e202a9dd3caa
--- /dev/null
+++ b/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch
@@ -0,0 +1,28 @@
+https://github.com/vim/vim/pull/11496
+
+From 360b569f86b851c37e32b7cfaec079823188ff27 Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Fri, 4 Nov 2022 03:18:23 +
+Subject: [PATCH] configure.ac: Fix -Wimplicit-int
+
+Clang 16 makes -Wimplicit-int an error by default. Fixes errors like:
+```
+error: type specifier missing, defaults to 'int'; ISO C99 and later do not
support implicit int [-Werror,-Wimplicit-int]
+```
+
+We already use proper declarations with every other test anyway, so
+let's be consistent.
+
+Signed-off-by: Sam James
+--- a/src/configure.ac
b/src/configure.ac
+@@ -3654,7 +3654,7 @@ dnl check if struct sigcontext is defined (used for SGI
only)
+ AC_MSG_CHECKING(for struct sigcontext)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ #include
+-test_sig()
++int test_sig()
+ {
+ struct sigcontext *scont;
+ scont = (struct sigcontext *)0;
+
diff --git a/app-editors/vim-core/vim-core-9.0.0828.ebuild
b/app-editors/vim-core/vim-core-9.0.0828-r1.ebuild
similarity index 99%
rename from app-editors/vim-core/vim-core-9.0.0828.ebuild
rename to app-editors/vim-core/vim-core-9.0.0828-r1.ebuild
index 9412ba51653d..e078361724fc 100644
--- a/app-editors/vim-core/vim-core-9.0.0828.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.0828-r1.ebuild
@@ -30,6 +30,10 @@ IUSE="nls acl minimal"
DEPEND=">=sys-libs/ncurses-5.2-r2:0"
BDEPEND="sys-devel/autoconf"
+PATCHES=(
+ "${FILESDIR}"/vim-0.0.0828-configure-clang16.patch
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug #82186.
unset LANG LC_ALL
[gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/files/, app-editors/vim-core/
commit: fcb39bd3c5102ee6e87719d38df2625f36513611
Author: Varsha Teratipally google com>
AuthorDate: Tue Aug 2 23:11:58 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 17 19:52:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb39bd3
app-editors/vim-core: fix cross-compilation (configure check for timer_create)
Problem: Configure check for timer_create may give wrong error.
Solution: Give a warning instead of an error.
Closes: https://github.com/gentoo/gentoo/pull/26713
Signed-off-by: Varsha Teratipally google.com>
Signed-off-by: Sam James gentoo.org>
...m-9.0-fix-create-timer-for-cros-compiling.patch | 28 ++
app-editors/vim-core/vim-core-9.0.0099.ebuild | 3 ++-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git
a/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch
b/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch
new file mode 100644
index ..5247a80754cc
--- /dev/null
+++
b/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch
@@ -0,0 +1,28 @@
+From bba26c9ed9d4ddc82afd0343f145dc9e14b91498 Mon Sep 17 00:00:00 2001
+From: Varsha Teratipally
+Date: Tue, 2 Aug 2022 22:18:29 +
+Subject: [PATCH] Configure check for timer_create may give wrong error.
+Give a warning instead of an error
+
+Partial solution from
github.com/vim/vim/commit/5f6cae8b8a49c435556e32f84d067cd0b4d28e4c
+
+---
+ src/configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/configure.ac b/src/configure.ac
+index e8522ec05..41f41dee3 100644
+--- a/src/configure.ac
b/src/configure.ac
+@@ -3850,7 +3850,7 @@ static void set_flag(union sigval sv) {}
+ ])],
+ vim_cv_timer_create=yes,
+ vim_cv_timer_create=no),
+-AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create')
++AC_MSG_WARN(cross-compiling: please set 'vim_cv_timer_create')
+ )]
+ )
+
+--
+
+
diff --git a/app-editors/vim-core/vim-core-9.0.0099.ebuild
b/app-editors/vim-core/vim-core-9.0.0099.ebuild
index f01043a5b22c..8bea948c71c7 100644
--- a/app-editors/vim-core/vim-core-9.0.0099.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.0099.ebuild
@@ -42,7 +42,8 @@ pkg_setup() {
src_prepare() {
if [[ ${PV} != * ]] ; then
# Gentoo patches to fix runtime issues, cross-compile errors,
etc
- eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches"
+ eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches
+ eapply
"${FILESDIR}"/vim-9.0-fix-create-timer-for-cros-compiling.patch
fi
# Fixup a script to use awk instead of nawk
[gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/files/, app-editors/vim-core/
commit: 84f989fbd929cacc1668e52b370639aae08942fa
Author: Kerin Millar plushkava net>
AuthorDate: Thu Jul 28 23:14:12 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 29 02:04:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f989fb
app-editors/vim-core: Don't try to assign to g:skip_defaults_vim for minimal
builds
A recent adjustment to some of the vim-core ebuilds accidentally removed a sed
command that removes the following line from /etc/vim/vimrc, provided that the
"minimal" USE flag was in effect.
let g:skip_defaults_vim = 1
The reason for doing so is that this assignment raises an error in the case of
a minimal build. Rather than re-instate the missing sed commands, let's update
the vimrc template so as to employ a feature guard, relying on the fact that
minimal builds lack the +eval feature.
Fixes: 5e9a3926fd3e0e573f529fd6aefebba53e082f4a
Signed-off-by: Kerin Millar plushkava.net>
Signed-off-by: Sam James gentoo.org>
app-editors/vim-core/files/{vimrc-r5 => vimrc-r6} | 7 +--
.../{vim-core-8.2.4586.ebuild => vim-core-8.2.4586-r1.ebuild} | 5 +
.../{vim-core-8.2.5066-r2.ebuild => vim-core-8.2.5066-r3.ebuild} | 2 +-
.../{vim-core-9.0.0049-r1.ebuild => vim-core-9.0.0049-r2.ebuild} | 2 +-
app-editors/vim-core/vim-core-.ebuild | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app-editors/vim-core/files/vimrc-r5
b/app-editors/vim-core/files/vimrc-r6
similarity index 97%
rename from app-editors/vim-core/files/vimrc-r5
rename to app-editors/vim-core/files/vimrc-r6
index 2409822e628c..0197f057d233 100644
--- a/app-editors/vim-core/files/vimrc-r5
+++ b/app-editors/vim-core/files/vimrc-r6
@@ -190,8 +190,11 @@ endif " has("autocmd")
" }}}
" We don't want VIM to load their own built-in defaults, preferring ours here
-" instead:
-let g:skip_defaults_vim = 1
+" instead. This option cannot apply to minimal builds, so it is guarded by a
+" test that's guaranteed to fail for those, owing to the lack of +eval.
+if 1
+ let g:skip_defaults_vim = 1
+endif
" Enable Omni completion when opening a file only if a specific plugin does
" not already exist for that filetype. This allows Omni completion
diff --git a/app-editors/vim-core/vim-core-8.2.4586.ebuild
b/app-editors/vim-core/vim-core-8.2.4586-r1.ebuild
similarity index 97%
rename from app-editors/vim-core/vim-core-8.2.4586.ebuild
rename to app-editors/vim-core/vim-core-8.2.4586-r1.ebuild
index ab6f035d555a..9082086dac7b 100644
--- a/app-editors/vim-core/vim-core-8.2.4586.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.4586-r1.ebuild
@@ -182,7 +182,7 @@ src_install() {
# default vimrc is installed by vim-core since it applies to
# both vim and gvim
insinto /etc/vim/
- newins "${FILESDIR}"/vimrc-r5 vimrc
+ newins "${FILESDIR}"/vimrc-r6 vimrc
eprefixify "${ED}"/etc/vim/vimrc
if use minimal; then
@@ -203,9 +203,6 @@ src_install() {
printf '%s\0' "${f}"
fi
done | xargs -0 rm -f || die
-
- # Delete skip_defaults_vim config not supported by vim[minimal]
- sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die
fi
newbashcomp "${FILESDIR}"/xxd-completion xxd
diff --git a/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild
b/app-editors/vim-core/vim-core-8.2.5066-r3.ebuild
similarity index 99%
rename from app-editors/vim-core/vim-core-8.2.5066-r2.ebuild
rename to app-editors/vim-core/vim-core-8.2.5066-r3.ebuild
index c11d467f2a5a..80f292882ea4 100644
--- a/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.5066-r3.ebuild
@@ -183,7 +183,7 @@ src_install() {
# default vimrc is installed by vim-core since it applies to
# both vim and gvim
insinto /etc/vim/
- newins "${FILESDIR}"/vimrc-r5 vimrc
+ newins "${FILESDIR}"/vimrc-r6 vimrc
eprefixify "${ED}"/etc/vim/vimrc
if use minimal; then
diff --git a/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild
b/app-editors/vim-core/vim-core-9.0.0049-r2.ebuild
similarity index 99%
rename from app-editors/vim-core/vim-core-9.0.0049-r1.ebuild
rename to app-editors/vim-core/vim-core-9.0.0049-r2.ebuild
index 555b9e91b8db..17a02fa52a3c 100644
--- a/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.0049-r2.ebuild
@@ -179,7 +179,7 @@ src_install() {
# default vimrc is installed by vim-core since it applies to
# both vim and gvim
insinto /etc/vim/
- newins "${FILESDIR}"/vimrc-r5 vimrc
+ newins "${FILESDIR}"/vimrc-r6 vimrc
eprefixify "${ED}"/etc/vim/vimrc
if use minimal; then
diff --git a/app-editors/vim-core/vim-core-.ebuild
b/app-editors/vim-core/vim-core-.ebuild
index 555b9e91b8db..17a02fa52a3c 100644
---
[gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/files/, app-editors/vim-core/
commit: b31404dbb83dac20670f803c81878b5d0643d26e
Author: Tim Harder gentoo org>
AuthorDate: Fri Dec 28 08:46:08 2018 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Dec 28 09:08:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b31404db
app-editors/vim-core: version bump to 8.1.0648
Move gvim.svg install from gvim to vim-core since vim now uses it as
well.
Signed-off-by: Tim Harder gentoo.org>
app-editors/vim-core/Manifest | 1 +
app-editors/vim-core/files/gvim.svg| 94 ++
...m-core-.ebuild => vim-core-8.1.0648.ebuild} | 7 +-
app-editors/vim-core/vim-core-.ebuild | 7 +-
4 files changed, 105 insertions(+), 4 deletions(-)
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 100f5698d8f..03ef5c341e2 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -3,3 +3,4 @@ DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B
4b6e3c4443cd675dc3727e8609b89c422f66c7
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
diff --git a/app-editors/vim-core/files/gvim.svg
b/app-editors/vim-core/files/gvim.svg
new file mode 100644
index 000..b82742a7901
--- /dev/null
+++ b/app-editors/vim-core/files/gvim.svg
@@ -0,0 +1,94 @@
+
+
+
+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">
+
+
+
+
+
+
+
+
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage; />
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app-editors/vim-core/vim-core-.ebuild
b/app-editors/vim-core/vim-core-8.1.0648.ebuild
similarity index 96%
copy from app-editors/vim-core/vim-core-.ebuild
copy to app-editors/vim-core/vim-core-8.1.0648.ebuild
index 49bba1db86d..3c18feca903 100644
--- a/app-editors/vim-core/vim-core-.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.0648.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 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
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop
if [[ ${PV} == * ]] ; then
inherit git-r3
@@ -201,6 +201,9 @@ src_install() {
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() {
diff --git a/app-editors/vim-core/vim-core-.ebuild
b/app-editors/vim-core/vim-core-.ebuild
index 49bba1db86d..3c18feca903 100644
--- a/app-editors/vim-core/vim-core-.ebuild
+++ b/app-editors/vim-core/vim-core-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 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
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop
if [[ ${PV} == * ]] ; then
inherit git-r3
@@ -201,6 +201,9 @@ src_install() {
fi
newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+ # install gvim icon since both vim/gvim desktop files reference it
+
[gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/files/
commit: e24b5f0d42be2a081237c6f1362f2672ebffaf4a
Author: Patrice Clement gentoo org>
AuthorDate: Sun Oct 22 14:31:13 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Oct 22 14:31:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24b5f0d
app-editors/vim-core: enable omni completion before sourcing of
/etc/vimrc.local.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-editors/vim-core/files/vimrc-r5 | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-editors/vim-core/files/vimrc-r5
b/app-editors/vim-core/files/vimrc-r5
index 5d8c9d5b0f1..2409822e628 100644
--- a/app-editors/vim-core/files/vimrc-r5
+++ b/app-editors/vim-core/files/vimrc-r5
@@ -193,12 +193,6 @@ endif " has("autocmd")
" instead:
let g:skip_defaults_vim = 1
-" {{{ vimrc.local
-if filereadable("@GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local")
- source @GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local
-endif
-" }}}
-
" Enable Omni completion when opening a file only if a specific plugin does
" not already exist for that filetype. This allows Omni completion
" (Ctrl-x/Ctrl-o) to work with any programming language if and only if a syntax
@@ -210,5 +204,11 @@ if exists("+omnifunc")
\ endif
endif
+" {{{ vimrc.local
+if filereadable("@GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local")
+ source @GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local
+endif
+" }}}
+
" vim: set fenc=utf-8 tw=80 sw=2 sts=2 et foldmethod=marker :
[gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/files/
commit: cc69009cc7aef4420b844bc199abfe5285b6e0d4
Author: Patrice Clement gentoo org>
AuthorDate: Sun Oct 22 14:03:05 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Oct 22 14:25:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc69009c
app-editors/vim-core: enable omni completion based on syntax files.
Closes: https://bugs.gentoo.org/330187
Courtesy of Florian Crouzat floriancrouzat.net>
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-editors/vim-core/files/vimrc-r5 | 11 +++
1 file changed, 11 insertions(+)
diff --git a/app-editors/vim-core/files/vimrc-r5
b/app-editors/vim-core/files/vimrc-r5
index 3386b6c54ba..5d8c9d5b0f1 100644
--- a/app-editors/vim-core/files/vimrc-r5
+++ b/app-editors/vim-core/files/vimrc-r5
@@ -199,5 +199,16 @@ if
filereadable("@GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local")
endif
" }}}
+" Enable Omni completion when opening a file only if a specific plugin does
+" not already exist for that filetype. This allows Omni completion
+" (Ctrl-x/Ctrl-o) to work with any programming language if and only if a syntax
+" file exists for the said language.
+if exists("+omnifunc")
+ autocmd Filetype *
+ \ if == "" |
+ \ setlocal omnifunc=syntaxcomplete#Complete |
+ \ endif
+endif
+
" vim: set fenc=utf-8 tw=80 sw=2 sts=2 et foldmethod=marker :
[gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/files/
commit: f75e7300cf7eba9070a39a6000e1099fb6a305cd
Author: Tim Harder gentoo org>
AuthorDate: Thu Dec 1 00:22:04 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Thu Dec 1 00:23:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75e7300
app-editors/vim-core: disregard user mappings when restoring cursor position
This fixes bug #598726.
app-editors/vim-core/files/vimrc-r5 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-editors/vim-core/files/vimrc-r5
b/app-editors/vim-core/files/vimrc-r5
index fdc316b..8143be5 100644
--- a/app-editors/vim-core/files/vimrc-r5
+++ b/app-editors/vim-core/files/vimrc-r5
@@ -167,7 +167,7 @@ augroup gentoo
autocmd BufReadPost *
\ if ! exists("g:leave_my_cursor_position_alone") |
\ if line("'\"") > 0 && line ("'\"") <= line("$") |
-\ exe "normal g'\"" |
+\ exe "normal! g'\"" |
\ endif |
\ endif
