diff options
author | Tim Harder <radhermit@gentoo.org> | 2014-12-08 05:57:54 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2014-12-08 05:57:54 +0000 |
commit | cc67fb3072fd855419d8c11c870f110cbbdb79b6 (patch) | |
tree | 3a0699564cff414850cb1bb86b93859531736707 /app-editors | |
parent | Version bump. (diff) | |
download | gentoo-2-cc67fb3072fd855419d8c11c870f110cbbdb79b6.tar.gz gentoo-2-cc67fb3072fd855419d8c11c870f110cbbdb79b6.tar.bz2 gentoo-2-cc67fb3072fd855419d8c11c870f110cbbdb79b6.zip |
Remove old.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/gvim/ChangeLog | 9 | ||||
-rw-r--r-- | app-editors/gvim/files/gvim-7.1-interix-link.patch | 16 | ||||
-rw-r--r-- | app-editors/gvim/files/gvim-7.1.285-darwin-x11link.patch | 11 | ||||
-rw-r--r-- | app-editors/gvim/files/gvim-7.1.319-interix-cflags.patch | 23 | ||||
-rw-r--r-- | app-editors/gvim/files/gvim-7.3.1214-python3.patch | 15 | ||||
-rw-r--r-- | app-editors/gvim/files/gvim-7.4.193-fix-tests.patch | 54 | ||||
-rw-r--r-- | app-editors/gvim/gvim-7.3.1214.ebuild | 33 | ||||
-rw-r--r-- | app-editors/gvim/gvim-7.3.762.ebuild | 29 | ||||
-rw-r--r-- | app-editors/gvim/gvim-7.4.430.ebuild | 407 | ||||
-rw-r--r-- | app-editors/gvim/gvim-7.4.475.ebuild | 405 |
10 files changed, 8 insertions, 994 deletions
diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog index 07a86d516ccf..26e232bfa4e1 100644 --- a/app-editors/gvim/ChangeLog +++ b/app-editors/gvim/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-editors/gvim # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.445 2014/12/08 05:41:45 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.446 2014/12/08 05:57:54 radhermit Exp $ + + 08 Dec 2014; Tim Harder <radhermit@gentoo.org> -gvim-7.3.762.ebuild, + -gvim-7.3.1214.ebuild, -gvim-7.4.430.ebuild, -gvim-7.4.475.ebuild, + -files/gvim-7.1.285-darwin-x11link.patch, + -files/gvim-7.1.319-interix-cflags.patch, -files/gvim-7.1-interix-link.patch, + -files/gvim-7.3.1214-python3.patch, -files/gvim-7.4.193-fix-tests.patch: + Remove old. *gvim-7.4.542 (08 Dec 2014) diff --git a/app-editors/gvim/files/gvim-7.1-interix-link.patch b/app-editors/gvim/files/gvim-7.1-interix-link.patch deleted file mode 100644 index da046665dfc5..000000000000 --- a/app-editors/gvim/files/gvim-7.1-interix-link.patch +++ /dev/null @@ -1,16 +0,0 @@ -Interix 3.5 does link fine with some libraries removed from the link -line (who knows why), but executing vim failes with unresolved -references to things like _dlclose, _iconv and such... - -diff -ru vim71.orig/src/link.sh vim71/src/link.sh ---- vim71.orig/src/link.sh Wed Feb 27 15:29:29 2008 -+++ vim71/src/link.sh Wed Feb 27 15:32:07 2008 -@@ -41,7 +41,7 @@ - if sh link.cmd; then - touch auto/link.sed - cp link.cmd linkit.sh -- for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w dl pthread thread readline m perl crypt attr; do -+ for libname in dummy; do - cont=yes - while test -n "$cont"; do - if grep "l$libname " linkit.sh >/dev/null; then diff --git a/app-editors/gvim/files/gvim-7.1.285-darwin-x11link.patch b/app-editors/gvim/files/gvim-7.1.285-darwin-x11link.patch deleted file mode 100644 index 1cf00d6a8faa..000000000000 --- a/app-editors/gvim/files/gvim-7.1.285-darwin-x11link.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/configure.in -+++ src/configure.in -@@ -2701,7 +2701,7 @@ - AC_MSG_CHECKING(whether X_LOCALE needed) - AC_TRY_COMPILE([#include <X11/Xlocale.h>],, - AC_TRY_LINK_FUNC([_Xsetlocale], [AC_MSG_RESULT(yes) -- AC_DEFINE(X_LOCALE)], AC_MSG_RESULT(no)), -+ AC_DEFINE(X_LOCALE) ldflags_save="$ldflags_save -lX11"], AC_MSG_RESULT(no)), - AC_MSG_RESULT(no)) - fi - CFLAGS=$cflags_save diff --git a/app-editors/gvim/files/gvim-7.1.319-interix-cflags.patch b/app-editors/gvim/files/gvim-7.1.319-interix-cflags.patch deleted file mode 100644 index 630e0015ee0a..000000000000 --- a/app-editors/gvim/files/gvim-7.1.319-interix-cflags.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ru vim71.orig/src/Makefile vim71/src/Makefile ---- vim71.orig/src/Makefile 2008-07-16 08:29:55 +0200 -+++ vim71/src/Makefile 2008-07-16 08:53:44 +0200 -@@ -1282,10 +1282,6 @@ - - ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(POST_DEFS) - --# Exclude $CFLAGS for osdef.sh, for Mac 10.4 some flags don't work together --# with "-E". --OSDEF_CFLAGS = $(PRE_DEFS) $(POST_DEFS) -- - LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) -Dinline= -D__extension__= -Dalloca=alloca - - LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)=" -@@ -2273,7 +2269,7 @@ - $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@ - - auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in -- CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh -+ CC="$(CC) $(CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh - - QUOTESED = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/' - auto/pathdef.c: Makefile auto/config.mk diff --git a/app-editors/gvim/files/gvim-7.3.1214-python3.patch b/app-editors/gvim/files/gvim-7.3.1214-python3.patch deleted file mode 100644 index 80dc073f5267..000000000000 --- a/app-editors/gvim/files/gvim-7.3.1214-python3.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -r 6e9667d3f166 src/configure.in ---- a/src/configure.in Sun Jun 16 22:49:14 2013 +0200 -+++ b/src/configure.in Sun Jun 16 17:47:30 2013 -0700 -@@ -1107,9 +1107,9 @@ - AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf, - [ - vi_cv_path_python3_conf= -- config_dir="config" -+ config_dir="config-${vi_cv_var_python3_version}" - if test "${vi_cv_var_python3_abiflags}" != ""; then -- config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" -+ config_dir="${config_dir}${vi_cv_var_python3_abiflags}" - fi - d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` - if test -d "$d" && test -f "$d/config.c"; then diff --git a/app-editors/gvim/files/gvim-7.4.193-fix-tests.patch b/app-editors/gvim/files/gvim-7.4.193-fix-tests.patch deleted file mode 100644 index 9159aa569f7c..000000000000 --- a/app-editors/gvim/files/gvim-7.4.193-fix-tests.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/src/testdir/test86.ok -+++ b/src/testdir/test86.ok -@@ -882,11 +882,11 @@ - l[:] = FailingIter():NotImplementedError:('iter',) - l[:] = FailingIterNext():NotImplementedError:('next',) - <<< Finished --nel[1:10:2] = "abcK":ValueError:('attempt to assign sequence of size greater then 2 to extended slice',) -+nel[1:10:2] = "abcK":ValueError:('attempt to assign sequence of size greater than 2 to extended slice',) - ('a', 'b', 'c', 'O') - nel[1:10:2] = "a":ValueError:('attempt to assign sequence of size 1 to extended slice of size 2',) - ('a', 'b', 'c', 'O') --nel[1:1:-1] = "a":ValueError:('attempt to assign sequence of size greater then 0 to extended slice',) -+nel[1:1:-1] = "a":ValueError:('attempt to assign sequence of size greater than 0 to extended slice',) - ('a', 'b', 'c', 'O') - nel[:] = FailingIterNextN(2):NotImplementedError:('next N',) - ('a', 'b', 'c', 'O') -@@ -1233,8 +1233,8 @@ - >>> Testing NumberToLong using vim.buffers[%s] - vim.buffers[[]]:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',) - vim.buffers[None]:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',) --vim.buffers[-1]:ValueError:('number must be greater then zero',) --vim.buffers[0]:ValueError:('number must be greater then zero',) -+vim.buffers[-1]:ValueError:('number must be greater than zero',) -+vim.buffers[0]:ValueError:('number must be greater than zero',) - <<< Finished - > Current - >> CurrentGetattr ---- a/src/testdir/test87.ok -+++ b/src/testdir/test87.ok -@@ -882,11 +882,11 @@ - l[:] = FailingIter():(<class 'NotImplementedError'>, NotImplementedError('iter',)) - l[:] = FailingIterNext():(<class 'NotImplementedError'>, NotImplementedError('next',)) - <<< Finished --nel[1:10:2] = "abcK":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater then 2 to extended slice',)) -+nel[1:10:2] = "abcK":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater than 2 to extended slice',)) - (b'a', b'b', b'c', b'O') - nel[1:10:2] = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size 1 to extended slice of size 2',)) - (b'a', b'b', b'c', b'O') --nel[1:1:-1] = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater then 0 to extended slice',)) -+nel[1:1:-1] = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater than 0 to extended slice',)) - (b'a', b'b', b'c', b'O') - nel[:] = FailingIterNextN(2):(<class 'NotImplementedError'>, NotImplementedError('next N',)) - (b'a', b'b', b'c', b'O') -@@ -1233,8 +1233,8 @@ - >>> Testing NumberToLong using vim.buffers[%s] - vim.buffers[[]]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',)) - vim.buffers[None]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got NoneType',)) --vim.buffers[-1]:(<class 'ValueError'>, ValueError('number must be greater then zero',)) --vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater then zero',)) -+vim.buffers[-1]:(<class 'ValueError'>, ValueError('number must be greater than zero',)) -+vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater than zero',)) - <<< Finished - > Current - >> CurrentGetattr diff --git a/app-editors/gvim/gvim-7.3.1214.ebuild b/app-editors/gvim/gvim-7.3.1214.ebuild deleted file mode 100644 index df05054de2b7..000000000000 --- a/app-editors/gvim/gvim-7.3.1214.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.3.1214.ebuild,v 1.2 2013/09/05 18:18:04 mgorny Exp $ - -EAPI=5 -VIM_VERSION="7.3" -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) -inherit vim - -VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2" -GVIMRC_FILE_SUFFIX="-r1" -GVIM_DESKTOP_SUFFIX="-r2" - -SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 - http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}" - -DESCRIPTION="GUI version of the Vim text editor" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" - -S=${WORKDIR}/vim${VIM_VERSION/.} - -src_prepare() { - vim_src_prepare - - epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch - if [[ ${CHOST} == *-interix* ]]; then - epatch "${FILESDIR}"/${PN}-7.1-interix-link.patch - epatch "${FILESDIR}"/${PN}-7.1.319-interix-cflags.patch - fi - - # fix python3 support - epatch "${FILESDIR}"/${P}-python3.patch -} diff --git a/app-editors/gvim/gvim-7.3.762.ebuild b/app-editors/gvim/gvim-7.3.762.ebuild deleted file mode 100644 index 33bf14b2825d..000000000000 --- a/app-editors/gvim/gvim-7.3.762.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.3.762.ebuild,v 1.13 2013/08/13 22:29:36 radhermit Exp $ - -EAPI=3 -VIM_VERSION="7.3" -inherit vim - -VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2" -GVIMRC_FILE_SUFFIX="-r1" -GVIM_DESKTOP_SUFFIX="-r2" - -SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 - http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}" - -S="${WORKDIR}/vim${VIM_VERSION/.}" -DESCRIPTION="GUI version of the Vim text editor" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="" - -src_prepare() { - vim_src_prepare - - epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch - if [[ ${CHOST} == *-interix* ]]; then - epatch "${FILESDIR}"/${PN}-7.1-interix-link.patch - epatch "${FILESDIR}"/${PN}-7.1.319-interix-cflags.patch - fi -} diff --git a/app-editors/gvim/gvim-7.4.430.ebuild b/app-editors/gvim/gvim-7.4.430.ebuild deleted file mode 100644 index da16f8810202..000000000000 --- a/app-editors/gvim/gvim-7.4.430.ebuild +++ /dev/null @@ -1,407 +0,0 @@ -# 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.430.ebuild,v 1.3 2014/10/11 18:35:54 mgorny 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 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} - # keep in sync with 'complete ... -F' list - bashcomp_alias gvim evim eview gview gvimdiff rgvim rgview - - # 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-7.4.475.ebuild b/app-editors/gvim/gvim-7.4.475.ebuild deleted file mode 100644 index 2c0c4179b908..000000000000 --- a/app-editors/gvim/gvim-7.4.475.ebuild +++ /dev/null @@ -1,405 +0,0 @@ -# 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 -} |