app-editors/vim-core: version bump
authorTim Harder <radhermit@gentoo.org>
Tue, 25 Aug 2015 03:18:47 +0000 (23:18 -0400)
committerTim Harder <radhermit@gentoo.org>
Tue, 25 Aug 2015 03:24:29 +0000 (23:24 -0400)
app-editors/vim-core/Manifest
app-editors/vim-core/vim-core-7.4.827.ebuild [new file with mode: 0644]
app-editors/vim-core/vim-core-9999.ebuild

index fd094a550bb2781e307c6df1fc9fc4b4db887263..386097fa26092f936fa64a76df917d8f59dd21c6 100644 (file)
@@ -5,6 +5,8 @@ DIST vim-7.4.670.patch.xz 845000 SHA256 5ffbb05466c68aea08fda6067a6a46e068beece3
 DIST vim-7.4.712.patch.xz 890304 SHA256 fa385439a55703715704b7163dc7ac4a53908d908bd456af432dd5618144c630 SHA512 639847f6c5e92c5838b259f83ffb8b473e8ad7142589e72e2dcd0d51a9e9d272c29ec4fd4239ee21bcf5599f3cc6cc790aee02fe2b860f7d79ce1d3a811a6dd0 WHIRLPOOL f9fe642fe68f324e2e68d1fcdda80d15e2eac6e7a246561728fa467c90e271cd83aab6b24adfec65977ab12cf0fd9ec5c1848bbfdc2342e63114f321234e95d9
 DIST vim-7.4.738.tar.gz 12178346 SHA256 f95cf39278ca67837538f8146dd4701de4a4da610d95687da252d458137dcb40 SHA512 4ef990c5b869a571f0ddafac7c14ef17b62e2a9e2e74f1adaa8a69f92f3c6f56a21f60a3b53cbb64922df8c709d4e8ba9aee081476ce90f5665b1124a7de9a3a WHIRLPOOL 92e9c019f2e0677fb2db99995f56b49a034abe5da2051d0012c05e6f74ab88070b635e5159c09c6635d69c23fc81afafdc11e37e17e9338a9ca41de9381cd1a1
 DIST vim-7.4.769.tar.gz 12189506 SHA256 d9b9c3af27161545a1e086e1ee9485432c0b1a792a1a59755f04ef94136c5042 SHA512 ce3917cc68dba8b69696eb43436f90347c68a687f1e8c4b2f15f4a232ff7ce1a581a61737042ec49548d78c5f010e55e4c40b051b1a2574bbc27146a9249f15c WHIRLPOOL 230304892e501ef9851bf9f0c9fc9c888bfe1ad2cd703bcd62c449866e28308027c37c7ed466966951ec9c5feb5d9ec82e843528861212cb40a5bf4cec6e8947
+DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
+DIST vim-7.4.827.tar.gz 12203128 SHA256 8920db8115c78d260abbb2757ebf0e1e64d6e2f989626435fffad1ef37a9760f SHA512 e055b71afdde347a45d78ff10a672be8b92d00dc0215febe39db8a0b44474a92b40f728cbbdbb2ceefbe6fa08683eed549880e07e6e97dd44c994b7f669a8e6a WHIRLPOOL e86e3b203c29ffd9b0b6536b7a997377bd0914cdb4f2b8775a4ae1fae2ab44f54b6c007e0d1bb08d8272aa8da596577729a9f004e7cf1f4914bf55c402b468e5
 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
diff --git a/app-editors/vim-core/vim-core-7.4.827.ebuild b/app-editors/vim-core/vim-core-7.4.827.ebuild
new file mode 100644 (file)
index 0000000..145f7d0
--- /dev/null
@@ -0,0 +1,223 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VIM_VERSION="7.4"
+inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
+
+if [[ ${PV} == 9999* ]] ; then
+       inherit git-r3
+       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/~radhermit/vim/vim-7.4.827-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-${PV}
+
+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 [[ -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
+}
index 69dd3419dea146c34f7e42e20a1e43f6d3aa9cf0..145f7d05995171c06b7ba4c5a661fe4f41501857 100644 (file)
@@ -6,15 +6,13 @@ EAPI=5
 VIM_VERSION="7.4"
 inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
 
-MY_PV=${PV//./-}
-
 if [[ ${PV} == 9999* ]] ; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/vim/vim.git"
-       EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${MY_PV}
+       EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
-       SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> vim-${PV}.tar.gz
-               https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
+       SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+               https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-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
 
@@ -28,7 +26,7 @@ IUSE="nls acl minimal"
 DEPEND="sys-devel/autoconf"
 PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
 
-S=${WORKDIR}/vim-${MY_PV}
+S=${WORKDIR}/vim-${PV}
 
 pkg_setup() {
        # people with broken alphabets run into trouble. bug 82186.