diff options
author | Tim Harder <radhermit@gentoo.org> | 2014-10-13 21:11:08 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2014-10-13 21:11:08 +0000 |
commit | decc06840c56336264827cbdd3d4159d5ebf6250 (patch) | |
tree | 3b3602f15f71aaca4e1633856b259d7fc4ff5ef0 | |
parent | Support multilib providers for deps. Bump to EAPI=5. (diff) | |
download | historical-decc06840c56336264827cbdd3d4159d5ebf6250.tar.gz historical-decc06840c56336264827cbdd3d4159d5ebf6250.tar.bz2 historical-decc06840c56336264827cbdd3d4159d5ebf6250.zip |
Version bump.
Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3
-rw-r--r-- | app-editors/gvim/ChangeLog | 8 | ||||
-rw-r--r-- | app-editors/gvim/Manifest | 26 | ||||
-rw-r--r-- | app-editors/gvim/gvim-7.4.475.ebuild | 405 | ||||
-rw-r--r-- | app-editors/gvim/gvim-9999.ebuild | 4 | ||||
-rw-r--r-- | app-editors/vim-core/ChangeLog | 7 | ||||
-rw-r--r-- | app-editors/vim-core/Manifest | 24 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-7.4.475.ebuild | 231 | ||||
-rw-r--r-- | app-editors/vim/ChangeLog | 7 | ||||
-rw-r--r-- | app-editors/vim/Manifest | 24 | ||||
-rw-r--r-- | app-editors/vim/vim-7.4.475.ebuild | 376 |
10 files changed, 1064 insertions, 48 deletions
diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog index 3037052726b3..0b590a7b5db2 100644 --- a/app-editors/gvim/ChangeLog +++ b/app-editors/gvim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-editors/gvim # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.440 2014/10/12 09:01:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.441 2014/10/13 21:11:06 radhermit Exp $ + +*gvim-7.4.475 (13 Oct 2014) + + 13 Oct 2014; Tim Harder <radhermit@gentoo.org> +gvim-7.4.475.ebuild, + gvim-9999.ebuild: + Version bump. 12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> gvim-7.4.273.ebuild: Stable for x86, wrt bug #511190 diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index aea6f6d0e9ad..99a42a765478 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -22,6 +22,7 @@ DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f DIST vim-patches-7.4.326.patch.bz2 547801 SHA256 ef055424ee6a38967a38420c136ad54cde2f0da02417b9cd5893a1eaeae589fb SHA512 f047a9cbe01ce1820eed33b9ca7de769851b22e39083e17c6d41f1f9d705a64f608e12ad9a383d2c3d45da20466f4e6db26118424452b76c3344043c163bee1a WHIRLPOOL 01dbc695dc6ca698fa64bfc02a12ef97cb8d12e52992acf529fcc5f0264b8db58d33ef909b65ded282e77a06a352a23f5d592bfaa9d2a4ddfc566813bc725afc DIST vim-patches-7.4.417.patch.bz2 672822 SHA256 244a556bf45a11d9b9a8669239062a400e1e73ea940e54b7bbaca954da7fc6be SHA512 abda7e717a486f677e0f6720beecc903879deadac9a61faf628a7c590030b81269c48c20de6e1fe99011072e9e7a675552917e7d367f9c2d3596688543e371e9 WHIRLPOOL 4398c9de866a2a84257fe2cd6743a75c494ecbd47ef2d5dd4393834e84801bf1786905dbf368f65b98eafb1541aaa5eda05b81f042afea564469f294add3f548 DIST vim-patches-7.4.430.patch.bz2 680438 SHA256 173ebaaf7e39e9cc9face31e6f8269ec7e5880998a8b846a80f88bc65fa40be3 SHA512 dd58e693286bf73d49a3f0625d597fc88c6a72eb386eae9f8e656854ac42f92a3e0bc0b43efd23e55d65040ec4f767ab48366753736b1b843b85c2a738829a54 WHIRLPOOL 7ce6e2de659103edf2dc5ff09c66fbe3d24d5f1fcaf34e49daef65a1d5f498c9326c5384615cb011848d60fb5ec538a531b28f63d2c2f9a51db979bf3141086e +DIST vim-patches-7.4.475.patch.bz2 704060 SHA256 35e1f82629e888865d03ddf8647554a607d94fc5ba33502822fa171d4914aba3 SHA512 80e26c872793604b6ff76bbb9b63d10ed9633b448008158d2f2538e9a18c62f7070b5f014b221643d2e97d0d6f7812ffc8a038f7acb2e1558ac5a083d6db8ee0 WHIRLPOOL 983c51f3d1220ab0512491f04e72cbf90a2891d44c578dcde043737a700c329cc3a090f3d2bf581ad4a23b6765bb72517f76520da1299ea8a65c6ac5957578da DIST vim-patches-7.4.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 @@ -32,24 +33,19 @@ EBUILD gvim-7.4.273.ebuild 12234 SHA256 9cccb531e99c93d8f4d2b51a7a9d50dc9b749beb EBUILD gvim-7.4.326.ebuild 12248 SHA256 40c82145cd3d9d34eefb4f56b0280ed27abdb879effeb59a02e1af9e99f6c7b0 SHA512 2df1d0ca7f8330cfbe0499cb2f700594c70c842a4582c7bfb54663e3dabae62ed1b8c8bec9120600f8ea9cca787db51707f7ea4576b6f7acf457a991e5da9d03 WHIRLPOOL 62bf6db969c6b37316c245c536778fec27c090b9c28c584137778382f5daea1a00ff88e8946df0539156c431bef1d2e82317dde60d57d0f52c1ca6f709cef3d2 EBUILD gvim-7.4.417.ebuild 12248 SHA256 0df62861374c3f4e69bbfa92fb1134080e4e09c12e22180f468795ebe66b2be5 SHA512 9393a5ae3b977fe9bd181204091d835d21ec60ee0b4eb1449f7a7e6bedc9752a750a2f9e48263d89546837e14c10b7a39c24c532d8dda64b9ad68a43b82d4cff WHIRLPOOL 93bd0751c1eff490d6423ef3900e2505f441e02853c60bab8a33bb286ed05775ca890bbc0d9fde5ca4f6c8efc98bdc3f23d745099b0386f4527187175ccb5894 EBUILD gvim-7.4.430.ebuild 12603 SHA256 fbb17afa454c85e8dac1dd925662edd347f94df9f6db35c48513d3cde210edc5 SHA512 674239cf064df438910e9945851e8439b55582180885160b00cfe9198c881d95ae459980d252209900cfacb280dca020ccb2ac35260cf43224c3632fdb9d97ab WHIRLPOOL 570f5b09d27e920659e984d454bca1217b58c030697cb41fae73c201cf5abee243df3f458da436762b529908ad7116d87187adc8b9900f8d0c673d9ff1f10f02 +EBUILD gvim-7.4.475.ebuild 12498 SHA256 d746afaaa070d5be60481bbabec1d20a9ddd3fca2b9c0e093171f566f51fec81 SHA512 34de2483f7fa3f738d035898d806ebd46b725b9df17b2beb02eef83ba25384d8f21c85880773a63fb025cb012d129af4cc844e353ddebac79659677b8e3c5d3d WHIRLPOOL f04142b405f76f91dc5ba955fa71f1ece8443c55243a74fea76c9c76500947faba04e348d2eb98f9c76973c38392df0934b1324b3de4b72d1af5f1a1ecfab439 EBUILD gvim-7.4.52.ebuild 12559 SHA256 14bc67c1fac648ae0990ad6b91f73a35db92c6cd8135e7d6bd8796e193bdf537 SHA512 7f1625a0220cd80f9a2516e082c64f8b32ac984ed1ae0c3a3a72d93b8d4d37cefedfd60b40a115f3d9cf4ad13e6bb13ad8b92b50da26b77074d434ee583fe112 WHIRLPOOL f278ae87c4fa0e49835ce91b070f9fd5acb5be939c8cc65f6f5e798b21eacf14c779bd6af18809fc7f9561f95a92ac7e7998ad3a60856de90a9340ed5090a6c8 -EBUILD gvim-9999.ebuild 12500 SHA256 27153873e6a9d4ae1c2dc87bd30c02b0de31aafaa76bb723dc050552cdcd5e51 SHA512 83f7eb6d178ba747d13a6a45cb72702edd08675ab707b4cd7b8837af30ee9b27377818d95d3092ec79f2be9ea69e64e237674fa4b96ad46e7cfd529f2b9685ea WHIRLPOOL 744fef672ac6adda06a8423891f76dcbf04185590300c738b5742340bce37e9751a9b9cdd362fd0ce6ef48198cd60392ec193b9a973eea3af93c41a9bcfc34cc -MISC ChangeLog 60274 SHA256 a921b0ec1b40ee6811179b973a21e615b8c7459ea71b3a24f9db972aaef28ae2 SHA512 a0c037b166f74b7be7814028ef558a7d2c03d6d7705da0ad2bc4ff1fcd256633ba314bb427ce3779487bc24a18a2a0ffc1b64cac1a821fe4a5bf575fd0e56040 WHIRLPOOL 2ff7498a81f6ccc1de384418e78b309e64fb6a1eb6afa3dd0ecd2ad8913bbbe19732d49870ea20068b93aaa39d5788bcd616a62b5b218a96e72ff344dd4963a3 +EBUILD gvim-9999.ebuild 12496 SHA256 2ccd4ad542131ca24141180f2ed53f30c60f6066590d2de70c068e2c67d57e2c SHA512 a5340b38d39db49240ce4c4e554b54c27ef8099dfadfa7b790c2b417281167c4d1f7ef4350d2774a829d00c0eec993dae3e5a6c4ba6ee17dd323b54155f19aaf WHIRLPOOL ed7ddfdf1a727db46b5632b94b1d18f39e236377127ed557145234c8701dc5b5b079508d69d289e95c9c7ad83c5a232891aa0e72ff243c828cec8cf9e887a077 +MISC ChangeLog 60417 SHA256 597c83d49add3dc36af04767fb5806a8e4f57849f7b4514954566c952b1a36c2 SHA512 a6e3d7eccd054969bc723eff2d6ade7d2fc0397cad5b795baceea0f850348910e6d58f4de6b3733a28b89116ead976964bf3f94dd0281a1729ad2c28677e0053 WHIRLPOOL 51bb2ab78dbea531e03cee0623d78746a9557315a3133a5bf584932090dba140794ecb915d75e6eaefd7c87086da1597e69ac86f93e882b6600f2f356f2ec76b MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUOkOGAAoJELp701BxlEWflJIQAMKbHVtKOnWY4XK3acyMyY7H -iNKXKd+XP2QgqVq++7nPKsW7Rr9Au9OtZPFW0VfHGDvppbL1q778hjOI6Yh/Ze6K -eAvXkvEAd1sW+JL7EtyModNrHv1/sj1Pw3k0wfbvpLxPFLNlmi4xZHqF83kNMLDi -g41OUIKwZ4p9TIiidAL/jAngkkofJPhgNColuucLrj6TAonpZoixoogs0FFInUVz -ob+3Ze7ShsqLLKy0r8C/LI+Mj1fGqOZXbny/mDxP+PXIXxYvQowyBn8fAP0pVpxu -8kz9YOp+gJQoQai+vNqZOyyZrE/Kq/CHvL1ZVnXELRe02cdd9SFDSllbK+ZFTnQn -+FG8PTwXdB7Bntlf2p/R4uNxoV0xtgKlCDx1agB+E51BOp4sfazM+uqxBivBXeBZ -cxGnOU7VchiFdHq+wk3B8TC0G1lyyOoCCpR360zAgJO1DWKNzEhGsT7eXdCaK8ME -zTRsXay+1xEy/iLhZ4lH6MXn+uuAX6xoPAseMaezuFZ5tRYvx/OIaPwhYFd0b0Z9 -GlhSxZpfdkjPFgXsGtmiu7bhGUULed22drAwcgT4jNKaNkp4p84wHfhKZ91wo+OY -6KyNgw+tjbZUoSxXTGtmWvxNPJTPitDjFkLdVlh6JM2WWoUOrpO6GtBGuPAoV22U -cjMFO9ZQDd/nXdVKnfpe -=p7AO +iQEcBAEBCAAGBQJUPEABAAoJEEqz6FtPBkyjnuMH/39pkcyLhoQg5y9AwQ3b6daz +iwG7BqSLiHQYWNmpVuRstwwYIer5j4BxXg2HiUnlKwDIQUUlIWxWFnKALZEPu1HH +9wuE9/T6uFzmHOdyHhg0unn3iNDWvKWIcgzctleMFq6ANXeg2fAWRwyq8G47Y5xk +OrHoWSZ+ZhN/VoKU+vUep0eXHEoCilHX4uW0tVBVd0T/XZHrPcPtTxbcSy2YYtjU +1CVqstTj+ENFdkqowmekpVGC+wNd+nIgZcKG5pxQpsLw4S6J0TSgsUHd57WvXoqZ +C9Jotj8iUdTDrasOlQCSVTBlpSUsDD+5blw/EDYJoa3dWElnj/pIfwEswivh5n4= +=86fu -----END PGP SIGNATURE----- diff --git a/app-editors/gvim/gvim-7.4.475.ebuild b/app-editors/gvim/gvim-7.4.475.ebuild new file mode 100644 index 000000000000..2c0c4179b908 --- /dev/null +++ b/app-editors/gvim/gvim-7.4.475.ebuild @@ -0,0 +1,405 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.475.ebuild,v 1.1 2014/10/13 21:11:06 radhermit Exp $ + +EAPI=5 +VIM_VERSION="7.4" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE=threads +inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-single-r1 + +if [[ ${PV} == 9999* ]] ; then + inherit mercurial + EHG_REPO_URI="https://vim.googlecode.com/hg/" + EHG_PROJECT="vim" +else + VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2" + SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES} + http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +fi + +DESCRIPTION="GUI version of the Vim text editor" +HOMEPAGE="http://www.vim.org/" + +SLOT="0" +LICENSE="vim" +IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + luajit? ( lua ) +" + +RDEPEND=" + ~app-editors/vim-core-${PV} + >=app-admin/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2 + x11-libs/libXext + x11-libs/libXt + acl? ( kernel_linux? ( sys-apps/acl ) ) + !aqua? ( + gtk? ( + >=x11-libs/gtk+-2.6:2 + x11-libs/libXft + gnome? ( >=gnome-base/libgnomeui-2.6 ) + ) + !gtk? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + neXt? ( x11-libs/neXtaw ) + !neXt? ( x11-libs/libXaw ) + ) + ) + ) + cscope? ( dev-util/cscope ) + lua? ( + luajit? ( dev-lang/luajit ) + !luajit? ( dev-lang/lua[deprecated] ) + ) + nls? ( virtual/libintl ) + perl? ( dev-lang/perl ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) ) + selinux? ( sys-libs/libselinux ) + session? ( x11-libs/libSM ) + tcl? ( dev-lang/tcl ) +" +DEPEND="${RDEPEND} + >=app-admin/eselect-vi-1.1 + dev-util/ctags + sys-devel/autoconf + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +S=${WORKDIR}/vim${VIM_VERSION/.} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home + export HOME="${T}"/home + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then + # Apply any patches available from vim.org for this version + epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} + fi + + if [[ -d "${WORKDIR}"/patches/ ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches/ + fi + fi + + # Fixup a script to use awk instead of nawk + sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ + || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\<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" + 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 ea9356e31664..1f047353df64 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -1,10 +1,10 @@ # 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.18 2014/09/06 17:53:59 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.19 2014/10/13 21:11:06 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_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 diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog index f473fcc91c52..c415ddf629b5 100644 --- a/app-editors/vim-core/ChangeLog +++ b/app-editors/vim-core/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/vim-core # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.450 2014/10/12 09:02:05 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.451 2014/10/13 21:06:35 radhermit Exp $ + +*vim-core-7.4.475 (13 Oct 2014) + + 13 Oct 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.475.ebuild: + Version bump. 12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> vim-core-7.4.273.ebuild: Stable for x86, wrt bug #511190 diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index a9c11b1148f8..7909afc260ca 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -18,6 +18,7 @@ DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f DIST vim-patches-7.4.326.patch.bz2 547801 SHA256 ef055424ee6a38967a38420c136ad54cde2f0da02417b9cd5893a1eaeae589fb SHA512 f047a9cbe01ce1820eed33b9ca7de769851b22e39083e17c6d41f1f9d705a64f608e12ad9a383d2c3d45da20466f4e6db26118424452b76c3344043c163bee1a WHIRLPOOL 01dbc695dc6ca698fa64bfc02a12ef97cb8d12e52992acf529fcc5f0264b8db58d33ef909b65ded282e77a06a352a23f5d592bfaa9d2a4ddfc566813bc725afc DIST vim-patches-7.4.417.patch.bz2 672822 SHA256 244a556bf45a11d9b9a8669239062a400e1e73ea940e54b7bbaca954da7fc6be SHA512 abda7e717a486f677e0f6720beecc903879deadac9a61faf628a7c590030b81269c48c20de6e1fe99011072e9e7a675552917e7d367f9c2d3596688543e371e9 WHIRLPOOL 4398c9de866a2a84257fe2cd6743a75c494ecbd47ef2d5dd4393834e84801bf1786905dbf368f65b98eafb1541aaa5eda05b81f042afea564469f294add3f548 DIST vim-patches-7.4.430.patch.bz2 680438 SHA256 173ebaaf7e39e9cc9face31e6f8269ec7e5880998a8b846a80f88bc65fa40be3 SHA512 dd58e693286bf73d49a3f0625d597fc88c6a72eb386eae9f8e656854ac42f92a3e0bc0b43efd23e55d65040ec4f767ab48366753736b1b843b85c2a738829a54 WHIRLPOOL 7ce6e2de659103edf2dc5ff09c66fbe3d24d5f1fcaf34e49daef65a1d5f498c9326c5384615cb011848d60fb5ec538a531b28f63d2c2f9a51db979bf3141086e +DIST vim-patches-7.4.475.patch.bz2 704060 SHA256 35e1f82629e888865d03ddf8647554a607d94fc5ba33502822fa171d4914aba3 SHA512 80e26c872793604b6ff76bbb9b63d10ed9633b448008158d2f2538e9a18c62f7070b5f014b221643d2e97d0d6f7812ffc8a038f7acb2e1558ac5a083d6db8ee0 WHIRLPOOL 983c51f3d1220ab0512491f04e72cbf90a2891d44c578dcde043737a700c329cc3a090f3d2bf581ad4a23b6765bb72517f76520da1299ea8a65c6ac5957578da DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0 EBUILD vim-core-7.3.1214.ebuild 1003 SHA256 0eb20cab51102107ef9c8df2e39d38f0d3f2e15e87fe88f271299f95e84b3e9b SHA512 eb4fc44617eedf81ffed762f28a4c8c0bf3b0b2fad493ef3310aa2782e5c45017bb2fe7f37b737649c17d1a4be6dc6c612b64301c80f9424d57abfc3eefac142 WHIRLPOOL 715d73a38bf97b2d3e520d8e6ec5e82d22392ec00701a743a0fbaf1de313bf1fac62d777268ae6da676cfa5730548d3337c46fe0cd36e6a6f85e1ad1986c234c EBUILD vim-core-7.3.762.ebuild 990 SHA256 4da64156648f1030702b5c699cce68b092631518fcf14b21cc787fe2cd86d6fd SHA512 fd5016260cab99b236147f090aab3b5e65cbfe5cb6f182d8e5e3638700a00969a0cfa2d20e3159241b21dd4e03035fcdd7e129017556ec128413531fe88e111e WHIRLPOOL 61485a3b00b0a1bd883ba7a8b3481844a7f4bfcb906e859da649d7487d595a17eaddc4a6617918e9750fcf0e9bcf91f91aed1a2dd3c18c7eb0915d672af0cd36 @@ -28,24 +29,19 @@ EBUILD vim-core-7.4.273.ebuild 7307 SHA256 b9ca490150e34c11c88c9c1689da45e88828a EBUILD vim-core-7.4.326.ebuild 7321 SHA256 566ba711f5e345a0c16c321139183a485650f3bbf835df474af4c64560d6e4c8 SHA512 3a6f8f03e4287996f460bbce314fee801ee48c34bf5201db9e6661d4c7d9b5e191c648ea6628d92c3691f68a1d3dd09c308d7c8d2b41860da3e30523b1da7a07 WHIRLPOOL b35735d5f6d58b5c9b27a635dbe4028691ae42ea8e135e174c715938565a7f5eaf4f8bf8622b9b1bdfa75eae1d2e609dbb53efd27ddf592226ebe6a619a56766 EBUILD vim-core-7.4.417.ebuild 7321 SHA256 5d4229901e8e26773efba042155f256070a1ab286354fe52e94fd4fea575011c SHA512 b5e3713581d44a61b359efcfa7ad5a4811cd81c6331470a9e2e1d9ea289e5891f8ea037ce5ba281fe83d8e7b7561a9fb4549aa3fe280c9545b6d6176bcc5b40c WHIRLPOOL ef5ccc3843cf95ddbc0599df558d64d8247770e4804dddf364de0f377516252df49b365abc64122f10b2be0058b4688ff931d2bb178e80fa5dca4620f09b3b1e EBUILD vim-core-7.4.430.ebuild 7328 SHA256 eb8904c14df9c7f281136e9bb9cea5c9cc9246369b9e38e8482285001cda1754 SHA512 ae50b12ed6e0af6ff52e465461b558c27f0b4a50f69219f82419185feb580a503e8960f1e8552ca06c1ed3ce4334151ffa78a1cf28e360138ad04398c3e64324 WHIRLPOOL e379a10ea8dd2eb53dc17f828ed7e4570a1c2ffd031017fc9109d39325a30bad4e4b48f30460062e488a9d9bc39c199f3bb4d9bcea7804ed44f3ebe2dfed4701 +EBUILD vim-core-7.4.475.ebuild 7328 SHA256 c315a6e0b3dcc88eadfd80b51e5bba5bb8df19c141858606da4467261f4f11be SHA512 acf8f8188a1ce95417bfe8842d8e35e9c9b504d0dc3769e1e21a87f71740096d82165324d30c7400525efe5abb254ef7094bd81ad91b4f03e724b3f4518788c2 WHIRLPOOL 126766f23f34048a250cbbd0af3e1f81264e0f0aeba469a0ba8d5f296e3a6b51b7d5030b9d708605f782281c980dcc527403644bb6a7c895444d5c7ecb1483b5 EBUILD vim-core-7.4.52.ebuild 7409 SHA256 31d591fcce20577af303ef2d7aef6f359a51e28e83880f22a5046245def77d60 SHA512 22b26ec530b9581b1c0617996630dc5f97485b6936ff749cf7459714a6bd077469e68cf334f5dcb412e4a33b2845e8fe260b209631ebc566c5a4c38529b1028a WHIRLPOOL 3fe3c8d1a7e14ff292866961900086f430b4b9eea77c0d69cb2ea03b32fb6c37bb1742a1cc1a10b06a097c613481b8766b587d781d710df2a85e01b04ef9fbc1 EBUILD vim-core-9999.ebuild 7326 SHA256 2104e2a2a46f42a2fae4556b1b86493193afc8f2831b411aae29fbae2968948b SHA512 22ff808a3c72be46e16e8bd835a621d0b74ddd892fa78b89127dc4c24273bb7f44f823f93db471688ba47da7ee68eb29d34f308e4c46fb16c382f53952423468 WHIRLPOOL 2d59dee07a8cd3af4ba036f58377fe46310f1330c28646686dba8783c45079d511152e7846df19b19eb786bb63a4c0fd6e5082bb35f183fc0a3c5b559436b6b1 -MISC ChangeLog 61073 SHA256 4ee03a0af9e06d337bc131038c6a3c429e64729201fc9eeda270d7d4fafa83a9 SHA512 c8a1f4d8f13637b82f91e99b5321339b6928df98c3add840243b58877c9eadc90d23d3bf075f3155adaaf0ac967aadcf8be61288529c7351bd1139dbd19c9c6b WHIRLPOOL d4788f535077bfe3c781daec31a17cbf10f56913af1227381ff00fe952bd201633fc01a977e5064f80e88c856fcb5137182326900e1cc40bd6a685d7a9596e39 +MISC ChangeLog 61204 SHA256 4a194ec087b12882acb8a8b151e8eacfd774cb1661f94a5827f8d6a4b610e542 SHA512 f2ff9f3a8c775e1ef9552e10fc30ad5f20c0f5ac0f36da34177f76307dd3da05f4346999ad3cd6c0efbfcbb0c8266480826f0d77a6d35ce80f5be0b36387769d WHIRLPOOL 836134222de1bd66493a3aacb1d732e96d251176e5d7b12006700d4e4858658eed369732c1dcffc84f595733bd8639a42cd16c1aa0390f663f3236dfd01cb662 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUOkOOAAoJELp701BxlEWfrFYP/iiDLtnmDKHhdgoqMWBiwF1W -SrR9YS1zdCZQwX7KUyNb1lH7iHEYsX0J7837nCaeKV2HOaTa6BZpr4FuyavSCZA5 -IFMrbyMueah/uCR0E/sWq7+yfgEOnDkHC4MThwMOwfQSQtZSaeNSH9/RBUYM1ZGx -f8BxlMOF2oZ9t2qIQRjSoLK3e3Itv20Dl8HmX7WHZPFR7BDHYMohykfdEb8gQCfC -r7YAo/aP63Xnao+pLe1nVnW4vbMnaLz/Ym5Eao1DpswHiu7nXOf6g46h5bjuhvhq -SmSYKODIrnlTUcxv9bDwCRZ137HhrPhpF49rd7fchLFAd9KOvJNCWr1rhQEIn71J -cHiiK84EVlavtc1Eh1/dwO0Nq7hzZQ4SW943EVhXNzHB7DGEs8TmRNHNfYctueOr -nQ7e9X7v7kSnCpqpZ26+qTpgsv6shOPrjHc17EQMmwX5Yj5UNOkldZFI7b6uVSN7 -9FR/uAvZxKdxsGqvdw8RDSMwIesRQ0DH+7NM2+8Z/SnPoISpdipdZFC1FTmbBzlF -D8cnkhuQQySpeOkEpZ+pXeOmWJeFrDR56iWeGcV/6AtkFDbf+fe6c6kbwaLlWsGM -oqHbMo+YqIXzixCTMVZ3I9ZpSFt4gJ5wSmeJMo4vz3wQ3RMtCVPYfLhlRPUaLCJA -VJucHjIV7XfaOY4WAaVL -=BEdM +iQEcBAEBCAAGBQJUPD71AAoJEEqz6FtPBkyj5/gH/0R5gcnIhGVhW8JKoVyNHRo2 +R23t0zsoY6MEftNv8mg9w+rUP3yV9SZiwVcS7wGjvRqkHF9FWR09npaB03PnPCmT +LeKXFz23L7h7/iYi38ghSx6jZtpgOI+X0F+GqflGHkRnUb1eCWvXlQHq6MN/M7ij +H1g4Y5fayfPPmMtwqCUjCDT6HO0JTfRuwSuXuMFgaqf3eotR/ztccY5C1stspdT8 +dCvi8RDGMQzvb037qVtFsAi4qJ/cpyBqKYjJIc+ertPi3SVDIfrdMeUAcLN/ff5I +P0FLKIweH+K6uRFcA3/KmyNpb8uihCbxBKeGUm6KvcCyc9SG2pt+hjsRTzzu9dw= +=mz5H -----END PGP SIGNATURE----- diff --git a/app-editors/vim-core/vim-core-7.4.475.ebuild b/app-editors/vim-core/vim-core-7.4.475.ebuild new file mode 100644 index 000000000000..26b389a24f02 --- /dev/null +++ b/app-editors/vim-core/vim-core-7.4.475.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.475.ebuild,v 1.1 2014/10/13 21:06:35 radhermit Exp $ + +EAPI=5 +VIM_VERSION="7.4" +inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix + +if [[ ${PV} == 9999* ]] ; then + inherit mercurial + EHG_REPO_URI="https://vim.googlecode.com/hg/" + EHG_PROJECT="vim" +else + VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2" + SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES} + http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="http://www.vim.org/" + +SLOT="0" +LICENSE="vim" +IUSE="nls acl minimal" + +DEPEND="sys-devel/autoconf" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +S=${WORKDIR}/vim${VIM_VERSION/.} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home + export HOME="${T}"/home +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then + # Apply any patches available from vim.org for this version + epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} + fi + + if [[ -d "${WORKDIR}"/patches/ ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches/ + fi + fi + + # Fixup a script to use awk instead of nawk + sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ + || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\<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} \ + --with-features=tiny \ + --enable-gui=no \ + --without-x \ + --disable-darwin \ + --disable-perlinterp \ + --disable-pythoninterp \ + --disable-rubyinterp \ + --disable-gpm \ + --disable-selinux \ + $(use_enable nls) \ + $(use_enable acl) \ + ${myconf} +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + cd src || die "cd src failed" + emake \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + install-icons \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r4 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal ; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + eshopts_push -s extglob + + rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} + rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor} + rm "${ED}"/usr/bin/vimtutor + + local keep_colors="default" + ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) + + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" + # tinkering with the next line might make bad things happen ... + keep_syntax="${keep_syntax}|syntax|nosyntax|synload" + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + + eshopts_pop + fi + + # These files might have slight security issues, so we won't + # install them. See bug #77841. We don't mind if these don't + # exist. + rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null + + newbashcomp "${FILESDIR}"/xxd-completion xxd + + # We shouldn't be installing the ex or view man page symlinks, as they + # are managed by eselect-vi + rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog index e592f9acbda7..3db0b2c9475c 100644 --- a/app-editors/vim/ChangeLog +++ b/app-editors/vim/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/vim # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.472 2014/10/12 09:02:01 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.473 2014/10/13 21:09:46 radhermit Exp $ + +*vim-7.4.475 (13 Oct 2014) + + 13 Oct 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.475.ebuild: + Version bump. 12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> vim-7.4.273.ebuild: Stable for x86, wrt bug #511190 diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index 5ccb8429c900..e25b29c7a190 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -18,6 +18,7 @@ DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f DIST vim-patches-7.4.326.patch.bz2 547801 SHA256 ef055424ee6a38967a38420c136ad54cde2f0da02417b9cd5893a1eaeae589fb SHA512 f047a9cbe01ce1820eed33b9ca7de769851b22e39083e17c6d41f1f9d705a64f608e12ad9a383d2c3d45da20466f4e6db26118424452b76c3344043c163bee1a WHIRLPOOL 01dbc695dc6ca698fa64bfc02a12ef97cb8d12e52992acf529fcc5f0264b8db58d33ef909b65ded282e77a06a352a23f5d592bfaa9d2a4ddfc566813bc725afc DIST vim-patches-7.4.417.patch.bz2 672822 SHA256 244a556bf45a11d9b9a8669239062a400e1e73ea940e54b7bbaca954da7fc6be SHA512 abda7e717a486f677e0f6720beecc903879deadac9a61faf628a7c590030b81269c48c20de6e1fe99011072e9e7a675552917e7d367f9c2d3596688543e371e9 WHIRLPOOL 4398c9de866a2a84257fe2cd6743a75c494ecbd47ef2d5dd4393834e84801bf1786905dbf368f65b98eafb1541aaa5eda05b81f042afea564469f294add3f548 DIST vim-patches-7.4.430.patch.bz2 680438 SHA256 173ebaaf7e39e9cc9face31e6f8269ec7e5880998a8b846a80f88bc65fa40be3 SHA512 dd58e693286bf73d49a3f0625d597fc88c6a72eb386eae9f8e656854ac42f92a3e0bc0b43efd23e55d65040ec4f767ab48366753736b1b843b85c2a738829a54 WHIRLPOOL 7ce6e2de659103edf2dc5ff09c66fbe3d24d5f1fcaf34e49daef65a1d5f498c9326c5384615cb011848d60fb5ec538a531b28f63d2c2f9a51db979bf3141086e +DIST vim-patches-7.4.475.patch.bz2 704060 SHA256 35e1f82629e888865d03ddf8647554a607d94fc5ba33502822fa171d4914aba3 SHA512 80e26c872793604b6ff76bbb9b63d10ed9633b448008158d2f2538e9a18c62f7070b5f014b221643d2e97d0d6f7812ffc8a038f7acb2e1558ac5a083d6db8ee0 WHIRLPOOL 983c51f3d1220ab0512491f04e72cbf90a2891d44c578dcde043737a700c329cc3a090f3d2bf581ad4a23b6765bb72517f76520da1299ea8a65c6ac5957578da DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0 EBUILD vim-7.3.1214.ebuild 1125 SHA256 682ed73f4a04ba569fe9dcde80a8d4296e0cdc9a3a2e14dcfe06e8d77603f6e2 SHA512 24b9e32030ff1fbf246575d05fcbd0a34edf91a5af5a2b5c46c54e53e76f015b6b796ea81714dc2215ae61adfec95d80b0410ed918647017e1df69235f5978a8 WHIRLPOOL 2c2966e9756b8432c2a9a58db84fecdc7ccee9d5c17ec85573b3b326535c151f089f872b60ec2c5514252e613a459cb0df1ffb4dd0fb46282c67492ed5c3d925 EBUILD vim-7.3.762.ebuild 1010 SHA256 63e9605c3a4726f130bc310c4d1d26006acf1db17b2351eb21fc15c916dabd38 SHA512 7a1809e3d4bb863c652f5baf76a258d86929a0b14eba5758722900b7b3c8687e0ad42a2674fe60207f50e0ae6a2d66baac056e371daad9804a36bdf489e2d7dc WHIRLPOOL 68a62475f39cb36a9c6935d352ff778617157b1f1d0259235fc01dc2bbd0ac8a45ec619726530fa447d0aa111b3a820684d61da88f501311d8d3555f3a68915a @@ -28,24 +29,19 @@ EBUILD vim-7.4.273.ebuild 11583 SHA256 8e18baa085586ae62719adf825fba0caf6c511472 EBUILD vim-7.4.326.ebuild 11597 SHA256 3bed65e619f768d0f80ef7f358c179f65f29c76226b8cdb191c40fe0e297c27a SHA512 f222d789a4b6d4beb4d554ebecf57c902fa8178fff40b8a92d6e11927c93805a93b78f57062db69d9dead7fe123f1ee47a960d469e324892d78b290c77fed9b8 WHIRLPOOL 660987d1825bb5530b3bda0cfa48972fb274276cea9e80b8c6f21f53730e0c6ee2d28d0d779052036aaf244280437fb7e1b08f3c210cb5647358a787a830a6f7 EBUILD vim-7.4.417.ebuild 11597 SHA256 90aa26e18489324e4d4ceda7e876033c5550c0f4fc15d98775814801af9faa3c SHA512 77b331806b6f393634f4191247b3d22e3d86b4b5376a478b58013e608b49017e3534ce31cb73272e345ecbc0d0d1dca644c9c5bb46a17899afe7864eada79ad4 WHIRLPOOL 5f5eed689bc411da17287e7e366cedc766304d7913251522b4a43a0f6feb7d6ef003b932103fcf88cad0824710c1d7504046161cf66daac8f1e8a859fab20212 EBUILD vim-7.4.430.ebuild 11942 SHA256 6ead57a07c4fb27de434d74f4874d12c6960c3a7bdb2ff6e2cc46d282776f541 SHA512 422cee85b8fa5fa79d782aa513334d11f51cf557fa3dc11a1082a66b3bc77fc1439161613ac2b0305030ba7f78b95cf1c8d03e00d61e3d9c11f1cc58bb291168 WHIRLPOOL 03fb88d2df1f848d0833982332bca1dbe2efa9c5f640b3d7fb98ed0ddac13c08782447beccc2eda46db2f78c56ab8cafed0a839bcaa754ec2bb6578dcfb57b14 +EBUILD vim-7.4.475.ebuild 11847 SHA256 fbffdcaf93a52777005e2fde759bda933e7325ad96129481a95bfd5f2a9b72d5 SHA512 6aa1d16dde375afb08ebdb15e718503c05e533cef649d92705cf343fe19e3911711a3a5b9746da3d3b010865c0309a0dd5e8cd5239276c41b1b32ceca4f38d10 WHIRLPOOL 68ba536ebc5b1e7a447d55f529873aa776841f772c57a2ab10c827868ae84d9987d26242b971331ff0a5e7e8e9d93c520d3d1642f070023ce6f7fdcbda16f813 EBUILD vim-7.4.52.ebuild 11778 SHA256 6c966f4d425286610619b546ea787222b4fdcdb619eefc017cc041c7eac16db9 SHA512 a4f7af2a712f6ac7f254b62597a25ce3b4e269d575531eae85df9d34fdb5315ccba8c1b5946d4eff210d3acc82781040f7309a176b79f25eb6886bf94bf0fe77 WHIRLPOOL c1e4bfa5d5ae42f9df88a237903190d7658eaaaaf37b05c5b4addbc56c3064556ba630e923a1b3037f5f7800b35287ce6b2cc2bd800099e079094b820e749545 EBUILD vim-9999.ebuild 11940 SHA256 a41913c4f593f870b85a5707fbfa4eb5bb4892d1289d9cc823a15fb14b2b88b9 SHA512 04ae72432c1a5e014b17db6b71312ba6df388bebbf1de4f8ffbae900b48a108cdfb1d719d471aa157a08a4495b710a9725ee16f3ff86283a576ed0b40aaca9e6 WHIRLPOOL f7ba510e92312248703156099dd4107ce9e6c36bd99f2cfa42e9475a6271ba23b9350b07ae716946ae23252151f4558f1cf58c89eef7c82217823f3cbb78954f -MISC ChangeLog 63633 SHA256 23f5df0726e5fb53cc4a6f0753a892337680a3f54cabe0cd530a604c0affd60c SHA512 0002094c64017cf4a5d340930a784721fd482b1d11267d993a7b2cc6466c3a4154f265b6433bef604aa7c7b31de2a6a310ffb93428f6854146c37a0c26aac641 WHIRLPOOL 024b74fd4f050d4bed581df7e98ce9430e8273c5a1fbf41c359e900d8884135091e26c1f99a793a9d0ae8c8ab10cc3e1502db4554a859c60baedcd1dc9842663 +MISC ChangeLog 63754 SHA256 24f0c81d4be33db9e9e6d3b1824ad53b2a20044fd7605d706e9488950051f9e7 SHA512 b352252a9c37eb9d66dcff77da3689f47f0245b37faa9d2e92c4d5cf54ac51a9926943e17c04105248f44e551c279aa29398785dc999eb7eae76cd2a27712ae3 WHIRLPOOL f81129d9fdd0640c610684b847ccf4ae3202d3d3e2cd63d66091d590dc2a3b613255ac3aa0fb33ad3f9e943eefdcc2bc7c44c19c522f0557d3016696e281ceb0 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUOkOKAAoJELp701BxlEWf3WgP/RS2s9c8E+y8xhLVEC9kjxBd -WL/KtP6Daw4FfuMAfFsgolhLNCrrsTIpYluahA4oW64w2xwYJSQuDAweTzK5boKo -0RV+h/Q9AK2hyvJ8H0XW0YKJxL5POre883y9rq4IUuuEPufGTLFfZqdmvhAf9Jbo -t4iBYCNzl1a10cBjLmLL6icaZbXzj3uosuPLahYZfIw4L4hNeEvhWX3l7S2EwJfr -y4oUt2UFA5toFYTO105nR0QPBzerfau6dUNlnZar2CORu3c/6e/rAzsbpU9mGxYo -pMltB8ALUnWTYUJLetmP+2NigRv3oKD385gG3c+zIL8LePAXldGGauMgvvZCYbwL -zmGh9cYBLvkjhrTFPL3unREtieIkW1xK2DlyAPkiFaXpNkVOV0vWP7ErRzokahJG -DdfTuB0zem8p/JzqzJ7nYsg8+WMnrNsZIsJAuxSXLLUjPkaTMs6FrSUw6OAQHt1j -AclYnqL01v/Nh/TjTy6U0eVJ1W/dCzx6dy/haApXm4Nin3tUMG5TLaS/G5V3cdtZ -+PGtk01sbLDipLIyhVIB+CwykWE9Dqv+qZMHYNkdZqLlEbOd68jG6+aflfCSA+VC -yUwNqDolNEs56byNGUzcD0g/d8RrIHaaSqVqBG9f8uL02ZyX40dceD70agDqeuQS -kLw1zcGrKiYQOze0ca5V -=m2MF +iQEcBAEBCAAGBQJUPD+yAAoJEEqz6FtPBkyjHaEH/247Aeo/PCpl1GNGNCn3hnnT +odILBp6J10Tg8jfeA1vtiopOhwEyGKd059590HP7bh/p9MjauBaDeQ9ytv9DKt/v +3Vb8HkR9QLbkH9sQ09x/OmMkdXZ6YTIL0vNGK924lF8UDF+GA8RDA+mIm5r1fbJk +nCoqCTe4vOL+Vkq1qm+ravIh8mWOsGHmK2tvVLq6BdLpFKFohD4iMeVU4vT7F/cs +pwc/4RPINaAKDIXXHYRrFV+t3Rb8Zzp0j98snrFT3ZWs+o7fGDUKQLwF2qCTpG43 +lpm6vbfQNXniGEz83uHQ0BAzHXdeKZsO537PmIhX2rVs2bwaB6lOOUcdmiFuOH0= +=EwNd -----END PGP SIGNATURE----- diff --git a/app-editors/vim/vim-7.4.475.ebuild b/app-editors/vim/vim-7.4.475.ebuild new file mode 100644 index 000000000000..265b5b7f841e --- /dev/null +++ b/app-editors/vim/vim-7.4.475.ebuild @@ -0,0 +1,376 @@ +# 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.475.ebuild,v 1.1 2014/10/13 21:09:46 radhermit Exp $ + +EAPI=5 +VIM_VERSION="7.4" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE=threads +inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1 + +if [[ ${PV} == 9999* ]] ; then + inherit mercurial + EHG_REPO_URI="https://vim.googlecode.com/hg/" + EHG_PROJECT="vim" +else + VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2" + SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES} + http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="http://www.vim.org/" + +SLOT="0" +LICENSE="vim" +IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + luajit? ( lua ) +" + +RDEPEND=" + >=app-admin/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2 + nls? ( virtual/libintl ) + acl? ( kernel_linux? ( sys-apps/acl ) ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( + luajit? ( dev-lang/luajit ) + !luajit? ( dev-lang/lua[deprecated] ) + ) + !minimal? ( + ~app-editors/vim-core-${PV} + dev-util/ctags + ) + perl? ( dev-lang/perl ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) ) + selinux? ( sys-libs/libselinux ) + tcl? ( dev-lang/tcl ) + X? ( x11-libs/libXt ) +" +DEPEND="${RDEPEND} + >=app-admin/eselect-vi-1.1 + sys-devel/autoconf + >=sys-libs/ncurses-5.2-r2 + nls? ( sys-devel/gettext ) +" + +S=${WORKDIR}/vim${VIM_VERSION/.} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home + export HOME="${T}"/home + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then + # Apply any patches available from vim.org for this version + epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} + fi + + if [[ -d "${WORKDIR}"/patches/ ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches/ + fi + fi + + # Fixup a script to use awk instead of nawk + sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ + || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\<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" + 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 +} |