From 18a8c5608d3797c64764b3ec6312e15f068d0ecb Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 15 Jul 2015 11:59:58 -0700 Subject: [PATCH] bump(app-editors/vim): sync with upstream Get upstream cross compile fixes. Signed-off-by: Geoff Levand --- .../portage-stable/app-editors/vim/ChangeLog | 8 +- .../portage-stable/app-editors/vim/Manifest | 28 +- .../app-editors/vim/vim-7.4.712.ebuild | 394 ++++++++++++++++++ .../app-editors/vim/vim-9999.ebuild | 4 +- .../md5-cache/app-editors/vim-7.4.712 | 14 + .../metadata/md5-cache/app-editors/vim-9999 | 2 +- 6 files changed, 429 insertions(+), 21 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.712.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.712 diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/ChangeLog b/sdk_container/src/third_party/portage-stable/app-editors/vim/ChangeLog index 3a11e3cb6d..8664792d6f 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-editors/vim # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.495 2015/04/08 07:30:35 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.496 2015/05/03 07:03:35 radhermit Exp $ + +*vim-7.4.712 (03 May 2015) + + 03 May 2015; Tim Harder +vim-7.4.712.ebuild, + vim-9999.ebuild: + Version bump. Set tab indentation to 8 spaces for vimmanpager (bug #545628). 08 Apr 2015; Michał Górny vim-7.4.273.ebuild: Remove old Python implementations diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest b/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest index 40f20fe8e2..fec6efcde7 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest @@ -6,31 +6,25 @@ 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-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a EBUILD vim-7.4.273.ebuild 11562 SHA256 cbc64bcd5136f7c6059e379634e75117062204075001cf861d18a589c6f8535d SHA512 4be49b7831a6f4f3f439a50cd451d92ead238956cf4f6c8a6b6c139ba2d2d04037f1729a01b9ff4013052ff02559b9e67161483d8505b2a8368ed8eaf1363b60 WHIRLPOOL 75f388a488c53842f33b812ad68bf947ec4f51dcae1c7aa1a368ff73c4ed641233b3035432adc4ecf696d7a944ca044f4bf144fc21a48d7568dd5ae846d3b744 EBUILD vim-7.4.591.ebuild 11782 SHA256 128294473a077585ca9cc42be1253e4d6435a218e3108c6ade27f6e77ea74cac SHA512 6d25bba81267cde8042edbad022d83e575935bcfc7449a4ec088ff24a9739ad59d257dc2c65c52e9965067e62206b2a0e706c1fef350b60bbf8b0bb39a7b5402 WHIRLPOOL 824930841411b5972f25f9de55f9280089fa3550bacdc314f1b2ab16462b4df325c7d900455df16cefd205a3524aa50b722b601d7575b43e03d8edf8baeef215 EBUILD vim-7.4.622.ebuild 11824 SHA256 59fa9cb8e2c68b1e45e0a373d6b0357769ff84fe0c7f31aa3958a953f7c31d08 SHA512 8ff58fccf512e60a60467219e02a3f91cde94ef946b70c9d434ab38a76174192acd20a5b8a4d150c2cec7209d7902ee4ec533df5f7023bc7429424cd17bada75 WHIRLPOOL 9b8a741250a2dedc94d5311d6ba8ac04221c4b6f625950e126fd1820df964b457222aea931c43b8359e23789d8a7382928d966c14bb01374a82718591a8e7e06 EBUILD vim-7.4.670.ebuild 11824 SHA256 aaee06a165d34c07de4c7a5f61f6800e2931c337ed378eebaab2b1c30be6635c SHA512 abc9c5476facb773f48ff7b05dbf13e9176e979290458cc27bf8c24a11350dde4b2aeb30283dd9a06e00395b00347dc201216ec22bcbace0267173a8fe417104 WHIRLPOOL a97d951e734d7c1788be7abbb165ca78adb9a8a613429ca4f0c2882417745753a8d0d3aac2c696ef448fcae446e397ca814cfc8135816af2a94ec842a60bf315 -EBUILD vim-9999.ebuild 11820 SHA256 cfc19bca103af412af3360236b51018ec657ac10daa8afc4de99b85119240557 SHA512 08dc40ad08bf27df24e5d62cc38604b17868de6cd06146530715685a0e03f001444e737ec42a9a65c594f3012c5d44890cbb9cce87097c5121be3271e391fcde WHIRLPOOL f27da42993ce505646b9f9eae4f47053d873e6c6562748e75a7111c2cc3ffa601609bac544c8f125736c1a87d76711fa48320867e271fe37632778908262a7d1 -MISC ChangeLog 67045 SHA256 f46ae912073ae45100de163c198657a53b56924bc26c368719a5d73365c16be1 SHA512 4cb86e4c8b5f5ae0deaa98843ee072b9072d36c76ba2fd0022b395f3ad90ad3e9eda312d1556ec8a2bcb7ad6e40610e05fcd83e550fa93c05d9efeb96b15cb89 WHIRLPOOL 8651ee35b8b9b7268d648e8c87086223410fa7a3dca54f0a8ef7d25f9767893e76a1aec494db2858ba0a624b509e27be8ba6c3c6626c20a4ed10b1a948bb122d +EBUILD vim-7.4.712.ebuild 11835 SHA256 650f6760f232d3929be03515bb8d8952f1d79703330fdff230d61650590318a0 SHA512 e094696b268a8b6f9479e5d7828b17e7a68effed7800ea1a3af8efb6f6075762161daba7d36841d4bce64ce828ba2df6198c3ee60f20a21b7ba687914c9d4fee WHIRLPOOL 518e3abebae020ea0d4f40cbff1b046351f44eae24b6aa25093a88f4191f7a894c2ba9864e33656523cedb70aa31c841a073e497411021e6bcc2e42092091d3a +EBUILD vim-9999.ebuild 11831 SHA256 cd88281e41d98622edfd1b277c5a211fc9aaf7d5c786683c6ef45543e23bca76 SHA512 cd62e3989d9bb957001b04dffe790246b67ceb39526cf7daaaad79728717bda14572c89abd4b31dc7df235da5a3ec79945f4320a6ae7663aa2a6e52dba4363ce WHIRLPOOL ec1eee395e28e7f0c24b7dc72f9fad97e0003cb24abed50a81478a5eeeb11c716736d979cdf8865e68aa004157806afd0a012b66e1fe13dba058f87a14aa1d1d +MISC ChangeLog 67245 SHA256 2572a4f06d9f55c43a6fea11e67c1181950d9a68ecc97e5bb2594e6b8e783c17 SHA512 1f8c23ba7c384b016a0fdf0f9c7318656ca8dccddba2522baea4aeeceef8455a6c8b5bbc524d15e2de16f1e646fcb8a38b15eb58eff3e4d53ee241f38df453a7 WHIRLPOOL fbd5db5dd1020de863f300ccd93bbe734d4dcee06a2812fdef4f18b344efb5b261c83657ef42b744f3dadc844ea6017568b95789a7a1bd38087293d216f4d571 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJVJNl4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7p8P/ipbi3kXhCSoh9SjHl/CQWwY -lkvRF1I/tACofRQ7tiw/BFyEhYM7ikws5mM5V4xxVbQgLlbXDWTPRUpmdb6TNKPa -6crFSrgg6hNvka6Ge417o3pxak9Qf8KAEosrMmcjztivoN2+YkislxiihcIrtBEs -AovbqFk6oQlDMyIBI588ROPb6HjSbuHdxBOFuLUMI3gne3O0jL0SqC1HbENThoCA -FveqEAf5vlkLjdzstB5Pu2pJ5rib+rUd9qisK0ipUoOLNgfIiOOI5RdjmIe39nTW -B3I/INWjmXA5e/gC/6pAOsm+q/EsQw+w7PQsox83pdiEM9eubx992uXr/kYVvjiU -NaA6tBumuWAnl2spt0NS6Lm4yFHB+QnpYC3QNu8Y5Zft5SOAZG219F8ZKetrrcGx -8T7XilnLrR670M9pOjynhLPP8naksYSk0Dxprg2CFkVWu2tmBxVSzFJujQlFosEu -pBxKnUI1fypIRI2iRySiLveUxB7ypIJXDAOLfCNizvJIymojFjwhs42I/0h8bHsx -+bnePiEdAkbZzcGE4YEm2Zji+kxSarXeBXhMw8vq4tBnOCUmg/kO1T9ftJxogwZv -ZMTV6cEOmmVHm38We5YRM7JJqzxelSdr6Rm0LBF4F68T2jej+wyLrCDTEqIkzG+D -wre6tceFjvpXrnuZmF5y -=iKtX +iQEcBAEBCAAGBQJVRchGAAoJEEqz6FtPBkyjVx0IAJFbA9Y4p8Kp5yOUYE5nkSfO +GjeVnikityp2LRnexP64AQaDAr42Kjr26E6dvAcjZUTIbA5umMQW+OthFgDYxww3 +Tfiwa/DQHzYAW/jKt+f5rbToUwvpCfI94t0bDT9Ua+6zAfnMXkPn3yCWtMx36UnO +sQ1DYzXkKrW5F4qyDK7PPM81Z2pSKpeKD6p4PjzBHKXqdBT5BOaGqG3IuiroyQUg +fcr+NNi+5dKVhPaMI1dsFGAzxbWo8NHObxyjCDMaYjfwOHaO7CJgyvmX4tYnpU1c +CSw7c8074IGMuMlv1vlKL2dtmtisoGpD6nNcaFtWJQjbiHBZgj8FdbBCpGM+f2Q= +=oAiG -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.712.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.712.ebuild new file mode 100644 index 0000000000..78ed6f0488 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.712.ebuild @@ -0,0 +1,394 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.712.ebuild,v 1.1 2015/05/03 07:03:35 radhermit Exp $ + +EAPI=5 +VIM_VERSION="7.4" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE=threads +inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1 + +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, an improved vi-style text editor" +HOMEPAGE="http://www.vim.org/" + +SLOT="0" +LICENSE="vim" +IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager" +REQUIRED_USE=" + luajit? ( lua ) + python? ( + || ( $(python_gen_useflags '*') ) + ?? ( $(python_gen_useflags 'python2*') ) + ?? ( $(python_gen_useflags 'python3*') ) + ) +" + +RDEPEND=" + >=app-eselect/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2 + nls? ( virtual/libintl ) + acl? ( kernel_linux? ( sys-apps/acl ) ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( + luajit? ( dev-lang/luajit:2= ) + !luajit? ( dev-lang/lua:0[deprecated] ) + ) + !minimal? ( + ~app-editors/vim-core-${PV} + dev-util/ctags + ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) + selinux? ( sys-libs/libselinux ) + tcl? ( dev-lang/tcl:0= ) + X? ( x11-libs/libXt ) +" +DEPEND="${RDEPEND} + sys-devel/autoconf + nls? ( sys-devel/gettext ) +" + +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/\> "$c" ; done + + # conditionally make the manpager.sh script + if use vim-pager ; then + cat <<-END > "${S}"/runtime/macros/manpager.sh + #!/bin/sh + sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ + vim \\ + -c 'let no_plugin_maps = 1' \\ + -c 'set nolist nomod ft=man ts=8' \\ + -c 'let g:showmarks_enable=0' \\ + -c 'runtime! macros/less.vim' - + END + fi + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]] ; then + sed -i '/-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 + + if use minimal ; then + myconf=( + --with-features=tiny + --disable-nls + --disable-multibyte + --disable-acl + --enable-gui=no + --without-x + --disable-darwin + --disable-luainterp + --disable-perlinterp + --disable-pythoninterp + --disable-mzschemeinterp + --disable-rubyinterp + --disable-selinux + --disable-tclinterp + --disable-gpm + ) + else + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + --enable-multibyte + $(use_enable acl) + $(use_enable cscope) + $(use_enable gpm) + $(use_enable lua luainterp) + $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "") + $(use_with luajit) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable racket mzschemeinterp) + $(use_enable ruby rubyinterp) + $(use_enable selinux) + $(use_enable tcl tclinterp) + ) + + if use python ; then + py_add_interp() { + local v + + [[ ${EPYTHON} == python3* ]] && v=3 + myconf+=( + --enable-python${v}interp + vi_cv_path_python${v}="${PYTHON}" + ) + } + + python_foreach_impl py_add_interp + else + myconf+=( + --disable-pythoninterp + --disable-python3interp + ) + fi + + # --with-features=huge forces on cscope even if we --disable it. We need + # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) + if ! use cscope ; then + sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \ + die "couldn't disable cscope" + fi + + # don't test USE=X here ... see bug #19115 + # but need to provide a way to link against X ... see bug #20093 + myconf+=( + --enable-gui=no + --disable-darwin + $(use_with X x) + ) + fi + + # 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} \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + echo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + echo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + echo + + # Don't let vim talk to X + unset DISPLAY + + # We've got to call make test from within testdir, since the Makefiles + # don't pass through our VIMPROG argument + cd "${S}"/src/testdir + + # Test 49 won't work inside a portage environment + einfo "Test 49 isn't sandbox-friendly, so it will be skipped." + sed -i 's~test49.out~~g' Makefile + + # We don't want to rebuild vim before running the tests + sed -i 's,: \$(VIMPROG),: ,' Makefile + + # Don't try to do the additional GUI test + emake -j1 VIMPROG=../vim nongui +} + +# Make convenience symlinks, hopefully without stepping on toes. Some +# of these links are "owned" by the vim ebuild when it is installed, +# but they might be good for gvim as well (see bug 45828) +update_vim_symlinks() { + local f syms + syms="vimdiff rvim rview" + einfo "Calling eselect vi update..." + # Call this with --if-unset to respect user's choice (bug 187449) + eselect vi update --if-unset + + # Make or remove convenience symlink, vim -> gvim + if [[ -f "${EROOT}"/usr/bin/gvim ]]; then + ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null + elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then + rm "${EROOT}"/usr/bin/vim + fi + + # Make or remove convenience symlinks to vim + if [[ -f "${EROOT}"/usr/bin/vim ]]; then + for f in ${syms}; do + ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null + done + else + for f in ${syms}; do + if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then + rm -f "${EROOT}"/usr/bin/${f} + fi + done + fi + + # This will still break if you merge then remove the vi package, + # but there's only so much you can do, eh? Unfortunately we don't + # have triggers like are done in rpm-land. +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are + # managed by eselect-vi + dobin src/vim + dosym vim /usr/bin/vimdiff + dosym vim /usr/bin/rvim + dosym vim /usr/bin/rview + if use vim-pager ; then + dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager + dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager + insinto ${vimfiles}/macros + doins runtime/macros/manpager.sh + fperms a+x ${vimfiles}/macros/manpager.sh + fi + + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + # keep in sync with 'complete ... -F' list + bashcomp_alias vim ex vi view rvim rview vimdiff + + # 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 + + if [[ -z ${REPLACING_VERSIONS} ]] ; then + if use X ; then + echo + elog "The 'X' USE flag enables vim <-> X communication, like" + elog "updating the xterm titlebar. It does not install a GUI." + fi + echo + elog "To install a GUI version of vim, use the app-editors/gvim" + elog "package." + echo + elog "Vim 7 includes an integrated spell checker. You need to install" + elog "word list files before you can use it. There are ebuilds for" + elog "some of these named app-vim/vim-spell-*. If your language of" + elog "choice is not included, please consult vim-spell.eclass for" + elog "instructions on how to make a package." + echo + ewarn "Note that the English word lists are no longer installed by" + ewarn "default." + fi + + # Make convenience symlinks + update_vim_symlinks +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Make convenience symlinks + update_vim_symlinks +} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild index 3415e8ac02..c9e7c51951 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.27 2015/03/31 17:37:10 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.28 2015/05/03 07:03:35 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" @@ -125,7 +125,7 @@ src_prepare() { sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ vim \\ -c 'let no_plugin_maps = 1' \\ - -c 'set nolist nomod ft=man' \\ + -c 'set nolist nomod ft=man ts=8' \\ -c 'let g:showmarks_enable=0' \\ -c 'runtime! macros/less.vim' - END diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.712 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.712 new file mode 100644 index 0000000000..b4f51b5adf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.712 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.712 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) +DESCRIPTION=Vim, an improved vi-style text editor +EAPI=5 +HOMEPAGE=http://www.vim.org/ +IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 +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 +RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.712 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) +REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_3 python_targets_python3_4 ) ) +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 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 +_md5_=b7b826b6e76049cb0ed0e693780b6f6c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-9999 index ebefd30c36..fbdb78f156 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-9999 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-9999 @@ -9,4 +9,4 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/li REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_3 python_targets_python3_4 ) ) SLOT=0 _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 mercurial 2fbda5894dda6392b71334ee9a92de0b multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 -_md5_=d3a3022bf39ae8c9c8274c946b192778 +_md5_=5e4557fc374e444b1426c37b58a4d449