summaryrefslogtreecommitdiff
path: root/app-editors/gvim
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors/gvim')
-rw-r--r--app-editors/gvim/Manifest4
-rw-r--r--app-editors/gvim/gvim-9.1.0366.ebuild2
-rw-r--r--app-editors/gvim/gvim-9999.ebuild23
3 files changed, 15 insertions, 14 deletions
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index eaee6f788444..a54ba0e3908a 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -4,6 +4,6 @@ DIST vim-9.0.2092-patches.tar.xz 2640 BLAKE2B 3a4b2bc57712de3b92b0e8d9b2d428e4d5
DIST vim-9.0.2167.tar.gz 17405049 BLAKE2B 496c8f9672bc4ecce743a145bc2b671bf09034b2875e728406b318c8b12e2d8d4ee3423ce94f8749679f07d36f229954f7ef0b12ce7bc4d71ccf6637ce2d6029 SHA512 6a9a785b1915dc167210b0da4d5e4401c71ee49b3554c8a22566378658ddcc3493562897ea39035852399cc5ffb55a73355ab13390c27a4d00ffd76bcd10ddf0
DIST vim-9.1.0366.tar.gz 17861209 BLAKE2B 8771f5ef6a966c1b5992a437dd6cf1de9525458f61a4cd8fa53737a7bde29a4da101668639a301288a266ee8b3911857d1ba5b4e88870b60473eb1eaa608d7a5 SHA512 11be2a6e349c7b6d26fc1943c35ea18c662baa4f30ae76936eefb30e0b4d988bfcaedf7ecd2c3903f64e23c75957f55b9bb4073e0f38c7eb10ef0ee0dc652ddb
EBUILD gvim-9.0.2167.ebuild 9887 BLAKE2B e5834640a338b28612d8185b0364f3b47eebf4293fca9e14b1ee0c0689263fcce5a9bc19b5eaa3f11ad4ff0f68ba85c9be847f63b0a29e947cf4b44a41c3f5e2 SHA512 3bffa18e082cf43f2d3593b1c722ef0124dc11a45b3631f50dbb0581ad8904b5474c11884a1e5da39f1b255841cc22a4bfe6d69f0215451ec5a31fd2414c7641
-EBUILD gvim-9.1.0366.ebuild 9894 BLAKE2B 3dc13abdf322638135338af0838fa1ea21c4e5c58956dddd8b8b58d033088f14158e18e88fb8633454b7eca30a2af0b0b2d55c5a4e4d31a49085752bb48fe532 SHA512 0cdbe263de561bbfd00c7deef08d848983ffe51e676871bea776fc84e067bef5bb533f51532e479714694600ef1f70e3f684bd9a857df4172a7c9ad882001cfd
-EBUILD gvim-9999.ebuild 9864 BLAKE2B 31a0ebf5740b43640d0d32cc16aef518e883e2d219c6bba0d3ae7d86ed105159d9200daeb3387204de45b551640d7c0bd675e42403b59ecbcd566e544cf2ed26 SHA512 b9885b03cad1b17b58f4381041caa489f7ab72d6c1efca7904503533de850f27f20fb28302ff30bfc8a78c2a3c754d7798ede0dfa60ff950b22bc0e48f31d73f
+EBUILD gvim-9.1.0366.ebuild 9892 BLAKE2B 2ebb686e156e42f174ff2e277692c73e085a2dbadcac777872f57a9fb6dbfe67d3a2692aea41cdf85de78b2ee85ad80645352ec446095bca2b4eaafa6aa08030 SHA512 3475b358ccd3938330f1f7762c0e7e75f4384428bbec47a8e10817158178099a5efd20f8a4361cb8897c769da2d947bdb9ffd346c1a7d4de888faa2ff8ed58fd
+EBUILD gvim-9999.ebuild 9894 BLAKE2B 3dc13abdf322638135338af0838fa1ea21c4e5c58956dddd8b8b58d033088f14158e18e88fb8633454b7eca30a2af0b0b2d55c5a4e4d31a49085752bb48fe532 SHA512 0cdbe263de561bbfd00c7deef08d848983ffe51e676871bea776fc84e067bef5bb533f51532e479714694600ef1f70e3f684bd9a857df4172a7c9ad882001cfd
MISC metadata.xml 938 BLAKE2B 14b5a8f0a77608a07d2d8241cf4b48b4b418f905e688962f995495ccd2dc649d1ab2ab14076042d814e8a33df21557f2a76f78e9df5e8eb810f361a5c0930fa5 SHA512 3e6cb69512c6a02fb56e78c7d1f4e5223ba15ce0036df81dc536dd3b4c16bb76bb37f403a767473a2a2a8fa55e075e9f5142f6b7a0037d282569841a1032293f
diff --git a/app-editors/gvim/gvim-9.1.0366.ebuild b/app-editors/gvim/gvim-9.1.0366.ebuild
index 826999e81017..244a84e2210f 100644
--- a/app-editors/gvim/gvim-9.1.0366.ebuild
+++ b/app-editors/gvim/gvim-9.1.0366.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999* ]]; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
S="${WORKDIR}"/vim-${PV}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 9f2b67d6fdc0..826999e81017 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -5,13 +5,13 @@ EAPI=8
# Please bump with app-editors/vim-core and app-editors/vim
-VIM_VERSION="9.0"
-VIM_PATCHES_VERSION="9.0.1000"
+VIM_VERSION="9.1"
+VIM_PATCHES_VERSION="9.0.2092"
LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32"
inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]]; then
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-${VIM_PATCHES_VERSION}-patches.tar.bz2"
+ https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
S="${WORKDIR}"/vim-${PV}
@@ -70,7 +70,8 @@ RDEPEND="
sound? ( media-libs/libcanberra )
tcl? ( dev-lang/tcl:0= )
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
# configure runs the Lua interpreter
BDEPEND="
dev-build/autoconf
@@ -83,7 +84,7 @@ 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"
+ "${WORKDIR}/vim-${VIM_PATCHES_VERSION}-patches"
)
fi
@@ -117,9 +118,9 @@ src_prepare() {
# Read vimrc and gvimrc from /etc/vim
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
- >> "${S}"/src/feature.h || die "echo failed"
+ >> "${S}"/src/feature.h || die "echo failed"
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
- >> "${S}"/src/feature.h || die "echo failed"
+ >> "${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.
@@ -137,7 +138,7 @@ src_prepare() {
# 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"
+ echo >> "$c" || die "echo failed"
done
# Try to avoid sandbox problems. Bug #114475.
@@ -260,7 +261,7 @@ src_configure() {
fi
econf \
- --with-modified-by=Gentoo-${PVR} \
+ --with-modified-by="Gentoo-${PVR} (RIP Bram)" \
--with-vim-name=gvim \
--with-x \
"${myconf[@]}"