From a7b3a9b0f7c1ea23be507c19fef181181dadd63e Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Sun, 26 Oct 2014 17:52:55 +0000 Subject: Version bump, make sed regex stricter (fixes bug #526682). Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3 --- app-editors/gvim/ChangeLog | 8 +- app-editors/gvim/Manifest | 20 +- app-editors/gvim/gvim-7.4.488.ebuild | 405 +++++++++++++++++++++++++++ app-editors/gvim/gvim-9999.ebuild | 4 +- app-editors/vim-core/ChangeLog | 8 +- app-editors/vim-core/Manifest | 20 +- app-editors/vim-core/vim-core-7.4.488.ebuild | 231 +++++++++++++++ app-editors/vim-core/vim-core-9999.ebuild | 4 +- app-editors/vim/ChangeLog | 8 +- app-editors/vim/Manifest | 20 +- app-editors/vim/vim-7.4.488.ebuild | 378 +++++++++++++++++++++++++ app-editors/vim/vim-9999.ebuild | 4 +- 12 files changed, 1074 insertions(+), 36 deletions(-) create mode 100644 app-editors/gvim/gvim-7.4.488.ebuild create mode 100644 app-editors/vim-core/vim-core-7.4.488.ebuild create mode 100644 app-editors/vim/vim-7.4.488.ebuild (limited to 'app-editors') diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog index 4091c217067d..42c6cacc9d28 100644 --- a/app-editors/gvim/ChangeLog +++ b/app-editors/gvim/ChangeLog @@ -1,6 +1,12 @@ # 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.442 2014/10/13 21:15:17 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.443 2014/10/26 17:52:52 radhermit Exp $ + +*gvim-7.4.488 (26 Oct 2014) + + 26 Oct 2014; Tim Harder +gvim-7.4.488.ebuild, + gvim-9999.ebuild: + Version bump, make sed regex stricter (fixes bug #526682). 13 Oct 2014; Tim Harder -gvim-7.4.52.ebuild, -gvim-7.4.155.ebuild, -gvim-7.4.169.ebuild, -gvim-7.4.193.ebuild, diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index 367fd523d828..24833991037f 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -18,22 +18,24 @@ DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c0 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a 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 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-9999.ebuild 12496 SHA256 2ccd4ad542131ca24141180f2ed53f30c60f6066590d2de70c068e2c67d57e2c SHA512 a5340b38d39db49240ce4c4e554b54c27ef8099dfadfa7b790c2b417281167c4d1f7ef4350d2774a829d00c0eec993dae3e5a6c4ba6ee17dd323b54155f19aaf WHIRLPOOL ed7ddfdf1a727db46b5632b94b1d18f39e236377127ed557145234c8701dc5b5b079508d69d289e95c9c7ad83c5a232891aa0e72ff243c828cec8cf9e887a077 -MISC ChangeLog 60616 SHA256 761d58c5f3c29c7ba3d9caaf2b36477c52b23fca57bda0b73b2a0df5ca33360d SHA512 b58df89aed0a9f325a5f704dcda96ab814b43e8eda0e492c9ef260e189e2edc4051d880ef860b4f8861d5bfd482f1a2df7987923b899b90bdab4b5aff775369f WHIRLPOOL 04eca53a5ebf565c26e1b68cc36b0d1a94b00148a3fc767ad956f1d4129c6be44a6e064aa3a55fb90addff35a73846de6abce6dfb300be45372cf0c3e071c9d6 +EBUILD gvim-7.4.488.ebuild 12499 SHA256 dd3d5bcd1cb9c8ecf3a81a0a4e0b6b4ef4d62e7f238fcce1a1abcf9471b24869 SHA512 5b03dc4933db8a60fee2fd892b47d6d9b539b0f4632d335571c1de651d548d19feff15067c76f3c873cc04f85493da44aea3bd2e39e81620fc2c290f640fa6e5 WHIRLPOOL b8bb0bf01229a794ac7ea4a08ff62651ec2c312c5139473f50809fe7293f084eb324ccacb8181316bb3bcefcc97339da59d50dcbddf934690a673ef38c7568e9 +EBUILD gvim-9999.ebuild 12497 SHA256 7d8ced3e84e1e59bc7c73317c39a9df2dad89b682a61cf7818cc72c5043d49b4 SHA512 954c1125ec995d73c660844c4f8da715b877e7229639de160a9263a528532903c80fe82856d486f8c22a5ee194fd4fea3a19e162c1a7ec5327ac81a073c15e28 WHIRLPOOL 0b5a7203474d47cab09b064abfcf47f0514f4f05356d287121c08f5d4f3fbbddd06fb3e9f8f577f8640f2ff421838309ebf1a8629d40dddf5eba7766130df2e6 +MISC ChangeLog 60798 SHA256 bcc6840b6cffdb6efdace9a235ff936f3dc515d12f03c77df37b95a6ae63e303 SHA512 a708ec31c27382f709407db64d15a354ec2a87d2e4fd4f7efc25501ff88c1740e0fcd40a40ef162fd531ce67c75bad219920049aff906762ae02421a8172d5c6 WHIRLPOOL 6ba8e07b3e885d92b2577ef2f61e134e187a8e0c46ed9b19953e1f419023d49996d2301dfc480943ddf8b3228b665f2de84c8d7966eb53af1d3a40b51b42141e MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUPED8AAoJEEqz6FtPBkyjge4H/0aFblkU1YHLvwbGovkU+/cY -6uiB0vOq7kbPnsBM7DdAYx8yixmSFhJQaupPw30gofIma3j+5261HMlGPOmnoXD0 -ePhX7lLxVJq5lAvnDXUhV9FkAMy4KTvb3KE7qtxmF0sljNYWGw9bNLFi5iKOFAUs -z0e8oB2XCJXifYP1kApU7+G1kXB5rOybKuzk2M7mT1FExlUNM4NeCYpS+2rgJqPN -Je0WoOGAfAn2QOVN4wyl9MndIQ+Kd0Vd+zTMWnDMJ1fxPmmXF5vSmK/bOKA/GY4E -uXPcJg9K1RUrqy5c34J22/FMUXCdQZxSEk4v8fjpYaTl9hd+oPFZ84tI3Oevkdg= -=9u2V +iQEcBAEBCAAGBQJUTTT4AAoJEEqz6FtPBkyjF7UIAI02qxLppYPDvC5Bym4kfIxK +Q/pjZQqGZrY/qMXGpDlZbhPV+HAMHuqyR72g1OCuVnqH8wCHcyMv1+M3KjgVoq+H +4RagRc9613WU4qVqU5DTRmNJ2RU5V7RzwHpJeZYKOdkKqmnFOB42l+Ddf+pihRN5 +CgMBexo+EWqTX4ZgwBrFJbKi2a1pc2eDRui9/LCu1UxeADN0jcM8CxYF4ndbmvno +0xQ03feBYL1VwXTYBQsR+Asyl541SDmrO69FP9Jlk+jJcR/ADA+leqVCLMAEhJUU +IT/3tYO//w7Q91wsylLgyIhaXW1dCnN9gRWR4bPnVBMr1X0p/UXpQCTtC6IDIMQ= +=9JR/ -----END PGP SIGNATURE----- diff --git a/app-editors/gvim/gvim-7.4.488.ebuild b/app-editors/gvim/gvim-7.4.488.ebuild new file mode 100644 index 000000000000..042e7342909b --- /dev/null +++ b/app-editors/gvim/gvim-7.4.488.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.488.ebuild,v 1.1 2014/10/26 17:52:52 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/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 1f047353df64..c61e04ef2c40 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -1,6 +1,6 @@ # 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-9999.ebuild,v 1.19 2014/10/13 21:11:06 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.20 2014/10/26 17:52:52 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" @@ -167,7 +167,7 @@ src_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" + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" rm -f src/auto/configure emake -j1 -C src autoconf diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog index c415ddf629b5..8cfc06e2ae69 100644 --- a/app-editors/vim-core/ChangeLog +++ b/app-editors/vim-core/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-editors/vim-core # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.451 2014/10/13 21:06:35 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.452 2014/10/26 17:47:20 radhermit Exp $ + +*vim-core-7.4.488 (26 Oct 2014) + + 26 Oct 2014; Tim Harder +vim-core-7.4.488.ebuild, + vim-core-9999.ebuild: + Version bump, make sed regex stricter (fixes bug #526682). *vim-core-7.4.475 (13 Oct 2014) diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index 7909afc260ca..2c5274baeb83 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -19,6 +19,7 @@ DIST vim-patches-7.4.326.patch.bz2 547801 SHA256 ef055424ee6a38967a38420c136ad54 DIST vim-patches-7.4.417.patch.bz2 672822 SHA256 244a556bf45a11d9b9a8669239062a400e1e73ea940e54b7bbaca954da7fc6be SHA512 abda7e717a486f677e0f6720beecc903879deadac9a61faf628a7c590030b81269c48c20de6e1fe99011072e9e7a675552917e7d367f9c2d3596688543e371e9 WHIRLPOOL 4398c9de866a2a84257fe2cd6743a75c494ecbd47ef2d5dd4393834e84801bf1786905dbf368f65b98eafb1541aaa5eda05b81f042afea564469f294add3f548 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.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0 EBUILD vim-core-7.3.1214.ebuild 1003 SHA256 0eb20cab51102107ef9c8df2e39d38f0d3f2e15e87fe88f271299f95e84b3e9b SHA512 eb4fc44617eedf81ffed762f28a4c8c0bf3b0b2fad493ef3310aa2782e5c45017bb2fe7f37b737649c17d1a4be6dc6c612b64301c80f9424d57abfc3eefac142 WHIRLPOOL 715d73a38bf97b2d3e520d8e6ec5e82d22392ec00701a743a0fbaf1de313bf1fac62d777268ae6da676cfa5730548d3337c46fe0cd36e6a6f85e1ad1986c234c EBUILD vim-core-7.3.762.ebuild 990 SHA256 4da64156648f1030702b5c699cce68b092631518fcf14b21cc787fe2cd86d6fd SHA512 fd5016260cab99b236147f090aab3b5e65cbfe5cb6f182d8e5e3638700a00969a0cfa2d20e3159241b21dd4e03035fcdd7e129017556ec128413531fe88e111e WHIRLPOOL 61485a3b00b0a1bd883ba7a8b3481844a7f4bfcb906e859da649d7487d595a17eaddc4a6617918e9750fcf0e9bcf91f91aed1a2dd3c18c7eb0915d672af0cd36 @@ -30,18 +31,19 @@ EBUILD vim-core-7.4.326.ebuild 7321 SHA256 566ba711f5e345a0c16c321139183a485650f EBUILD vim-core-7.4.417.ebuild 7321 SHA256 5d4229901e8e26773efba042155f256070a1ab286354fe52e94fd4fea575011c SHA512 b5e3713581d44a61b359efcfa7ad5a4811cd81c6331470a9e2e1d9ea289e5891f8ea037ce5ba281fe83d8e7b7561a9fb4549aa3fe280c9545b6d6176bcc5b40c WHIRLPOOL ef5ccc3843cf95ddbc0599df558d64d8247770e4804dddf364de0f377516252df49b365abc64122f10b2be0058b4688ff931d2bb178e80fa5dca4620f09b3b1e EBUILD vim-core-7.4.430.ebuild 7328 SHA256 eb8904c14df9c7f281136e9bb9cea5c9cc9246369b9e38e8482285001cda1754 SHA512 ae50b12ed6e0af6ff52e465461b558c27f0b4a50f69219f82419185feb580a503e8960f1e8552ca06c1ed3ce4334151ffa78a1cf28e360138ad04398c3e64324 WHIRLPOOL e379a10ea8dd2eb53dc17f828ed7e4570a1c2ffd031017fc9109d39325a30bad4e4b48f30460062e488a9d9bc39c199f3bb4d9bcea7804ed44f3ebe2dfed4701 EBUILD vim-core-7.4.475.ebuild 7328 SHA256 c315a6e0b3dcc88eadfd80b51e5bba5bb8df19c141858606da4467261f4f11be SHA512 acf8f8188a1ce95417bfe8842d8e35e9c9b504d0dc3769e1e21a87f71740096d82165324d30c7400525efe5abb254ef7094bd81ad91b4f03e724b3f4518788c2 WHIRLPOOL 126766f23f34048a250cbbd0af3e1f81264e0f0aeba469a0ba8d5f296e3a6b51b7d5030b9d708605f782281c980dcc527403644bb6a7c895444d5c7ecb1483b5 +EBUILD vim-core-7.4.488.ebuild 7329 SHA256 bac64687000fd5195b60023a7de517101e78fd0879f7ef24a3b58f979e0fd756 SHA512 074d4653a1e2fdb6a0bc7eb4de4632ec83a2c6961d0922dfcc6d7d173c2dee566fed646aa343f1be1ea7c469dd8e29d28c4a7374d89ef761d9ed5b5d673c2f0f WHIRLPOOL 0c7cd4950173f36a0a6e9c11415b220eefe4e003310e5835a1624d769dfa8b8335ea6768c4b6ea70106bc3e07fb1870264877119a9231fb3707bcd12771e5a67 EBUILD vim-core-7.4.52.ebuild 7409 SHA256 31d591fcce20577af303ef2d7aef6f359a51e28e83880f22a5046245def77d60 SHA512 22b26ec530b9581b1c0617996630dc5f97485b6936ff749cf7459714a6bd077469e68cf334f5dcb412e4a33b2845e8fe260b209631ebc566c5a4c38529b1028a WHIRLPOOL 3fe3c8d1a7e14ff292866961900086f430b4b9eea77c0d69cb2ea03b32fb6c37bb1742a1cc1a10b06a097c613481b8766b587d781d710df2a85e01b04ef9fbc1 -EBUILD vim-core-9999.ebuild 7326 SHA256 2104e2a2a46f42a2fae4556b1b86493193afc8f2831b411aae29fbae2968948b SHA512 22ff808a3c72be46e16e8bd835a621d0b74ddd892fa78b89127dc4c24273bb7f44f823f93db471688ba47da7ee68eb29d34f308e4c46fb16c382f53952423468 WHIRLPOOL 2d59dee07a8cd3af4ba036f58377fe46310f1330c28646686dba8783c45079d511152e7846df19b19eb786bb63a4c0fd6e5082bb35f183fc0a3c5b559436b6b1 -MISC ChangeLog 61204 SHA256 4a194ec087b12882acb8a8b151e8eacfd774cb1661f94a5827f8d6a4b610e542 SHA512 f2ff9f3a8c775e1ef9552e10fc30ad5f20c0f5ac0f36da34177f76307dd3da05f4346999ad3cd6c0efbfcbb0c8266480826f0d77a6d35ce80f5be0b36387769d WHIRLPOOL 836134222de1bd66493a3aacb1d732e96d251176e5d7b12006700d4e4858658eed369732c1dcffc84f595733bd8639a42cd16c1aa0390f663f3236dfd01cb662 +EBUILD vim-core-9999.ebuild 7327 SHA256 fda3b9a81efa75e2d110e2bbf0112dade10e8a8f19f5fe8fcaf96803101dece8 SHA512 ad5391ee93e8f18706a0c1ab5864f756596886dc2ebce21437fbc9223339c4eb3831b50643a926c7e7dba1c21999c5dd3e5ddeb380a3878ddde0c33fba1a4bf3 WHIRLPOOL 6b6fff4e5f11329a3f5a58f2169b3d4c5c12a51d6de2c207642d95e7884473c4046a684a3ba661e838bc0f8c532b2d566ee14199c4baad3f6562931fcb8e6484 +MISC ChangeLog 61398 SHA256 581b4dc60181cf60539601a5763f5ccb3e9bafbea73fac955956e0d5d95d0140 SHA512 a3f54540d16df30ea63d6f6f6566410cfaea0b2cb428196b67ae931e4f39b6d05d6652dd5c6f48f3d136ec93889809b8f1b60a6f360ede3cc9b6bcbea26d6ade WHIRLPOOL 2bae77c260785bd2511c4a6c45318509f8350e775c350c1cc8f524268f7334a49f46a47d8f28381ab5ef6d4d2435c70db25225ca0268d82ab329a2101f5678c3 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUPD71AAoJEEqz6FtPBkyj5/gH/0R5gcnIhGVhW8JKoVyNHRo2 -R23t0zsoY6MEftNv8mg9w+rUP3yV9SZiwVcS7wGjvRqkHF9FWR09npaB03PnPCmT -LeKXFz23L7h7/iYi38ghSx6jZtpgOI+X0F+GqflGHkRnUb1eCWvXlQHq6MN/M7ij -H1g4Y5fayfPPmMtwqCUjCDT6HO0JTfRuwSuXuMFgaqf3eotR/ztccY5C1stspdT8 -dCvi8RDGMQzvb037qVtFsAi4qJ/cpyBqKYjJIc+ertPi3SVDIfrdMeUAcLN/ff5I -P0FLKIweH+K6uRFcA3/KmyNpb8uihCbxBKeGUm6KvcCyc9SG2pt+hjsRTzzu9dw= -=mz5H +iQEcBAEBCAAGBQJUTTOvAAoJEEqz6FtPBkyjgsEIAJ6puoHvw+nu7mZZudBSOV+y +ZYzvf6TFFwLgAazgtdDDTAknvPyDSvr+Q3/Qfh40jhmnhfnis+Dblimsq5PCsW0J +ImP4XiY65WVA60ToRYfIXKwBh1VdyknTR11s7A2Upz5K5Pm48MOV3euaB9BOT5aK +nX10TQa3h9GRB/Brgjpjn9T1ugvNhfzkKvM8QahN//t6Ss2qLsxRsZGM51su8zi0 +ayb5vEUdhDgB4WxubchrFOrb6zYtMghIfQFXuqhRhFXECchE1wG5h3B3ubGnrzRO +P6/rgWVIp5QYJz4FLgHk6LOe85LMCtHCKn+A806MKmncsi5Zi/D/43GaBdJ+Em8= +=Fr11 -----END PGP SIGNATURE----- diff --git a/app-editors/vim-core/vim-core-7.4.488.ebuild b/app-editors/vim-core/vim-core-7.4.488.ebuild new file mode 100644 index 000000000000..02c0b8a9b00e --- /dev/null +++ b/app-editors/vim-core/vim-core-7.4.488.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2014 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.488.ebuild,v 1.1 2014/10/26 17:47:20 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_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 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_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 -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} \ + --with-features=tiny \ + --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-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index 6e5dec311948..d51316c9a5f4 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.10 2014/09/06 17:50:42 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.11 2014/10/26 17:47:20 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" @@ -120,7 +120,7 @@ src_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" + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" rm -f src/auto/configure emake -j1 -C src autoconf diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog index b9191697225b..d501a81f1432 100644 --- a/app-editors/vim/ChangeLog +++ b/app-editors/vim/ChangeLog @@ -1,6 +1,12 @@ # 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.475 2014/10/13 21:17:40 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.476 2014/10/26 17:51:35 radhermit Exp $ + +*vim-7.4.488 (26 Oct 2014) + + 26 Oct 2014; Tim Harder +vim-7.4.488.ebuild, + vim-9999.ebuild: + Version bump, make sed regex stricter (fixes bug #526682). 13 Oct 2014; Tim Harder -vim-7.4.52.ebuild, -vim-7.4.155.ebuild, -vim-7.4.169.ebuild, -vim-7.4.193.ebuild, diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index 651549527e3f..103107c58d13 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -14,22 +14,24 @@ DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c0 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a 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 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-9999.ebuild 11939 SHA256 0c2d109a6d03c90700cafaf8393cb15c36cb6e62041da8a0669b6ed3ef2c5b9a SHA512 823685d0b04b5ec585258b5678793f92388601bb7d9c181c38107c7771ec4db62cd852442a14c3a70ac9c7cc76d5237e212bc0f695b3ee066dc4cc5d85c62e38 WHIRLPOOL ec1dcdf1928a626a33bf3982884751520bec18511f15db918fce9dcd5f20af202d18dc2e5fc56f6973fdc0be9a216624fb6907380bb962eecf35abde412d518d -MISC ChangeLog 64065 SHA256 f1efb26b0769cd3807ea0bdd55861f8ff9496fa197364576ffcdb919a8fea2b7 SHA512 1798ec7f2fb28d9e36d442bd662d6ed2bfd93ae8a9de82985e00bff9c905a391d7b52d60a4a547f455aaeefb1969df083022c807b2e1b2680e406eb365532e57 WHIRLPOOL 15262476925fd9163c444ece15f4450d0ccf79e9828719136aadd1b178b8456ceecbaaf6667e4ad9f11e2a662f25b22554dd0753d3d698fda06bd9c19fba5440 +EBUILD vim-7.4.488.ebuild 11942 SHA256 7a01b7bdd6bcd4fd6597277f8c4129fd80127627602ea55c77632c1f23e5899c SHA512 c85da514554cfcb282740eaf4a53d0e3bec9e5dd4f61d713b603f8d584ffb56f958888ece24a7ea36e2327245cd29b1fc9c36658d3304ff072dbb57914af6f5f WHIRLPOOL 2042b303a07acbb061f7e910d44d4b4e6a7a3308f77a3597f28f0e9829dcd76fcfcbe3db4f6301eac4a62f16b07542f2b7bf5d84137f0f07d842d264ed3097bb +EBUILD vim-9999.ebuild 11940 SHA256 178f4fc4a8d57c1d120f3e571d8bf534c3f64949c2807d1db51fad770a4084cf SHA512 525bdab2862840d96213a9fd18257d81f1285132103446ac35b995d355c34ff5dcc366bfce196fca2a3d56ebe03974516e1f6ffb283897fb643a2af194233525 WHIRLPOOL 79692ac000136a4dfbb4174413526cf3de1b1b3eeb2d9d49b483fc1adfb5c2090881c750a1a1a2af4d556c83db06f8bbc7611837eae15bd3760b49e8ee77aa3c +MISC ChangeLog 64244 SHA256 44d2080b37f803e060586f22341f58c6b3d162b6667f6f8ee43576b68ce5c459 SHA512 0e7764144361456747ca20d5327a044dd6d438640617f517e6e3c75b24f7d102cbe686fec526cc4a9f9f07a05a1a709d158e0e5bde7953c326a7b58c1fd32015 WHIRLPOOL 9783d79affbcb83be7ae2feedb68e2d89ea4028e5c7c60bc7b2f8d720b31d739b72e7727820940b6f28818b8faf78a4413ed6ab2df689ddc06f9392ba8de2011 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUPEGLAAoJEEqz6FtPBkyjV+QH/iwPr3tKoJO6IxG3xxiwtj5T -fR6zp9uYO0ARfOuCNMBkOeo17PYhVS+IjEXsZy4qtBqqf45rI1eiUVlINIjfn0Jk -uIG7GWB9zG7W6da++WsYIRKQI2XsockkQhlbqPOXNVJcU57tObgZwA0JZ/WbfUsw -fvDPLQGdDxR64FIARrHkK8ULxcRqHCTqQxqjnpQEdXSa0EcZM0lD/kLt3cyukyN0 -NmmHUTJb4boGgg+8v0hUcrH8qCBCIVB28qXipgXSMGcpZf4wi+Be84yBruW+GkQg -hrhn8OyzAPfITsCgKuvMXvQHv77/FFdOXD2+g+a1BP7dNTAr+ZYTs+E/AtTC0wg= -=GgcQ +iQEcBAEBCAAGBQJUTTSqAAoJEEqz6FtPBkyjoM8H/1ipHKvNLWDCPjwNzyoaHwIX +OoNiwZp61QzrJaEgjor7VvvpkeQjxYiTsPRN65WRDiFaieZZoGLI6JilzhtzUD9U +zrwwXZuAIUpWOyHEv6WTn40yrwsvLiz+eGSctBMp56Gfs0PN5aY1r3JdunyPY7yt +cSCyamC/y9lB6cqsZJH07gnkh+R7BS1xaufllxblmumCyis7CANhMgPstPWXyGZ1 +6eJvwIWZAXmlhfyctlLMPBQw4XhG75AquGYY5nnKWifQdj0W2wzy46+XVCn4ux5h +jdO3C4twm/ty5mXFq7TxC2LL5+UYy7mg0gpq4sNxY60G7JgzytFyfwzpnT0pmno= +=tsK2 -----END PGP SIGNATURE----- diff --git a/app-editors/vim/vim-7.4.488.ebuild b/app-editors/vim/vim-7.4.488.ebuild new file mode 100644 index 000000000000..f391cf6bc9c2 --- /dev/null +++ b/app-editors/vim/vim-7.4.488.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.488.ebuild,v 1.1 2014/10/26 17:51:35 radhermit Exp $ + +EAPI=5 +VIM_VERSION="7.4" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE=threads +inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-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 +} diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 8e1293fc1c43..78f2fcbecd0b 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -1,6 +1,6 @@ # 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-9999.ebuild,v 1.16 2014/10/13 21:13:29 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.17 2014/10/26 17:51:35 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" @@ -167,7 +167,7 @@ src_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" + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" rm -f src/auto/configure emake -j1 -C src autoconf -- cgit v1.2.3-65-gdbad