From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 74C4E158094 for ; Tue, 19 Jul 2022 21:16:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D8C1E0C0E; Tue, 19 Jul 2022 21:16:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E01EE0C11 for ; Tue, 19 Jul 2022 21:16:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC4313406C0 for ; Tue, 19 Jul 2022 21:16:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5ABF5544 for ; Tue, 19 Jul 2022 21:16:32 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1658265136.9a87ace4dacbfb8424e2d4f8bebba818f16ed6fd.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/vim-core/vim-core-9999.ebuild X-VCS-Directories: app-editors/vim-core/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 9a87ace4dacbfb8424e2d4f8bebba818f16ed6fd X-VCS-Branch: master Date: Tue, 19 Jul 2022 21:16:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 76e69c1c-ab85-447f-b7bf-6ad0f41c7354 X-Archives-Hash: 3321e8194bf029efcc169eb57809e3dc commit: 9a87ace4dacbfb8424e2d4f8bebba818f16ed6fd Author: Thomas Bracht Laumann Jespersen laumann xyz> AuthorDate: Mon Jul 18 19:37:11 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Jul 19 21:12:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a87ace4 app-editors/vim-core: update live ebuild Signed-off-by: Thomas Bracht Laumann Jespersen laumann.xyz> Signed-off-by: Mike Gilbert gentoo.org> app-editors/vim-core/vim-core-9999.ebuild | 68 +++++++++++++++---------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index 2ab640fe7da3..0fd6ae36dd53 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Please bump with app-editors/vim and app-editors/gvim -VIM_VERSION="8.2" +VIM_VERSION="9.0" inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils if [[ ${PV} == 9999* ]] ; then @@ -13,11 +13,11 @@ if [[ ${PV} == 9999* ]] ; then 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://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz" + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -S="${WORKDIR}"/vim-${PV} +S="${WORKDIR}/vim-${PV}" DESCRIPTION="vim and gvim shared files" HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" @@ -36,16 +36,12 @@ pkg_setup() { # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die "mkdir -p failed" - export HOME="${T}"/home } src_prepare() { if [[ ${PV} != 9999* ]] ; then # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches + eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches" fi # Fixup a script to use awk instead of nawk @@ -57,8 +53,8 @@ src_prepare() { rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. # Hopefully this pattern won't break for a while at least. @@ -97,16 +93,6 @@ src_prepare() { "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - eapply_user -} - -src_configure() { - local myconf - - # Fix bug #37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for # everyone since previous flag filtering bugs have turned out to affect # multiple archs... @@ -122,6 +108,14 @@ src_configure() { # Remove src/auto/configure file. rm -v src/auto/configure || die "rm configure failed" + eapply_user +} + +src_configure() { + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc @@ -135,22 +129,24 @@ src_configure() { # Let Portage do the stripping. Some people like that. export ac_cv_prog_STRIP="$(type -P true ) faking strip" + local myconf=( + --with-modified-by=Gentoo-${PVR} + --enable-gui=no + --without-x + --disable-darwin + --disable-perlinterp + --disable-pythoninterp + --disable-rubyinterp + --disable-gpm + --disable-selinux + $(use_enable nls) + $(use_enable acl) + ) + # Keep Gentoo Prefix env contained within the EPREFIX - use prefix && myconf+=" --without-local-dir" - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} + use prefix && myconf+=( --without-local-dir ) + + econf "${myconf[@]}" } src_compile() {