commit: 7e0e804b6966112e6793ebafa806ce04ead2e16c Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com> AuthorDate: Thu Sep 11 11:58:56 2025 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Tue Nov 11 19:07:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e0e804b
app-editors/vim-core: do not build/install xxd, depend on dev-util/xxd instead Bug: https://bugs.gentoo.org/962554 Co-Authored-By: Lucio Sauer <watermanpaint <AT> posteo.net> Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com> Part-of: https://github.com/gentoo/gentoo/pull/43726 Closes: https://github.com/gentoo/gentoo/pull/43726 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> .../files/vim-core-9.1.1652-r1-unbundle-xxd.patch | 35 ++++++++++++++++++++++ ...ore-9999.ebuild => vim-core-9.1.1652-r1.ebuild} | 16 +++++----- app-editors/vim-core/vim-core-9999.ebuild | 9 +++--- 3 files changed, 49 insertions(+), 11 deletions(-) diff --git a/app-editors/vim-core/files/vim-core-9.1.1652-r1-unbundle-xxd.patch b/app-editors/vim-core/files/vim-core-9.1.1652-r1-unbundle-xxd.patch new file mode 100644 index 000000000000..d7a6dc1fd185 --- /dev/null +++ b/app-editors/vim-core/files/vim-core-9.1.1652-r1-unbundle-xxd.patch @@ -0,0 +1,35 @@ +The xxd utility is packaged in dev-util/xxd. With USE=nls, the prerequisite +$(INSTALL_TOOL_LANGS) target variable contains install-tool-languages, which +only installs xxd manpages. Remove it to prevent file collisions with +dev-util/xxd. + +From: Lucio Sauer <[email protected]> +--- a/src/Makefile ++++ b/src/Makefile +@@ -947,7 +947,7 @@ EVIEWNAME = e$(VIEWNAME) + EVIEWTARGET = $(EVIEWNAME)$(LNKEXT) + + ### Names of the tools that are also made {{{1 +-TOOLS = xxd/xxd$(EXEEXT) ++TOOLS = + + ### Installation directories. The defaults come from configure. {{{1 + # +@@ -2533,16 +2533,11 @@ installspell: $(DEST_VIM) $(DEST_RT) $(DEST_SPELL) + + # install helper program xxd + installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \ +- $(TOOLSSOURCE) $(DEST_VIM) $(DEST_RT) $(DEST_TOOLS) \ +- $(INSTALL_TOOL_LANGS) ++ $(TOOLSSOURCE) $(DEST_VIM) $(DEST_RT) $(DEST_TOOLS) + if test -f $(DEST_BIN)/xxd$(EXEEXT); then \ + mv -f $(DEST_BIN)/xxd$(EXEEXT) $(DEST_BIN)/xxd.rm; \ + rm -f $(DEST_BIN)/xxd.rm; \ + fi +- $(INSTALL_PROG) xxd/xxd$(EXEEXT) $(DEST_BIN) +- $(STRIP) $(DEST_BIN)/xxd$(EXEEXT) +- chmod $(BINMOD) $(DEST_BIN)/xxd$(EXEEXT) +- -$(SHELL) ./installman.sh xxd $(DEST_MAN) "" $(INSTALLMANARGS) + + # install the runtime tools + $(INSTALL_DATA_R) $(TOOLSSOURCE)/* $(DEST_TOOLS) diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9.1.1652-r1.ebuild similarity index 92% copy from app-editors/vim-core/vim-core-9999.ebuild copy to app-editors/vim-core/vim-core-9.1.1652-r1.ebuild index d9ac9cfb553b..96213c8c2dd1 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9.1.1652-r1.ebuild @@ -6,8 +6,8 @@ EAPI=8 # Please bump with app-editors/vim and app-editors/gvim VIM_VERSION="9.1" -VIM_PATCHES_VERSION="9.0.2092" -inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils +VIM_PATCHES_VERSION="9.1.1432" +inherit desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -16,7 +16,8 @@ if [[ ${PV} == 9999* ]] ; then 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"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + # 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="vim and gvim shared files" @@ -27,6 +28,7 @@ LICENSE="vim" SLOT="0" IUSE="nls acl minimal" +RDEPEND="dev-util/xxd" # ncurses is only needed by ./configure, so no subslot operator required DEPEND=">=sys-libs/ncurses-5.2-r2:0" BDEPEND="dev-build/autoconf" @@ -38,6 +40,9 @@ if [[ ${PV} != 9999* ]]; then ) fi +# unbundle xxd +PATCHES+=( "${FILESDIR}/vim-core-9.1.1652-r1-unbundle-xxd.patch" ) + # platform-specific checks (bug #898406): # - acl() -- Solaris # - statacl() -- AIX @@ -130,7 +135,7 @@ src_configure() { export ac_cv_prog_STRIP="$(type -P true ) faking strip" local myconf=( - --with-modified-by=Gentoo-${PVR} + --with-modified-by="Gentoo-${PVR} (RIP Bram)" --enable-gui=no --without-x --disable-darwin @@ -159,7 +164,6 @@ src_configure() { src_compile() { emake -j1 -C src auto/osdef.h objects - emake tools } src_test() { :; } @@ -209,8 +213,6 @@ src_install() { done | xargs -0 rm -f || die fi - newbashcomp "${FILESDIR}"/xxd-completion xxd - # install gvim icon since both vim/gvim desktop files reference it doicon -s scalable "${FILESDIR}"/gvim.svg } diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index d9ac9cfb553b..8762bfea7cb1 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -7,7 +7,7 @@ EAPI=8 VIM_VERSION="9.1" VIM_PATCHES_VERSION="9.0.2092" -inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils +inherit desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -27,6 +27,7 @@ LICENSE="vim" SLOT="0" IUSE="nls acl minimal" +RDEPEND="dev-util/xxd" # ncurses is only needed by ./configure, so no subslot operator required DEPEND=">=sys-libs/ncurses-5.2-r2:0" BDEPEND="dev-build/autoconf" @@ -38,6 +39,9 @@ if [[ ${PV} != 9999* ]]; then ) fi +# unbundle xxd +PATCHES+=( "${FILESDIR}/vim-core-9.1.1652-r1-unbundle-xxd.patch" ) + # platform-specific checks (bug #898406): # - acl() -- Solaris # - statacl() -- AIX @@ -159,7 +163,6 @@ src_configure() { src_compile() { emake -j1 -C src auto/osdef.h objects - emake tools } src_test() { :; } @@ -209,8 +212,6 @@ src_install() { done | xargs -0 rm -f || die fi - newbashcomp "${FILESDIR}"/xxd-completion xxd - # install gvim icon since both vim/gvim desktop files reference it doicon -s scalable "${FILESDIR}"/gvim.svg }
