commit: 8ef01b5deddc1b8633d99907f2941ee8a85d60f1
Author: Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Thu Feb 16 07:07:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 04:32:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef01b5d
app-editors/gvim: remove manual patch application
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/gvim/gvim-9.0.1000.ebuild | 14 ++++++++------
app-editors/gvim/gvim-9.0.1157.ebuild | 14 ++++++++------
app-editors/gvim/gvim-9999.ebuild | 14 ++++++++------
3 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/app-editors/gvim/gvim-9.0.1000.ebuild
b/app-editors/gvim/gvim-9.0.1000.ebuild
index 2de60ab53f5d..708d13e40470 100644
--- a/app-editors/gvim/gvim-9.0.1000.ebuild
+++ b/app-editors/gvim/gvim-9.0.1000.ebuild
@@ -80,6 +80,13 @@ BDEPEND="
"
PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+if [[ ${PV} != 9999* ]]; then
+ # Gentoo patches to fix runtime issues, cross-compile errors, etc
+ PATCHES=(
+ "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+ )
+fi
+
# various failures (bugs #630042 and #682320)
RESTRICT="test"
@@ -93,10 +100,7 @@ pkg_setup() {
}
src_prepare() {
- if [[ ${PV} != 9999* ]]; then
- # Gentoo patches to fix runtime issues, cross-compile errors,
etc
- eapply
"${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
- fi
+ default
# Fixup a script to use awk instead of nawk
sed -i -e \
@@ -163,8 +167,6 @@ src_prepare() {
sed -i -e \
'/# define FEAT_CSCOPE/d' src/feature.h || die
"couldn't disable cscope"
fi
-
- eapply_user
}
src_configure() {
diff --git a/app-editors/gvim/gvim-9.0.1157.ebuild
b/app-editors/gvim/gvim-9.0.1157.ebuild
index 29c24d0ea9fb..01f283c88448 100644
--- a/app-editors/gvim/gvim-9.0.1157.ebuild
+++ b/app-editors/gvim/gvim-9.0.1157.ebuild
@@ -80,6 +80,13 @@ BDEPEND="
"
PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+if [[ ${PV} != 9999* ]]; then
+ # Gentoo patches to fix runtime issues, cross-compile errors, etc
+ PATCHES=(
+ "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+ )
+fi
+
# various failures (bugs #630042 and #682320)
RESTRICT="test"
@@ -93,10 +100,7 @@ pkg_setup() {
}
src_prepare() {
- if [[ ${PV} != 9999* ]]; then
- # Gentoo patches to fix runtime issues, cross-compile errors,
etc
- eapply
"${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
- fi
+ default
# Fixup a script to use awk instead of nawk
sed -i -e \
@@ -163,8 +167,6 @@ src_prepare() {
sed -i -e \
'/# define FEAT_CSCOPE/d' src/feature.h || die
"couldn't disable cscope"
fi
-
- eapply_user
}
src_configure() {
diff --git a/app-editors/gvim/gvim-9999.ebuild
b/app-editors/gvim/gvim-9999.ebuild
index 29c24d0ea9fb..01f283c88448 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -80,6 +80,13 @@ BDEPEND="
"
PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+if [[ ${PV} != 9999* ]]; then
+ # Gentoo patches to fix runtime issues, cross-compile errors, etc
+ PATCHES=(
+ "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+ )
+fi
+
# various failures (bugs #630042 and #682320)
RESTRICT="test"
@@ -93,10 +100,7 @@ pkg_setup() {
}
src_prepare() {
- if [[ ${PV} != 9999* ]]; then
- # Gentoo patches to fix runtime issues, cross-compile errors,
etc
- eapply
"${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
- fi
+ default
# Fixup a script to use awk instead of nawk
sed -i -e \
@@ -163,8 +167,6 @@ src_prepare() {
sed -i -e \
'/# define FEAT_CSCOPE/d' src/feature.h || die
"couldn't disable cscope"
fi
-
- eapply_user
}
src_configure() {
