From: Tim Harder Date: Sat, 21 Mar 2015 06:30:34 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8c4e3b731df21b3c1560123f6299cdec8f558ea6;p=gentoo.git Version bump. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x4F064CA3 --- diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog index 08b7a6defcb4..53bb3d550d65 100644 --- a/app-editors/gvim/ChangeLog +++ b/app-editors/gvim/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/gvim # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.456 2015/03/19 15:44:37 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.457 2015/03/21 06:30:32 radhermit Exp $ + +*gvim-7.4.670 (21 Mar 2015) + + 21 Mar 2015; Tim Harder +gvim-7.4.670.ebuild: + Version bump. 19 Mar 2015; Justin Lecher gvim-7.4.273.ebuild, gvim-7.4.488.ebuild, gvim-7.4.527.ebuild, gvim-7.4.542.ebuild, diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index ab3bec8d941e..8a8222843535 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX gvim-completion 1219 SHA256 5786b55da26ee0c5973f6e2b366d304f30cc3801f70c7ac26c515856413b8938 SHA512 08bb32a3c9fcbdd00977b7343dda9cda44b389a13b1717ebddb462e22b6cf9d4db37d5b49ff752b931e305bf57e8f9f4a7d6e32ea25f8acd1b00e5f8320ac132 WHIRLPOOL a080164530c604ae384721356a7b51b60ba401948b3d0ffec386cb9b78320147e9d01118c8538a65815e43f9d432c84185c42032e987f3d8c367745b6638c5db AUX gvim.desktop-r2 171 SHA256 840e4bcac0b448566e26e53b8292f31a9e187360b6aaf75f37929e43c46f22ce SHA512 1e4ceb7776100d00cb4ea70039cc4e7342decffd392c0c8633254c6c0ffa6c0816acbe56b8b03b9302119c473d2e4618b4df0e6e1e2031282e21a66063a1ec3b WHIRLPOOL fd085e75deaecd336f23c784929d6b95b8889cd5aba3c8c0777adc6aaf5a484881bd11d5d7a291972a75b527e82240a9d48ac7668550ddfbe25c903665e54e6a @@ -10,6 +10,7 @@ DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a4 DIST vim-7.4.560.patch.xz 741936 SHA256 e67cb9ba8772c72c3ebed0727e6dd57fc8eaeb1c8087cab7b9b8fe52f9063e04 SHA512 6748efa85883cbe811f4997192f5c0c11ac4825b40a3ef81a9a457eab26d86868aea6f62c8ced7018b3a7758242bd6c8e789fdfb8ce111f4b468f6563bc146fd WHIRLPOOL 45864fdabb133551c66768a4c075588744b99fc823f555ae19a440b2486054e1336c64c50f0bd7e3c1c0c88a0e345595a4bd384cd7dde312ff1465351db869e1 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.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66 @@ -22,25 +23,18 @@ EBUILD gvim-7.4.542.ebuild 12495 SHA256 5d3ba9e0911086a066c1cfcb9cf1576f79fe9727 EBUILD gvim-7.4.560.ebuild 12378 SHA256 f5e977b99676bbc31aec6c04935c7bd3b8adf837154be8507680cb3b5593d748 SHA512 9ccf48e6e684f0ce2d5f4cc8948d968a02c9e535b0b4650f4063b324210d9f49ac0752191a2a3ef0acb68b976db88a605b7bfb7eef1544f931759698a1e6b52a WHIRLPOOL 07a5cd6ae629dfe7290d561f1356991fba09f464c687f8dea416a8b59706369aa9df949728b3646537a73180550e22c374ae4ab7627355fc8c5757c79caaa8d9 EBUILD gvim-7.4.591.ebuild 12320 SHA256 faf28d0f64af63886dd8ee8b620d609af1320fa07b956345d4522d73e9a08f45 SHA512 fca07cd0e9e4d6c21a2e6eed748145d3dbf0d05bb3890e1e515a6aa677635d8c5551a4fec7b71e83bdb137622de387fa9311c47a4af93b42fda6177499462828 WHIRLPOOL b875a07182342480268d7cb006ed7a6cf33a25a71d06d4a9ff799ccba7a92393da5fb2d7b59e0681c1d47e74bd71d56b51fe7ac5aae571e3d2a86132dfb5152b EBUILD gvim-7.4.622.ebuild 12359 SHA256 0781e3907311fce05ce1e2c0098050dc641c0c3184a307b36afa6f9a81f97b62 SHA512 603ba652f2dbea3cc9aa6e201fbe54c5c12cd5a356f5cd15893b94ad3fdd6b5c9a00a9f3a87e09c62910b3b62458770bbebde784c12c9102e2eba1dffe779942 WHIRLPOOL 21f73aefb38f3644c158f1117c70d158bd58e8ad9ad52ef6c992dc963d4eca9a53201143fd9bf2d9f21af7396cfaea5dba39e84927ce6235fc08b644d0c30d27 +EBUILD gvim-7.4.670.ebuild 12364 SHA256 4c3f1abc8a088caf7a4542062ef0a14107add1d78ac39e75971bb6cc92ce7686 SHA512 1ff1c274a9fd9163d2464d0ae4ffb3dc4147d1957260101d46ecbce96ef20c9e523240cd9e04d4ab92787fb0ede8f05ab143387ac6b155f1ea2ff1345c040b04 WHIRLPOOL 3dcfbd881be08f501b944160bc091d5e9aa06f9455718d11bfd75d9a84aaa84ce87b294dc94046052acd9c21e3dd982831ca29baf885800d657d10d1468a083c EBUILD gvim-9999.ebuild 12355 SHA256 262a6a189572a048f45a74eb53c646d64da123eb32b603687fc20428e52d6355 SHA512 3bb588a9e990f50d39567091a18dded44befd73015c7f146250693a362c42ae69279fb9812c95112ce8007d34c8dca5661c14e433fa518307208b4229680d23d WHIRLPOOL df700683cb84c1319a5db55b793fc36b4aa0d81ad11b8d25f0ebac7f3d42afc91e864919e252288ff920b71de4571531e023bc5db96c6785d4e672f5f22d99c3 -MISC ChangeLog 62836 SHA256 6d3b797a50413443d738dddfd4271ac23a5ac47bae1ba64785c0ea2a9254b8b0 SHA512 3dd58dbf744ff291883cb2379b1732ae3dd4c72210a2f9e9dbc53a33633df9b2c17b4ce10734be4a774069a2e9078663fd7b07bb1cd0798f2b5ae5e7555d898e WHIRLPOOL 14aa4dfff51559d0b5272a89ef958c8579d2f0b363fbdcc03626382676289aff879f57735cd98d60216979308dd344bc697ded9bcd4217dc6367e5d0e3809b8b +MISC ChangeLog 62958 SHA256 e0e37271acd9debd3161db05c8c433ab2a34d4322384a1be81c15685addc8ebe SHA512 0df80049f75b3bb22655dfb86a4009c2d0efc55ff2f2683a4ec640d7549773460a58d2d151d40e755e27f17b213286e5516adf81ae6466a8d9d0074959f2833c WHIRLPOOL 0bf506269eb6aec79a4f19d73f7e53a700eaf418ca909875c1319c3753745f6bc5e01873c71b832c6e47f1cfd8f724cdc2831e6bfd9c16fd6f322388aa5e40db MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJ8BAEBCgBmBQJVCu7nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirN3wP/RKgWDeR1EOmx7PFAd8fI3RF -yr56B0sqA9roRg+8kybfC6Y9gGU09Pp4KCeQxwsgs5Xjjju5Bg2tEQnA5cHjKGV5 -l9HV2Kw51Kl02v8uyQ5foJGf2rf9eqwR7zfwU+g3yGU3IEu9wi4c6NuHg9HuMJDR -LXmBBd0PBFJc3PrLm+pNo0NCxu2z/5l12rhARt0GW0T4oWJ2rn5z3hPXLCnKx2qk -BNo1K4xjcyM5rP7wnrfhzHxxftZnoNIu54rbBto856XWOPOX/qMYed1tPxnfdPx6 -1hcgVrCqaZUM5oKaZeriafxf/E0DZ7WBZBEh+9TPSKVZfvQQpOxG5f8B6cTz8Qbs -KYQUZ6ZF1aBIbMKGV0/SX9IX+UaX5HUy5SrU5e1SZH41uiP6+hOc8YQJ/Gmgj5Gf -NzPR6BTfEFRxf5sRC0UhTZZOlF0V4ODUErNrYfxZWxfZgewAyOsrNzmr1V1/YOws -IbJHw2BNkMmeJDZtJrvAmbF9USrFoasdnvCpaSzcUHxasIU7gM+XoP5ZK+HNCh0T -K62cDxUb6uQiPwjJbQUzrqJDMenNkc0jFYmOQzbtAnpvKdXBH38aNIT9YvFfG+sm -CPmzyLOPIw+FqkLUIibVpCHasEp8Gi8ZQKJSkfYvxfVp9vMhWhFBgx5Gd1W/o7dF -85inRMpKf2c16ljunzri -=gI85 +iQEcBAEBCAAGBQJVDRAIAAoJEEqz6FtPBkyjaL8H/1BM2G5O5rFpUd+IVGH8x7gU +WmXhRQqhd0pXvOQZSOik2WmuuB/Em/SIuD0uBMTbejulZFnyidCrajxBlOpqe3fx +U7I+bnq31aQoj3jKViVRUzhnzlQIYco6MJ3KZ7Uk7A9zEEZ92Wc3PmLPU6JN2VYM +q+3K14FbLU4XYGn+enjACa2gSy6evMTDhvSql8WRT5EG0r7xKkKZ00DfDbzQNTFz +c5N5ZSyGpjuy/0cw/ZNCtotxO486k7B153OOtr+rbEwBxCSsERd22nFS2OBkXttj +4c9aoRZYpvQ60FZj7Bl8rE6/2vG2V235yDp+isMRnMdnMhfmL9sS1Xac1cVpgxw= +=SmhB -----END PGP SIGNATURE----- diff --git a/app-editors/gvim/gvim-7.4.670.ebuild b/app-editors/gvim/gvim-7.4.670.ebuild new file mode 100644 index 000000000000..3f4ccf5a240e --- /dev/null +++ b/app-editors/gvim/gvim-7.4.670.ebuild @@ -0,0 +1,420 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.670.ebuild,v 1.1 2015/03/21 06:30:32 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 prefix 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +fi + +DESCRIPTION="GUI version of the Vim text editor" +HOMEPAGE="http://www.vim.org/" + +SLOT="0" +LICENSE="vim" +IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" +REQUIRED_USE=" + luajit? ( lua ) + python? ( + || ( $(python_gen_useflags '*') ) + ?? ( $(python_gen_useflags 'python2*') ) + ?? ( $(python_gen_useflags 'python3*') ) + ) +" + +RDEPEND=" + ~app-editors/vim-core-${PV} + >=app-admin/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2 + x11-libs/libXext + x11-libs/libXt + acl? ( kernel_linux? ( sys-apps/acl ) ) + !aqua? ( + gtk? ( + >=x11-libs/gtk+-2.6:2 + x11-libs/libXft + gnome? ( >=gnome-base/libgnomeui-2.6 ) + ) + !gtk? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + neXt? ( x11-libs/neXtaw ) + !neXt? ( x11-libs/libXaw ) + ) + ) + ) + cscope? ( dev-util/cscope ) + lua? ( + luajit? ( dev-lang/luajit:2= ) + !luajit? ( dev-lang/lua:0[deprecated] ) + ) + nls? ( virtual/libintl ) + 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 ) + session? ( x11-libs/libSM ) + tcl? ( dev-lang/tcl:0= ) +" +DEPEND="${RDEPEND} + dev-util/ctags + sys-devel/autoconf + virtual/pkgconfig + 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 + + # 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 + + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + --disable-gpm + --enable-multibyte + $(use_enable acl) + $(use_enable cscope) + $(use_enable lua luainterp) + $(use_with luajit) + $(use_enable netbeans) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable racket mzschemeinterp) + $(use_enable ruby rubyinterp) + $(use_enable selinux) + $(use_enable session xsmp) + $(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 + + # gvim's GUI preference order is as follows: + # aqua CARBON (not tested) + # -aqua gtk gnome GNOME2 + # -aqua gtk -gnome GTK2 + # -aqua -gtk motif MOTIF + # -aqua -gtk -motif neXt NEXTAW + # -aqua -gtk -motif -neXt ATHENA + echo ; echo + if use aqua ; then + einfo "Building gvim with the Carbon GUI" + myconf+=( + --enable-darwin + --enable-gui=carbon + ) + elif use gtk ; then + myconf+=( --enable-gtk2-check ) + if use gnome ; then + einfo "Building gvim with the Gnome 2 GUI" + myconf+=( --enable-gui=gnome2 ) + else + einfo "Building gvim with the gtk+-2 GUI" + myconf+=( --enable-gui=gtk2 ) + fi + elif use motif ; then + einfo "Building gvim with the MOTIF GUI" + myconf+=( --enable-gui=motif ) + elif use neXt ; then + einfo "Building gvim with the neXtaw GUI" + myconf+=( --enable-gui=nextaw ) + else + einfo "Building gvim with the Athena GUI" + myconf+=( --enable-gui=athena ) + fi + echo ; echo + + # 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 ) + + if [[ ${CHOST} == *-interix* ]]; then + # avoid finding of this function, to avoid having to patch either + # configure or the source, which would be much more hackish. + # after all vim does it right, only interix is badly broken (again) + export ac_cv_func_sigaction=no + fi + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --with-vim-name=gvim \ + --with-x \ + "${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 + + # Make gvim not try to connect to X. See :help gui-x11-start + # in vim for how this evil trickery works. + ln -s "${S}"/src/gvim "${S}"/src/testvim + + # Don't try to do the additional GUI test + emake -j1 VIMPROG=../testvim 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/.} + + dobin src/gvim + dosym gvim /usr/bin/gvimdiff + dosym gvim /usr/bin/evim + dosym gvim /usr/bin/eview + dosym gvim /usr/bin/gview + dosym gvim /usr/bin/rgvim + dosym gvim /usr/bin/rgview + + dodir /usr/share/man/man1 + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 + echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 + + insinto /etc/vim + newins "${FILESDIR}"/gvimrc-r1 gvimrc + eprefixify "${ED}"/etc/vim/gvimrc + + newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop + doicon "${FILESDIR}"/gvim.xpm + + # bash completion script, bug #79018. + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # 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 + + # Update fdo mime stuff, bug #78394 + fdo-mime_mime_database_update + + if [[ -z ${REPLACING_VERSIONS} ]] ; then + 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." + echo + fi + + # Make convenience symlinks + update_vim_symlinks +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Update fdo mime stuff, bug #78394 + fdo-mime_mime_database_update + + # Make convenience symlinks + update_vim_symlinks +} diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog index 1ee3b9f4e87a..e988b8786427 100644 --- a/app-editors/vim-core/ChangeLog +++ b/app-editors/vim-core/ChangeLog @@ -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.461 2015/02/28 22:26:04 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.462 2015/03/21 06:28:50 radhermit Exp $ + +*vim-core-7.4.670 (21 Mar 2015) + + 21 Mar 2015; Tim Harder +vim-core-7.4.670.ebuild: + Version bump. 28 Feb 2015; vim-core-7.4.591.ebuild: stable on arm64 diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index dbef6b3a8c16..dded318b4a22 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX vimrc-r4 6919 SHA256 9c59acc4c486a2aca5c6e5e297f13521a8ec57ebd540ec9ab846112fbb3e5c39 SHA512 f4ea9d2865e400d9b205ee8924b1152fa38434d1b73c67bcfceda18f737db8c8763701e12a3608465ef5409e74bfe6b5581a500577c826a16f3112bea49d63a9 WHIRLPOOL 7c7263db7b219cb845e15968c268c25614610696d6e5b6c508662b30640392aeb9f823ef4f74873ad2785dd354eb32ea612794ddab896f63bd4a24c53b38f182 AUX xxd-completion 461 SHA256 580064ca4db3ac149fd89c743bd9946241220c211721f978f7a3ef97b3c171df SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c WHIRLPOOL 65324afb44612f1dd8f8850b7caa8524cff055d83aaad74c5b5030787463d0a95dbe0ce1b91c1a7b7f3e6954db3c0608ac2a2e1e75572af94e83758237b18447 DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34 @@ -5,6 +8,7 @@ DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a4 DIST vim-7.4.560.patch.xz 741936 SHA256 e67cb9ba8772c72c3ebed0727e6dd57fc8eaeb1c8087cab7b9b8fe52f9063e04 SHA512 6748efa85883cbe811f4997192f5c0c11ac4825b40a3ef81a9a457eab26d86868aea6f62c8ced7018b3a7758242bd6c8e789fdfb8ce111f4b468f6563bc146fd WHIRLPOOL 45864fdabb133551c66768a4c075588744b99fc823f555ae19a440b2486054e1336c64c50f0bd7e3c1c0c88a0e345595a4bd384cd7dde312ff1465351db869e1 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.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 @@ -18,6 +22,18 @@ EBUILD vim-core-7.4.542.ebuild 7295 SHA256 de9c01a6270db1e8a5bc97545d018bda8b2b0 EBUILD vim-core-7.4.560.ebuild 7280 SHA256 8eb7eee82c150f763618d2f8bd307298c3c63fb705f36dd8a1c15b34c1f425ce SHA512 ddafadbc1a848349356e53740593e8baecf40bc69bd7dbbe4c5e40112bf2af44c6fb94933ee963c0b2906af8791cd76b7bd9cf20d419f3885c54dd031dafacf0 WHIRLPOOL 75d747511b55294408f1e8199fc449555c0b87cec86693eea7c48b02c4958d003aab207813966f0e4be2b2a840fbf870bbba7d53c8c219af219d36a7346c3930 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-9999.ebuild 7281 SHA256 1c2447ac314f57288405a460470ef0f85b720991d8c70d1a17d00f5533f8597c SHA512 c045c66c69024d2ac0b6c6f3e48d4dad58496ad54ac30e27e6fb416bb6e397826b539cfd6abf118e7bd14a758b49eee6baa66f00af9e1f56f2b0b52cafacac55 WHIRLPOOL 8e192352ea56a0900526748f86231ddb7d6da42a3233bfb3df81559f7d8cd818118f159857d45f47d13f4af07f63f5306fb6bf57291daa10e5bb0cdd8eb5abc6 -MISC ChangeLog 62702 SHA256 5ac44fc1def88bc6ac2c3bd1db6f1753c14b7604c1c9dbabeaeb7888f216980f SHA512 169741f61c758e70cc20e098c475497aa2b77ec73dcd216550d028343f7ac7dd54bedc86a7eab1c67ab43d08bb17f32b80fec7daa6e4778085411a0c12e91252 WHIRLPOOL 8d9478fe34a5f072422e1d5968d4e5de279c7966eaac54e088d0e13df591417c3427bd951963ec89cefb11824c0b358ccd1ec2cefdb2c853c5af540af024875b +MISC ChangeLog 62831 SHA256 53dd03c7dda9539e70e06c8c7e93bba0733e1393366547ae642df95094d0ad99 SHA512 ed868f9aa4373c47df77bf4e951a47b13020ab9552d0ebf9242fe69ca536990318aa69d9f0205777d2c84e5620f24bdc5cba30fcddfde114cc7ea1ef62f8ab30 WHIRLPOOL a8fb092650197bd67f3e5e5135b060e8ff99f3f6707f404381508e490a51cd05a457b47f582c2fc9b31fd05e3a9feb031dd34f2f1bef604f04cd7a1eb2700fc4 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAEBCAAGBQJVDQ+lAAoJEEqz6FtPBkyjWfkH/RnHH9cJox6+5GucA+kRocfr +9AECaS9QEgkux7PXsD4Qbc4St6Rl1GDrkcbQjggKTue1hXBOsXeDcC2VaFA7je3f +tczaJFpkGAG+2sCjlpk9jdkjNWpGLCT4smc/WKiVyRA+gS78033dHk3/+DORzwSM +F5S6Aqdambr3GtHoE3abJbpvfPKWEZ/sYLcupHGYxi8YLS+A1ur962gozo11pyqY +7RO8xqEiY6lX456ffE74xl0neG8DDBULURqhw9FhuJDEtmdowFlmQU4As7JQmueR +BUFAsZxRy/rD9uQTu6YgQs9RusH98m6eSpfOXhg1ivYBjj88Iai214LRpVsIDu0= +=8YHP +-----END PGP SIGNATURE----- diff --git a/app-editors/vim-core/vim-core-7.4.670.ebuild b/app-editors/vim-core/vim-core-7.4.670.ebuild new file mode 100644 index 000000000000..a1fc6eefe397 --- /dev/null +++ b/app-editors/vim-core/vim-core-7.4.670.ebuild @@ -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.670.ebuild,v 1.1 2015/03/21 06:28:50 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/\> "$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 +} diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog index f6e8e07c56cf..e0b5eb3912ca 100644 --- a/app-editors/vim/ChangeLog +++ b/app-editors/vim/ChangeLog @@ -1,6 +1,11 @@ # 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.491 2015/03/19 16:24:20 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.492 2015/03/21 06:29:33 radhermit Exp $ + +*vim-7.4.670 (21 Mar 2015) + + 21 Mar 2015; Tim Harder +vim-7.4.670.ebuild: + Version bump. 19 Mar 2015; Justin Lecher vim-7.4.273.ebuild, vim-7.4.488.ebuild, vim-7.4.527.ebuild, vim-7.4.542.ebuild, diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index 61edd16a904c..a5982792256c 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX vim-completion 1004 SHA256 8191a5a47e03de62d67ad6936259c8eb005e50b52d94994bcf4164e54ffefdae SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41 WHIRLPOOL 0f5d9ed640ecd3520c79e9abb4473bbca66f145106d2c997791eacf6f0f93131f102d55b2f056f87484c5d5ca781af958fd48f1a24e2c2c1a4ac1be378700f84 DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34 @@ -7,6 +7,7 @@ DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a4 DIST vim-7.4.560.patch.xz 741936 SHA256 e67cb9ba8772c72c3ebed0727e6dd57fc8eaeb1c8087cab7b9b8fe52f9063e04 SHA512 6748efa85883cbe811f4997192f5c0c11ac4825b40a3ef81a9a457eab26d86868aea6f62c8ced7018b3a7758242bd6c8e789fdfb8ce111f4b468f6563bc146fd WHIRLPOOL 45864fdabb133551c66768a4c075588744b99fc823f555ae19a440b2486054e1336c64c50f0bd7e3c1c0c88a0e345595a4bd384cd7dde312ff1465351db869e1 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.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66 @@ -19,25 +20,18 @@ EBUILD vim-7.4.542.ebuild 12003 SHA256 d34f21a0485ac6dc9ad03f13262e9edb837255a41 EBUILD vim-7.4.560.ebuild 11840 SHA256 0975356980a0e6e5100b85509f3e405ac1f403fc1b715b7cda8a3495855922ab SHA512 5bb81348e2558882893d3ab505a4f02a0f738aad8e181f1f6f5db429ad4893474faa10370f149187eac3702becfc29093687808786676e874f1447df20f68b08 WHIRLPOOL 3ca7f3498881f0b8135ba016bae150dbff19450b4f270c7a1b4efa11e7efca183727752d3419b2697463b5b9aa7bc2e32ae05a3fe39ad615a1e6e914237f688d EBUILD vim-7.4.591.ebuild 11781 SHA256 b5d5649e595f375578c2eabfe26e5755fe66e444b4fb72ef7e91c26bb57134a8 SHA512 e3aa616db2a1e87935d339e0497c503e0ade30e0f8568a2ccd8df76cdaa0741f2ac9766a75d4d343f2397dbd7325fd9464cc41098ab44d4cfb398a55c33200bc WHIRLPOOL 4ab7b422c39f46e14919254935ba3b0d39b685c755d5f76f3c85b7a0ca15c8a1ba1d8504644fe08e1a0ad17c0247f7f11e790bfde984190ff0ffe92e14ce4572 EBUILD vim-7.4.622.ebuild 11823 SHA256 13d7293105c20504427a3acc8724c3f7b221031531fd08af2ffdb9de37be562d SHA512 1f8a239caeaae155885a1d81eda6e24094327474e9d11200e384e104ceb50be9861be6a34bb8de5d2f7cf879901724e5b7653d5fcd1041f932bfed041097e5e5 WHIRLPOOL d87b781cbd70ee4c505f13090ebae891eb437a4cb4dd6c03b2f07ca6c0176cad6206dfc265671a287b7d777ff5f141b32571a4d495ce2da8a0ca779d5758f136 +EBUILD vim-7.4.670.ebuild 11828 SHA256 44a14da050810fc533722ddc284f6fb389046eae0cfa0595e67d85dd62e69f4f SHA512 98c0dd070b501a5bba0940035fd2eb93a811cd2e9edd415b164c6e72d9a5e27c15b5954f2ba3ddddbbd71cc808e30ab61b85dcb316cda0a157256dd0d8e7922f WHIRLPOOL bb0585ebaee278c8029b5f01d9bfb5723f1b6f2daa4d874231a952f7f48b7e517ea16aa33f2dd66aecfd9b6f444bb7bb91a6a75a2f06e389d635b63082b32ab2 EBUILD vim-9999.ebuild 11819 SHA256 7080e417e76f2d97f6693aff777078983c9f2bc0f6e05923eee896c4e2788a3f SHA512 65b29d2eeebd1aa3c505facc8bc82b09ff104e2922b70f31300f90eab3ff4d8969252346766006e92f8121e0860e069faa64ad299671ebb561daee2b0c1901bd WHIRLPOOL 746ca677679b37293cf7159947afb973f674736b4cab3874688d0dbab484c2e1bf58fbd88742ba71600bc0e7d0bddbb8c118c1dee60731749a9ce71a67611a66 -MISC ChangeLog 66450 SHA256 ebc22177c6e7a5cd6da39e663678c849e6595a903719c8f5a41a7aebc8c352a1 SHA512 0eb1fcf8fd3d4048fd08f50e06c3b2a1e70ffc4371836cb4756d45e2df93c07a8881967d06d157eb8798c74257ef4a16ec6c390fa25ad3516ecf398f4534623d WHIRLPOOL c3ce531248ac3230451a809545b01e9d1f235f78bd4279cbe0ea5dda4d27cff6b5916d25eca88bfb9578b39c7fb4e6bcb372daf084fb84b04ea690b9b1b03fc9 +MISC ChangeLog 66570 SHA256 651badacfda071f162810b2c5550b7c49cd024e1b65f576fbc3e4be6b486e59d SHA512 f741f9a12dcb5df08ebf62e4fe2b8c37c0d50a8f56f3b9bb15746e1b3abc5900a980b33fbfb1dee47afffd4d3178d0cd8edeaf0490b5ed32e05ef6d6cb248831 WHIRLPOOL 9696fbb7bf3abd82a86dc11bddf5be236e006666a54a6a98e65315588dcccef339738d362b42253ab8794bac32d07dc58a08995fd1041930f505fd7509bebf2d MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJ8BAEBCgBmBQJVCvg2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirg+cQAI+Ch0Nd6kG++s4OgS4izLm2 -ph8BRYKAnlO76ef81YBCO6MbWRA9I9dSXWkojobWr0oOxWB5ji0NHuV0wNQG4nDl -FbYRYxhRkXXjYjBLQ8YW/03hfkoYh5Jr7CtMd/IQmuNp4voUuIER/I8VIgpEHIYJ -Lxv4cz6ZpB7pm5XX/MNNYHU0WvR5iWFjo7CXQ+gunNI/V9CQB0x1nM72ARMp/VaY -KIesfV6TS+i7Ugfw2qt8c1FdSOH3tKcMPMgK4ZGOVC+jhbOQhzh7MMwoz4WGuOnU -/hrTAyVJJNOOIEc/czKea5/F/Ybhz11qYp1qbmDdN7PwdjtX9kaGhEEcwnDYPzMq -5qlmlPT2aZJXL0s07HJasDhkmjYoDHeEJN3vIe+K8Hq/zEMsSryM9b2WMx/UyBXO -/Pl9eLL/wpt9lk7+wmjjfT4bGsloOuh6s3gCBc19gMd+vED1PAVcpZ0EoyC8P5vQ -1EKl8sBD+mwHesOTuqiYJo8cRWy+tKnUeAU20CMEB6Whub0ZTQmwGJjseu+CXb0M -lasOqoYlYHfJfBdwamnGMv47Kwn/Mw9M4nbNNs4MCiUzsN07UUNKfNb/aZp/4EAm -Iss8di/ZASEn9MKWq3fm1EKRc9XTuHx38LjgluvlQTXYufdZKBHrK9qMAKNqWZMI -4YRZPfRxwLyG8OHG1GWM -=HK6w +iQEcBAEBCAAGBQJVDQ/NAAoJEEqz6FtPBkyj6/YIAKxd2or9eJs+YPcbqIzC7XcF +fopPgcaSgUN3ngs/YmfFwWSavC3DzfY+AvJSj/od4MLDGcxTgiHIZCnTupNMHg7k +mcHWNy0NJ77x6bpq8sxkvWtIVLUP9PiJMwfjb6SxwmGgNtEMseGxv0Eu1/UxawkN +c6xFeE6WnoII2hKHruo4Sgh8GM7fRWq1XbOgHd7RZJIaGYChSNnVWBApdnnwpPLV +8xnZGjB3QJ9Kf6dhWOGfIE7INH8XeZfwWCjVVMC8EnpvEqmKBjSl+LPjPZ0Fyp/x +MGBD6KXDSu2Vh0ysqdGnUfimoE75AF9JFKIhyi/lI9dk//95Fwdy06L4Wvu0eVo= +=4H4y -----END PGP SIGNATURE----- diff --git a/app-editors/vim/vim-7.4.670.ebuild b/app-editors/vim/vim-7.4.670.ebuild new file mode 100644 index 000000000000..6def461b6106 --- /dev/null +++ b/app-editors/vim/vim-7.4.670.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.670.ebuild,v 1.1 2015/03/21 06:29:33 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-admin/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' \\ + -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 +}