app-editors/gvim: version bump to 7.4.2102
authorTim Harder <radhermit@gentoo.org>
Tue, 26 Jul 2016 04:14:12 +0000 (00:14 -0400)
committerTim Harder <radhermit@gentoo.org>
Tue, 26 Jul 2016 04:20:19 +0000 (00:20 -0400)
app-editors/gvim/Manifest
app-editors/gvim/gvim-7.4.2102.ebuild [new file with mode: 0644]
app-editors/gvim/gvim-9999.ebuild

index de808a23649e439b51a94de863359c69ee9781e6..02bfaa9f05c8aec7f19233eaa2b6352ad9a1863d 100644 (file)
@@ -1,5 +1,7 @@
 DIST vim-7.4.1583.tar.gz 12559634 SHA256 dbe697fcacca5c50535714a31dbd02e7691943491c4004a867edd4a6fcdc9cf5 SHA512 6e049ea8e711382fd4f69360afaeac904ad7721ccb7bf9990754983efd66963e1bc24919483ac8f4cbededcd22e1e58c2e246d524f059a0648600e49b550fc2b WHIRLPOOL a4e18bfa89b1a2620e96b6688cac41bed8d68d3adb7f8c7b3580a9ae40df0c39d612c051c73b2b91cf3d5d18348651e4bd4808f40b44132ebcc648bc554e451f
 DIST vim-7.4.1821.tar.gz 12565373 SHA256 452b6346f64b23ab0e7483091ddc09b62540f149fa786bdd14d6712d8b66e1cf SHA512 6bc3698c715860837ab264b9312207f85e0c2a603c15eca92678f301175db93195d83d3f26c4815fc6f0757e5051945b88ce415f358b7396520df6231314cc64 WHIRLPOOL 3699966e5c599ca9090486006a8e1bab5720854f9c44fc249f5cb31d6198e048a6523697ce6416c835154c737ffab87482a72ebe1af321874eef3461b69de90b
+DIST vim-7.4.2102-gentoo-patches.tar.bz2 2308 SHA256 1928059fe173b3abf66a96a8205c2e46b5320639d62385aeeae760e99820da67 SHA512 4e678b214fc7b1be89728b8151335ca8af332e8b0c0e25c27287a38ad5ccf14d5dcf82d5dd86af9aa502df4fae986aba98104f150b49a880e34f8283e8e63574 WHIRLPOOL 8a53a8980418f16f8c7883409dea49cfc758fc29dcfaab36f1bd6ae53b32211870a95361c8b63cdfe50795ea11958b113c9909ed6d29de5cb3696efc6ff7888b
+DIST vim-7.4.2102.tar.gz 12838026 SHA256 19c059b2d0e61effcd288e2a18969017cbbc031cf19fe775b3f4b4c42bda2578 SHA512 9cf80b1c9e2dd8713b9ba33c39917a8771c7378ae59c2dc1809bf0cabc4545547ad0a5b9f0b87cef2b34f6d1f72b135d1217495716fc482a70a16e1097bd88a2 WHIRLPOOL 301d41e9bf9a6a220776d6e32ab2918c6a8aaf33862725fba9c738e0c99921e631d8c2fdfd9bc2dc9a214a9124ecfa113081a86addf79b023e8421471843f869
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
 DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
 DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
diff --git a/app-editors/gvim/gvim-7.4.2102.ebuild b/app-editors/gvim/gvim-7.4.2102.ebuild
new file mode 100644 (file)
index 0000000..7bdb323
--- /dev/null
@@ -0,0 +1,390 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-r1
+
+if [[ ${PV} == 9999* ]] ; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/vim/vim.git"
+       EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+       SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+               https://dev.gentoo.org/~radhermit/vim/vim-7.4.2102-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/ https://github.com/vim/vim"
+
+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="
+       luajit? ( lua )
+       python? (
+               || ( $(python_gen_useflags '*') )
+               ?? ( $(python_gen_useflags 'python2*') )
+               ?? ( $(python_gen_useflags 'python3*') )
+       )
+"
+
+RDEPEND="
+       ~app-editors/vim-core-${PV}
+       >=app-eselect/eselect-vi-1.1
+       >=sys-libs/ncurses-5.2-r2:0=
+       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:2= )
+               !luajit? ( dev-lang/lua:0[deprecated] )
+       )
+       nls? ( virtual/libintl )
+       perl? ( dev-lang/perl:= )
+       python? ( ${PYTHON_DEPS} )
+       racket? ( dev-scheme/racket )
+       ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
+       selinux? ( sys-libs/libselinux )
+       session? ( x11-libs/libSM )
+       tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+       dev-util/ctags
+       sys-devel/autoconf
+       virtual/pkgconfig
+       nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/vim-${PV}
+
+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
+               # Gentoo patches to fix runtime issues, cross-compile errors, etc
+               eapply "${WORKDIR}"/patches/
+       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
+
+       default
+}
+
+src_configure() {
+       local myconf=()
+
+       # Fix bug 37354: Disallow -funroll-all-loops on amd64
+       # Bug 57859 suggests that we want to do this for all archs
+       filter-flags -funroll-all-loops
+
+       # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+       # everyone since previous flag filtering bugs have turned out to affect
+       # multiple archs...
+       replace-flags -O3 -O2
+
+       # Fix bug 18245: Prevent "make" from the following chain:
+       # (1) Notice configure.in is newer than auto/configure
+       # (2) Rebuild auto/configure
+       # (3) Notice auto/configure is newer than auto/config.mk
+       # (4) Run ./configure (with wrong args) to remake auto/config.mk
+       sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+       rm -f src/auto/configure
+       emake -j1 -C src autoconf
+
+       # This should fix a sandbox violation (see bug 24447). The hvc
+       # things are for ppc64, see bug 86433.
+       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+               [[ -e ${file} ]] && addwrite $file
+       done
+
+       use debug && append-flags "-DDEBUG"
+
+       myconf=(
+               --with-features=huge
+               --disable-gpm
+               --enable-multibyte
+               $(use_enable acl)
+               $(use_enable cscope)
+               $(use_enable lua luainterp)
+               $(use_with luajit)
+               $(use_enable netbeans)
+               $(use_enable nls)
+               $(use_enable perl perlinterp)
+               $(use_enable racket mzschemeinterp)
+               $(use_enable ruby rubyinterp)
+               $(use_enable selinux)
+               $(use_enable session xsmp)
+               $(use_enable tcl tclinterp)
+       )
+
+       if use python ; then
+               py_add_interp() {
+                       local v
+
+                       [[ ${EPYTHON} == python3* ]] && v=3
+                       myconf+=(
+                               --enable-python${v}interp
+                               vi_cv_path_python${v}="${PYTHON}"
+                       )
+               }
+
+               python_foreach_impl py_add_interp
+       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
+
+       # 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 || die
+
+       # Make sure our VIMPROG is used.
+       sed -i 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+       # Don't do additional GUI tests.
+       emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+       local f syms
+       syms="vimdiff rvim rview"
+       einfo "Calling eselect vi update..."
+       # Call this with --if-unset to respect user's choice (bug 187449)
+       eselect vi update --if-unset
+
+       # Make or remove convenience symlink, vim -> gvim
+       if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+               ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+       elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+               rm "${EROOT}"/usr/bin/vim
+       fi
+
+       # Make or remove convenience symlinks to vim
+       if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+               for f in ${syms}; do
+                       ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+               done
+       else
+               for f in ${syms}; do
+                       if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+                               rm -f "${EROOT}"/usr/bin/${f}
+                       fi
+               done
+       fi
+
+       # This will still break if you merge then remove the vi package,
+       # but there's only so much you can do, eh?  Unfortunately we don't
+       # have triggers like are done in rpm-land.
+}
+
+src_install() {
+       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+       dobin src/gvim
+       dosym gvim /usr/bin/gvimdiff
+       dosym gvim /usr/bin/evim
+       dosym gvim /usr/bin/eview
+       dosym gvim /usr/bin/gview
+       dosym gvim /usr/bin/rgvim
+       dosym gvim /usr/bin/rgview
+
+       dodir /usr/share/man/man1
+       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
+       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
+       echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+
+       insinto /etc/vim
+       newins "${FILESDIR}"/gvimrc-r1 gvimrc
+       eprefixify "${ED}"/etc/vim/gvimrc
+
+       newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+       doicon "${FILESDIR}"/gvim.xpm
+       doicon -s scalable "${FILESDIR}"/gvim.svg
+
+       # 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
+
+       # 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
+}
index 543f695418380ddd708f6ec706a08afd3379e999..7bdb32354021f97cd1a67558a1cfb0161afc7de9 100644 (file)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 VIM_VERSION="7.4"
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 PYTHON_REQ_USE=threads
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then
        EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
        SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-               https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-gentoo-patches.tar.bz2"
+               https://dev.gentoo.org/~radhermit/vim/vim-7.4.2102-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
 
@@ -89,11 +89,8 @@ pkg_setup() {
 
 src_prepare() {
        if [[ ${PV} != 9999* ]] ; then
-               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
+               # Gentoo patches to fix runtime issues, cross-compile errors, etc
+               eapply "${WORKDIR}"/patches/
        fi
 
        # Fixup a script to use awk instead of nawk
@@ -141,7 +138,7 @@ src_prepare() {
                        "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
        fi
 
-       epatch_user
+       default
 }
 
 src_configure() {