diff options
author | Tim Harder <radhermit@gentoo.org> | 2014-02-06 07:10:46 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2014-02-06 07:10:46 +0000 |
commit | 6003d6f709d661cadd881cf001e881157b0ef084 (patch) | |
tree | 64fbe96d0e82f54b532579d40f7bdea9f034a439 /app-editors | |
parent | Version bump. (diff) | |
download | historical-6003d6f709d661cadd881cf001e881157b0ef084.tar.gz historical-6003d6f709d661cadd881cf001e881157b0ef084.tar.bz2 historical-6003d6f709d661cadd881cf001e881157b0ef084.zip |
Version bump. Support ruby:2.1, fix lua dep (bug #500376), and force lua support to be enabled for luajit (bug #499950).
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/gvim/ChangeLog | 9 | ||||
-rw-r--r-- | app-editors/gvim/Manifest | 20 | ||||
-rw-r--r-- | app-editors/gvim/gvim-7.4.169.ebuild | 397 | ||||
-rw-r--r-- | app-editors/gvim/gvim-9999.ebuild | 22 | ||||
-rw-r--r-- | app-editors/vim/ChangeLog | 9 | ||||
-rw-r--r-- | app-editors/vim/Manifest | 20 | ||||
-rw-r--r-- | app-editors/vim/vim-7.4.169.ebuild | 368 | ||||
-rw-r--r-- | app-editors/vim/vim-9999.ebuild | 22 |
8 files changed, 831 insertions, 36 deletions
diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog index 9c7b0b6fc515..e22d962518be 100644 --- a/app-editors/gvim/ChangeLog +++ b/app-editors/gvim/ChangeLog @@ -1,6 +1,13 @@ # 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.422 2014/01/23 10:36:06 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.423 2014/02/06 07:10:44 radhermit Exp $ + +*gvim-7.4.169 (06 Feb 2014) + + 06 Feb 2014; Tim Harder <radhermit@gentoo.org> +gvim-7.4.169.ebuild, + gvim-9999.ebuild: + Version bump. Support ruby:2.1, fix lua dep (bug #500376), and force lua + support to be enabled for luajit (bug #499950). 23 Jan 2014; Tim Harder <radhermit@gentoo.org> -gvim-7.4.22.ebuild, -gvim-7.4.41.ebuild, -gvim-7.4.94.ebuild, -gvim-7.4.131.ebuild: diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index b078905d3dec..323141507b35 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -14,22 +14,24 @@ DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3 DIST vim-patches-7.4.155.patch.bz2 183677 SHA256 df57d372ace540809dde22ad649ee7f13c4a165770cef28bb76d8dc7aa630671 SHA512 0667810a1ae908f5739ab37b32688fff3d65c4f69e83d3f9d0364112e8e7f70c77eeae3d672725df25ad837a75e373619321c1f183e7ded67afad544fbdd7801 WHIRLPOOL 829ab6152daed43323af6537669d4c3d6367138d0858c746ba02a6fc15497ef7161c62ccbe9bac7526296f5adf52a4ba1fe86c3539dd559ddc5cb4f6e0f90cfe +DIST vim-patches-7.4.169.patch.bz2 220499 SHA256 faf5e06098d45b25cea6ddb9e4ef080ce4717f2c2148678ded4f715bcb9fd652 SHA512 1102d7f89ad0cdd81f4bfa03875d400be3b642565527c61e72583b85723ef5f25ed7d7bc0dd6b620d013f65f500add84b96db734f45c21369e22405f6f6a6f8d WHIRLPOOL 1e45b776f85c941b3b741018338ece2b299576e5261103bc381e9b1f1162652bd79f119e060710dbabf99e3bff0668de9485df38b57897f716bd52a2f1f3cb2f DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0 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.155.ebuild 12176 SHA256 100e8776c9a4901090b11fe52eb9dd93826ccc37f1ee7c86fbfb0f1c3c62f3ff SHA512 5dfa0df6a04f94906044190d0ed2c50daf82f8173a3429e927b726099ea4ee378e20097bf59f18f3a9e36fe3ef59d9cb7b84b0dc79800052cccf18148a1ddcb5 WHIRLPOOL 5d4a093537d250cd487df5c6d57f2dd5a3be4dddf83ca707b7d3786cd6a25e93af8d41610fca1e3c9799987efe4971302fbae9d67bd5fbf30fc90ebb08b59a2f +EBUILD gvim-7.4.169.ebuild 12230 SHA256 ba711bbc117c9ab20fa949f5ff59bcc7b5180b7159e1fbe8ae7b95c4c7f3f4cb SHA512 6d2a9a43fb0edfb540fcc46672223ed274b9e71539aacac1178b9a8fb44bce0fb1c7fa6acedf3239cc9d59d0b4975b8b7d7e912518866366b960be290f0e48b5 WHIRLPOOL 467f352896767da1df0257c6b60f2f5aa13676d3b2d3adbf34a60e81558efe8a2fb86c926e784fc4e45aa5fb094b35f7c5d2ba171b32e5d4b56274dec5d4c20b EBUILD gvim-7.4.52.ebuild 12559 SHA256 14bc67c1fac648ae0990ad6b91f73a35db92c6cd8135e7d6bd8796e193bdf537 SHA512 7f1625a0220cd80f9a2516e082c64f8b32ac984ed1ae0c3a3a72d93b8d4d37cefedfd60b40a115f3d9cf4ad13e6bb13ad8b92b50da26b77074d434ee583fe112 WHIRLPOOL f278ae87c4fa0e49835ce91b070f9fd5acb5be939c8cc65f6f5e798b21eacf14c779bd6af18809fc7f9561f95a92ac7e7998ad3a60856de90a9340ed5090a6c8 -EBUILD gvim-9999.ebuild 12173 SHA256 4a56ac084b5051b1bc9482ee6edef3ae4c65361d6f3d4aa89c75c906945e29d2 SHA512 1c10a361d3a733a8170b5685d428e833d722684a37944f28dde1ae5be39df3fb61be2348d76b3ba7ff78abf6584ebdadd488b69da1593231c4faabdc1a87f7f6 WHIRLPOOL d3e802952c1420a406c942c157fd090f6fcc0f71f477f6ec42854a512f5fdd2c9eb225ef435beef3f340eebe7cc03e7523e18b1403e156956383fdba6b6de55e -MISC ChangeLog 57823 SHA256 a9f255ebbf9985a53bc856f70f148a15c5edac0139fa2e6d7fa470bc99cd8637 SHA512 2083f97f12c69943968b2838bde3a92f969f4519db66fd8346719510cfd381cbabb2d518bf937b34aefbb86ea2011cefaf7f32d473bd93feed59a0e2553baa57 WHIRLPOOL 944ee9451ba6ac84b2e879ee82051cbb035414bda472c1a5d99ec173165be50d4ca43b2ad80932c2139e74292fbe269b7a13a614851460810b5c17a4a6b9f939 +EBUILD gvim-9999.ebuild 12228 SHA256 3083eefe04d5f5a865517d2607c62a144a21030a804512a1dc270c281c86b92d SHA512 0413d343cb4e0ea4071fef36522c7bae30d23dffe664b597e58fda6d18bd6fb32a8198b9179f319ff19ee09af52eded1439a7de682f100b43724a99485d1205e WHIRLPOOL 31409a57ffe3fbbb2c2ff2ca487d6fbb6c48ee7afa2ed13a35948ab45f055889d48467b746f67c187d11e127006acb4635936c8fcab2de9db2c7d56faaa80eb5 +MISC ChangeLog 58069 SHA256 be307a1fc7b29a33ad55f4d4cf670e665ac83060bf603fd27b5dbfe39d925257 SHA512 a001d06c36677aa67a7333894f983ad910c93d352de73b2a3a8ea97cfb37ef44431e90df3274c3ffe5c3edab6b2d2a70b9aa666de446b80888e58ad85325abf5 WHIRLPOOL e7951cd0f8543eb938cb54c585dbb2ca2aa4949eb516e13ffc7027e1ced9012ac51f829b4b5a84bc7cc3daedf994fd1ad583976da98c71d02d44e25aedf81f31 MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJS4PCXAAoJEEqz6FtPBkyj19cH/29IzARErcyluA+kwhzFi+h5 -swvhavQjW2FmVD+lEgkgjbd6vyvTSWdw5d34h05zMN6BlrEqy0TE3boPOckKFENY -v/d5ztrdCWcVJ8ZORMLtMuMMyBBncaP5ynQPrp0GQ+yLXEAsplSQsic6w7CAdThv -+zhrzOQ27vm1inhPl/nBJ+0eS4n4q2K4HYCzso+4jc5ufrUje6BwuYwFcZnVaPSq -Yaou9AJYrpyNPD6VCteDyIFsvUjKbiCDPeVI517zcKF6m63C9VjSIh77KBnpiiya -Kv5y1Z0M8W+gXU1TVzbXPVTu0J+2GsT+kbir1GWvfyy7rez5ENUlvBiRkrQ3/RE= -=XTMC +iQEcBAEBCAAGBQJS8zV1AAoJEEqz6FtPBkyjcDkIAKDIL7yTQERJ3j6Mnm0lcYaV +Dgw4cQIjtJY4aTJVZQrpnwPlUxfBTbITYKmwGwyR2u8isD1wn86igR61Sqmuy5FT +CnNByMpl6hzYMeUqWtMG6PK+1eaD1hhL5dF7oDbi575UWidzvFOnUPdfGo++yC63 +Nc5sBC5PFUkXUPM2qbxrfSRvgueY47O7ME8h8EBHiKEAJrnOU3/RgQRf6uUc6rxa +/NkCJWoeWlGNm0cPVg7mOZzIIAOrSZzHiM8PJKO7sa3jfd+Rj+2Da6e6owbAgKQm +gyNbjmbtSyrm1i7iq0VSNViEYZbpx0uFtiQs1J9wO18vgMnzabUsaGZm6eBGlQQ= +=BUsC -----END PGP SIGNATURE----- diff --git a/app-editors/gvim/gvim-7.4.169.ebuild b/app-editors/gvim/gvim-7.4.169.ebuild new file mode 100644 index 000000000000..7f6657544a0e --- /dev/null +++ b/app-editors/gvim/gvim-7.4.169.ebuild @@ -0,0 +1,397 @@ +# 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.169.ebuild,v 1.1 2014/02/06 07:10:44 radhermit Exp $ + +EAPI=5 +VIM_VERSION="7.4" +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) +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}" + 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 dev-lang/ruby:1.8 ) ) + 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 + 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 +} + +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 abed2621307f..8ff7859abff0 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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.13 2013/12/23 10:59:13 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.14 2014/02/06 07:10:44 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" @@ -26,9 +26,13 @@ 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} )" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + luajit? ( lua ) +" -RDEPEND="~app-editors/vim-core-${PV} +RDEPEND=" + ~app-editors/vim-core-${PV} >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 x11-libs/libXext @@ -51,22 +55,24 @@ RDEPEND="~app-editors/vim-core-${PV} cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit ) - !luajit? ( dev-lang/lua ) + !luajit? ( dev-lang/lua[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( ${PYTHON_DEPS} ) racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) + ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) - tcl? ( dev-lang/tcl )" + tcl? ( dev-lang/tcl ) +" DEPEND="${RDEPEND} >=app-admin/eselect-vi-1.1 dev-util/ctags sys-devel/autoconf virtual/pkgconfig - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" S=${WORKDIR}/vim${VIM_VERSION/.} diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog index 21ea74426a19..4bf632f5031d 100644 --- a/app-editors/vim/ChangeLog +++ b/app-editors/vim/ChangeLog @@ -1,6 +1,13 @@ # 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.452 2014/01/23 10:36:43 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.453 2014/02/06 07:06:07 radhermit Exp $ + +*vim-7.4.169 (06 Feb 2014) + + 06 Feb 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.169.ebuild, + vim-9999.ebuild: + Version bump. Support ruby:2.1, fix lua dep (bug #500376), and force lua + support to be enabled for luajit (bug #499950). 23 Jan 2014; Tim Harder <radhermit@gentoo.org> -vim-7.4.22.ebuild, -vim-7.4.41.ebuild, -vim-7.4.94.ebuild, -vim-7.4.131.ebuild: diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index 60137e424439..923edf837edb 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -10,22 +10,24 @@ DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3 DIST vim-patches-7.4.155.patch.bz2 183677 SHA256 df57d372ace540809dde22ad649ee7f13c4a165770cef28bb76d8dc7aa630671 SHA512 0667810a1ae908f5739ab37b32688fff3d65c4f69e83d3f9d0364112e8e7f70c77eeae3d672725df25ad837a75e373619321c1f183e7ded67afad544fbdd7801 WHIRLPOOL 829ab6152daed43323af6537669d4c3d6367138d0858c746ba02a6fc15497ef7161c62ccbe9bac7526296f5adf52a4ba1fe86c3539dd559ddc5cb4f6e0f90cfe +DIST vim-patches-7.4.169.patch.bz2 220499 SHA256 faf5e06098d45b25cea6ddb9e4ef080ce4717f2c2148678ded4f715bcb9fd652 SHA512 1102d7f89ad0cdd81f4bfa03875d400be3b642565527c61e72583b85723ef5f25ed7d7bc0dd6b620d013f65f500add84b96db734f45c21369e22405f6f6a6f8d WHIRLPOOL 1e45b776f85c941b3b741018338ece2b299576e5261103bc381e9b1f1162652bd79f119e060710dbabf99e3bff0668de9485df38b57897f716bd52a2f1f3cb2f DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0 EBUILD vim-7.3.1214.ebuild 1118 SHA256 5f2562a86a39ba99c79baf0b44173aba00e20013e249af74777ea9ba4bfaf751 SHA512 514233dab534cc49a4f318681e568ed059128352e94d748e1b38632340ed4576f6b0218367bc28024ec689e613c9fe180872054cde6e83a164227eace5568dba WHIRLPOOL 421d998ef49148b7efc77830126c8c2aa2eb7c2b0674752a24e60de289c2588f5b426847f8bed35951410c906d21c6b0d5fc9f814d81b5b8c1ce12277f3444b5 EBUILD vim-7.3.762.ebuild 1001 SHA256 17cb878cf1c5922ac95d2d6c04215ae1bd695bff7a4ac742f92fbd0a8d688829 SHA512 2c7dbc515e74af5614e9a3290f61adb270c6f4dd0be4795f55a35d9d723c2bc7f3af4b890b571c21962be6585551b685dde68d6c1838368af7a1721ec87c1219 WHIRLPOOL 2a17ab2e9a9e903f1d2792d29d39086a8d3eb42c55683a409c6a6025ab2a5bbe1ca3750b5ac815164b293a6ecd59d187c37558e084baf66b4b6818d290800325 EBUILD vim-7.4.155.ebuild 11525 SHA256 a5ff17318686529f80eca4b8814776f8ef36b5aae19e5591788a6d7418dba50a SHA512 3f6b113be76cb45343e46eae6fb81cf86a023412fc3c984c3446616868c8e387caa640027929bb3d26829d381f938f151d70fdfa7c884fc311781bd91be7531b WHIRLPOOL 7e547fb61f4b73d40151f130c0c5a2eae0075bf07133abb17264c288c1bf7f25df61000620eff26c79f6e91bf2fbe372a12d096ed5ea6dcc69a81b32d8509d22 +EBUILD vim-7.4.169.ebuild 11579 SHA256 48c9e8b3a8e5242cf7696c8289a0a594fb489bfe5458f56c01c2c4e201015f20 SHA512 1ec702e647f3477a925151095cf7353b6e4e58349b36f0b083ca27760c51046a7f4ca43db5c6d7d804c10742b4e58adb4fb257f7cc233f39cddcb32b3f2a7f15 WHIRLPOOL 012301ac84569bbbd8a40649beac0ef5900ce5e1d5a1425ad7884ff33e1ee2a059a7595b6a872e89518928d44f4f1457e39158436970d260a45bf07bbdbe0f80 EBUILD vim-7.4.52.ebuild 11778 SHA256 6c966f4d425286610619b546ea787222b4fdcdb619eefc017cc041c7eac16db9 SHA512 a4f7af2a712f6ac7f254b62597a25ce3b4e269d575531eae85df9d34fdb5315ccba8c1b5946d4eff210d3acc82781040f7309a176b79f25eb6886bf94bf0fe77 WHIRLPOOL c1e4bfa5d5ae42f9df88a237903190d7658eaaaaf37b05c5b4addbc56c3064556ba630e923a1b3037f5f7800b35287ce6b2cc2bd800099e079094b820e749545 -EBUILD vim-9999.ebuild 11522 SHA256 9423d9f0bc8acd782369bb80234d6ae69761c764cc42288140ebcd4b0983b497 SHA512 46007156879aebfd269b1b84a57b15c73b48482a62c87697c9cca898958d398e36a87382eb2a2577ad5b417a5494eabf193182cf8c79f9c1068011b1ada26f1f WHIRLPOOL 40eaaa28265f7a4743e18f2672afc10e8f14faa084d4d7f3547d2f927548f8c31c729ed7f41e118973b6d96e5f7fce171e5da0800f6b67832f3b686b057819a2 -MISC ChangeLog 60992 SHA256 0b5849fc441e20fa0e35f7e98e971aaec3e804096ef8adb749e4995c2ab42d64 SHA512 38aac1fe5b062990e031581de6b6a3715eeb7610ea9b9a8070ecb8414d397cc11b95289b15ca432c3b78a25d4c5db4943b70e66027e4a3640dfd7b1dd4fae322 WHIRLPOOL 03977d53236efe57cf1fffd4de9ef170f805d6093e3ab76d041cea05741a82164a46d66cde9f1a8250d6c837e86b4b060b8d16190c34691eae0feda404f1b97e +EBUILD vim-9999.ebuild 11577 SHA256 95ed1c4c7d7597bc4670de225c2e275b939a216d9b8d5ed2a6d401f1e7f25fcb SHA512 05bac9cd70470570bdb901379b8ee7774290962a2937c3e6b97ad055acffafe693f3dc8fb6aceb7b40965e5556c690184d7a189a5b62de09a0903a995b17d2e6 WHIRLPOOL e13f5581d6ebf9aea36a39557478efd8f95eb4783c114aed5c8383787ffe703a2779e71d70a469176d1f483ac5852aa200ecc12f030c7ac303805f9191a097cd +MISC ChangeLog 61235 SHA256 f2d63f88d27f97f8a3bf39d907b6eba3a3f42338aa8321b6a0501574c497ae14 SHA512 597b482758833f075360f30ab7a2cad99002536a23e19151c140ed8631945558b2be285048ddc8c5435cc87153ae947bb2d0c3d60073ce7d0695220b69961bbc WHIRLPOOL 15757cc8a4ca2813cf38753d699679ca9730baaadd0c7641bb9897dd9e00fcaeb0cb0e399ec1699a2558cf59d941a1a62710f73d198badb33bf26d43a983dfea MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJS4PC8AAoJEEqz6FtPBkyjwFMH/12zJJU1cAjy8EYnq63KQSVt -gGfdHjbTOXRQLOf7uf98oqjjY6DguV8zFW56tqLnv3q/TPaLO/KdQv08nwhp51jF -5x6O7oovMcHqStXGJ6lXMj05lEL54c5MAhAKlOZVIIW0K+m3rLuhRo39E+nTlydf -pMilX0LAKum55v9J1At6P2gvlILkPsNrFz5D0q24Ppc9bvRlQY3LvmYuMGpjS839 -K8QYLaLfsIeR75RlEuJTYQvpysN442c0FfoF8vYYd496H28ZVwhCee8tmO8mSTBw -WRBcWyKfG3JyGYpBLkc7pltMpxKZkUV+fhLLfXqAa8xfZkHQu6nnZNXcuPBjczw= -=QpQ+ +iQEcBAEBCAAGBQJS8zRhAAoJEEqz6FtPBkyj27cH/3Y4/eP7DhyouxH66niDwK/f +9Da/0jcQ6d7x/DRHLim0YBviOq2JwPI3EELTe+1GxYk9kCg7zcAV6vfXUkBPujFM +l1/6aaLTYJd3ICXqmG+WKiTCl0nZmF24GBsFw7TIzmD50ppV8WHymBmidiegnraF +/3H7+7393DfQZ6uCY9DL8m0oLSiDCg9CLXoWwLBHpiWCYb89QsRlmCnJjpsJigyL +E3DHKuKCmqGeV55PbpoukklplN9CapHoMdtxfG8gKIwCIwAnJ/9KLXk32FNGyanL +YcVgF6UXWDZQDWJ9cdbGW1iHU5KmgE9ReQTg5t1JPCVP3L2O6Ozhpsb6g7+kQnk= +=l1wP -----END PGP SIGNATURE----- diff --git a/app-editors/vim/vim-7.4.169.ebuild b/app-editors/vim/vim-7.4.169.ebuild new file mode 100644 index 000000000000..1cf9107490fe --- /dev/null +++ b/app-editors/vim/vim-7.4.169.ebuild @@ -0,0 +1,368 @@ +# 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.169.ebuild,v 1.1 2014/02/06 07:06:07 radhermit Exp $ + +EAPI=5 +VIM_VERSION="7.4" +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) +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}" + 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 dev-lang/ruby:1.8 ) ) + 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 + 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 +} + +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} + + # 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 32fe11575f61..87b0c84dc574 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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.9 2013/12/16 09:57:57 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.10 2014/02/06 07:06:07 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" @@ -26,9 +26,13 @@ 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} )" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + luajit? ( lua ) +" -RDEPEND=">=app-admin/eselect-vi-1.1 +RDEPEND=" + >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) @@ -36,7 +40,7 @@ RDEPEND=">=app-admin/eselect-vi-1.1 gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) - !luajit? ( dev-lang/lua ) + !luajit? ( dev-lang/lua[deprecated] ) ) !minimal? ( ~app-editors/vim-core-${PV} @@ -45,15 +49,17 @@ RDEPEND=">=app-admin/eselect-vi-1.1 perl? ( dev-lang/perl ) python? ( ${PYTHON_DEPS} ) racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) + ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl ) - X? ( x11-libs/libXt )" + 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 )" + nls? ( sys-devel/gettext ) +" S=${WORKDIR}/vim${VIM_VERSION/.} |