radhermit 14/09/05 22:35:05 Modified: vim-9999.ebuild ChangeLog Added: vim-7.4.430.ebuild Log: Version bump. Use upstream patches instead of rolling our own (thanks to exherbo for the code) and fix cross-compile issues (bug #473372). (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 4F064CA3)
Revision Changes Path 1.13 app-editors/vim/vim-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim/vim-9999.ebuild?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim/vim-9999.ebuild?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim/vim-9999.ebuild?r1=1.12&r2=1.13 Index: vim-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- vim-9999.ebuild 27 Apr 2014 21:34:22 -0000 1.12 +++ vim-9999.ebuild 5 Sep 2014 22:35:05 -0000 1.13 @@ -1,22 +1,30 @@ # 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.12 2014/04/27 21:34:22 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.13 2014/09/05 22:35:05 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} ) +PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) PYTHON_REQ_USE=threads inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1 +# Used for setting SRC_URI (when $1 is non-zero) and for outputting the patch names (for src_prepare) +vim_src_uri_patches() { + local i + for (( i=1; i <= $(get_version_component_range 3); i++ )); do + printf "${1:+${VIM_BASE_URI}/patches/${VIM_VERSION}/${VIM_VERSION}.%03d -> } vim-${VIM_VERSION}.%03d.patch\n" ${1:+"${i}"} "${i}" + done +} + 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}"; + VIM_BASE_URI="${VIM_BASE_URI:-ftp://ftp.vim.org/pub/vim}"; + SRC_URI="${VIM_BASE_URI}/unix/vim-${VIM_VERSION}.tar.bz2 + $(vim_src_uri_patches SRC_URI) + 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 @@ -49,7 +57,7 @@ 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 ) ) + 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 ) @@ -77,10 +85,18 @@ 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 + # Apply any patches available from vim.org for this version + local p patches + for p in $(vim_src_uri_patches); do + patches+=( "${DISTDIR}"/${p} ) + done + + # Gentoo patches to fix runtime issues, cross-compile errors, etc + for p in "${WORKDIR}"/patches/*; do + patches+=( "${p}" ) + done + + epatch "${patches[@]}" fi # Fixup a script to use awk instead of nawk 1.468 app-editors/vim/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim/ChangeLog?rev=1.468&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim/ChangeLog?rev=1.468&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim/ChangeLog?r1=1.467&r2=1.468 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v retrieving revision 1.467 retrieving revision 1.468 diff -u -r1.467 -r1.468 --- ChangeLog 27 Aug 2014 12:25:24 -0000 1.467 +++ ChangeLog 5 Sep 2014 22:35:05 -0000 1.468 @@ -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.467 2014/08/27 12:25:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.468 2014/09/05 22:35:05 radhermit Exp $ + +*vim-7.4.430 (05 Sep 2014) + + 05 Sep 2014; Tim Harder <radher...@gentoo.org> +vim-7.4.430.ebuild, + vim-9999.ebuild: + Version bump. Use upstream patches instead of rolling our own (thanks to + exherbo for the code) and fix cross-compile issues (bug #473372). 27 Aug 2014; Agostino Sarubbo <a...@gentoo.org> vim-7.4.273.ebuild: Stable for ppc, wrt bug #511190 1.1 app-editors/vim/vim-7.4.430.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim/vim-7.4.430.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim/vim-7.4.430.ebuild?rev=1.1&content-type=text/plain Index: vim-7.4.430.ebuild =================================================================== # 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.430.ebuild,v 1.1 2014/09/05 22:35:05 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) PYTHON_REQ_USE=threads inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1 # Used for setting SRC_URI (when $1 is non-zero) and for outputting the patch names (for src_prepare) vim_src_uri_patches() { local i for (( i=1; i <= $(get_version_component_range 3); i++ )); do printf "${1:+${VIM_BASE_URI}/patches/${VIM_VERSION}/${VIM_VERSION}.%03d -> } vim-${VIM_VERSION}.%03d.patch\n" ${1:+"${i}"} "${i}" done } if [[ ${PV} == 9999* ]] ; then inherit mercurial EHG_REPO_URI="https://vim.googlecode.com/hg/"; EHG_PROJECT="vim" else VIM_BASE_URI="${VIM_BASE_URI:-ftp://ftp.vim.org/pub/vim}"; SRC_URI="${VIM_BASE_URI}/unix/vim-${VIM_VERSION}.tar.bz2 $(vim_src_uri_patches SRC_URI) 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 # Apply any patches available from vim.org for this version local p patches for p in $(vim_src_uri_patches); do patches+=( "${DISTDIR}"/${p} ) done # Gentoo patches to fix runtime issues, cross-compile errors, etc for p in "${WORKDIR}"/patches/*; do patches+=( "${p}" ) done epatch "${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 # 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 }
