commit: 9c845e29724821b3749c95c2e82c5d020b6b421d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Sep 19 15:46:27 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Sep 19 15:49:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c845e29
app-editors/gvim: use PERL_FEATURES Bug: https://bugs.gentoo.org/940672 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{gvim-9999.ebuild => gvim-9.1.1652-r1.ebuild} | 60 +++++++++++----------- app-editors/gvim/gvim-9999.ebuild | 10 ++-- 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9.1.1652-r1.ebuild similarity index 85% copy from app-editors/gvim/gvim-9999.ebuild copy to app-editors/gvim/gvim-9.1.1652-r1.ebuild index b746be5b9b64..f5d2c4abb884 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9.1.1652-r1.ebuild @@ -6,14 +6,15 @@ EAPI=8 # Please bump with app-editors/vim-core and app-editors/vim VIM_VERSION="9.1" -VIM_PATCHES_VERSION="9.0.2092" +VIM_PATCHES_VERSION="9.1.1432" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{11..14} ) +PYTHON_COMPAT=( python3_{10..14} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby31 ruby32" +GENTOO_DEPEND_ON_PERL=no -inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils +inherit bash-completion-r1 flag-o-matic lua-single perl-module prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -21,8 +22,9 @@ 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://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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"; + # https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="GUI version of the Vim text editor" @@ -31,7 +33,7 @@ S="${WORKDIR}"/vim-${PV} LICENSE="vim" SLOT="0" -IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" +IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl ${GENTOO_PERL_USESTRING}" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -58,7 +60,10 @@ RDEPEND=" $(lua_gen_impl_dep 'deprecated' lua5-1) ) nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) + perl? ( + ${GENTOO_PERL_DEPSTRING} + dev-lang/perl:= + ) python? ( ${PYTHON_DEPS} ) racket? ( dev-scheme/racket ) ruby? ( ${RUBY_DEPS} ) @@ -68,8 +73,7 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) " DEPEND="${RDEPEND} - x11-base/xorg-proto -" + x11-base/xorg-proto" # configure runs the Lua interpreter BDEPEND=" dev-build/autoconf @@ -82,14 +86,14 @@ PDEPEND="!minimal? ( app-vim/gentoo-syntax )" if [[ ${PV} != 9999* ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc PATCHES=( - "${WORKDIR}/vim-${VIM_PATCHES_VERSION}-patches" + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" ) fi # various failures (bugs #630042 and #682320) RESTRICT="test" -# platform-specific checks (bug #898450 #898452): +# platform-specific checks (bug #898450): # - acl() -- Solaris # - statacl() -- AIX QA_CONFIG_IMPL_DECL_SKIP=( @@ -98,7 +102,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( ) pkg_setup() { - # people with broken alphabets run into trouble. bug #82186. + # people with broken alphabets run into trouble. bug 82186. unset LANG LC_ALL export LC_COLLATE="C" @@ -122,7 +126,7 @@ src_prepare() { # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. # Hopefully this pattern won't break for a while at least. - # This fixes bug #29398 (27 Sep 2003 agriffis) + # This fixes bug 29398 (27 Sep 2003 agriffis) sed -i -e \ 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ @@ -143,7 +147,7 @@ src_prepare() { if [[ -d "${S}"/src/po ]]; then sed -i -e \ '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile || die "sed failed" + "${S}"/src/po/Makefile || die fi cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" @@ -155,7 +159,7 @@ src_prepare() { # (4) Run ./configure (with wrong args) to remake auto/config.mk sed -i -e \ 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm src/auto/configure || die "rm failed" + rm -v src/auto/configure || die "rm failed" # --with-features=huge forces on cscope even if we --disable it. We need # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) @@ -173,24 +177,18 @@ src_prepare() { src_configure() { emake -j1 -C src autoconf - # This should fix a sandbox violation (see bug #24447). The hvc - # things are for ppc64, see bug #86433. + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. local file for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do if [[ -e ${file} ]]; then - addwrite ${file} + addwrite $file fi done - local myconf=( - --with-modified-by="Gentoo-${PVR} (RIP Bram)" - --with-vim-name=gvim - --with-x - ) - use debug && append-flags "-DDEBUG" - myconf+=( + local myconf=( --with-features=huge --disable-gpm --with-gnome=no @@ -248,7 +246,11 @@ src_configure() { vim_cv_toupper_broken=no fi - econf "${myconf[@]}" + econf \ + --with-modified-by="Gentoo-${PVR} (RIP Bram)" \ + --with-vim-name=gvim \ + --with-x \ + "${myconf[@]}" } src_compile() { @@ -283,7 +285,7 @@ src_test() { } # Call eselect vi update with --if-unset -# to respect user's choice (bug #187449) +# to respect user's choice (bug 187449) eselect_vi_update() { ebegin "Calling eselect vi update" eselect vi update --if-unset @@ -324,7 +326,7 @@ pkg_postinst() { # update documentation tags (from vim-doc.eclass) update_vim_helptags - # update desktop file mime cache + # update fdo mime stuff, bug #78394 xdg_desktop_database_update # update icon cache @@ -338,7 +340,7 @@ pkg_postrm() { # update documentation tags (from vim-doc.eclass) update_vim_helptags - # update desktop file mime cache + # update fdo mime stuff, bug #78394 xdg_desktop_database_update # update icon cache diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index b746be5b9b64..7cab86f792b8 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -12,8 +12,9 @@ LUA_COMPAT=( lua5-{1..4} luajit ) PYTHON_COMPAT=( python3_{11..14} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby31 ruby32" +GENTOO_DEPEND_ON_PERL=no -inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils +inherit bash-completion-r1 flag-o-matic lua-single perl-module prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -31,7 +32,7 @@ S="${WORKDIR}"/vim-${PV} LICENSE="vim" SLOT="0" -IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" +IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl ${GENTOO_PERL_USESTRING}" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -58,7 +59,10 @@ RDEPEND=" $(lua_gen_impl_dep 'deprecated' lua5-1) ) nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) + perl? ( + ${GENTOO_PERL_DEPSTRING} + dev-lang/perl:= + ) python? ( ${PYTHON_DEPS} ) racket? ( dev-scheme/racket ) ruby? ( ${RUBY_DEPS} )
