bump(app-editors/vim-core): sync with upstream

Get upstream cross compile fixes.

Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand 2015-07-15 11:59:58 -07:00
parent 18a8c5608d
commit f502a8217e
4 changed files with 259 additions and 9 deletions

View File

@ -1,6 +1,11 @@
# ChangeLog for app-editors/vim-core
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.463 2015/03/21 06:33:56 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.464 2015/05/03 06:55:01 radhermit Exp $
*vim-core-7.4.712 (03 May 2015)
03 May 2015; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.712.ebuild:
Version bump.
21 Mar 2015; Tim Harder <radhermit@gentoo.org> -vim-core-7.4.488.ebuild,
-vim-core-7.4.527.ebuild, -vim-core-7.4.542.ebuild, -vim-core-7.4.560.ebuild:

View File

@ -7,6 +7,7 @@ DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a4
DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238
DIST vim-7.4.622.patch.xz 816104 SHA256 f9d6624b7c8e5cbae749eff3f3bef30f7b10554fa04edf7fe3c85828b2b2e7a8 SHA512 544258cca6e46291743f95acba3dbc7844fddf0f579706cb7903f338b359b852cb4818238e7402e2b5413fa1a2ca9084246ffe39a7c23d29d14883594caa65c3 WHIRLPOOL 2b92e418892bc99c45e6b56592635804394e282c8f0959addf1a93434dccdfb06fa75f39f171624f484cc6a6420bfd6ea6a9d30b1b0a9694cb8a14cbf42e456e
DIST vim-7.4.670.patch.xz 845000 SHA256 5ffbb05466c68aea08fda6067a6a46e068beece3e26d33098964e5e472439ec0 SHA512 04e2c54fe4b6afba6f8b123ef24d63e898667c808083b91ea5affa6607ad1661b081fa0bd6536a5a2260dbd2b818e7942ef3896719ed82fcc071355239cba536 WHIRLPOOL 6b632e757101d4a54989bd85c0b6186326573794504dc0dd0ebf25e14fca5827b4a884677c380381359968687e40d4aa4ea27b42d5419538a0e843c4356227e6
DIST vim-7.4.712.patch.xz 890304 SHA256 fa385439a55703715704b7163dc7ac4a53908d908bd456af432dd5618144c630 SHA512 639847f6c5e92c5838b259f83ffb8b473e8ad7142589e72e2dcd0d51a9e9d272c29ec4fd4239ee21bcf5599f3cc6cc790aee02fe2b860f7d79ce1d3a811a6dd0 WHIRLPOOL f9fe642fe68f324e2e68d1fcdda80d15e2eac6e7a246561728fa467c90e271cd83aab6b24adfec65977ab12cf0fd9ec5c1848bbfdc2342e63114f321234e95d9
DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
DIST vim-core-7.3-gentoo-patches-r4.tar.bz2 3015 SHA256 a4f61e4d0cd1848812f603e7f6b8a5304d13ac199f4e3061264cd3bec75a17c5 SHA512 0ba7a20dfdc2c24a92a4af5a6fe49a94d5d5c5e9111c42c4812d0cd52c26cc567acd2d7e74f66730afd3c4bc9f1667b0ad9c1f82f93d2844d8309b143f293676 WHIRLPOOL cec628c0f19971077677e667cc8903ea0a56041799a43907d47acc218fd9e0a6ea2a2a30999c74512fb36d233c6ac6d436f033684290155ff6ae70be5277bdbf
DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a
@ -14,17 +15,18 @@ EBUILD vim-core-7.4.273.ebuild 7307 SHA256 b9ca490150e34c11c88c9c1689da45e88828a
EBUILD vim-core-7.4.591.ebuild 7280 SHA256 472bd4528d24e49a80030de2ed573d0d00773549f21aa424205e5880bb83f9f9 SHA512 5c94f9de098b5368b5c5a9c970ad71bc3968bbebfb5caafc7fa1d2e75a88d0ec3a06ec40ae479687dbbe30dfe001502875e4bea9cec1ebaf70d10f9f592780db WHIRLPOOL e9a1957a7335f9c376867395285a0bd5486ce5409b080e06ca30562769a9a49274ffce61cfb17373b74cbe1f43cb11fe4baf95a0d6dd42db6c34b78b473cdf2f
EBUILD vim-core-7.4.622.ebuild 7285 SHA256 9bb92aefe746df6bf35159f919beff75643f80416e79bf54283c35d737adf8b6 SHA512 467eefa8956789ec9b6efaf0958a0f4d16dfb3f1a6327009a7c021a3bf72648dae1a563d59addc097731d3f140a42a31e4cfe9822e36b221bbbf24df8da7abf8 WHIRLPOOL 4fe446cd52643a3efbc1847b6e64ea33aa58877e1d6b2b52f9a59807ff68d3c63f732dd9122d22f88c5dc41af0437359b8b1f1d2d63e0383fd983c82d4e5a28d
EBUILD vim-core-7.4.670.ebuild 7285 SHA256 3517c9615c476b15078f8602747241675a60a2284a56bdae3813ab2ee3cf8e25 SHA512 93bd5938d48c550705c048948c6de2f0eb0d17d737610bb0ae94bcb794a529a3d2fe50f5a8fa7442e193d7942082995cb70a4046752bd87c3ae85455ad74bb83 WHIRLPOOL faaa25c9c272ee036faa30d9158a537152a4673f930a8f5b9ce8106c315c09fa756292526c01a459f293dce5ff73c1d9296f12d43ee223b0029849599d7405dd
EBUILD vim-core-7.4.712.ebuild 7285 SHA256 b4c67239511ecffcdfcadf43b463db0d48a85c864998da4d8a856be32af40922 SHA512 efca85cd6ca6b88468652f2a65bc93e8378990428f5ff121482004dabf00e3c836ea567c13e1ab06bb8e7b252727b06109efb38d68359d308737362b0fa37aa7 WHIRLPOOL 83557ab477282cdb26096f7de67b871e4a3627dc9eeca2b649ac4cc0629304858b31ab50facf14deaa1f92d5c8bd0feeba46b7ca5ab084029d52c633d4d0cb8d
EBUILD vim-core-9999.ebuild 7281 SHA256 1c2447ac314f57288405a460470ef0f85b720991d8c70d1a17d00f5533f8597c SHA512 c045c66c69024d2ac0b6c6f3e48d4dad58496ad54ac30e27e6fb416bb6e397826b539cfd6abf118e7bd14a758b49eee6baa66f00af9e1f56f2b0b52cafacac55 WHIRLPOOL 8e192352ea56a0900526748f86231ddb7d6da42a3233bfb3df81559f7d8cd818118f159857d45f47d13f4af07f63f5306fb6bf57291daa10e5bb0cdd8eb5abc6
MISC ChangeLog 63001 SHA256 a4c914d555ff96150d3f31a02b7ede966c5435a5d1f42dee71f703f0a7d8d09a SHA512 1629d167809be450fdba739712a076554e73c819d6e0c088909567d98424560972962570db6c47fe8fa32ce7aabf9dec39d3466fd06584314dabaf70147bfe06 WHIRLPOOL 4adc567ca704ff5e381a25fdb329c9d56ae7c205f6bfe622675870e17646522d72003a8d85bea0b5034a4daddf120c843ba0986bb6f2ac09f0ef7dd9a441cdc5
MISC ChangeLog 63126 SHA256 233830915e6106ea2989134519603c90c4b678841f0fee22640ebb5d02b63f45 SHA512 9307b70aa882f47c111bab17b7747a3de142595e79618514aef5d63bb6261db2359630fc1e67928c388175b369fe646b8defc4d394101e8b6f3735046ecdf02a WHIRLPOOL 3fc9447ed61b7156187edcf481c2d38d4f9108b4c07419dec342d4456067dd0abda8da0037f7dd197707db4652386fb701199ed028be94da99c4c4ef819c779d
MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAEBCAAGBQJVDRDUAAoJEEqz6FtPBkyjNU4H/1vjKzRW3t+0V3BSFgKCKlQ8
/jeIWlWcy/bHSffJ18T7JEvoN1nrkdc2P9jtPEj85ASTCQ6VXFHLqtQnCG8VusdI
cO0JzQBFKKPCOEpYwecjCxa9rgcdjvYQxa8n+jjJpDYHI0CNumjVLnwUg8vVG5hD
4823O4bwUJEejSp7DjRvW6/NBbT2y8blHkL6ve/oYBwqRf+/hbH9ZQzViW2QUg/E
W/Scj6ZdRoDYdanAOOCOjM2QByYZGaGXlowxNsfYfexmkj86wLC1X2CzbHPHkogU
QYbJSbRGTNRrXaPzKdRwrH0GSCi1Ud/3CL2/757PXsxdi1M5vYXlpjwzl/PoSAM=
=tLO3
iQEcBAEBCAAGBQJVRcZEAAoJEEqz6FtPBkyjMnsH/RKdlHpLHrjA93/Nv8BXtrF8
02SHQ6iY5HKX4LARLNwJ/4oboAPaRTjjdOnK7Z5vIjj0dIdSsUhoRRaVMV6MOROU
hc60CadrGr6c37C/jmkO9tHQkkuQaHEeG4LbinogTr3ebOi3AllZb13JLbXNNkVQ
uOH2445FHftg++YFI676tTRNwabITkSmMGKhovv3TK3hgS9ZR7dHf+dtvkiUqB/s
RAlvLz3Rk5+gwzPs0cjG6AJ4bzfOLvqjIYakpZmvvSekOR9EkRqLtjlx1EHlU5jo
9280RIMq5apSNog1QrGDYzOsc4+laVnngonuapi0kGKrw3hmwWUlemg2sRrg1Xc=
=byGu
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,230 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.712.ebuild,v 1.1 2015/05/03 06:55:01 radhermit Exp $
EAPI=5
VIM_VERSION="7.4"
inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
if [[ ${PV} == 9999* ]] ; then
inherit mercurial
EHG_REPO_URI="https://vim.googlecode.com/hg/"
EHG_PROJECT="vim"
else
VIM_ORG_PATCH="vim-${PV}.patch.xz"
SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"
HOMEPAGE="http://www.vim.org/"
SLOT="0"
LICENSE="vim"
IUSE="nls acl minimal"
DEPEND="sys-devel/autoconf"
PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
S=${WORKDIR}/vim${VIM_VERSION/.}
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
export HOME="${T}"/home
}
src_prepare() {
if [[ ${PV} != 9999* ]] ; then
if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
# Apply any patches available from vim.org for this version
epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
fi
if [[ -d "${WORKDIR}"/patches/ ]]; then
# Gentoo patches to fix runtime issues, cross-compile errors, etc
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/patches/
fi
fi
# Fixup a script to use awk instead of nawk
sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
|| die "mve.awk sed 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
# 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)
sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
"${S}"/runtime/doc/syntax.txt \
"${S}"/runtime/doc/tagsrch.txt \
"${S}"/runtime/doc/usr_29.txt \
"${S}"/runtime/menu.vim \
"${S}"/src/configure.in || die 'sed failed'
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
# this is NeXT, but it's actually just a file in dev-libs/9libs
# This fixes bug 43885 (20 Mar 2004 agriffis)
sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
# correctly. To avoid some really entertaining error messages about stuff
# 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" ; done
# Try to avoid sandbox problems. Bug #114475.
if [[ -d "${S}"/src/po ]] ; then
sed -i -e \
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
"${S}"/src/po/Makefile
fi
if version_is_at_least 7.3.122 ; then
cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
fi
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
if version_is_at_least 7.3 ; then
sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
fi
epatch_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...
replace-flags -O3 -O2
# Fix bug 18245: Prevent "make" from the following chain:
# (1) Notice configure.in is newer than auto/configure
# (2) Rebuild auto/configure
# (3) Notice auto/configure is newer than auto/config.mk
# (4) Run ./configure (with wrong args) to remake auto/config.mk
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
rm -f src/auto/configure
emake -j1 -C src autoconf
# This should fix a sandbox violation (see bug 24447). The hvc
# things are for ppc64, see bug 86433.
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
[[ -e ${file} ]] && addwrite $file
done
# Let Portage do the stripping. Some people like that.
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
# 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}
}
src_compile() {
# The following allows emake to be used
emake -j1 -C src auto/osdef.h objects
emake tools
}
src_test() { :; }
src_install() {
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
dodir /usr/{bin,share/{man/man1,vim}}
cd src || die "cd src failed"
emake \
installruntime \
installmanlinks \
installmacros \
installtutor \
installtutorbin \
installtools \
install-languages \
install-icons \
DESTDIR="${D}" \
BINDIR="${EPREFIX}"/usr/bin \
MANDIR="${EPREFIX}"/usr/share/man \
DATADIR="${EPREFIX}"/usr/share
keepdir ${vimfiles}/keymap
# default vimrc is installed by vim-core since it applies to
# both vim and gvim
insinto /etc/vim/
newins "${FILESDIR}"/vimrc-r4 vimrc
eprefixify "${ED}"/etc/vim/vimrc
if use minimal ; then
# To save space, install only a subset of the files.
# Helps minimalize the livecd, bug 65144.
eshopts_push -s extglob
rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
rm "${ED}"/usr/bin/vimtutor
local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
# tinkering with the next line might make bad things happen ...
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
eshopts_pop
fi
# These files might have slight security issues, so we won't
# install them. See bug #77841. We don't mind if these don't
# exist.
rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
newbashcomp "${FILESDIR}"/xxd-completion xxd
# We shouldn't be installing the ex or view man page symlinks, as they
# are managed by eselect-vi
rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
}
pkg_postinst() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
}
pkg_postrm() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
}

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test
DEPEND=sys-devel/autoconf
DESCRIPTION=vim and gvim shared files
EAPI=5
HOMEPAGE=http://www.vim.org/
IUSE=nls acl minimal
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=vim
PDEPEND=!minimal? ( app-vim/gentoo-syntax )
SLOT=0
SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.712.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2
_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2
_md5_=864b9cbb408d04a563d5c006dc23ac11