From 19f9e7e19d99de8add1d940e25667b70f3a84e2f Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Mon, 24 Nov 2014 03:47:10 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3 --- app-editors/gvim/ChangeLog | 7 +- app-editors/gvim/Manifest | 18 +- app-editors/gvim/gvim-7.4.527.ebuild | 405 +++++++++++++++++++++++++++ app-editors/vim/ChangeLog | 7 +- app-editors/vim/Manifest | 18 +- app-editors/vim/vim-7.4.527.ebuild | 378 +++++++++++++++++++++++++ 6 files changed, 815 insertions(+), 18 deletions(-) create mode 100644 app-editors/gvim/gvim-7.4.527.ebuild create mode 100644 app-editors/vim/vim-7.4.527.ebuild diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog index 42c6cacc9d28..1b81ef1a33a7 100644 --- a/app-editors/gvim/ChangeLog +++ b/app-editors/gvim/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/gvim # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.443 2014/10/26 17:52:52 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.444 2014/11/24 03:47:09 radhermit Exp $ + +*gvim-7.4.527 (24 Nov 2014) + + 24 Nov 2014; Tim Harder +gvim-7.4.527.ebuild: + Version bump. *gvim-7.4.488 (26 Oct 2014) diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index 24833991037f..5388fe1ed258 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -19,23 +19,25 @@ DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f DIST vim-patches-7.4.430.patch.bz2 680438 SHA256 173ebaaf7e39e9cc9face31e6f8269ec7e5880998a8b846a80f88bc65fa40be3 SHA512 dd58e693286bf73d49a3f0625d597fc88c6a72eb386eae9f8e656854ac42f92a3e0bc0b43efd23e55d65040ec4f767ab48366753736b1b843b85c2a738829a54 WHIRLPOOL 7ce6e2de659103edf2dc5ff09c66fbe3d24d5f1fcaf34e49daef65a1d5f498c9326c5384615cb011848d60fb5ec538a531b28f63d2c2f9a51db979bf3141086e DIST vim-patches-7.4.475.patch.bz2 704060 SHA256 35e1f82629e888865d03ddf8647554a607d94fc5ba33502822fa171d4914aba3 SHA512 80e26c872793604b6ff76bbb9b63d10ed9633b448008158d2f2538e9a18c62f7070b5f014b221643d2e97d0d6f7812ffc8a038f7acb2e1558ac5a083d6db8ee0 WHIRLPOOL 983c51f3d1220ab0512491f04e72cbf90a2891d44c578dcde043737a700c329cc3a090f3d2bf581ad4a23b6765bb72517f76520da1299ea8a65c6ac5957578da DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66 +DIST vim-patches-7.4.527.patch.bz2 791537 SHA256 18cc9809e5322ea121c0326246d268bd7e8a56457fa00c12756538f0efa4d80b SHA512 55cfe5be9a4f356c8053450b55c79a8ecb38a64a77a97613e020de6ff9149508f7298a9ac3adb2b830e7cc1d68e183986ceb894401a8cce011e020371286f8cc WHIRLPOOL a7d443387705bd89ff7ea17b915842f8d055640546715836555361de0d7d6bfc82b9211cedfa51ebf2b4b8fbb294dcb6940007e1884a53e5ad7dc4f352ede4df EBUILD gvim-7.3.1214.ebuild 1067 SHA256 d005488811ca107f47fcc78d63d4bc7fcfd17232eaa8f43a553fbe4e14c81b5d SHA512 a0e321432369a986810cd7ac1201247e42c1693331de7e4de234f204b7b943ef8e9cc689bde0122082a984583ce9c36ec5ecf1136df3a8fb451493fde8cef484 WHIRLPOOL 2a3a10f491937a96980f6207c1309ab3df46336d589b812ab2e1748698f19194e7fe44eca07b21f0f88b0297e742372f7eba1337d40add870929b2ee860ab783 EBUILD gvim-7.3.762.ebuild 958 SHA256 19a7ce0d8ad24047c022c866046ec63aab92efa911e87dea3d83f7e4b33e7dd9 SHA512 3966bd3a5cb514f99cc3ee5718b09a3fcb8eaf2e71c118a255a3ffc496b64d116a5321719a3773d38743b9552408bc2655373753a9e1b8e5f571d848226253e3 WHIRLPOOL 8095463dd1ed4bbace9ef0fbb9a2ce74fc49f1c1f431fc9ce83e8eed4d23c97f1eb54e90575baaa77b928eacf659322076256e511b045896b94e1ec5479fe5ce EBUILD gvim-7.4.273.ebuild 12234 SHA256 9cccb531e99c93d8f4d2b51a7a9d50dc9b749beb3288938aac680b40721a2c47 SHA512 b961d123615be81d14ed802915ee48362fd9f0636326e541d6f584640e1e6faef9193e3a736f474064d3ee20521e1ae79d65fa947735a583cdbb68f541131975 WHIRLPOOL a176ff75f895dfda802da8099e6c5a32fff6cbf0616e31025179f1c9addde981d91ef253e1cf50d940b2f38789fb652f87af3aa389cfd76157bde772a3b01d71 EBUILD gvim-7.4.430.ebuild 12603 SHA256 fbb17afa454c85e8dac1dd925662edd347f94df9f6db35c48513d3cde210edc5 SHA512 674239cf064df438910e9945851e8439b55582180885160b00cfe9198c881d95ae459980d252209900cfacb280dca020ccb2ac35260cf43224c3632fdb9d97ab WHIRLPOOL 570f5b09d27e920659e984d454bca1217b58c030697cb41fae73c201cf5abee243df3f458da436762b529908ad7116d87187adc8b9900f8d0c673d9ff1f10f02 EBUILD gvim-7.4.475.ebuild 12498 SHA256 d746afaaa070d5be60481bbabec1d20a9ddd3fca2b9c0e093171f566f51fec81 SHA512 34de2483f7fa3f738d035898d806ebd46b725b9df17b2beb02eef83ba25384d8f21c85880773a63fb025cb012d129af4cc844e353ddebac79659677b8e3c5d3d WHIRLPOOL f04142b405f76f91dc5ba955fa71f1ece8443c55243a74fea76c9c76500947faba04e348d2eb98f9c76973c38392df0934b1324b3de4b72d1af5f1a1ecfab439 EBUILD gvim-7.4.488.ebuild 12499 SHA256 dd3d5bcd1cb9c8ecf3a81a0a4e0b6b4ef4d62e7f238fcce1a1abcf9471b24869 SHA512 5b03dc4933db8a60fee2fd892b47d6d9b539b0f4632d335571c1de651d548d19feff15067c76f3c873cc04f85493da44aea3bd2e39e81620fc2c290f640fa6e5 WHIRLPOOL b8bb0bf01229a794ac7ea4a08ff62651ec2c312c5139473f50809fe7293f084eb324ccacb8181316bb3bcefcc97339da59d50dcbddf934690a673ef38c7568e9 +EBUILD gvim-7.4.527.ebuild 12499 SHA256 540c8cc4f04a1111586b8a89e42b31d0ec405369d6ff3e6bfc71372da554a002 SHA512 97ab0336f11b2d4699933306e0c6d71d6a28cb62af8dc27bf317772df5d1d4015fd9c5fa4a76812ee021601b6d8efc6369411747f9791a30aa1deaa14f326aad WHIRLPOOL 302abd8bf71431728a7c4a5831427ab6037ca5cbf2fbcf076dbda1ebbb28d7c5b98080e1a6fcfb9313be318a1e54780719d3ad11d52991962aed110a35a34b60 EBUILD gvim-9999.ebuild 12497 SHA256 7d8ced3e84e1e59bc7c73317c39a9df2dad89b682a61cf7818cc72c5043d49b4 SHA512 954c1125ec995d73c660844c4f8da715b877e7229639de160a9263a528532903c80fe82856d486f8c22a5ee194fd4fea3a19e162c1a7ec5327ac81a073c15e28 WHIRLPOOL 0b5a7203474d47cab09b064abfcf47f0514f4f05356d287121c08f5d4f3fbbddd06fb3e9f8f577f8640f2ff421838309ebf1a8629d40dddf5eba7766130df2e6 -MISC ChangeLog 60798 SHA256 bcc6840b6cffdb6efdace9a235ff936f3dc515d12f03c77df37b95a6ae63e303 SHA512 a708ec31c27382f709407db64d15a354ec2a87d2e4fd4f7efc25501ff88c1740e0fcd40a40ef162fd531ce67c75bad219920049aff906762ae02421a8172d5c6 WHIRLPOOL 6ba8e07b3e885d92b2577ef2f61e134e187a8e0c46ed9b19953e1f419023d49996d2301dfc480943ddf8b3228b665f2de84c8d7966eb53af1d3a40b51b42141e +MISC ChangeLog 60915 SHA256 c209672bd1cee2cc52cb5e54bfec2e36a820457e9be202454f40899309f12e19 SHA512 965909c4a4130a005ae9b37b79ca8df595008152ad4f42a01767e97fcb7fcbe00b57200a6395fbd42a9bd88768d4bedd7c6c2280fc011154fab552aa34d825e1 WHIRLPOOL a8e8cbca536d1d57a9854ea996a1d6a5d557bb37be27ef154ea8b60287c8c1a7579a016709838f078c497ad83e057f7b4b391a592dfc6a423cd4ba96f54e251e MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUTTT4AAoJEEqz6FtPBkyjF7UIAI02qxLppYPDvC5Bym4kfIxK -Q/pjZQqGZrY/qMXGpDlZbhPV+HAMHuqyR72g1OCuVnqH8wCHcyMv1+M3KjgVoq+H -4RagRc9613WU4qVqU5DTRmNJ2RU5V7RzwHpJeZYKOdkKqmnFOB42l+Ddf+pihRN5 -CgMBexo+EWqTX4ZgwBrFJbKi2a1pc2eDRui9/LCu1UxeADN0jcM8CxYF4ndbmvno -0xQ03feBYL1VwXTYBQsR+Asyl541SDmrO69FP9Jlk+jJcR/ADA+leqVCLMAEhJUU -IT/3tYO//w7Q91wsylLgyIhaXW1dCnN9gRWR4bPnVBMr1X0p/UXpQCTtC6IDIMQ= -=9JR/ +iQEcBAEBCAAGBQJUcqpEAAoJEEqz6FtPBkyjdvcH/0ry8LA8or+jS6c3mDaziEpw +1SiIdCs6kFHZgt5aQv1lKGNxhCO8xwQneYMslXeJc+IDr/MlxbW2xu2HkrDf4qCu +D1SMgQHSqa/VOv7ERAnI+CeGYDaYhP2qGtmc3x9etDDeTkWFtpUTK9ejYLBDfHsM +Or1dvmPoeyxd+UxQhsVDYpn1ury2inOOyPMDshzP3ImFZ//6C+hh6na4nBpeK01B +cnRXTdHzrixQRln8wS33xrnd8Hy/Z5f78J3Ow+G5KgrPFBICz1jK5GSSp32/NAwx +JMbSMqq3d9S2Af/KJmz77dRNYjQr7INdU00uq3P0LVpyVX6yX4l/+qQOkuTtrbk= +=VXQr -----END PGP SIGNATURE----- diff --git a/app-editors/gvim/gvim-7.4.527.ebuild b/app-editors/gvim/gvim-7.4.527.ebuild new file mode 100644 index 000000000000..d3eb29530fb7 --- /dev/null +++ b/app-editors/gvim/gvim-7.4.527.ebuild @@ -0,0 +1,405 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.527.ebuild,v 1.1 2014/11/24 03:47:09 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-single-r1 + +if [[ ${PV} == 9999* ]] ; then + inherit mercurial + EHG_REPO_URI="https://vim.googlecode.com/hg/" + EHG_PROJECT="vim" +else + VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2" + SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES} + http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-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=" + python? ( ${PYTHON_REQUIRED_USE} ) + luajit? ( lua ) +" + +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 ) + !luajit? ( dev-lang/lua[deprecated] ) + ) + nls? ( virtual/libintl ) + perl? ( dev-lang/perl ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) ) + selinux? ( sys-libs/libselinux ) + session? ( x11-libs/libSM ) + tcl? ( dev-lang/tcl ) +" +DEPEND="${RDEPEND} + >=app-admin/eselect-vi-1.1 + 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 + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then + # Apply any patches available from vim.org for this version + epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} + 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" + myconf+=" $(use_enable acl)" + myconf+=" $(use_enable cscope)" + myconf+=" $(use_enable lua luainterp)" + myconf+=" $(use_with luajit)" + myconf+=" $(use_enable netbeans)" + myconf+=" $(use_enable nls)" + myconf+=" $(use_enable perl perlinterp)" + myconf+=" $(use_enable racket mzschemeinterp)" + myconf+=" $(use_enable ruby rubyinterp)" + myconf+=" $(use_enable selinux)" + myconf+=" $(use_enable session xsmp)" + myconf+=" $(use_enable tcl tclinterp)" + + if use python ; then + if [[ ${EPYTHON} == python3* ]] ; then + myconf+=" --enable-python3interp" + export vi_cv_path_python3="${PYTHON}" + else + myconf+=" --enable-pythoninterp" + export vi_cv_path_python="${PYTHON}" + fi + 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() { + has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}" + 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/ChangeLog b/app-editors/vim/ChangeLog index d501a81f1432..04679f0fbfa5 100644 --- a/app-editors/vim/ChangeLog +++ b/app-editors/vim/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/vim # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.476 2014/10/26 17:51:35 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.477 2014/11/24 03:45:46 radhermit Exp $ + +*vim-7.4.527 (24 Nov 2014) + + 24 Nov 2014; Tim Harder +vim-7.4.527.ebuild: + Version bump. *vim-7.4.488 (26 Oct 2014) diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index 103107c58d13..8b76924c7b15 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -15,23 +15,25 @@ DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f DIST vim-patches-7.4.430.patch.bz2 680438 SHA256 173ebaaf7e39e9cc9face31e6f8269ec7e5880998a8b846a80f88bc65fa40be3 SHA512 dd58e693286bf73d49a3f0625d597fc88c6a72eb386eae9f8e656854ac42f92a3e0bc0b43efd23e55d65040ec4f767ab48366753736b1b843b85c2a738829a54 WHIRLPOOL 7ce6e2de659103edf2dc5ff09c66fbe3d24d5f1fcaf34e49daef65a1d5f498c9326c5384615cb011848d60fb5ec538a531b28f63d2c2f9a51db979bf3141086e DIST vim-patches-7.4.475.patch.bz2 704060 SHA256 35e1f82629e888865d03ddf8647554a607d94fc5ba33502822fa171d4914aba3 SHA512 80e26c872793604b6ff76bbb9b63d10ed9633b448008158d2f2538e9a18c62f7070b5f014b221643d2e97d0d6f7812ffc8a038f7acb2e1558ac5a083d6db8ee0 WHIRLPOOL 983c51f3d1220ab0512491f04e72cbf90a2891d44c578dcde043737a700c329cc3a090f3d2bf581ad4a23b6765bb72517f76520da1299ea8a65c6ac5957578da DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66 +DIST vim-patches-7.4.527.patch.bz2 791537 SHA256 18cc9809e5322ea121c0326246d268bd7e8a56457fa00c12756538f0efa4d80b SHA512 55cfe5be9a4f356c8053450b55c79a8ecb38a64a77a97613e020de6ff9149508f7298a9ac3adb2b830e7cc1d68e183986ceb894401a8cce011e020371286f8cc WHIRLPOOL a7d443387705bd89ff7ea17b915842f8d055640546715836555361de0d7d6bfc82b9211cedfa51ebf2b4b8fbb294dcb6940007e1884a53e5ad7dc4f352ede4df EBUILD vim-7.3.1214.ebuild 1125 SHA256 682ed73f4a04ba569fe9dcde80a8d4296e0cdc9a3a2e14dcfe06e8d77603f6e2 SHA512 24b9e32030ff1fbf246575d05fcbd0a34edf91a5af5a2b5c46c54e53e76f015b6b796ea81714dc2215ae61adfec95d80b0410ed918647017e1df69235f5978a8 WHIRLPOOL 2c2966e9756b8432c2a9a58db84fecdc7ccee9d5c17ec85573b3b326535c151f089f872b60ec2c5514252e613a459cb0df1ffb4dd0fb46282c67492ed5c3d925 EBUILD vim-7.3.762.ebuild 1010 SHA256 63e9605c3a4726f130bc310c4d1d26006acf1db17b2351eb21fc15c916dabd38 SHA512 7a1809e3d4bb863c652f5baf76a258d86929a0b14eba5758722900b7b3c8687e0ad42a2674fe60207f50e0ae6a2d66baac056e371daad9804a36bdf489e2d7dc WHIRLPOOL 68a62475f39cb36a9c6935d352ff778617157b1f1d0259235fc01dc2bbd0ac8a45ec619726530fa447d0aa111b3a820684d61da88f501311d8d3555f3a68915a EBUILD vim-7.4.273.ebuild 11583 SHA256 8e18baa085586ae62719adf825fba0caf6c511472926f6b41dbe6d6f46f082ad SHA512 7c9714048c4263c770ea199931e1181e7bde37866c4c3fe269215577411add77cab18c900b10144c65ded164991664e6af93740463336316d7eff8e4262824fa WHIRLPOOL 6fbf8bdd200d73a1e50ff6c5c7abc6b248bf3a764080d0be2ee8544d45ca1dcda313dbabddcfb9c9f175190fab04dac1a1c6942a8e5c1fa749fab58f8d35d4e8 EBUILD vim-7.4.430.ebuild 11942 SHA256 6ead57a07c4fb27de434d74f4874d12c6960c3a7bdb2ff6e2cc46d282776f541 SHA512 422cee85b8fa5fa79d782aa513334d11f51cf557fa3dc11a1082a66b3bc77fc1439161613ac2b0305030ba7f78b95cf1c8d03e00d61e3d9c11f1cc58bb291168 WHIRLPOOL 03fb88d2df1f848d0833982332bca1dbe2efa9c5f640b3d7fb98ed0ddac13c08782447beccc2eda46db2f78c56ab8cafed0a839bcaa754ec2bb6578dcfb57b14 EBUILD vim-7.4.475.ebuild 11941 SHA256 0470b4bb5664ec08b48e3c1e742dc4a75d2f1c8b84bb9dcae1348ebf9e7dad5e SHA512 c7989f1998a11e26c1d2785dec36d13abeba83f353a08b1ee28f5a7d89b306ca5a5eb126c26205a3b6cceb440eb93f78fdf64daa4e3eafc339c38d8dc7518590 WHIRLPOOL 2bf372a28c69b0f708ce8992edfdbd67075f0ec6c608819750f53b7f9e7f07b8adc06bccea184a949ff5d88dd4799e6c03dcc958212df99b0578e72caabf83b9 EBUILD vim-7.4.488.ebuild 11942 SHA256 7a01b7bdd6bcd4fd6597277f8c4129fd80127627602ea55c77632c1f23e5899c SHA512 c85da514554cfcb282740eaf4a53d0e3bec9e5dd4f61d713b603f8d584ffb56f958888ece24a7ea36e2327245cd29b1fc9c36658d3304ff072dbb57914af6f5f WHIRLPOOL 2042b303a07acbb061f7e910d44d4b4e6a7a3308f77a3597f28f0e9829dcd76fcfcbe3db4f6301eac4a62f16b07542f2b7bf5d84137f0f07d842d264ed3097bb +EBUILD vim-7.4.527.ebuild 11942 SHA256 ec0efe24daefd46bc176c0e6a29f86b2fd1342e0b07a2c8161d0ead7c9edaf82 SHA512 0c3c2adae0fcd3011d3cd598d047cc73b9426579f06076d08977eedba8e0060caacc78929ea569decea855ebba0eb7f14d96b8934d31da7afa7c046edb789d79 WHIRLPOOL a15c2937e0bbdf724958540d47699eff032ac34e9b20aabf3d4fd7a4409cc0b2061c6444f03e14f1ad0506f33eb1d328fce6e125bb656692116ac6706af6e1b5 EBUILD vim-9999.ebuild 11940 SHA256 178f4fc4a8d57c1d120f3e571d8bf534c3f64949c2807d1db51fad770a4084cf SHA512 525bdab2862840d96213a9fd18257d81f1285132103446ac35b995d355c34ff5dcc366bfce196fca2a3d56ebe03974516e1f6ffb283897fb643a2af194233525 WHIRLPOOL 79692ac000136a4dfbb4174413526cf3de1b1b3eeb2d9d49b483fc1adfb5c2090881c750a1a1a2af4d556c83db06f8bbc7611837eae15bd3760b49e8ee77aa3c -MISC ChangeLog 64244 SHA256 44d2080b37f803e060586f22341f58c6b3d162b6667f6f8ee43576b68ce5c459 SHA512 0e7764144361456747ca20d5327a044dd6d438640617f517e6e3c75b24f7d102cbe686fec526cc4a9f9f07a05a1a709d158e0e5bde7953c326a7b58c1fd32015 WHIRLPOOL 9783d79affbcb83be7ae2feedb68e2d89ea4028e5c7c60bc7b2f8d720b31d739b72e7727820940b6f28818b8faf78a4413ed6ab2df689ddc06f9392ba8de2011 +MISC ChangeLog 64359 SHA256 157b3f71753573c19d352fb5489ba9d11b79acf5360c923e0a8e91b2bb9d2cb7 SHA512 3de189bc7543cfca5d8e4c2b86076827dfcdc3f1378b45e45f15b600fd4f94b4590c5f5e7862d1302915d5422f3ede92edc84012da3908a7fb7fa6b01160a2ca WHIRLPOOL 6224f4789795fc078b397170755d0619c75f14a8f3e9c70986066720b8312c9ddd5334693c7b58a239fc8e7aab6766d7a3ebadc9d73eb30cc16ed0cb03809fdd MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUTTSqAAoJEEqz6FtPBkyjoM8H/1ipHKvNLWDCPjwNzyoaHwIX -OoNiwZp61QzrJaEgjor7VvvpkeQjxYiTsPRN65WRDiFaieZZoGLI6JilzhtzUD9U -zrwwXZuAIUpWOyHEv6WTn40yrwsvLiz+eGSctBMp56Gfs0PN5aY1r3JdunyPY7yt -cSCyamC/y9lB6cqsZJH07gnkh+R7BS1xaufllxblmumCyis7CANhMgPstPWXyGZ1 -6eJvwIWZAXmlhfyctlLMPBQw4XhG75AquGYY5nnKWifQdj0W2wzy46+XVCn4ux5h -jdO3C4twm/ty5mXFq7TxC2LL5+UYy7mg0gpq4sNxY60G7JgzytFyfwzpnT0pmno= -=tsK2 +iQEcBAEBCAAGBQJUcqnzAAoJEEqz6FtPBkyj7+oH/3bdiHRTFc7mvbg44Bvl6Idg +1i4yIygwhqWciOyhCg3HmGlHWyXvJ4pgWo3mtyEblOXrfmYTjDGUvlADCMG/n9NY +e71xnRghCnKG6B4Kx6p9XuAfoRFd/vKA9wpCTawO61OwuCjJSWdCvLGOPyke+CXK +bRN5N4e9qcHCB5XmaN+u5Jd5j4cIoL3E1lDPZZKbf0tnRYMblcnjqigfrnes6O+F +Uqap5xtzB1GSaQDVjZ92rz2nEVDaKymkt6qoeDOl56yTDixuDsktm9rVV6f1P3BO +11b16utPUMu6UonLnWM8rTfRWvvsedv7o5xOhUCRl7UcrEbjcEfR/RwYxFH3pZ8= +=oJz+ -----END PGP SIGNATURE----- diff --git a/app-editors/vim/vim-7.4.527.ebuild b/app-editors/vim/vim-7.4.527.ebuild new file mode 100644 index 000000000000..9c33d4c3d575 --- /dev/null +++ b/app-editors/vim/vim-7.4.527.ebuild @@ -0,0 +1,378 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.527.ebuild,v 1.1 2014/11/24 03:45:46 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-single-r1 + +if [[ ${PV} == 9999* ]] ; then + inherit mercurial + EHG_REPO_URI="https://vim.googlecode.com/hg/" + EHG_PROJECT="vim" +else + VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2" + SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES} + http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~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=" + python? ( ${PYTHON_REQUIRED_USE} ) + luajit? ( lua ) +" + +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 ) + !luajit? ( dev-lang/lua[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.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) ) + selinux? ( sys-libs/libselinux ) + tcl? ( dev-lang/tcl ) + X? ( x11-libs/libXt ) +" +DEPEND="${RDEPEND} + >=app-admin/eselect-vi-1.1 + sys-devel/autoconf + >=sys-libs/ncurses-5.2-r2 + 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 + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then + # Apply any patches available from vim.org for this version + epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} + 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" + myconf+=" $(use_enable acl)" + myconf+=" $(use_enable cscope)" + myconf+=" $(use_enable gpm)" + myconf+=" $(use_enable lua luainterp)" + myconf+=" $(use_with luajit)" + myconf+=" $(use_enable nls)" + myconf+=" $(use_enable perl perlinterp)" + myconf+=" $(use_enable racket mzschemeinterp)" + myconf+=" $(use_enable ruby rubyinterp)" + myconf+=" $(use_enable selinux)" + myconf+=" $(use_enable tcl tclinterp)" + + if use python ; then + if [[ ${EPYTHON} == python3* ]] ; then + myconf+=" --enable-python3interp" + export vi_cv_path_python3="${PYTHON}" + else + myconf+=" --enable-pythoninterp" + export vi_cv_path_python="${PYTHON}" + fi + 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() { + has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}" + 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 +} -- 2.26.2