diff options
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/gvim/ChangeLog | 7 | ||||
-rw-r--r-- | app-editors/gvim/Manifest | 18 | ||||
-rw-r--r-- | app-editors/gvim/gvim-7.4.591.ebuild | 414 | ||||
-rw-r--r-- | app-editors/vim-core/ChangeLog | 8 | ||||
-rw-r--r-- | app-editors/vim-core/Manifest | 26 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-7.4.591.ebuild | 230 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-9999.ebuild | 4 | ||||
-rw-r--r-- | app-editors/vim/ChangeLog | 7 | ||||
-rw-r--r-- | app-editors/vim/Manifest | 18 | ||||
-rw-r--r-- | app-editors/vim/vim-7.4.591.ebuild | 388 |
10 files changed, 1084 insertions, 36 deletions
diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog index 354c8af0139b..532944cc44a2 100644 --- a/app-editors/gvim/ChangeLog +++ b/app-editors/gvim/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/gvim # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.452 2015/01/22 23:18:18 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.453 2015/01/26 23:27:38 radhermit Exp $ + +*gvim-7.4.591 (26 Jan 2015) + + 26 Jan 2015; Tim Harder <radhermit@gentoo.org> +gvim-7.4.591.ebuild: + Version bump. 22 Jan 2015; Tim Harder <radhermit@gentoo.org> gvim-9999.ebuild: Add ruby:2.2 and drop ruby:1.9 support. diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index 8c2a4769f97f..52a4f1e6a933 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -8,6 +8,7 @@ AUX gvimrc-r1 1099 SHA256 d6a92cf8e9b7a3faf92285214c97adcae4fa6632a00e0c1a2bfa34 DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2 DIST vim-7.4.560.patch.xz 741936 SHA256 e67cb9ba8772c72c3ebed0727e6dd57fc8eaeb1c8087cab7b9b8fe52f9063e04 SHA512 6748efa85883cbe811f4997192f5c0c11ac4825b40a3ef81a9a457eab26d86868aea6f62c8ced7018b3a7758242bd6c8e789fdfb8ce111f4b468f6563bc146fd WHIRLPOOL 45864fdabb133551c66768a4c075588744b99fc823f555ae19a440b2486054e1336c64c50f0bd7e3c1c0c88a0e345595a4bd384cd7dde312ff1465351db869e1 +DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66 @@ -18,17 +19,18 @@ EBUILD gvim-7.4.488.ebuild 12501 SHA256 e310aab40f3e9aeac9d090bd7b0f31498c53bd39 EBUILD gvim-7.4.527.ebuild 12501 SHA256 c208c8777b8127eb4c57f6add60afeaf8f1404148bafeabe7530082e7554aec5 SHA512 0e703f35517dcfa7677f6c8c28f79e103086637225900fb300a42543328ab56d93c0777f278c4b32a138af76339edff45ea80ff43651b6e2b23fcab0da670b09 WHIRLPOOL ba5aaf23db506711541a8262a0d4a33799190de4cef0c41ebce1166df1f9c48deac53a5305e49d00430a4ea740734ad37250240ca6d335cfe3bef8eeada39d25 EBUILD gvim-7.4.542.ebuild 12492 SHA256 2e7bf0cb9190f2b052cea32b2227ca53542646c101d2c79a2fcdf6586c76a386 SHA512 a082a237bbfb5bfbeecc6bd4a0688790cf7f2bc6c75a2aa645b42e751fd0912d6f4b9a43a2ae15a5fa681eb4ea2ae9e28335af51d793451d76b144008309f46f WHIRLPOOL 3555c34aadd70cca7305893ee5c9aa5ed712319c5fffa49467a47a720b8e44b4d5ce16da61b08d56c90e5c34f32acbc6f3918a8c39fea47ba61822317876e5af EBUILD gvim-7.4.560.ebuild 12375 SHA256 ba3c230d7fe2e8fc2757a9c2e55eafc6e1fb23fa1d25be3590deaa87f19f0950 SHA512 be43518842526937d6239a207072da2dc74ef5d225029994c757722a5cc2a5cc6969bc6a6508a9f97c5254712326138225b85ab6d8d2bcaf456e560b1d80feb2 WHIRLPOOL 699b694d6ed8cf8c3eacbaef201bf47c8e7dde19571ac0dfc7ef78042d3329ef21abc5d2619f50f285db2b9dc768eb0c6b1d1d1f47206c862847df311f59f862 +EBUILD gvim-7.4.591.ebuild 12317 SHA256 1acb962cd79a13b11b36eb2bfe89cdee606d231876ff638c033436c55fd14723 SHA512 0a911433f81459efee5a365140ed41734c59e751f903909d650e8439a0f7072399e09659d2fcc31d7c70c67b8c1ade7ef19bb7cfe17ace3ac3f347f834a41ac3 WHIRLPOOL 48bc1f3c690429800ef5721dffe8d245386e8d2b0e991a079828fa49d40c81c9f065be39e60af7d9ed32b8f35076185e77f9391198c4e64de2095f74874c7d26 EBUILD gvim-9999.ebuild 12313 SHA256 4588546d0696ce3ecf82181ec8091ea8c11d358889127492a39c62b04f9a5351 SHA512 a91aee68aa485eea28c53d786ee29ef36ffe9e359fd4e5402cbc46457b3a5536c011ed34e5efbc41e6ef30d9001db18d0442dea20e65fea1ab5d7023a6b133b4 WHIRLPOOL ef0301e912b349b91bffb2ecddf35b8f55890e32cbf82456bd9bcb79ad0e268d0bbe6eb091d5fb3fc3ee3f4f00555e946ed5ea2d4b937651d73d41d823b4d14b -MISC ChangeLog 62177 SHA256 4371178fea8284745e2980b31371b446dabd431a8722aa5cbbd5f817b67161e1 SHA512 2f4f94dd327b7c6e3b466017edd8519abb0d879b43f1b4c242ce3b8fa5e79126bac2c0e507fc35ada481667711ba0ec7edfd82328a87613f4de4671f5468f243 WHIRLPOOL e786f5cc5aea46605be0fba54973399c5f29104364fca2fff2b3e8fcaefc02e509638aaa2ce5d8069d13aca29a060beff0dddbb45506399f2e19ebaaaab7365e +MISC ChangeLog 62294 SHA256 435cc516dd747892dbf28a6097e0a228893305adf60c9a60ce98473ff6ccd11a SHA512 bb5a7b2b4f1f055cefcc9e08e14ae917189175f6b4e45eecad075140eaec8583998efffd6c6ae5815d3e60c2d1bae67d011fb25a02d8367c29d9efef3d2e4c5a WHIRLPOOL b1e458ca18e78436140cc428ce68fddfd29492e472fb8bfab7a0ea1e7ea13989a1535e645c7d3bc888a38b115beeefaa5cab07568db17935cae89f93d68ebcc3 MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUwYU+AAoJEEqz6FtPBkyjRzMH/RoeEXzYAnkwk6Xj1r5J014U -WIN9sk7Py1uXB5iIO3LE1kfnW80nwjK/L571fY61pI/hgcIIWRKrq5+SQypJUz6E -j+Gv2PFiqwFpA8zkwQs4ts07C7QW/kIVeaDfsSs/NE8tV5G3e5MXRNYT5N26eWl8 -BgI2ow6GBl0F6YZsFWzA8G4YMBnISZHLS/QpVbbW2WS5czfXJHvDOD+2GDHTvSRK -qhSEJuv285lsHJAfOaj7Vfuxkia/HdbEf2LjC1o+xQtXUnbRcBxbZaTFKle1SI9Y -FboR6n12+OyTeWOXp50t7l0OoZrAmwk2/1/20K6S+/P2SQi2hhezWf0CqsKiA+s= -=IrKd +iQEcBAEBCAAGBQJUxs1vAAoJEEqz6FtPBkyjvj4H/2s3J05/HsyHzGtb7+nfsNkb +85gSMBPYMFGCJTGvP5SndN7xoLUNy122riLhDVbSTN2ltKYhtCtE6fy1H9mbKDVA +mgedq4j00eVf1y7HKdZh/RTymU5/Q95tG6Xgj6SVA+7gPXe0NB08Bl0LhNX56nIg +VgENso2wYgXHxuYvC/1O2eunZOYln5nPf1ZjATyW5EeZeGGKQ/iLyz1uLOJ1LSk3 +l5w2rjnRO3vzNMRqbuqQ481VigumiwMTghnwg6tvZCSyVjt4pn3RFFMhEIlm6+4D +yOLFnSvu13zFV2zved4qJEuWQJwv3QHScbxcLfORlsR/O3vOwla2H2Hc6E8qysY= +=Te7J -----END PGP SIGNATURE----- diff --git a/app-editors/gvim/gvim-7.4.591.ebuild b/app-editors/gvim/gvim-7.4.591.ebuild new file mode 100644 index 000000000000..b34939f92fd2 --- /dev/null +++ b/app-editors/gvim/gvim-7.4.591.ebuild @@ -0,0 +1,414 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.591.ebuild,v 1.1 2015/01/26 23:27:38 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_PATCH="vim-${PV}.patch.xz" + SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} + http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +fi + +DESCRIPTION="GUI version of the Vim text editor" +HOMEPAGE="http://www.vim.org/" + +SLOT="0" +LICENSE="vim" +IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" +REQUIRED_USE=" + 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.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) + selinux? ( sys-libs/libselinux ) + session? ( x11-libs/libSM ) + tcl? ( dev-lang/tcl ) +" +DEPEND="${RDEPEND} + dev-util/ctags + sys-devel/autoconf + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +S=${WORKDIR}/vim${VIM_VERSION/.} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home + export HOME="${T}"/home + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then + # Apply any patches available from vim.org for this version + epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz} + fi + + if [[ -d "${WORKDIR}"/patches/ ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches/ + fi + fi + + # Fixup a script to use awk instead of nawk + sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ + || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.in || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug 43885 (20 Mar 2004 agriffis) + sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]] ; then + sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile + fi + + if version_is_at_least 7.3.122 ; then + cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk + fi + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + if version_is_at_least 7.3 ; then + sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + fi + + epatch_user +} + +src_configure() { + local myconf=() + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.in is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -f src/auto/configure + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do + [[ -e ${file} ]] && addwrite $file + done + + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + --disable-gpm + --enable-multibyte + $(use_enable acl) + $(use_enable cscope) + $(use_enable lua luainterp) + $(use_with luajit) + $(use_enable netbeans) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable racket mzschemeinterp) + $(use_enable ruby rubyinterp) + $(use_enable selinux) + $(use_enable session xsmp) + $(use_enable tcl tclinterp) + ) + + if use python ; then + 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() { + local f syms + syms="vimdiff rvim rview" + einfo "Calling eselect vi update..." + # Call this with --if-unset to respect user's choice (bug 187449) + eselect vi update --if-unset + + # Make or remove convenience symlink, vim -> gvim + if [[ -f "${EROOT}"/usr/bin/gvim ]]; then + ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null + elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then + rm "${EROOT}"/usr/bin/vim + fi + + # Make or remove convenience symlinks to vim + if [[ -f "${EROOT}"/usr/bin/vim ]]; then + for f in ${syms}; do + ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null + done + else + for f in ${syms}; do + if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then + rm -f "${EROOT}"/usr/bin/${f} + fi + done + fi + + # This will still break if you merge then remove the vi package, + # but there's only so much you can do, eh? Unfortunately we don't + # have triggers like are done in rpm-land. +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dobin src/gvim + dosym gvim /usr/bin/gvimdiff + dosym gvim /usr/bin/evim + dosym gvim /usr/bin/eview + dosym gvim /usr/bin/gview + dosym gvim /usr/bin/rgvim + dosym gvim /usr/bin/rgview + + dodir /usr/share/man/man1 + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 + echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 + + insinto /etc/vim + newins "${FILESDIR}"/gvimrc-r1 gvimrc + eprefixify "${ED}"/etc/vim/gvimrc + + newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop + doicon "${FILESDIR}"/gvim.xpm + + # bash completion script, bug #79018. + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # We shouldn't be installing the ex or view man page symlinks, as they + # are managed by eselect-vi + rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Update fdo mime stuff, bug #78394 + fdo-mime_mime_database_update + + if [[ -z ${REPLACING_VERSIONS} ]] ; then + echo + elog "Vim 7 includes an integrated spell checker. You need to install" + elog "word list files before you can use it. There are ebuilds for" + elog "some of these named app-vim/vim-spell-*. If your language of" + elog "choice is not included, please consult vim-spell.eclass for" + elog "instructions on how to make a package." + echo + ewarn "Note that the English word lists are no longer installed by" + ewarn "default." + echo + fi + + # Make convenience symlinks + update_vim_symlinks +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Update fdo mime stuff, bug #78394 + fdo-mime_mime_database_update + + # Make convenience symlinks + update_vim_symlinks +} diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog index 51f713354450..459c92994942 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-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.458 2015/01/05 08:51:33 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.459 2015/01/26 23:25:08 radhermit Exp $ + +*vim-core-7.4.591 (26 Jan 2015) + + 26 Jan 2015; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.591.ebuild, + vim-core-9999.ebuild: + Version bump. 05 Jan 2015; Yixun Lan <dlan@gentoo.org> vim-core-7.4.560.ebuild: keyword ~arm64, test on board diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index ce55d90bfbf1..6b2acb9997b1 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -6,6 +6,7 @@ AUX xxd-completion 461 SHA256 580064ca4db3ac149fd89c743bd9946241220c211721f978f7 DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2 DIST vim-7.4.560.patch.xz 741936 SHA256 e67cb9ba8772c72c3ebed0727e6dd57fc8eaeb1c8087cab7b9b8fe52f9063e04 SHA512 6748efa85883cbe811f4997192f5c0c11ac4825b40a3ef81a9a457eab26d86868aea6f62c8ced7018b3a7758242bd6c8e789fdfb8ce111f4b468f6563bc146fd WHIRLPOOL 45864fdabb133551c66768a4c075588744b99fc823f555ae19a440b2486054e1336c64c50f0bd7e3c1c0c88a0e345595a4bd384cd7dde312ff1465351db869e1 +DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4 DIST vim-core-7.3-gentoo-patches-r4.tar.bz2 3015 SHA256 a4f61e4d0cd1848812f603e7f6b8a5304d13ac199f4e3061264cd3bec75a17c5 SHA512 0ba7a20dfdc2c24a92a4af5a6fe49a94d5d5c5e9111c42c4812d0cd52c26cc567acd2d7e74f66730afd3c4bc9f1667b0ad9c1f82f93d2844d8309b143f293676 WHIRLPOOL cec628c0f19971077677e667cc8903ea0a56041799a43907d47acc218fd9e0a6ea2a2a30999c74512fb36d233c6ac6d436f033684290155ff6ae70be5277bdbf DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a @@ -17,23 +18,18 @@ EBUILD vim-core-7.4.488.ebuild 7329 SHA256 bac64687000fd5195b60023a7de517101e78f EBUILD vim-core-7.4.527.ebuild 7304 SHA256 70b799da600d1b4c32b5790c7785150fd4be21ae129e91f3d522ed3e18445ae8 SHA512 6daf6ce5dda3586d1625a77456a3b83e28b84b831d3b76049620cf7ff1956158b80016204fe0f3bcb86c54cc6ec657b46e99c93833b04228db228eccb34f6738 WHIRLPOOL 9f618984c79e82b4f5cac30668a7ee8c7fd0396c32a70530dea1692eb52304c5800c0af6e73e95a9529e98cb15bcf98752d57bed2cf25411a405b6e399efc4e9 EBUILD vim-core-7.4.542.ebuild 7295 SHA256 de9c01a6270db1e8a5bc97545d018bda8b2b087214a18313a4a975d5c2db04ce SHA512 eb0bb59ff4fb6f8e129233a2ca4be9300524d3dbfa83c15f1a2274c449a930177bca9e65dcd675a731e7b94d67045600b968177cfce0ed5321ee9a59e8fcee4f WHIRLPOOL 81a85e15c8f458dbb21064addaeffaea46003f1ab76f88dc0b753310c86407d2935d83dcc69caf7c0114596ed35ba8fdbb8fbc119195988263266a5e1b0e5eb5 EBUILD vim-core-7.4.560.ebuild 7280 SHA256 8eb7eee82c150f763618d2f8bd307298c3c63fb705f36dd8a1c15b34c1f425ce SHA512 ddafadbc1a848349356e53740593e8baecf40bc69bd7dbbe4c5e40112bf2af44c6fb94933ee963c0b2906af8791cd76b7bd9cf20d419f3885c54dd031dafacf0 WHIRLPOOL 75d747511b55294408f1e8199fc449555c0b87cec86693eea7c48b02c4958d003aab207813966f0e4be2b2a840fbf870bbba7d53c8c219af219d36a7346c3930 -EBUILD vim-core-9999.ebuild 7274 SHA256 837c4439e16232779168417df58ae9d5f0e90453df504e614889677a22826013 SHA512 0bb82fe43539d5fc8a1b2a99917b705d6abad6eb3f88eaafd6cff2c94d87dbeb9dc40a58db1b17e5502d5ba258548249d987268e3ace81f0b66ca7226cc36e72 WHIRLPOOL e9f8c49b2436b75b0b654560c45fc0b20b3dee27e2c117e0261870c727d0aeb4b2eb17fa3b2e50dffa88b517f150df4c244b881813a46219d619d10bb8a5d90c -MISC ChangeLog 62348 SHA256 a81c63717ac15849bc7e9f29d0bee1f176cd2e67b78e2394b155fd8127e1d09c SHA512 92862634b88fd2e61d1f95611978cdfb4797201f6f6b2ad98912474ecb5ecbfdaad08039eaa5cc7556d686ea044f56161088f34eff6c934edfc34e41d546cfe8 WHIRLPOOL ce82b5be6fa2d50ba3e8fa916634b78291059a96040e97a4bc7fce0667c0ad3a56dbefc6025d340677f703a9b0ada95119a34d65f0de68bb87365fdc875551a0 +EBUILD vim-core-7.4.591.ebuild 7285 SHA256 5975664273da7104de0fc7dd15f4f32511d5d2d86a28af0d8e5abbe8e9e9795e SHA512 8e0759f32169d1485a3b8d6522df8e11b95857ce3827a773bfb0898adfbb6115f39dc3e91035bcf2b6c37da5f21bed29d53bb3bb80c54dd14ba5d679f175e96e WHIRLPOOL c6703f391d97dbb174fcf46700deca938691db144152e15aacda1b4ac871dc70e183b9673e5db147728b1db317bfed578c9ed6337a38dacc2b6f1b9a8ac056ae +EBUILD vim-core-9999.ebuild 7281 SHA256 1c2447ac314f57288405a460470ef0f85b720991d8c70d1a17d00f5533f8597c SHA512 c045c66c69024d2ac0b6c6f3e48d4dad58496ad54ac30e27e6fb416bb6e397826b539cfd6abf118e7bd14a758b49eee6baa66f00af9e1f56f2b0b52cafacac55 WHIRLPOOL 8e192352ea56a0900526748f86231ddb7d6da42a3233bfb3df81559f7d8cd818118f159857d45f47d13f4af07f63f5306fb6bf57291daa10e5bb0cdd8eb5abc6 +MISC ChangeLog 62502 SHA256 5b53431643a5b68771e0983cf58eb86ff4673e4ac03e8282becf7fc436331bfd SHA512 dacf85ab802bf085e813f1dc237218c90eab3f01e4060904596a744ecb463268f0de8045c2275d5a04ae0804629c952214dd7a9f6da751ef0057474374549312 WHIRLPOOL e352aa65ee8c39e864857b106076fc7d199463b26e0dc231789f708f2e48430d530b1036260f4de1b8010a78a485500280a9708f75aabaa088656e198934f8a5 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUqlCeAAoJEJIMDbyqvv1VSNQP/2rUFzh77NQD8EzAv7lLpoOI -l5jXX6quMfzZylZVCZk4tQxVEOIWVVkTWY4udLJtSCGyM5eoFnsJE5Ac1PiUYboF -L3fchrI642vmCD+bCBP512KWWywkQKa+AF5dNDVJ7fIr+oJ6/FS9pxUYPqQ3t+0Q -muac7LxhVa5EnY5d4yKx0BfggOZ8r5LRMcRzJCuHG4eo9mnFozY1RgMsayBrgu8I -sjprTJw8jnDBc8a4+S+jz849gJT1O4j6A11FB5ebGNMM5gT1vOQiIinuISvWRFBJ -GVrm7iFhP60VKXECycSOS/H0dr+jNwqM0tQhG6KSEV/477ieTes4o/es2DJ/r91H -W07SZyFxuc0hkEr9DDWRQOC0wgvwMfX+dHDC3vlUForLznyKoiAkkJV5PH7PjJki -IfyvXfpYxkkijwwIyNFsOuy3TY7lx+1YSLUxCgstndHV23JdUmXJ/KF4nV62leFM -bvg91ZIRAHhvU8gThmzDtnJXh4/D2S6lztMWb5uD/ahiovTI8lNnXzvovzzWYOXv -+sKidZVNeDCZIvopFsFZtv6z+xoqL/hRWPRieoZeFVxeKnK8k4Ox3JEuaa6FrCrD -86wlS5j+XGGYPzcJmtNWqpWgd4cJs1WA9byDt/FFycpS0Fq2oSchnX63W9m283SD -h3kbO+cAdcaXvWXVZ0wL -=zA5n +iQEcBAEBCAAGBQJUxszcAAoJEEqz6FtPBkyja38H/00UfHxcMYFuZ+Jx0jxo7c6A +LqOC0Iro8uRGCm39dKi8D5TvHlKN744D2nXhZfLbBFjyZ0H0wnKHE2LVFNG7gfmf +kevA/UnfkCC1W7s4wZLzLSkaB6ikPH8zJy/P8mvHXlD5DC4rEj4D9ilKv6p8h2Tw +2CQG55NPtqaAPu/EHb5Bb7CVge1ZZmjrCgYUMo285/zhy0vAUIB8sEMMN0h22H2h +zt79SXD+v9DiRRi26486wn4vRWsOnwD9FqXqG4c024S8QZU1PLEN7DutoG1BW6Yr +2nBjubFx9nqz6XqYaZxrRk9n4rJLoen9FGeh+o0PK1+vx8It+fr+3GLqwIHZE2I= +=ANec -----END PGP SIGNATURE----- diff --git a/app-editors/vim-core/vim-core-7.4.591.ebuild b/app-editors/vim-core/vim-core-7.4.591.ebuild new file mode 100644 index 000000000000..bb19f9752168 --- /dev/null +++ b/app-editors/vim-core/vim-core-7.4.591.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.591.ebuild,v 1.1 2015/01/26 23:25:08 radhermit Exp $ + +EAPI=5 +VIM_VERSION="7.4" +inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix + +if [[ ${PV} == 9999* ]] ; then + inherit mercurial + EHG_REPO_URI="https://vim.googlecode.com/hg/" + EHG_PROJECT="vim" +else + VIM_ORG_PATCH="vim-${PV}.patch.xz" + SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} + http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="http://www.vim.org/" + +SLOT="0" +LICENSE="vim" +IUSE="nls acl minimal" + +DEPEND="sys-devel/autoconf" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +S=${WORKDIR}/vim${VIM_VERSION/.} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home + export HOME="${T}"/home +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then + # Apply any patches available from vim.org for this version + epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz} + fi + + if [[ -d "${WORKDIR}"/patches/ ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches/ + fi + fi + + # Fixup a script to use awk instead of nawk + sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ + || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.in || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug 43885 (20 Mar 2004 agriffis) + sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]] ; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile + fi + + if version_is_at_least 7.3.122 ; then + cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk + fi + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + if version_is_at_least 7.3 ; then + sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + fi + + epatch_user +} + +src_configure() { + local myconf + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.in is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -f src/auto/configure + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do + [[ -e ${file} ]] && addwrite $file + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=" --without-local-dir" + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --enable-gui=no \ + --without-x \ + --disable-darwin \ + --disable-perlinterp \ + --disable-pythoninterp \ + --disable-rubyinterp \ + --disable-gpm \ + --disable-selinux \ + $(use_enable nls) \ + $(use_enable acl) \ + ${myconf} +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + cd src || die "cd src failed" + emake \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + install-icons \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r4 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal ; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + eshopts_push -s extglob + + rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} + rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor} + rm "${ED}"/usr/bin/vimtutor + + local keep_colors="default" + ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) + + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" + # tinkering with the next line might make bad things happen ... + keep_syntax="${keep_syntax}|syntax|nosyntax|synload" + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + + eshopts_pop + fi + + # These files might have slight security issues, so we won't + # install them. See bug #77841. We don't mind if these don't + # exist. + rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null + + newbashcomp "${FILESDIR}"/xxd-completion xxd + + # We shouldn't be installing the ex or view man page symlinks, as they + # are managed by eselect-vi + rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index 4f0c5109d8cd..a787142c0b44 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-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.13 2015/01/04 05:45:17 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.14 2015/01/26 23:25:08 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" @@ -15,7 +15,7 @@ else SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} http://dev.gentoo.org/~radhermit/vim/vim-${PV}-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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="vim and gvim shared files" diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog index 861d3d5fe897..b31f337be90a 100644 --- a/app-editors/vim/ChangeLog +++ b/app-editors/vim/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/vim # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.487 2015/01/22 23:17:27 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.488 2015/01/26 23:26:21 radhermit Exp $ + +*vim-7.4.591 (26 Jan 2015) + + 26 Jan 2015; Tim Harder <radhermit@gentoo.org> +vim-7.4.591.ebuild: + Version bump. 22 Jan 2015; Tim Harder <radhermit@gentoo.org> vim-9999.ebuild: Add ruby:2.2 and drop ruby:1.9 support. diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index 0e6ed5825e90..3c7d8079e5e0 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -5,6 +5,7 @@ AUX vim-completion 1004 SHA256 8191a5a47e03de62d67ad6936259c8eb005e50b52d94994bc DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2 DIST vim-7.4.560.patch.xz 741936 SHA256 e67cb9ba8772c72c3ebed0727e6dd57fc8eaeb1c8087cab7b9b8fe52f9063e04 SHA512 6748efa85883cbe811f4997192f5c0c11ac4825b40a3ef81a9a457eab26d86868aea6f62c8ced7018b3a7758242bd6c8e789fdfb8ce111f4b468f6563bc146fd WHIRLPOOL 45864fdabb133551c66768a4c075588744b99fc823f555ae19a440b2486054e1336c64c50f0bd7e3c1c0c88a0e345595a4bd384cd7dde312ff1465351db869e1 +DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66 @@ -15,17 +16,18 @@ EBUILD vim-7.4.488.ebuild 11944 SHA256 bacdd6a7ed9f18723f30ab5e0787c7ebc5866d404 EBUILD vim-7.4.527.ebuild 11944 SHA256 deeb77a5c2ac1eafc87a9ffc8bea469b4e87b0a1e533d0db27e6cff658e4eee1 SHA512 74f7fc2d72e016d7420a8f57a874f31119f90ef9186fdd7bb761b43e022912604dcea86b1258d13a58e075957894ba813f32fc07f6308473786793d3f1d125a8 WHIRLPOOL 2f2a907d68ffbe1ec64b0b8c9113eb7f5df0da39092d71f0e9d6ec8df847c87700b095fc8261f163b936f06c66dabb29c9fd482c1ce14b0cb5d2379c509b1c26 EBUILD vim-7.4.542.ebuild 11998 SHA256 bbb865bb61e76172a80ff39b8e1b98caca4edaebd5b3abc3394ecb8876fd6547 SHA512 f212de529f4c45b30ed89fb198e56767996eac11cf3b884984bc6ffdd071c9e4065b817dc4bf929c1e628594e1c4261d74e0e6e1ef80e52548e5dc348652744a WHIRLPOOL 17d5024c8c04f2daf2fc0e1e7bbd4adf6094c086c1c5f8dd604059dd19442b8250c86c2d69286dd4c3ee03454fc2b8a697dd1e30f3c91d8a8c3e2d41d54869ff EBUILD vim-7.4.560.ebuild 11832 SHA256 51b0399b4894cbf76e827929f0cbfa54aaecfbc3b01a02a4b598ac4d25e79106 SHA512 e0a530629a5d60466499a6cc0d721fe09a081921dc736dc08f8a5aa73e32e8e008dd6b5da935aec1cc82fdacb154bc5c07d03cdf9170c1119b40f632f14726b9 WHIRLPOOL 83c9704c91cb41fd2e06065a135cac822717d22fc55ad79f39b8fb21c09274f34f2fb54c5fbbb7a07d305d72615ea50950fc8939fbe6e12fe1b3df1ddac28f77 +EBUILD vim-7.4.591.ebuild 11779 SHA256 e25dbd9ffe65042da99f72c4919bb4c9a47780a290c77dc6e0bbd7fa4117ea9a SHA512 939b1bf8b0effac50326fb6c17bc7047745fb91a861d2246074a19c975aaf8591491618d77df71a57cb6a4b6edce305e9f62261529fcda414c8a4be0d6973ce1 WHIRLPOOL 11e06083d957e58c7562c709c0d0fa0f38f5dc59d001e91685b22b25c18029b885eea5e227c26c8e0a6d2148fb93bf7af833bd8fe78dbd79e0b318a04fd82bee EBUILD vim-9999.ebuild 11775 SHA256 18632b8d1cae286f8d20a1eb6ffbc767ef6e44bc55af271978273fa2027525d7 SHA512 cba27b3878ac03cbedf89200a7bcc1cbe79621d43cf0e52cb2cd31f85829ff219d2caddf6f58f7c57fceb35d8903d252ad7f1fc99913936207854e264bf52a2a WHIRLPOOL 0e85ab87a9a0858edf392125c0519dc3f8656841dbc65e6c5c8696401b226d5c080cb2dc24555fa77a051d554234e3c497002b99e2699f6f4b127fd338ed57af -MISC ChangeLog 65845 SHA256 58c9b6f6efcc838dffcd06b70df7057648d73a2fa5ace5f09d8669e072a27243 SHA512 3d3c3b460af5a7e771d175c0f33ce58231989709506c006256b81e86ebb51057107fc49f3b3d6c3c85c5be4c01501eed8d09d495e8726391c2b64882035c1572 WHIRLPOOL e5b988485299f8ed1a00499bccaf546d8387123720fe71e961e2eedc616457e1fe53f58624a4be0244766bc50ec1ce9193281822b1f9dfb4a93c4a65728ca94f +MISC ChangeLog 65960 SHA256 3b73ef0534d69f587b9eb0b694830d5503a95523703b73ce2231f58cb13fa692 SHA512 7c02b1ae09a3b901e4a78e7c31483f7925cc1215c687383fb6b67758311a878d613c47fdb90ac92b585d59106dea1e62e6b390baca603a2d817569a78cd1acc9 WHIRLPOOL 8cc7899aef4f684dab57e86f8d1654f8572bbabdfa037d5fa5029faf8b9097d6f2edd29951703d8ea7bbcf99d443e57de80a3ee65f2648e00180f9952398a553 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUwYUNAAoJEEqz6FtPBkyjniMIAK720MOA/nnKTPxXvdD/bARo -hF6x6Jk6Wcfd6R7hHAB4/6M9NxmQh/DTFhoKMLlw+JTcDxZt+tFOjmkRSFpPZUv4 -DsFqJGWyUhZUMYQA0I8ubWrcxstBm4kJdYLy7CAP6S0yZFISatSScrneELefxBxK -1iz4WDlsMEGoUzkMIrNTUX6ZLp74eu8ub4haboKh34F8XFTfWU6/gMmpuwBb6qN1 -//zRxzavkSfFz89kYJwHujcN21QYvzkH+VfNQdXMjMPO6Tbw8zGUWxP4pusUIW59 -cV8xMv3wDWXmpCFiK5k8bS9gt1F6dM1pxT3nS1cnlzuZOzGHofsggGTwSvJzlPk= -=2X9W +iQEcBAEBCAAGBQJUxs0hAAoJEEqz6FtPBkyjg2oIAKOd6oBSe4YxIw7CnrkdXPEy +vAs83LgrDsfl1cuxzRYXI6YUn3sp+7C2VzG/cEmoc3+3miqBwKt6Mr59lb4AewNt +Ueqv5Tc4Yaj3a1mkm9kdAWE4FPEsisMPBBCkh9xEz4N/BgGOnipirdiXowngoLKp +RFml0Kyq27+HuOrS1Adc5ZEaumf+eUy4r/HwCfu4wZIWdvNUcInWj5fO00zu3SZJ +46woTt6ggaVwoH05ZmOuKfhdqcqekkbM89vencSriZCGCpV4XkdDsNjIVaRfZMC+ +LZ6UHJUi/ZOa9h6ZgZJxlj1P6osOx5SmmA7oh4cB6wk6s8ZIUABb7Y4EjYB2LS4= +=mwWA -----END PGP SIGNATURE----- diff --git a/app-editors/vim/vim-7.4.591.ebuild b/app-editors/vim/vim-7.4.591.ebuild new file mode 100644 index 000000000000..ecd75c43eac6 --- /dev/null +++ b/app-editors/vim/vim-7.4.591.ebuild @@ -0,0 +1,388 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.591.ebuild,v 1.1 2015/01/26 23:26:21 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_PATCH="vim-${PV}.patch.xz" + SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} + http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="http://www.vim.org/" + +SLOT="0" +LICENSE="vim" +IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager" +REQUIRED_USE=" + 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.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) + selinux? ( sys-libs/libselinux ) + tcl? ( dev-lang/tcl ) + X? ( x11-libs/libXt ) +" +DEPEND="${RDEPEND} + sys-devel/autoconf + nls? ( sys-devel/gettext ) +" + +S=${WORKDIR}/vim${VIM_VERSION/.} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home + export HOME="${T}"/home + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then + # Apply any patches available from vim.org for this version + epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz} + fi + + if [[ -d "${WORKDIR}"/patches/ ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches/ + fi + fi + + # Fixup a script to use awk instead of nawk + sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ + || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.in || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug 43885 (20 Mar 2004 agriffis) + sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done + + # conditionally make the manpager.sh script + if use vim-pager ; then + cat <<-END > "${S}"/runtime/macros/manpager.sh + #!/bin/sh + sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ + vim \\ + -c 'let no_plugin_maps = 1' \\ + -c 'set nolist nomod ft=man' \\ + -c 'let g:showmarks_enable=0' \\ + -c 'runtime! macros/less.vim' - + END + fi + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]] ; then + sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile + fi + + if version_is_at_least 7.3.122 ; then + cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk + fi + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + if version_is_at_least 7.3 ; then + sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + fi + + epatch_user +} + +src_configure() { + local myconf=() + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.in is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -f src/auto/configure + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do + [[ -e ${file} ]] && addwrite $file + done + + if use minimal ; then + myconf=( + --with-features=tiny + --disable-nls + --disable-multibyte + --disable-acl + --enable-gui=no + --without-x + --disable-darwin + --disable-luainterp + --disable-perlinterp + --disable-pythoninterp + --disable-mzschemeinterp + --disable-rubyinterp + --disable-selinux + --disable-tclinterp + --disable-gpm + ) + else + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + --enable-multibyte + $(use_enable acl) + $(use_enable cscope) + $(use_enable gpm) + $(use_enable lua luainterp) + $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "") + $(use_with luajit) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable racket mzschemeinterp) + $(use_enable ruby rubyinterp) + $(use_enable selinux) + $(use_enable tcl tclinterp) + ) + + if use python ; then + 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() { + 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 +} |