* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2007-09-27 9:32 Ali Polatel (hawking)
0 siblings, 0 replies; 32+ messages in thread
From: Ali Polatel (hawking) @ 2007-09-27 9:32 UTC (permalink / raw
To: gentoo-commits
hawking 07/09/27 09:32:21
Modified: vim.eclass
Log:
respect GVIM_DESKTOP_SUFFIX, so gvim.desktop file can be updated.
Revision Changes Path
1.167 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.167&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.167&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.166&r2=1.167
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- vim.eclass 5 Sep 2007 21:22:23 -0000 1.166
+++ vim.eclass 27 Sep 2007 09:32:21 -0000 1.167
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.166 2007/09/05 21:22:23 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.167 2007/09/27 09:32:21 hawking Exp $
# Authors:
# Ryan Phillips <rphillips@gentoo.org>
@@ -582,7 +582,7 @@
# as of 6.3-r1, we install a desktop entry. bug #44633, and bug #68622
# for the nicer updated version.
insinto /usr/share/applications
- doins ${FILESDIR}/gvim.desktop
+ newins ${FILESDIR}/gvim.desktop${GVIM_DESKTOP_SUFFIX} gvim.desktop
insinto /usr/share/pixmaps
doins ${FILESDIR}/gvim.xpm
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2007-11-07 15:01 Ali Polatel (hawking)
0 siblings, 0 replies; 32+ messages in thread
From: Ali Polatel (hawking) @ 2007-11-07 15:01 UTC (permalink / raw
To: gentoo-commits
hawking 07/11/07 15:01:19
Modified: vim.eclass
Log:
fixed parsing Subject: of vim patch mails
Revision Changes Path
1.168 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.168&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.168&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.167&r2=1.168
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- vim.eclass 27 Sep 2007 09:32:21 -0000 1.167
+++ vim.eclass 7 Nov 2007 15:01:18 -0000 1.168
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.167 2007/09/27 09:32:21 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.168 2007/11/07 15:01:18 hawking Exp $
# Authors:
# Ryan Phillips <rphillips@gentoo.org>
@@ -161,7 +161,7 @@
p=${WORKDIR}/${VIM_ORG_PATCHES%.tar*}.patch
ls ${WORKDIR}/vimpatches | sort | \
while read f; do gzip -dc ${WORKDIR}/vimpatches/${f}; done | gawk '
- /^Subject: Patch/ {
+ /^Subject: [Pp]atch/ {
if (patchnum) {printf "\n" >"/dev/stderr"}
patchnum = $3
printf "%s:", patchnum >"/dev/stderr"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2008-01-09 21:14 Ali Polatel (hawking)
0 siblings, 0 replies; 32+ messages in thread
From: Ali Polatel (hawking) @ 2008-01-09 21:14 UTC (permalink / raw
To: gentoo-commits
hawking 08/01/09 21:14:00
Modified: vim.eclass
Log:
Close file handles in gawk code to avoid leakage, bug 205037
Revision Changes Path
1.169 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.169&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.169&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.168&r2=1.169
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- vim.eclass 7 Nov 2007 15:01:18 -0000 1.168
+++ vim.eclass 9 Jan 2008 21:13:59 -0000 1.169
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.168 2007/11/07 15:01:18 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.169 2008/01/09 21:13:59 hawking Exp $
# Authors:
# Ryan Phillips <rphillips@gentoo.org>
@@ -188,6 +188,8 @@
next
}
}
+ # Close the file to avoid leakage, bug 205037
+ close(thisfile)
# Print the previous lines and start printing
print firstlines
printing = 1
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2008-03-03 15:09 Ali Polatel (hawking)
0 siblings, 0 replies; 32+ messages in thread
From: Ali Polatel (hawking) @ 2008-03-03 15:09 UTC (permalink / raw
To: gentoo-commits
hawking 08/03/03 15:09:19
Modified: vim.eclass
Log:
Comment out netbeans dependency, gvim doesn't require dev-util/netbeans for netbeans external editor support, bug 184065.
Revision Changes Path
1.170 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.170&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.170&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.169&r2=1.170
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- vim.eclass 9 Jan 2008 21:13:59 -0000 1.169
+++ vim.eclass 3 Mar 2008 15:09:18 -0000 1.170
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.169 2008/01/09 21:13:59 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.170 2008/03/03 15:09:18 hawking Exp $
# Authors:
# Ryan Phillips <rphillips@gentoo.org>
@@ -108,8 +108,11 @@
#fi
if [[ "${MY_PN}" == "gvim" ]] ; then
IUSE="${IUSE} netbeans aqua nextaw"
- DEPEND="${DEPEND} netbeans? ( dev-util/netbeans )"
- RDEPEND="${RDEPEND} netbeans? ( dev-util/netbeans )"
+ # Vim implements netbeans external editor protocol when netbeans is
+ # enabled and doesn't necessarily need dev-util/netbeans.
+ # bug 184065
+ # DEPEND="${DEPEND} netbeans? ( dev-util/netbeans )"
+ # RDEPEND="${RDEPEND} netbeans? ( dev-util/netbeans )"
fi
if [[ "${MY_PN}" == "vim" ]] ; then
IUSE="${IUSE} vim-pager"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2008-04-06 9:22 Ali Polatel (hawking)
0 siblings, 0 replies; 32+ messages in thread
From: Ali Polatel (hawking) @ 2008-04-06 9:22 UTC (permalink / raw
To: gentoo-commits
hawking 08/04/06 09:22:13
Modified: vim.eclass
Log:
Strip colour codes before piping to vim for vimmanpager, bug 212844, thanks to Guillaume Castagnino
Revision Changes Path
1.171 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.171&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.171&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.170&r2=1.171
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- vim.eclass 3 Mar 2008 15:09:18 -0000 1.170
+++ vim.eclass 6 Apr 2008 09:22:13 -0000 1.171
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.170 2008/03/03 15:09:18 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.171 2008/04/06 09:22:13 hawking Exp $
# Authors:
# Ryan Phillips <rphillips@gentoo.org>
@@ -302,6 +302,7 @@
&& use vim-pager ; then
cat <<END > ${S}/runtime/macros/manpager.sh
#!/bin/sh
+sed -e 's/\x1B\[[[:digit:]]\+m//g' | \\
tr '\\267' '.' | col -b | \\
vim \\
-c 'let no_plugin_maps = 1' \\
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2008-07-26 14:20 Ali Polatel (hawking)
0 siblings, 0 replies; 32+ messages in thread
From: Ali Polatel (hawking) @ 2008-07-26 14:20 UTC (permalink / raw
To: gentoo-commits
hawking 08/07/26 14:20:50
Modified: vim.eclass
Log:
Quoting, fixes #203985
Revision Changes Path
1.172 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.172&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.172&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.171&r2=1.172
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- vim.eclass 6 Apr 2008 09:22:13 -0000 1.171
+++ vim.eclass 26 Jul 2008 14:20:50 -0000 1.172
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.171 2008/04/06 09:22:13 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.172 2008/07/26 14:20:50 hawking Exp $
# Authors:
# Ryan Phillips <rphillips@gentoo.org>
@@ -24,18 +24,18 @@
inherit eutils vim-doc flag-o-matic versionator fdo-mime
# Support -cvs ebuilds, even though they're not in the official tree.
-MY_PN="${PN%-cvs}"
+MY_PN=${PN%-cvs}
# This isn't a conditional inherit from portage's perspective, since $MY_PN is
# constant at cache creation time. It's therefore legal and doesn't break
# anything. I even checked with carpaski first :) (08 Sep 2004 ciaranm)
-if [[ "${MY_PN}" != "vim-core" ]] && ! version_is_at_least "6.3.086" ; then
- IUSE="debug"
+if [[ ${MY_PN} != "vim-core" ]] && ! version_is_at_least 6.3.086 ; then
+ IUSE=debug
else
- IUSE=""
+ IUSE=
fi
-if [[ "${PN##*-}" == "cvs" ]] ; then
+if [[ ${PN##*-} == "cvs" ]] ; then
inherit cvs
fi
@@ -45,7 +45,7 @@
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install src_test pkg_postinst pkg_postrm
-if version_is_at_least "6.4_beta" ; then
+if version_is_at_least 6.4_beta ; then
IUSE="${IUSE} nls acl"
else
IUSE="${IUSE} selinux nls acl"
@@ -54,7 +54,7 @@
DEPEND="${DEPEND} nls? ( virtual/libintl )"
RDEPEND="${RDEPEND} nls? ( virtual/libintl )"
-if [[ "${MY_PN}" == "vim-core" ]] ; then
+if [[ ${MY_PN} == "vim-core" ]] ; then
IUSE="${IUSE} livecd"
else
IUSE="${IUSE} cscope gpm perl python ruby"
@@ -73,18 +73,18 @@
acl? ( kernel_linux? ( sys-apps/acl ) )
ruby? ( virtual/ruby )"
- if ! version_is_at_least "6.4_beta" ; then
+ if ! version_is_at_least 6.4_beta ; then
DEPEND="${DEPEND} selinux? ( sys-libs/libselinux )"
RDEPEND="${RDEPEND} selinux? ( sys-libs/libselinux )"
fi
- if [[ "${MY_PN}" == "vim" ]] ; then
+ if [[ ${MY_PN} == vim ]] ; then
IUSE="${IUSE} vim-with-x minimal"
# see bug #111979 for modular X deps
DEPEND="${DEPEND} vim-with-x? ( x11-libs/libXt x11-libs/libX11
x11-libs/libSM x11-proto/xproto )"
RDEPEND="${RDEPEND} vim-with-x? ( x11-libs/libXt )"
- elif [[ "${MY_PN}" == "gvim" ]] ; then
+ elif [[ ${MY_PN} == gvim ]] ; then
if version_is_at_least "6.3.086" ; then
IUSE="${IUSE} gnome gtk motif"
else
@@ -99,14 +99,14 @@
# ebuilds don't handle it).
if [[ $(get_major_version ) -ge 7 ]] ; then
# mzscheme support is currently broken. bug #91970
- #if [[ "${MY_PN}" != "vim-core" ]] ; then
+ #if [[ ${MY_PN} != "vim-core" ]] ; then
# IUSE="${IUSE} mzscheme"
# DEPEND="${DEPEND}
# mzscheme? ( dev-scheme/mzscheme )"
# RDEPEND="${RDEPEND}
# mzscheme? ( dev-scheme/mzscheme )"
#fi
- if [[ "${MY_PN}" == "gvim" ]] ; then
+ if [[ ${MY_PN} == gvim ]] ; then
IUSE="${IUSE} netbeans aqua nextaw"
# Vim implements netbeans external editor protocol when netbeans is
# enabled and doesn't necessarily need dev-util/netbeans.
@@ -114,12 +114,12 @@
# DEPEND="${DEPEND} netbeans? ( dev-util/netbeans )"
# RDEPEND="${RDEPEND} netbeans? ( dev-util/netbeans )"
fi
- if [[ "${MY_PN}" == "vim" ]] ; then
+ if [[ ${MY_PN} == vim ]] ; then
IUSE="${IUSE} vim-pager"
fi
# app-vim blocks
- if [[ "${MY_PN}" != "vim-core" ]] ; then
+ if [[ ${MY_PN} != "vim-core" ]] ; then
# align: bug 79982
RDEPEND="${RDEPEND}
!<app-vim/align-30-r1
@@ -153,7 +153,7 @@
apply_vim_patches() {
local p
- cd ${S} || die "cd ${S} failed"
+ cd "${S}" || die "cd ${S} failed"
# Scan the patches, applying them only to files that either
# already exist or that will be created by the patch
@@ -162,8 +162,8 @@
# --spb, 2004/12/18
einfo "Filtering vim patches ..."
p=${WORKDIR}/${VIM_ORG_PATCHES%.tar*}.patch
- ls ${WORKDIR}/vimpatches | sort | \
- while read f; do gzip -dc ${WORKDIR}/vimpatches/${f}; done | gawk '
+ ls "${WORKDIR}"/vimpatches | sort | \
+ while read f; do gzip -dc "${WORKDIR}"/vimpatches/${f}; done | gawk '
/^Subject: [Pp]atch/ {
if (patchnum) {printf "\n" >"/dev/stderr"}
patchnum = $3
@@ -223,7 +223,7 @@
vim_src_unpack() {
unpack ${A}
- if [[ "${PN##*-}" == "cvs" ]] ; then
+ if [[ ${PN##*-} == cvs ]] ; then
ECVS_SERVER="vim.cvs.sourceforge.net:/cvsroot/vim"
ECVS_PASS=""
if [[ $(get_major_version ) -ge 7 ]] ; then
@@ -240,67 +240,67 @@
# Unpack the runtime snapshot if available (only for vim-core)
if [[ -n "$VIM_RUNTIME_SNAP" ]] ; then
- cd ${S} || die
+ cd "${S}" || die
ebegin "Unpacking vim runtime snapshot"
rm -rf runtime
# Changed this from bzip2 |tar to tar -j since the former broke for
# some reason on freebsd.
# --spb, 2004/12/18
- tar xjf ${DISTDIR}/${VIM_RUNTIME_SNAP}
+ tar xjf "${DISTDIR}"/${VIM_RUNTIME_SNAP}
assert # this will check both parts of the pipeline; eend would not
eend 0
fi
fi
# Another set of patches borrowed from src rpm to fix syntax errors etc.
- cd ${S} || die "cd ${S} failed"
+ cd "${S}" || die "cd ${S} failed"
EPATCH_SUFFIX="gz" EPATCH_FORCE="yes" \
- epatch ${WORKDIR}/gentoo/patches-all/
+ epatch "${WORKDIR}"/gentoo/patches-all/
# Unpack an updated netrw snapshot if necessary. This is nasty. Don't
# ask, you don't want to know.
if [[ -n "${VIM_NETRW_SNAP}" ]] ; then
ebegin "Unpacking updated netrw snapshot"
- tar xjf ${DISTDIR}/${VIM_NETRW_SNAP} -C runtime/
+ tar xjf "${DISTDIR}"/${VIM_NETRW_SNAP} -C runtime/
eend $?
fi
# Fixup a script to use awk instead of nawk
- sed -i '1s|.*|#!/usr/bin/awk -f|' ${S}/runtime/tools/mve.awk \
+ sed -i '1s|.*|#!/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
|| die "mve.awk sed failed"
# Patch to build with ruby-1.8.0_pre5 and following
- sed -i 's/defout/stdout/g' ${S}/src/if_ruby.c
+ sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
# Read vimrc and gvimrc from /etc/vim
- echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> ${S}/src/feature.h
- echo '#define SYS_GVIMRC_FILE "/etc/vim/gvimrc"' >> ${S}/src/feature.h
+ echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> "${S}"/src/feature.h
+ echo '#define SYS_GVIMRC_FILE "/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'
+ "${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'
+ 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
+ find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
# if we're vim-7 and USE vim-pager, make the manpager.sh script
- if [[ "${MY_PN}" == "vim" ]] && [[ $(get_major_version ) -ge 7 ]] \
+ if [[ ${MY_PN} == vim ]] && [[ $(get_major_version ) -ge 7 ]] \
&& use vim-pager ; then
- cat <<END > ${S}/runtime/macros/manpager.sh
+ cat <<END > "${S}"/runtime/macros/manpager.sh
#!/bin/sh
sed -e 's/\x1B\[[[:digit:]]\+m//g' | \\
tr '\\267' '.' | col -b | \\
@@ -313,10 +313,10 @@
fi
# Try to avoid sandbox problems. Bug #114475.
- if [[ $(get_major_version ) -ge 7 ]] && [[ -d "${S}/src/po" ]] ; then
+ if [[ $(get_major_version ) -ge 7 ]] && [[ -d "${S}"/src/po ]] ; then
sed -i -e \
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
- "${S}/src/po/Makefile"
+ "${S}"/src/po/Makefile
fi
}
@@ -355,8 +355,8 @@
[[ -e ${file} ]] && addwrite $file
done
- if [[ "${MY_PN}" == "vim-core" ]] ||
- ( [[ "${MY_PN}" == "vim" ]] && use minimal ); then
+ if [[ ${MY_PN} == "vim-core" ]] ||
+ ( [[ ${MY_PN} == vim ]] && use minimal ); then
myconf="--with-features=tiny \
--enable-gui=no \
--without-x \
@@ -366,7 +366,7 @@
--disable-gpm"
else
- if ! version_is_at_least "6.3.086" ; then
+ if ! version_is_at_least 6.3.086 ; then
use debug && append-flags "-DDEBUG"
fi
@@ -383,7 +383,7 @@
if [[ $(get_major_version ) -ge 7 ]] ; then
# mzscheme support is currently broken. bug #91970
#myconf="${myconf} `use_enable mzscheme mzschemeinterp`"
- if [[ "${MY_PN}" == "gvim" ]] ; then
+ if [[ ${MY_PN} == gvim ]] ; then
myconf="${myconf} `use_enable netbeans`"
fi
fi
@@ -395,12 +395,12 @@
die "couldn't disable cscope"
fi
- if [[ "${MY_PN}" == "vim" ]] ; then
+ if [[ ${MY_PN} == vim ]] ; then
# don't test USE=X here ... see bug #19115
# but need to provide a way to link against X ... see bug #20093
myconf="${myconf} --enable-gui=no `use_with vim-with-x x`"
- elif [[ "${MY_PN}" == "gvim" ]] ; then
+ elif [[ ${MY_PN} == gvim ]] ; then
myconf="${myconf} --with-vim-name=gvim --with-x"
echo ; echo
@@ -408,7 +408,7 @@
einfo "Building gvim with the Carbon GUI"
myconf="${myconf} --enable-gui=carbon"
elif use gtk ; then
- if version_is_at_least "6.3.086" ; then
+ if version_is_at_least 6.3.086 ; then
myconf="${myconf} --enable-gtk2-check"
if use gnome ; then
einfo "Building gvim with the Gnome 2 GUI"
@@ -454,7 +454,7 @@
fi
fi
- if [[ "${MY_PN}" == "vim" ]] && use minimal ; then
+ if [[ ${MY_PN} == vim ]] && use minimal ; then
myconf="${myconf} --disable-nls --disable-multibyte --disable-acl"
else
myconf="${myconf} `use_enable nls` `use_enable acl`"
@@ -464,7 +464,7 @@
# for the reasons behind the USE flag change.
myconf="${myconf} --with-tlib=curses"
- if version_is_at_least "6.4_beta" ; then
+ if version_is_at_least 6.4_beta ; then
myconf="${myconf} --disable-selinux"
else
use selinux \
@@ -472,7 +472,7 @@
fi
# Let Portage do the stripping. Some people like that.
- if version_is_at_least "7.0_beta" ; then
+ if version_is_at_least 7.0_beta ; then
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
fi
@@ -482,7 +482,7 @@
# The following allows emake to be used
make -j1 -C src auto/osdef.h objects || die "make failed"
- if [[ "${MY_PN}" == "vim-core" ]] ; then
+ if [[ ${MY_PN} == "vim-core" ]] ; then
emake tools || die "emake tools failed"
rm -f src/vim
else
@@ -498,7 +498,7 @@
}
vim_src_install() {
- if [[ "${MY_PN}" == "vim-core" ]] ; then
+ if [[ ${MY_PN} == "vim-core" ]] ; then
dodir /usr/{bin,share/{man/man1,vim}}
cd src || die "cd src failed"
if [[ $(get_major_version ) -ge 7 ]] ; then
@@ -525,7 +525,7 @@
installtools \
install-languages \
install-icons \
- DESTDIR=${D} \
+ DESTDIR="${D}" \
BINDIR=/usr/bin \
MANDIR=/usr/share/man \
DATADIR=/usr/share \
@@ -537,7 +537,7 @@
# default vimrc is installed by vim-core since it applies to
# both vim and gvim
insinto /etc/vim/
- newins ${FILESDIR}/vimrc${VIMRC_FILE_SUFFIX} vimrc
+ newins "${FILESDIR}"/vimrc${VIMRC_FILE_SUFFIX} vimrc
if use livecd ; then
# To save space, install only a subset of the files if we're on a
@@ -548,7 +548,7 @@
shopt -s extglob
rm -fr ${vimfiles}/{compiler,doc,ftplugin,indent}
rm -fr ${vimfiles}/{macros,print,tools,tutor}
- rm ${D}/usr/bin/vimtutor
+ rm "${D}"/usr/bin/vimtutor
local keep_colors="default"
ignore=$(rm -fr ${vimfiles}/colors/!(${keep_colors}).vim )
@@ -562,15 +562,15 @@
# 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 ${D}/usr/share/vim/vim${VIM_VERSION/.}/tools/{vimspell.sh,tcltags}
+ rm "${D}"/usr/share/vim/vim${VIM_VERSION/.}/tools/{vimspell.sh,tcltags}
- elif [[ "${MY_PN}" == "gvim" ]] ; then
+ elif [[ ${MY_PN} == gvim ]] ; then
dobin src/gvim
dosym gvim /usr/bin/gvimdiff
dosym gvim /usr/bin/evim
dosym gvim /usr/bin/eview
# bug #74349 says we should install these
- if version_is_at_least "6.3-r4" ; then
+ if version_is_at_least 6.3-r4 ; then
dosym gvim /usr/bin/gview
dosym gvim /usr/bin/rgvim
dosym gvim /usr/bin/rgview
@@ -583,28 +583,28 @@
fi
insinto /etc/vim
- newins ${FILESDIR}/gvimrc${GVIMRC_FILE_SUFFIX} gvimrc
+ newins "${FILESDIR}"/gvimrc${GVIMRC_FILE_SUFFIX} gvimrc
# as of 6.3-r1, we install a desktop entry. bug #44633, and bug #68622
# for the nicer updated version.
insinto /usr/share/applications
- newins ${FILESDIR}/gvim.desktop${GVIM_DESKTOP_SUFFIX} gvim.desktop
+ newins "${FILESDIR}"/gvim.desktop${GVIM_DESKTOP_SUFFIX} gvim.desktop
insinto /usr/share/pixmaps
- doins ${FILESDIR}/gvim.xpm
+ doins "${FILESDIR}"/gvim.xpm
else
dobin src/vim
- ln -s vim ${D}/usr/bin/vimdiff && \
- ln -s vim ${D}/usr/bin/rvim && \
- ln -s vim ${D}/usr/bin/ex && \
- ln -s vim ${D}/usr/bin/view && \
- ln -s vim ${D}/usr/bin/rview \
+ ln -s vim "${D}"/usr/bin/vimdiff && \
+ ln -s vim "${D}"/usr/bin/rvim && \
+ ln -s vim "${D}"/usr/bin/ex && \
+ ln -s vim "${D}"/usr/bin/view && \
+ ln -s vim "${D}"/usr/bin/rview \
|| die "/usr/bin symlinks failed"
if [[ $(get_major_version ) -ge 7 ]] && use vim-pager ; then
ln -s /usr/share/vim/vim${VIM_VERSION//./}/macros/less.sh \
- ${D}/usr/bin/vimpager
+ "${D}"/usr/bin/vimpager
ln -s /usr/share/vim/vim${VIM_VERSION//./}/macros/manpager.sh \
- ${D}/usr/bin/vimmanpager
+ "${D}"/usr/bin/vimmanpager
insinto /usr/share/vim/vim${VIM_VERSION//./}/macros
doins runtime/macros/manpager.sh
fperms a+x /usr/share/vim/vim${VIM_VERSION//./}/macros/manpager.sh
@@ -613,10 +613,10 @@
# bash completion script, bug #79018.
if version_is_at_least 6.3.1 ; then
- if [[ "${MY_PN}" == "vim-core" ]] ; then
- dobashcompletion ${FILESDIR}/xxd-completion xxd
+ if [[ ${MY_PN} == "vim-core" ]] ; then
+ dobashcompletion "${FILESDIR}"/xxd-completion xxd
else
- dobashcompletion ${FILESDIR}/${MY_PN}-completion ${MY_PN}
+ dobashcompletion "${FILESDIR}"/${MY_PN}-completion ${MY_PN}
fi
fi
@@ -645,21 +645,21 @@
fi
# Make or remove convenience symlink, vim -> gvim
- if [[ -f ${ROOT}/usr/bin/gvim ]]; then
- ln -s gvim ${ROOT}/usr/bin/vim 2>/dev/null
- elif [[ -L ${ROOT}/usr/bin/vim && ! -f ${ROOT}/usr/bin/vim ]]; then
- rm ${ROOT}/usr/bin/vim
+ if [[ -f "${ROOT}"/usr/bin/gvim ]]; then
+ ln -s gvim "${ROOT}"/usr/bin/vim 2>/dev/null
+ elif [[ -L "${ROOT}"/usr/bin/vim && ! -f "${ROOT}"/usr/bin/vim ]]; then
+ rm "${ROOT}"/usr/bin/vim
fi
# Make or remove convenience symlinks to vim
- if [[ -f ${ROOT}/usr/bin/vim ]]; then
+ if [[ -f "${ROOT}"/usr/bin/vim ]]; then
for f in ${syms}; do
- ln -s vim ${ROOT}/usr/bin/${f} 2>/dev/null
+ ln -s vim "${ROOT}"/usr/bin/${f} 2>/dev/null
done
else
for f in ${syms}; do
- if [[ -L ${ROOT}/usr/bin/${f} && ! -f ${ROOT}/usr/bin/${f} ]]; then
- rm -f ${ROOT}/usr/bin/${f}
+ if [[ -L "${ROOT}"/usr/bin/${f} && ! -f "${ROOT}"/usr/bin/${f} ]]; then
+ rm -f "${ROOT}"/usr/bin/${f}
fi
done
fi
@@ -674,12 +674,12 @@
update_vim_helptags
# Update fdo mime stuff, bug #78394
- if [[ "${MY_PN}" == "gvim" ]] ; then
+ if [[ ${MY_PN} == gvim ]] ; then
fdo-mime_mime_database_update
fi
if [[ $(get_major_version ) -lt 7 ]] ; then
- if [[ "${MY_PN}" == "gvim" ]] ; then
+ if [[ ${MY_PN} == gvim ]] ; then
echo
elog "To enable UTF-8 viewing, set guifont and guifontwide: "
elog ":set guifont=-misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1"
@@ -690,12 +690,12 @@
elog
elog "Then, set read encoding to UTF-8:"
elog ":set encoding=utf-8"
- elif [[ "${MY_PN}" == "vim" ]] ; then
+ elif [[ ${MY_PN} == vim ]] ; then
echo
elog "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
fi
else
- if [[ "${MY_PN}" == "vim" ]] ; then
+ if [[ ${MY_PN} == vim ]] ; then
echo
elog "To install a GUI version of vim, use the app-editors/gvim"
elog "package."
@@ -711,7 +711,7 @@
ewarn "default."
fi
- if [[ "${MY_PN}" != "vim-core" ]] ; then
+ if [[ ${MY_PN} != "vim-core" ]] ; then
echo
elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
fi
@@ -751,14 +751,14 @@
update_vim_symlinks
# Update fdo mime stuff, bug #78394
- if [[ "${MY_PN}" == "gvim" ]] ; then
+ if [[ ${MY_PN} == gvim ]] ; then
fdo-mime_mime_database_update
fi
}
vim_src_test() {
- if [[ "${MY_PN}" == "vim-core" ]] ; then
+ if [[ ${MY_PN} == "vim-core" ]] ; then
einfo "No testing needs to be done for vim-core"
return
fi
@@ -776,10 +776,10 @@
# Don't let vim talk to X
unset DISPLAY
- if [[ "${MY_PN}" == "gvim" ]] ; then
+ if [[ ${MY_PN} == gvim ]] ; then
# 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
+ ln -s "${S}"/src/gvim "${S}"/src/testvim
testprog="../testvim"
else
testprog="../vim"
@@ -787,7 +787,7 @@
# We've got to call make test from within testdir, since the Makefiles
# don't pass through our VIMPROG argument
- cd ${S}/src/testdir
+ 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."
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2008-10-10 13:44 Ali Polatel (hawking)
0 siblings, 0 replies; 32+ messages in thread
From: Ali Polatel (hawking) @ 2008-10-10 13:44 UTC (permalink / raw
To: gentoo-commits
hawking 08/10/10 13:44:16
Modified: vim.eclass
Log:
Remove the tr which truncates utf8 man pages, bug 225039.
Revision Changes Path
1.173 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.173&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.173&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.172&r2=1.173
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- vim.eclass 26 Jul 2008 14:20:50 -0000 1.172
+++ vim.eclass 10 Oct 2008 13:44:16 -0000 1.173
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.172 2008/07/26 14:20:50 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.173 2008/10/10 13:44:16 hawking Exp $
# Authors:
# Ryan Phillips <rphillips@gentoo.org>
@@ -302,8 +302,7 @@
&& use vim-pager ; then
cat <<END > "${S}"/runtime/macros/manpager.sh
#!/bin/sh
-sed -e 's/\x1B\[[[:digit:]]\+m//g' | \\
-tr '\\267' '.' | col -b | \\
+sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
vim \\
-c 'let no_plugin_maps = 1' \\
-c 'set nolist nomod ft=man' \\
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2009-05-18 17:02 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2009-05-18 17:02 UTC (permalink / raw
To: gentoo-commits
lack 09/05/18 17:02:32
Modified: vim.eclass
Log:
Allow either gzipped or uncompressed patches in the tarball.
Also removed date-seeking regexp to find first and second lines of the patch
since as of 7.2.167 the date format in all vim.org patches has changed. It is
less work (while marginally less correct) to just look for lines that start with
'***' and do not end with '****' (and "---" / "----" for the second line).
Revision Changes Path
1.174 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.174&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.174&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.173&r2=1.174
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- vim.eclass 10 Oct 2008 13:44:16 -0000 1.173
+++ vim.eclass 18 May 2009 17:02:32 -0000 1.174
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.173 2008/10/10 13:44:16 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.174 2009/05/18 17:02:32 lack Exp $
# Authors:
# Ryan Phillips <rphillips@gentoo.org>
@@ -160,21 +160,40 @@
#
# Changed awk to gawk in the below; BSD's awk chokes on it
# --spb, 2004/12/18
+ #
+ # Allow either gzipped or uncompressed patches in the tarball.
+ # --lack 2009-05-18
+ #
+ # Also removed date-seeking regexp to find first and second lines of the
+ # patch since as of 7.2.167 the date format has changed. It is less work
+ # (while marginally less correct) to just look for lines that start with
+ # '***' and do not end with '****' (and "---" / "----" for the second line).
+ # --lack 2009-05-18
einfo "Filtering vim patches ..."
p=${WORKDIR}/${VIM_ORG_PATCHES%.tar*}.patch
ls "${WORKDIR}"/vimpatches | sort | \
- while read f; do gzip -dc "${WORKDIR}"/vimpatches/${f}; done | gawk '
+ while read f; do
+ local fpath="${WORKDIR}"/vimpatches/${f}
+ case $f in
+ *.gz)
+ gzip -dc "${fpath}"
+ ;;
+ *)
+ cat "${fpath}"
+ ;;
+ esac
+ done | gawk '
/^Subject: [Pp]atch/ {
if (patchnum) {printf "\n" >"/dev/stderr"}
patchnum = $3
printf "%s:", patchnum >"/dev/stderr"
}
- $1=="***" && $(NF-1)~/^[0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/ {
+ $1=="***" && $(NF)!="****" {
# First line of a patch; suppress printing
firstlines = $0
next
}
- $1=="---" && $(NF-1)~/^[0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/ {
+ $1=="---" && $(NF)!="----" {
# Second line of a patch; try to open the file to see
# if it exists.
thisfile = $2
@@ -205,7 +224,7 @@
' > ${p} || die
# For reasons yet unknown, epatch fails to apply this cleanly
- ebegin "Applying filtered vim patches ..."
+ ebegin "Applying filtered vim patches"
TMPDIR=${T} patch -f -s -p0 < ${p}
eend 0
}
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2009-10-11 11:49 Markus Meier (maekke)
0 siblings, 0 replies; 32+ messages in thread
From: Markus Meier (maekke) @ 2009-10-11 11:49 UTC (permalink / raw
To: gentoo-commits
maekke 09/10/11 11:49:42
Modified: vim.eclass
Log:
whitespace
Revision Changes Path
1.175 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.175&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.175&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.174&r2=1.175
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- vim.eclass 18 May 2009 17:02:32 -0000 1.174
+++ vim.eclass 11 Oct 2009 11:49:42 -0000 1.175
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.174 2009/05/18 17:02:32 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.175 2009/10/11 11:49:42 maekke Exp $
# Authors:
# Ryan Phillips <rphillips@gentoo.org>
@@ -172,7 +172,7 @@
einfo "Filtering vim patches ..."
p=${WORKDIR}/${VIM_ORG_PATCHES%.tar*}.patch
ls "${WORKDIR}"/vimpatches | sort | \
- while read f; do
+ while read f; do
local fpath="${WORKDIR}"/vimpatches/${f}
case $f in
*.gz)
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2009-10-14 1:29 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2009-10-14 1:29 UTC (permalink / raw
To: gentoo-commits
lack 09/10/14 01:29:49
Modified: vim.eclass
Log:
The bashcomp message for vim-core should mention 'xxd' not 'vim-core'
Fixes bug #278056
Revision Changes Path
1.176 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.176&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.176&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.175&r2=1.176
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- vim.eclass 11 Oct 2009 11:49:42 -0000 1.175
+++ vim.eclass 14 Oct 2009 01:29:49 -0000 1.176
@@ -1,8 +1,9 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.175 2009/10/11 11:49:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.176 2009/10/14 01:29:49 lack Exp $
# Authors:
+# Jim Ramsay <i.am@gentoo.org>
# Ryan Phillips <rphillips@gentoo.org>
# Seemant Kulleen <seemant@gentoo.org>
# Aron Griffis <agriffis@gentoo.org>
@@ -754,6 +755,9 @@
echo
if version_is_at_least 6.3.1 ; then
+ if [[ ${MY_PN} == "vim-core" ]] ; then
+ export BASH_COMPLETION_NAME="xxd"
+ fi
bash-completion_pkg_postinst
fi
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2009-10-17 13:43 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2009-10-17 13:43 UTC (permalink / raw
To: gentoo-commits
lack 09/10/17 13:43:30
Modified: vim.eclass
Log:
Add dependency on python[threads] (Bug #228099)
This includes some EAPI-aware code (finally)
Revision Changes Path
1.177 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.177&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.177&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.176&r2=1.177
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- vim.eclass 14 Oct 2009 01:29:49 -0000 1.176
+++ vim.eclass 17 Oct 2009 13:43:30 -0000 1.177
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.176 2009/10/14 01:29:49 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.177 2009/10/17 13:43:30 lack Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -24,6 +24,15 @@
inherit eutils vim-doc flag-o-matic versionator fdo-mime
+# Check for EAPI functions we need:
+case "${EAPI:-0}" in
+ 2)
+ HAS_SRC_PREPARE=1
+ HAS_USE_DEP=1
+ ;;
+ *) ;;
+esac
+
# Support -cvs ebuilds, even though they're not in the official tree.
MY_PN=${PN%-cvs}
@@ -44,7 +53,13 @@
inherit bash-completion
fi
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install src_test pkg_postinst pkg_postrm
+TO_EXPORT="pkg_setup src_compile src_install src_test pkg_postinst pkg_postrm"
+if [[ $HAS_SRC_PREPARE ]]; then
+ TO_EXPORT="${TO_EXPORT} src_prepare"
+else
+ TO_EXPORT="${TO_EXPORT} src_unpack"
+fi
+EXPORT_FUNCTIONS ${TO_EXPORT}
if version_is_at_least 6.4_beta ; then
IUSE="${IUSE} nls acl"
@@ -59,20 +74,27 @@
IUSE="${IUSE} livecd"
else
IUSE="${IUSE} cscope gpm perl python ruby"
+
+ if [[ $HAS_USE_DEP ]]; then
+ PYTHON_DEP="python? ( dev-lang/python[threads] )"
+ else
+ PYTHON_DEP="python? ( dev-lang/python )"
+ fi
+
DEPEND="${DEPEND}
cscope? ( dev-util/cscope )
gpm? ( >=sys-libs/gpm-1.19.3 )
perl? ( dev-lang/perl )
- python? ( dev-lang/python )
acl? ( kernel_linux? ( sys-apps/acl ) )
- ruby? ( virtual/ruby )"
+ ruby? ( virtual/ruby )
+ ${PYTHON_DEP}"
RDEPEND="${RDEPEND}
cscope? ( dev-util/cscope )
gpm? ( >=sys-libs/gpm-1.19.3 )
perl? ( dev-lang/perl )
- python? ( dev-lang/python )
acl? ( kernel_linux? ( sys-apps/acl ) )
- ruby? ( virtual/ruby )"
+ ruby? ( virtual/ruby )
+ ${PYTHON_DEP}"
if ! version_is_at_least 6.4_beta ; then
DEPEND="${DEPEND} selinux? ( sys-libs/libselinux )"
@@ -238,11 +260,14 @@
# Gnome sandbox silliness. bug #114475.
mkdir -p "${T}/home"
export HOME="${T}/home"
-}
-vim_src_unpack() {
- unpack ${A}
+ # Need python[threads]
+ if use python && ! built_with_use dev-lang/python threads; then
+ die "You must build dev-lang/python with USE=threads"
+ fi
+}
+vim_src_prepare() {
if [[ ${PN##*-} == cvs ]] ; then
ECVS_SERVER="vim.cvs.sourceforge.net:/cvsroot/vim"
ECVS_PASS=""
@@ -339,6 +364,11 @@
fi
}
+vim_src_unpack() {
+ unpack ${A}
+ vim_src_prepare
+}
+
vim_src_compile() {
local myconf confrule
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2009-10-17 17:10 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2009-10-17 17:10 UTC (permalink / raw
To: gentoo-commits
lack 09/10/17 17:10:53
Modified: vim.eclass
Log:
Big long-overdue cleanup:
- Removed all code that had anything to do with <vim-7 since all version 6 has
been out of the tree for over a year now.
- Reorganized IUSE and all [RP]DEPEND variables to be less spread-out
- Moved in all current IUSE and [RP]DEPEND from app-editors/[g]vim[-core]
- Make dev-util/ctags dependent on USE=minimal for app-editors/vim
(Bug #261025)
- Don't call update_vim_symlinks() for app-editors/vim-core
(Bug #252724)
Revision Changes Path
1.178 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.178&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.178&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.177&r2=1.178
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- vim.eclass 17 Oct 2009 13:43:30 -0000 1.177
+++ vim.eclass 17 Oct 2009 17:10:52 -0000 1.178
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.177 2009/10/17 13:43:30 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.178 2009/10/17 17:10:52 lack Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -15,14 +15,18 @@
# official vim*-cvs ebuilds in the tree.
# gvim's GUI preference order is as follows:
-# aqua CARBON (not tested, 7+)
-# -aqua gtk gnome GNOME2 (6.3-r1+, earlier uses GTK2)
+# aqua CARBON (not tested)
+# -aqua gtk gnome GNOME2
# -aqua gtk -gnome GTK2
# -aqua -gtk motif MOTIF
-# -aqua -gtk -motif nextaw NEXTAW (7+)
+# -aqua -gtk -motif nextaw NEXTAW
# -aqua -gtk -motif -nextaw ATHENA
-inherit eutils vim-doc flag-o-matic versionator fdo-mime
+inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion
+
+HOMEPAGE="http://www.vim.org/"
+SLOT="0"
+LICENSE="vim"
# Check for EAPI functions we need:
case "${EAPI:-0}" in
@@ -33,25 +37,14 @@
*) ;;
esac
-# Support -cvs ebuilds, even though they're not in the official tree.
-MY_PN=${PN%-cvs}
-
-# This isn't a conditional inherit from portage's perspective, since $MY_PN is
-# constant at cache creation time. It's therefore legal and doesn't break
-# anything. I even checked with carpaski first :) (08 Sep 2004 ciaranm)
-if [[ ${MY_PN} != "vim-core" ]] && ! version_is_at_least 6.3.086 ; then
- IUSE=debug
-else
- IUSE=
-fi
-
if [[ ${PN##*-} == "cvs" ]] ; then
inherit cvs
fi
-if version_is_at_least 6.3.1 ; then
- inherit bash-completion
-fi
+# Support -cvs ebuilds, even though they're not in the official tree.
+MY_PN=${PN%-cvs}
+
+IUSE="nls acl"
TO_EXPORT="pkg_setup src_compile src_install src_test pkg_postinst pkg_postrm"
if [[ $HAS_SRC_PREPARE ]]; then
@@ -61,19 +54,22 @@
fi
EXPORT_FUNCTIONS ${TO_EXPORT}
-if version_is_at_least 6.4_beta ; then
- IUSE="${IUSE} nls acl"
-else
- IUSE="${IUSE} selinux nls acl"
-fi
-
-DEPEND="${DEPEND} nls? ( virtual/libintl )"
-RDEPEND="${RDEPEND} nls? ( virtual/libintl )"
+DEPEND="${DEPEND}
+ >=app-admin/eselect-vi-1.1
+ >=sys-apps/sed-4
+ sys-devel/autoconf
+ >=sys-libs/ncurses-5.2-r2
+ nls? ( virtual/libintl )"
+RDEPEND="${RDEPEND}
+ >=app-admin/eselect-vi-1.1
+ >=sys-libs/ncurses-5.2-r2
+ nls? ( virtual/libintl )"
if [[ ${MY_PN} == "vim-core" ]] ; then
IUSE="${IUSE} livecd"
+ PDEPEND="!livecd? ( app-vim/gentoo-syntax )"
else
- IUSE="${IUSE} cscope gpm perl python ruby"
+ IUSE="${IUSE} cscope debug gpm perl python ruby"
if [[ $HAS_USE_DEP ]]; then
PYTHON_DEP="python? ( dev-lang/python[threads] )"
@@ -94,86 +90,65 @@
perl? ( dev-lang/perl )
acl? ( kernel_linux? ( sys-apps/acl ) )
ruby? ( virtual/ruby )
- ${PYTHON_DEP}"
+ ${PYTHON_DEP}
+ !<app-vim/align-30-r1
+ !app-vim/vimspell
+ !<app-vim/vimbuddy-0.9.1-r1
+ !<app-vim/autoalign-11
+ !<app-vim/supertab-0.41"
- if ! version_is_at_least 6.4_beta ; then
- DEPEND="${DEPEND} selinux? ( sys-libs/libselinux )"
- RDEPEND="${RDEPEND} selinux? ( sys-libs/libselinux )"
- fi
+ # mzscheme support is currently broken. bug #91970
+ # IUSE="${IUSE} mzscheme"
+ # DEPEND="${DEPEND}
+ # mzscheme? ( dev-scheme/mzscheme )"
+ # RDEPEND="${RDEPEND}
+ # mzscheme? ( dev-scheme/mzscheme )"
if [[ ${MY_PN} == vim ]] ; then
- IUSE="${IUSE} vim-with-x minimal"
- # see bug #111979 for modular X deps
- DEPEND="${DEPEND} vim-with-x? ( x11-libs/libXt x11-libs/libX11
- x11-libs/libSM x11-proto/xproto )"
- RDEPEND="${RDEPEND} vim-with-x? ( x11-libs/libXt )"
+ IUSE="${IUSE} vim-with-x minimal vim-pager"
+ DEPEND="${DEPEND}
+ vim-with-x? ( x11-libs/libXt x11-libs/libX11
+ x11-libs/libSM x11-proto/xproto )
+ !minimal? ( dev-util/ctags )"
+ RDEPEND="${RDEPEND}
+ vim-with-x? ( x11-libs/libXt )
+ !minimal? ( ~app-editors/vim-core-${PV}
+ dev-util/ctags )
+ !<app-editors/nvi-1.81.5-r4"
elif [[ ${MY_PN} == gvim ]] ; then
- if version_is_at_least "6.3.086" ; then
- IUSE="${IUSE} gnome gtk motif"
- else
- IUSE="${IUSE} gnome gtk gtk2 motif"
- fi
- fi
-fi
-
-# vim7 has some extra options. mzscheme support has been added. netbeans now has
-# its own USE flag, but it's only available under gvim. We have a few new GUI
-# toolkits, and we can also install a vimpager (this is in vim6 as well, but the
-# ebuilds don't handle it).
-if [[ $(get_major_version ) -ge 7 ]] ; then
- # mzscheme support is currently broken. bug #91970
- #if [[ ${MY_PN} != "vim-core" ]] ; then
- # IUSE="${IUSE} mzscheme"
- # DEPEND="${DEPEND}
- # mzscheme? ( dev-scheme/mzscheme )"
- # RDEPEND="${RDEPEND}
- # mzscheme? ( dev-scheme/mzscheme )"
- #fi
- if [[ ${MY_PN} == gvim ]] ; then
- IUSE="${IUSE} netbeans aqua nextaw"
- # Vim implements netbeans external editor protocol when netbeans is
- # enabled and doesn't necessarily need dev-util/netbeans.
- # bug 184065
- # DEPEND="${DEPEND} netbeans? ( dev-util/netbeans )"
- # RDEPEND="${RDEPEND} netbeans? ( dev-util/netbeans )"
- fi
- if [[ ${MY_PN} == vim ]] ; then
- IUSE="${IUSE} vim-pager"
- fi
-
- # app-vim blocks
- if [[ ${MY_PN} != "vim-core" ]] ; then
- # align: bug 79982
+ IUSE="${IUSE} aqua gnome gtk motif nextaw netbeans"
+ DEPEND="${DEPEND}
+ dev-util/ctags
+ !aqua? (
+ gtk? (
+ dev-util/pkgconfig
+ )
+ )"
RDEPEND="${RDEPEND}
- !<app-vim/align-30-r1
- !app-vim/vimspell
- !<app-vim/vimbuddy-0.9.1-r1
- !<app-vim/autoalign-11
- !<app-vim/supertab-0.41"
+ ~app-editors/vim-core-${PV}
+ dev-util/ctags
+ x11-libs/libXext
+ !aqua? (
+ gtk? (
+ >=x11-libs/gtk+-2.6
+ x11-libs/libXft
+ gnome? ( >=gnome-base/libgnomeui-2.6 )
+ )
+ !gtk? (
+ motif? (
+ x11-libs/openmotif
+ )
+ !motif? (
+ nextaw? (
+ x11-libs/neXtaw
+ )
+ !nextaw? ( x11-libs/libXaw )
+ )
+ )
+ )"
fi
fi
-# eselect-vi support
-if version_is_at_least 7.0.109 ; then
- DEPEND="${DEPEND} >=app-admin/eselect-vi-1.1"
- RDEPEND="${RDEPEND} >=app-admin/eselect-vi-1.1"
-fi
-
-HOMEPAGE="http://www.vim.org/"
-SLOT="0"
-LICENSE="vim"
-
-# ctags dependancy allows help tags to be rebuilt properly, along
-# with detection of exuberant-ctags by configure.
-DEPEND="${DEPEND}
- >=sys-apps/sed-4
- sys-devel/autoconf
- dev-util/ctags
- >=sys-libs/ncurses-5.2-r2"
-RDEPEND="${RDEPEND}
- dev-util/ctags
- >=sys-libs/ncurses-5.2-r2"
-
apply_vim_patches() {
local p
cd "${S}" || die "cd ${S} failed"
@@ -271,14 +246,9 @@
if [[ ${PN##*-} == cvs ]] ; then
ECVS_SERVER="vim.cvs.sourceforge.net:/cvsroot/vim"
ECVS_PASS=""
- if [[ $(get_major_version ) -ge 7 ]] ; then
- ECVS_MODULE="vim7"
- else
- ECVS_MODULE="vim"
- fi
+ ECVS_MODULE="vim7"
ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src/${ECVS_MODULE}"
cvs_src_unpack
-
else
# Apply any patches available from vim.org for this version
[[ -n "$VIM_ORG_PATCHES" ]] && apply_vim_patches
@@ -342,9 +312,8 @@
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
- # if we're vim-7 and USE vim-pager, make the manpager.sh script
- if [[ ${MY_PN} == vim ]] && [[ $(get_major_version ) -ge 7 ]] \
- && use vim-pager ; then
+ # conditionally make the manpager.sh script
+ if [[ ${MY_PN} == vim ]] && use vim-pager ; then
cat <<END > "${S}"/runtime/macros/manpager.sh
#!/bin/sh
sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
@@ -357,7 +326,7 @@
fi
# Try to avoid sandbox problems. Bug #114475.
- if [[ $(get_major_version ) -ge 7 ]] && [[ -d "${S}"/src/po ]] ; then
+ if [[ -d "${S}"/src/po ]] ; then
sed -i -e \
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
"${S}"/src/po/Makefile
@@ -370,7 +339,7 @@
}
vim_src_compile() {
- local myconf confrule
+ local myconf
# Fix bug 37354: Disallow -funroll-all-loops on amd64
# Bug 57859 suggests that we want to do this for all archs
@@ -389,13 +358,10 @@
ebegin "Creating configure script"
sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
rm -f src/auto/configure
- # vim-6.2 changed the name of this rule from auto/configure to autoconf
- confrule=auto/configure
- grep -q ^autoconf: src/Makefile && confrule=autoconf
# autoconf-2.13 needed for this package -- bug 35319
# except it seems we actually need 2.5 now -- bug 53777
WANT_AUTOCONF=2.5 \
- make -j1 -C src $confrule || die "make $confrule failed"
+ make -j1 -C src autoconf || die "make autoconf failed"
eend $?
# This should fix a sandbox violation (see bug 24447). The hvc
@@ -415,9 +381,7 @@
--disable-gpm"
else
- if ! version_is_at_least 6.3.086 ; then
- use debug && append-flags "-DDEBUG"
- fi
+ use debug && append-flags "-DDEBUG"
myconf="--with-features=huge \
--enable-multibyte"
@@ -429,12 +393,10 @@
# tclinterp is broken; when you --enable-tclinterp flag, then
# the following command never returns:
# VIMINIT='let OS=system("uname -s")' vim
- if [[ $(get_major_version ) -ge 7 ]] ; then
- # mzscheme support is currently broken. bug #91970
- #myconf="${myconf} `use_enable mzscheme mzschemeinterp`"
- if [[ ${MY_PN} == gvim ]] ; then
- myconf="${myconf} `use_enable netbeans`"
- fi
+ # mzscheme support is currently broken. bug #91970
+ #myconf="${myconf} `use_enable mzscheme mzschemeinterp`"
+ if [[ ${MY_PN} == gvim ]] ; then
+ myconf="${myconf} `use_enable netbeans`"
fi
# --with-features=huge forces on cscope even if we --disable it. We need
@@ -453,43 +415,22 @@
myconf="${myconf} --with-vim-name=gvim --with-x"
echo ; echo
- if [[ $(get_major_version ) -ge 7 ]] && use aqua ; then
+ if use aqua ; then
einfo "Building gvim with the Carbon GUI"
myconf="${myconf} --enable-gui=carbon"
elif use gtk ; then
- if version_is_at_least 6.3.086 ; then
- myconf="${myconf} --enable-gtk2-check"
- if use gnome ; then
- einfo "Building gvim with the Gnome 2 GUI"
- myconf="${myconf} --enable-gui=gnome2"
- else
- einfo "Building gvim with the gtk+-2 GUI"
- myconf="${myconf} --enable-gui=gtk2"
- fi
+ myconf="${myconf} --enable-gtk2-check"
+ if use gnome ; then
+ einfo "Building gvim with the Gnome 2 GUI"
+ myconf="${myconf} --enable-gui=gnome2"
else
- if use gtk2 ; then
- myconf="${myconf} --enable-gtk2-check"
- if use gnome ; then
- einfo "Building gvim with the Gnome 2 GUI"
- myconf="${myconf} --enable-gui=gnome2"
- else
- einfo "Building gvim with the gtk+-2 GUI"
- myconf="${myconf} --enable-gui=gtk2"
- fi
- else
- if use gnome ; then
- einfo "Building gvim with the Gnome 1 GUI"
- myconf="${myconf} --enable-gui=gnome"
- else
- einfo "Building gvim with the gtk+-1.2 GUI"
- myconf="${myconf} --enable-gui=gtk"
- fi
- fi
+ einfo "Building gvim with the gtk+-2 GUI"
+ myconf="${myconf} --enable-gui=gtk2"
fi
elif use motif ; then
einfo "Building gvim with the MOTIF GUI"
myconf="${myconf} --enable-gui=motif"
- elif [[ $(get_major_version ) -ge 7 ]] && use nextaw ; then
+ elif use nextaw ; then
einfo "Building gvim with the neXtaw GUI"
myconf="${myconf} --enable-gui=nextaw"
else
@@ -513,17 +454,10 @@
# for the reasons behind the USE flag change.
myconf="${myconf} --with-tlib=curses"
- if version_is_at_least 6.4_beta ; then
- myconf="${myconf} --disable-selinux"
- else
- use selinux \
- || myconf="${myconf} --disable-selinux"
- fi
+ myconf="${myconf} --disable-selinux"
# Let Portage do the stripping. Some people like that.
- if version_is_at_least 7.0_beta ; then
- export ac_cv_prog_STRIP="$(type -P true ) faking strip"
- fi
+ export ac_cv_prog_STRIP="$(type -P true ) faking strip"
myconf="${myconf} --with-modified-by=Gentoo-${PVR}"
econf ${myconf} || die "vim configure failed"
@@ -547,41 +481,27 @@
}
vim_src_install() {
+ local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
if [[ ${MY_PN} == "vim-core" ]] ; then
dodir /usr/{bin,share/{man/man1,vim}}
cd src || die "cd src failed"
- if [[ $(get_major_version ) -ge 7 ]] ; then
- make \
- installruntime \
- installmanlinks \
- installmacros \
- installtutor \
- installtutorbin \
- installtools \
- install-languages \
- install-icons \
- DESTDIR=${D} \
- BINDIR=/usr/bin \
- MANDIR=/usr/share/man \
- DATADIR=/usr/share \
- || die "install failed"
- else
- make \
- installruntime \
- installhelplinks \
- installmacros \
- installtutor \
- installtools \
- install-languages \
- install-icons \
- DESTDIR="${D}" \
- BINDIR=/usr/bin \
- MANDIR=/usr/share/man \
- DATADIR=/usr/share \
- || die "install failed"
- fi
+ make \
+ installruntime \
+ installmanlinks \
+ installmacros \
+ installtutor \
+ installtutorbin \
+ installtools \
+ install-languages \
+ install-icons \
+ DESTDIR=${D} \
+ BINDIR=/usr/bin \
+ MANDIR=/usr/share/man \
+ DATADIR=/usr/share \
+ || die "install failed"
- keepdir /usr/share/vim/vim${VIM_VERSION/./}/keymap
+ keepdir ${vimfiles}/keymap
# default vimrc is installed by vim-core since it applies to
# both vim and gvim
@@ -593,89 +513,70 @@
# livecd. bug 65144.
einfo "Removing some files for a smaller livecd install ..."
- local vimfiles=${D}/usr/share/vim/vim${VIM_VERSION/.}
shopt -s extglob
- rm -fr ${vimfiles}/{compiler,doc,ftplugin,indent}
- rm -fr ${vimfiles}/{macros,print,tools,tutor}
+ rm -fr "${D}${vimfiles}"/{compiler,doc,ftplugin,indent}
+ rm -fr "${D}${vimfiles}"/{macros,print,tools,tutor}
rm "${D}"/usr/bin/vimtutor
local keep_colors="default"
- ignore=$(rm -fr ${vimfiles}/colors/!(${keep_colors}).vim )
+ ignore=$(rm -fr "${D}${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 ${vimfiles}/syntax/!(${keep_syntax}).vim )
+ ignore=$(rm -fr "${D}${vimfiles}"/syntax/!(${keep_syntax}).vim )
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 "${D}"/usr/share/vim/vim${VIM_VERSION/.}/tools/{vimspell.sh,tcltags}
+ rm "${D}${vimfiles}"/tools/{vimspell.sh,tcltags}
elif [[ ${MY_PN} == gvim ]] ; then
dobin src/gvim
dosym gvim /usr/bin/gvimdiff
dosym gvim /usr/bin/evim
dosym gvim /usr/bin/eview
- # bug #74349 says we should install these
- if version_is_at_least 6.3-r4 ; then
- dosym gvim /usr/bin/gview
- dosym gvim /usr/bin/rgvim
- dosym gvim /usr/bin/rgview
- fi
-
- if version_is_at_least 7.0.109 ; then
+ dosym gvim /usr/bin/gview
+ dosym gvim /usr/bin/rgvim
+ dosym gvim /usr/bin/rgview
dosym vim.1.gz /usr/share/man/man1/gvim.1.gz
dosym vim.1.gz /usr/share/man/man1/gview.1.gz
dosym vimdiff.1.gz /usr/share/man/man1/gvimdiff.1.gz
- fi
- insinto /etc/vim
+ insinto /etc/vim
newins "${FILESDIR}"/gvimrc${GVIMRC_FILE_SUFFIX} gvimrc
- # as of 6.3-r1, we install a desktop entry. bug #44633, and bug #68622
- # for the nicer updated version.
insinto /usr/share/applications
newins "${FILESDIR}"/gvim.desktop${GVIM_DESKTOP_SUFFIX} gvim.desktop
insinto /usr/share/pixmaps
doins "${FILESDIR}"/gvim.xpm
- else
+ else # app-editor/vim
+ # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+ # managed by eselect-vi
dobin src/vim
- ln -s vim "${D}"/usr/bin/vimdiff && \
- ln -s vim "${D}"/usr/bin/rvim && \
- ln -s vim "${D}"/usr/bin/ex && \
- ln -s vim "${D}"/usr/bin/view && \
- ln -s vim "${D}"/usr/bin/rview \
- || die "/usr/bin symlinks failed"
- if [[ $(get_major_version ) -ge 7 ]] && use vim-pager ; then
- ln -s /usr/share/vim/vim${VIM_VERSION//./}/macros/less.sh \
- "${D}"/usr/bin/vimpager
- ln -s /usr/share/vim/vim${VIM_VERSION//./}/macros/manpager.sh \
- "${D}"/usr/bin/vimmanpager
- insinto /usr/share/vim/vim${VIM_VERSION//./}/macros
+ 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 /usr/share/vim/vim${VIM_VERSION//./}/macros/manpager.sh
+ fperms a+x ${vimfiles}/macros/manpager.sh
fi
fi
# bash completion script, bug #79018.
- if version_is_at_least 6.3.1 ; then
- if [[ ${MY_PN} == "vim-core" ]] ; then
- dobashcompletion "${FILESDIR}"/xxd-completion xxd
- else
- dobashcompletion "${FILESDIR}"/${MY_PN}-completion ${MY_PN}
- fi
- fi
-
- if version_is_at_least 7.0.109 ; then
- # We shouldn't be installing the ex or view man page symlinks, as they
- # are managed by eselect-vi
- rm -f "${D}"/usr/share/man/man1/{ex,view}.1
- # Same for these /usr/bin symlinks
- rm -f "${D}"/usr/bin/{ex,view}
+ if [[ ${MY_PN} == "vim-core" ]] ; then
+ dobashcompletion "${FILESDIR}"/xxd-completion xxd
+ else
+ dobashcompletion "${FILESDIR}"/${MY_PN}-completion ${MY_PN}
fi
+ # We shouldn't be installing the ex or view man page symlinks, as they
+ # are managed by eselect-vi
+ rm -f "${D}"/usr/share/man/man1/{ex,view}.1
}
# Make convenience symlinks, hopefully without stepping on toes. Some
@@ -683,15 +584,10 @@
# but they might be good for gvim as well (see bug 45828)
update_vim_symlinks() {
local f syms
- if ! version_is_at_least 7.0.109 ; then
- syms="vi vimdiff rvim ex view rview"
- else
- # Use eselect vi instead.
- 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
- fi
+ 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 "${ROOT}"/usr/bin/gvim ]]; then
@@ -727,38 +623,20 @@
fdo-mime_mime_database_update
fi
- if [[ $(get_major_version ) -lt 7 ]] ; then
- if [[ ${MY_PN} == gvim ]] ; then
- echo
- elog "To enable UTF-8 viewing, set guifont and guifontwide: "
- elog ":set guifont=-misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1"
- elog ":set guifontwide=-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1"
- elog
- elog "note: to find out which fonts you can use, please read the UTF-8 help:"
- elog ":h utf-8"
- elog
- elog "Then, set read encoding to UTF-8:"
- elog ":set encoding=utf-8"
- elif [[ ${MY_PN} == vim ]] ; then
- echo
- elog "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
- fi
- else
- if [[ ${MY_PN} == vim ]] ; then
- echo
- elog "To install a GUI version of vim, use the app-editors/gvim"
- elog "package."
- fi
+ if [[ ${MY_PN} == vim ]] ; 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."
- ewarn
- ewarn "Note that the English word lists are no longer installed by"
- ewarn "default."
+ elog "To install a GUI version of vim, use the app-editors/gvim"
+ elog "package."
fi
+ 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."
+ ewarn
+ ewarn "Note that the English word lists are no longer installed by"
+ ewarn "default."
if [[ ${MY_PN} != "vim-core" ]] ; then
echo
@@ -784,15 +662,17 @@
echo
- if version_is_at_least 6.3.1 ; then
- if [[ ${MY_PN} == "vim-core" ]] ; then
- export BASH_COMPLETION_NAME="xxd"
- fi
- bash-completion_pkg_postinst
+ # Display bash-completion message
+ if [[ ${MY_PN} == "vim-core" ]] ; then
+ export BASH_COMPLETION_NAME="xxd"
fi
+ bash-completion_pkg_postinst
# Make convenience symlinks
- update_vim_symlinks
+ if [[ ${MY_PN} != "vim-core" ]] ; then
+ # But only for vim/gvim, bug #252724
+ update_vim_symlinks
+ fi
}
vim_pkg_postrm() {
@@ -800,7 +680,10 @@
update_vim_helptags
# Make convenience symlinks
- update_vim_symlinks
+ if [[ ${MY_PN} != "vim-core" ]] ; then
+ # But only for vim/gvim, bug #252724
+ update_vim_symlinks
+ fi
# Update fdo mime stuff, bug #78394
if [[ ${MY_PN} == gvim ]] ; then
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2009-10-17 18:30 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2009-10-17 18:30 UTC (permalink / raw
To: gentoo-commits
lack 09/10/17 18:30:40
Modified: vim.eclass
Log:
A couple more small cleanups:
- Only check 'use python' if IUSE has python in in (Fixes QA warning)
- Look for gentoo/patches-all and a new vim-core specific gentoo/patches-core
Revision Changes Path
1.179 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.179&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.179&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.178&r2=1.179
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- vim.eclass 17 Oct 2009 17:10:52 -0000 1.178
+++ vim.eclass 17 Oct 2009 18:30:40 -0000 1.179
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.178 2009/10/17 17:10:52 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.179 2009/10/17 18:30:40 lack Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -236,8 +236,8 @@
mkdir -p "${T}/home"
export HOME="${T}/home"
- # Need python[threads]
- if use python && ! built_with_use dev-lang/python threads; then
+ # [g]vim needs dev-lang/python[threads]
+ if [[ ${MY_PN} != "vim-core" ]] && use python && ! built_with_use dev-lang/python threads; then
die "You must build dev-lang/python with USE=threads"
fi
}
@@ -269,8 +269,14 @@
# Another set of patches borrowed from src rpm to fix syntax errors etc.
cd "${S}" || die "cd ${S} failed"
- EPATCH_SUFFIX="gz" EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"/gentoo/patches-all/
+ if [[ -d "${WORKDIR}"/gentoo/patches-all/ ]]; then
+ EPATCH_SUFFIX="gz" EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}"/gentoo/patches-all/
+ elif [[ ${MY_PN} == "vim-core" ]] && [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then
+ # Patches for vim-core only (runtime/*)
+ EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}"/gentoo/patches-core/
+ fi
# Unpack an updated netrw snapshot if necessary. This is nasty. Don't
# ask, you don't want to know.
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2009-10-21 22:20 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2009-10-21 22:20 UTC (permalink / raw
To: gentoo-commits
lack 09/10/21 22:20:36
Modified: vim.eclass
Log:
Took Darkside's advice on preventing a double run of econf for EAPI=2, plus
scarabeus' tip on not accepting unknown EAPIs.
Revision Changes Path
1.180 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.180&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.180&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.179&r2=1.180
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- vim.eclass 17 Oct 2009 18:30:40 -0000 1.179
+++ vim.eclass 21 Oct 2009 22:20:36 -0000 1.180
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.179 2009/10/17 18:30:40 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.180 2009/10/21 22:20:36 lack Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -30,11 +30,15 @@
# Check for EAPI functions we need:
case "${EAPI:-0}" in
+ 0|1)
+ ;;
2)
HAS_SRC_PREPARE=1
HAS_USE_DEP=1
;;
- *) ;;
+ *)
+ die "Unknown EAPI ${EAPI}"
+ ;;
esac
if [[ ${PN##*-} == "cvs" ]] ; then
@@ -48,7 +52,7 @@
TO_EXPORT="pkg_setup src_compile src_install src_test pkg_postinst pkg_postrm"
if [[ $HAS_SRC_PREPARE ]]; then
- TO_EXPORT="${TO_EXPORT} src_prepare"
+ TO_EXPORT="${TO_EXPORT} src_prepare src_configure"
else
TO_EXPORT="${TO_EXPORT} src_unpack"
fi
@@ -344,7 +348,7 @@
vim_src_prepare
}
-vim_src_compile() {
+vim_src_configure() {
local myconf
# Fix bug 37354: Disallow -funroll-all-loops on amd64
@@ -467,6 +471,10 @@
myconf="${myconf} --with-modified-by=Gentoo-${PVR}"
econf ${myconf} || die "vim configure failed"
+}
+
+vim_src_compile() {
+ has src_configure ${TO_EXPORT} || vim_src_configure
# The following allows emake to be used
make -j1 -C src auto/osdef.h objects || die "make failed"
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2010-03-23 16:02 Jeremy Olexa (darkside)
0 siblings, 0 replies; 32+ messages in thread
From: Jeremy Olexa (darkside) @ 2010-03-23 16:02 UTC (permalink / raw
To: gentoo-commits
darkside 10/03/23 16:02:36
Modified: vim.eclass
Log:
Add EAPI3 support to vim.eclass, signed off by Jim Ramsay
Revision Changes Path
1.181 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.181&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.181&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.180&r2=1.181
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- vim.eclass 21 Oct 2009 22:20:36 -0000 1.180
+++ vim.eclass 23 Mar 2010 16:02:36 -0000 1.181
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.180 2009/10/21 22:20:36 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.181 2010/03/23 16:02:36 darkside Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -22,7 +22,7 @@
# -aqua -gtk -motif nextaw NEXTAW
# -aqua -gtk -motif -nextaw ATHENA
-inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion
+inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion prefix
HOMEPAGE="http://www.vim.org/"
SLOT="0"
@@ -32,7 +32,7 @@
case "${EAPI:-0}" in
0|1)
;;
- 2)
+ 2|3)
HAS_SRC_PREPARE=1
HAS_USE_DEP=1
;;
@@ -247,6 +247,7 @@
}
vim_src_prepare() {
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
if [[ ${PN##*-} == cvs ]] ; then
ECVS_SERVER="vim.cvs.sourceforge.net:/cvsroot/vim"
ECVS_PASS=""
@@ -291,15 +292,15 @@
fi
# Fixup a script to use awk instead of nawk
- sed -i '1s|.*|#!/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+ sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
|| die "mve.awk sed failed"
# Patch to build with ruby-1.8.0_pre5 and following
sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
# Read vimrc and gvimrc from /etc/vim
- echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> "${S}"/src/feature.h
- echo '#define SYS_GVIMRC_FILE "/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+ 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.
@@ -385,6 +386,7 @@
myconf="--with-features=tiny \
--enable-gui=no \
--without-x \
+ --disable-darwin \
--disable-perlinterp \
--disable-pythoninterp \
--disable-rubyinterp \
@@ -419,7 +421,7 @@
if [[ ${MY_PN} == vim ]] ; then
# don't test USE=X here ... see bug #19115
# but need to provide a way to link against X ... see bug #20093
- myconf="${myconf} --enable-gui=no `use_with vim-with-x x`"
+ myconf="${myconf} --enable-gui=no --disable-darwin `use_with vim-with-x x`"
elif [[ ${MY_PN} == gvim ]] ; then
myconf="${myconf} --with-vim-name=gvim --with-x"
@@ -427,7 +429,7 @@
echo ; echo
if use aqua ; then
einfo "Building gvim with the Carbon GUI"
- myconf="${myconf} --enable-gui=carbon"
+ myconf="${myconf} --enable-darwin --enable-gui=carbon"
elif use gtk ; then
myconf="${myconf} --enable-gtk2-check"
if use gnome ; then
@@ -469,6 +471,9 @@
# Let Portage do the stripping. Some people like that.
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+ # We have much more cooler tools in our prefix than /usr/local
+ use prefix && myconf="${myconf} --without-local-dir"
+
myconf="${myconf} --with-modified-by=Gentoo-${PVR}"
econf ${myconf} || die "vim configure failed"
}
@@ -495,6 +500,8 @@
}
vim_src_install() {
+ has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
+ has "${EAPI:-0}" 0 1 2 && use !prefix && ED="${D}"
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
if [[ ${MY_PN} == "vim-core" ]] ; then
@@ -510,9 +517,9 @@
install-languages \
install-icons \
DESTDIR=${D} \
- BINDIR=/usr/bin \
- MANDIR=/usr/share/man \
- DATADIR=/usr/share \
+ BINDIR="${EPREFIX}"/usr/bin \
+ MANDIR="${EPREFIX}"/usr/share/man \
+ DATADIR="${EPREFIX}"/usr/share \
|| die "install failed"
keepdir ${vimfiles}/keymap
@@ -521,6 +528,7 @@
# both vim and gvim
insinto /etc/vim/
newins "${FILESDIR}"/vimrc${VIMRC_FILE_SUFFIX} vimrc
+ eprefixify "${ED}"/etc/vim/vimrc
if use livecd ; then
# To save space, install only a subset of the files if we're on a
@@ -528,23 +536,23 @@
einfo "Removing some files for a smaller livecd install ..."
shopt -s extglob
- rm -fr "${D}${vimfiles}"/{compiler,doc,ftplugin,indent}
- rm -fr "${D}${vimfiles}"/{macros,print,tools,tutor}
- rm "${D}"/usr/bin/vimtutor
+ 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 "${D}${vimfiles}"/colors/!(${keep_colors}).vim )
+ 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 "${D}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+ ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
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 "${D}${vimfiles}"/tools/{vimspell.sh,tcltags}
+ rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags}
elif [[ ${MY_PN} == gvim ]] ; then
dobin src/gvim
@@ -560,6 +568,7 @@
insinto /etc/vim
newins "${FILESDIR}"/gvimrc${GVIMRC_FILE_SUFFIX} gvimrc
+ eprefixify "${ED}"/etc/vim/gvimrc
insinto /usr/share/applications
newins "${FILESDIR}"/gvim.desktop${GVIM_DESKTOP_SUFFIX} gvim.desktop
@@ -590,13 +599,14 @@
fi
# We shouldn't be installing the ex or view man page symlinks, as they
# are managed by eselect-vi
- rm -f "${D}"/usr/share/man/man1/{ex,view}.1
+ rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
}
# 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..."
@@ -604,21 +614,21 @@
eselect vi update --if-unset
# Make or remove convenience symlink, vim -> gvim
- if [[ -f "${ROOT}"/usr/bin/gvim ]]; then
- ln -s gvim "${ROOT}"/usr/bin/vim 2>/dev/null
- elif [[ -L "${ROOT}"/usr/bin/vim && ! -f "${ROOT}"/usr/bin/vim ]]; then
- rm "${ROOT}"/usr/bin/vim
+ 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 "${ROOT}"/usr/bin/vim ]]; then
+ if [[ -f "${EROOT}"/usr/bin/vim ]]; then
for f in ${syms}; do
- ln -s vim "${ROOT}"/usr/bin/${f} 2>/dev/null
+ ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
done
else
for f in ${syms}; do
- if [[ -L "${ROOT}"/usr/bin/${f} && ! -f "${ROOT}"/usr/bin/${f} ]]; then
- rm -f "${ROOT}"/usr/bin/${f}
+ if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+ rm -f "${EROOT}"/usr/bin/${f}
fi
done
fi
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2010-03-26 18:40 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2010-03-26 18:40 UTC (permalink / raw
To: gentoo-commits
lack 10/03/26 18:40:26
Modified: vim.eclass
Log:
Fix for bug #311175 and bug #311179: Clean up python support
app-editors/vim and app-editors/gvim both rely completely on vim.eclass, so this
is the place to ensure we only use python2, since vim does not yet support
python3.
Revision Changes Path
1.182 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.182&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.182&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.181&r2=1.182
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- vim.eclass 23 Mar 2010 16:02:36 -0000 1.181
+++ vim.eclass 26 Mar 2010 18:40:26 -0000 1.182
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.181 2010/03/23 16:02:36 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.182 2010/03/26 18:40:26 lack Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -22,7 +22,12 @@
# -aqua -gtk -motif nextaw NEXTAW
# -aqua -gtk -motif -nextaw ATHENA
-inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion prefix
+if [[ ${MY_PN} != "vim-core" ]] ; then
+ # vim supports python-2 only
+ PYTHON_DEPEND="python? 2"
+ PYTHON_USE_WITH="threads"
+fi
+inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion prefix python
HOMEPAGE="http://www.vim.org/"
SLOT="0"
@@ -75,26 +80,18 @@
else
IUSE="${IUSE} cscope debug gpm perl python ruby"
- if [[ $HAS_USE_DEP ]]; then
- PYTHON_DEP="python? ( dev-lang/python[threads] )"
- else
- PYTHON_DEP="python? ( dev-lang/python )"
- fi
-
DEPEND="${DEPEND}
cscope? ( dev-util/cscope )
gpm? ( >=sys-libs/gpm-1.19.3 )
perl? ( dev-lang/perl )
acl? ( kernel_linux? ( sys-apps/acl ) )
- ruby? ( virtual/ruby )
- ${PYTHON_DEP}"
+ ruby? ( virtual/ruby )"
RDEPEND="${RDEPEND}
cscope? ( dev-util/cscope )
gpm? ( >=sys-libs/gpm-1.19.3 )
perl? ( dev-lang/perl )
acl? ( kernel_linux? ( sys-apps/acl ) )
ruby? ( virtual/ruby )
- ${PYTHON_DEP}
!<app-vim/align-30-r1
!app-vim/vimspell
!<app-vim/vimbuddy-0.9.1-r1
@@ -240,9 +237,16 @@
mkdir -p "${T}/home"
export HOME="${T}/home"
- # [g]vim needs dev-lang/python[threads]
- if [[ ${MY_PN} != "vim-core" ]] && use python && ! built_with_use dev-lang/python threads; then
- die "You must build dev-lang/python with USE=threads"
+ if [[ ${MY_PN} != "vim-core" ]] && use python; then
+ # vim supports python-2 only
+ python_set_active_version 2
+ if [[ $HAS_USE_DEP ]]; then
+ # python.eclass only defines python_pkg_setup for EAPIs that support
+ # USE dependencies
+ python_pkg_setup
+ elif ! built_with_use =dev-lang/python-2* threads; then
+ die "You must build dev-lang/python with USE=threads"
+ fi
fi
}
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2010-03-28 2:23 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2010-03-28 2:23 UTC (permalink / raw
To: gentoo-commits
lack 10/03/28 02:23:20
Modified: vim.eclass
Log:
Oops, don't use MY_PN before setting it!
Revision Changes Path
1.183 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.183&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.183&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.182&r2=1.183
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- vim.eclass 26 Mar 2010 18:40:26 -0000 1.182
+++ vim.eclass 28 Mar 2010 02:23:19 -0000 1.183
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.182 2010/03/26 18:40:26 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.183 2010/03/28 02:23:19 lack Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -22,6 +22,9 @@
# -aqua -gtk -motif nextaw NEXTAW
# -aqua -gtk -motif -nextaw ATHENA
+# Support -cvs ebuilds, even though they're not in the official tree.
+MY_PN=${PN%-cvs}
+
if [[ ${MY_PN} != "vim-core" ]] ; then
# vim supports python-2 only
PYTHON_DEPEND="python? 2"
@@ -50,9 +53,6 @@
inherit cvs
fi
-# Support -cvs ebuilds, even though they're not in the official tree.
-MY_PN=${PN%-cvs}
-
IUSE="nls acl"
TO_EXPORT="pkg_setup src_compile src_install src_test pkg_postinst pkg_postrm"
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2010-04-15 19:23 Jeremy Olexa (darkside)
0 siblings, 0 replies; 32+ messages in thread
From: Jeremy Olexa (darkside) @ 2010-04-15 19:23 UTC (permalink / raw
To: gentoo-commits
darkside 10/04/15 19:23:34
Modified: vim.eclass
Log:
Apply interix *vim workaround to eclass, bug 310991
Revision Changes Path
1.185 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.185&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.185&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.184&r2=1.185
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- vim.eclass 7 Apr 2010 04:20:46 -0000 1.184
+++ vim.eclass 15 Apr 2010 19:23:34 -0000 1.185
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.184 2010/04/07 04:20:46 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.185 2010/04/15 19:23:34 darkside Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -475,9 +475,18 @@
# Let Portage do the stripping. Some people like that.
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
- # We have much more cooler tools in our prefix than /usr/local
+ # Keep Gentoo Prefix env contained within the EPREFIX
use prefix && myconf="${myconf} --without-local-dir"
+ if [[ ${MY_PN} == "*vim" ]] ; then
+ 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
+ fi
+
myconf="${myconf} --with-modified-by=Gentoo-${PVR}"
econf ${myconf} || die "vim configure failed"
}
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2010-05-03 1:41 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2010-05-03 1:41 UTC (permalink / raw
To: gentoo-commits
lack 10/05/03 01:41:53
Modified: vim.eclass
Log:
Use PYTHON_USE_WITH_OPT to only pull in python when actually required. Bug #317939
Revision Changes Path
1.186 eclass/vim.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.186&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?rev=1.186&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?r1=1.185&r2=1.186
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- vim.eclass 15 Apr 2010 19:23:34 -0000 1.185
+++ vim.eclass 3 May 2010 01:41:53 -0000 1.186
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.185 2010/04/15 19:23:34 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.186 2010/05/03 01:41:53 lack Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -28,6 +28,7 @@
if [[ ${MY_PN} != "vim-core" ]] ; then
# vim supports python-2 only
PYTHON_DEPEND="python? 2"
+ PYTHON_USE_WITH_OPT="python"
PYTHON_USE_WITH="threads"
fi
inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion prefix python
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2010-06-09 18:35 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2010-06-09 18:35 UTC (permalink / raw
To: gentoo-commits
lack 10/06/09 18:35:45
Modified: vim.eclass
Log:
Rename local USE flag 'vim-with-x' to global USE flag 'X'
Revision Changes Path
1.187 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.187&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.187&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.186&r2=1.187
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- vim.eclass 3 May 2010 01:41:53 -0000 1.186
+++ vim.eclass 9 Jun 2010 18:35:45 -0000 1.187
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.186 2010/05/03 01:41:53 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.187 2010/06/09 18:35:45 lack Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -107,13 +107,13 @@
# mzscheme? ( dev-scheme/mzscheme )"
if [[ ${MY_PN} == vim ]] ; then
- IUSE="${IUSE} vim-with-x minimal vim-pager"
+ IUSE="${IUSE} X minimal vim-pager"
DEPEND="${DEPEND}
- vim-with-x? ( x11-libs/libXt x11-libs/libX11
+ X? ( x11-libs/libXt x11-libs/libX11
x11-libs/libSM x11-proto/xproto )
!minimal? ( dev-util/ctags )"
RDEPEND="${RDEPEND}
- vim-with-x? ( x11-libs/libXt )
+ X? ( x11-libs/libXt )
!minimal? ( ~app-editors/vim-core-${PV}
dev-util/ctags )
!<app-editors/nvi-1.81.5-r4"
@@ -426,7 +426,7 @@
if [[ ${MY_PN} == vim ]] ; then
# don't test USE=X here ... see bug #19115
# but need to provide a way to link against X ... see bug #20093
- myconf="${myconf} --enable-gui=no --disable-darwin `use_with vim-with-x x`"
+ myconf="${myconf} --enable-gui=no --disable-darwin `use_with X x`"
elif [[ ${MY_PN} == gvim ]] ; then
myconf="${myconf} --with-vim-name=gvim --with-x"
@@ -662,6 +662,11 @@
fi
if [[ ${MY_PN} == vim ]] ; 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."
@@ -672,7 +677,7 @@
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."
- ewarn
+ echo
ewarn "Note that the English word lists are no longer installed by"
ewarn "default."
@@ -683,7 +688,7 @@
# Warn about VIMRUNTIME
if [ -n "$VIMRUNTIME" -a "${VIMRUNTIME##*/vim}" != "${VIM_VERSION/./}" ] ; then
- ewarn
+ echo
ewarn "WARNING: You have VIMRUNTIME set in your environment from an old"
ewarn "installation. You will need to either unset VIMRUNTIME in each"
ewarn "terminal, or log out completely and back in. This problem won't"
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2010-07-15 13:11 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2010-07-15 13:11 UTC (permalink / raw
To: gentoo-commits
lack 10/07/15 13:11:50
Modified: vim.eclass
Log:
Removing now-deprecated epause from vim.eclass
Revision Changes Path
1.188 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.188&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.188&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.187&r2=1.188
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- vim.eclass 9 Jun 2010 18:35:45 -0000 1.187
+++ vim.eclass 15 Jul 2010 13:11:50 -0000 1.188
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.187 2010/06/09 18:35:45 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.188 2010/07/15 13:11:50 lack Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -774,9 +774,6 @@
# We don't want to rebuild vim before running the tests
sed -i -e 's,: \$(VIMPROG),: ,' Makefile
- # Give the user time to read the "what to do if these break" messages
- epause 10
-
# Don't try to do the additional GUI test
make VIMPROG=${testprog} nongui \
|| die "At least one test failed"
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2010-07-20 13:53 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2010-07-20 13:53 UTC (permalink / raw
To: gentoo-commits
lack 10/07/20 13:53:43
Modified: vim.eclass
Log:
Updating code to use eshopts_push/pop (Bug #328873, thanks Spanky!)
Revision Changes Path
1.189 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.189&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.189&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.188&r2=1.189
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- vim.eclass 15 Jul 2010 13:11:50 -0000 1.188
+++ vim.eclass 20 Jul 2010 13:53:43 -0000 1.189
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.188 2010/07/15 13:11:50 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.189 2010/07/20 13:53:43 lack Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -549,7 +549,8 @@
# livecd. bug 65144.
einfo "Removing some files for a smaller livecd install ..."
- shopt -s extglob
+ 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
@@ -561,6 +562,8 @@
# 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
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2011-01-04 13:55 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2011-01-04 13:55 UTC (permalink / raw
To: gentoo-commits
lack 11/01/04 13:55:57
Modified: vim.eclass
Log:
Bug #340479 - Use slot dependencies for openmotif, and force all vim.eclass
users to use EAPI 2 or 3
Revision Changes Path
1.192 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.192&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.192&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.191&r2=1.192
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- vim.eclass 10 Oct 2010 17:23:14 -0000 1.191
+++ vim.eclass 4 Jan 2011 13:55:57 -0000 1.192
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.191 2010/10/10 17:23:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.192 2011/01/04 13:55:57 lack Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -40,6 +40,7 @@
# Check for EAPI functions we need:
case "${EAPI:-0}" in
0|1)
+ die "vim.eclass no longer supports EAPI 0 or 1"
;;
2|3)
HAS_SRC_PREPARE=1
@@ -138,7 +139,7 @@
)
!gtk? (
motif? (
- >=x11-libs/openmotif-2.3
+ >=x11-libs/openmotif-2.3:0
)
!motif? (
nextaw? (
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2011-03-06 10:19 Tim Harder (radhermit)
0 siblings, 0 replies; 32+ messages in thread
From: Tim Harder (radhermit) @ 2011-03-06 10:19 UTC (permalink / raw
To: gentoo-commits
radhermit 11/03/06 10:19:22
Modified: vim.eclass
Log:
Use slot dependencies for gtk+.
Revision Changes Path
1.193 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.193&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.193&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.192&r2=1.193
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- vim.eclass 4 Jan 2011 13:55:57 -0000 1.192
+++ vim.eclass 6 Mar 2011 10:19:22 -0000 1.193
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.192 2011/01/04 13:55:57 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.193 2011/03/06 10:19:22 radhermit Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -133,7 +133,7 @@
x11-libs/libXext
!aqua? (
gtk? (
- >=x11-libs/gtk+-2.6
+ >=x11-libs/gtk+-2.6:2
x11-libs/libXft
gnome? ( >=gnome-base/libgnomeui-2.6 )
)
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2011-03-14 8:22 Tim Harder (radhermit)
0 siblings, 0 replies; 32+ messages in thread
From: Tim Harder (radhermit) @ 2011-03-14 8:22 UTC (permalink / raw
To: gentoo-commits
radhermit 11/03/14 08:22:38
Modified: vim.eclass
Log:
Use the global neXt USE flag instead of nextaw (bug #292682 by Nico R).
Revision Changes Path
1.194 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.194&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.194&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.193&r2=1.194
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- vim.eclass 6 Mar 2011 10:19:22 -0000 1.193
+++ vim.eclass 14 Mar 2011 08:22:38 -0000 1.194
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.193 2011/03/06 10:19:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.194 2011/03/14 08:22:38 radhermit Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -19,8 +19,8 @@
# -aqua gtk gnome GNOME2
# -aqua gtk -gnome GTK2
# -aqua -gtk motif MOTIF
-# -aqua -gtk -motif nextaw NEXTAW
-# -aqua -gtk -motif -nextaw ATHENA
+# -aqua -gtk -motif neXt NEXTAW
+# -aqua -gtk -motif -neXt ATHENA
# Support -cvs ebuilds, even though they're not in the official tree.
MY_PN=${PN%-cvs}
@@ -119,7 +119,7 @@
dev-util/ctags )
!<app-editors/nvi-1.81.5-r4"
elif [[ ${MY_PN} == gvim ]] ; then
- IUSE="${IUSE} aqua gnome gtk motif nextaw netbeans"
+ IUSE="${IUSE} aqua gnome gtk motif neXt netbeans"
DEPEND="${DEPEND}
dev-util/ctags
!aqua? (
@@ -142,10 +142,10 @@
>=x11-libs/openmotif-2.3:0
)
!motif? (
- nextaw? (
+ neXt? (
x11-libs/neXtaw
)
- !nextaw? ( x11-libs/libXaw )
+ !neXt? ( x11-libs/libXaw )
)
)
)"
@@ -448,7 +448,7 @@
elif use motif ; then
einfo "Building gvim with the MOTIF GUI"
myconf="${myconf} --enable-gui=motif"
- elif use nextaw ; then
+ elif use neXt ; then
einfo "Building gvim with the neXtaw GUI"
myconf="${myconf} --enable-gui=nextaw"
else
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2011-03-24 17:43 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2011-03-24 17:43 UTC (permalink / raw
To: gentoo-commits
lack 11/03/24 17:43:29
Modified: vim.eclass
Log:
Bug #360217: Needs auto/config.mk copied in as of 7.3.122
Revision Changes Path
1.195 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.195&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.195&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.194&r2=1.195
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- vim.eclass 14 Mar 2011 08:22:38 -0000 1.194
+++ vim.eclass 24 Mar 2011 17:43:29 -0000 1.195
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.194 2011/03/14 08:22:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.195 2011/03/24 17:43:29 lack Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -348,6 +348,10 @@
'/-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
}
vim_src_unpack() {
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2011-03-28 6:47 Diego Petteno (flameeyes)
0 siblings, 0 replies; 32+ messages in thread
From: Diego Petteno (flameeyes) @ 2011-03-28 6:47 UTC (permalink / raw
To: gentoo-commits
flameeyes 11/03/28 06:47:46
Modified: vim.eclass
Log:
QA (partial): use emake -j1 rather than make -j1.
Revision Changes Path
1.196 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.196&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.196&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.195&r2=1.196
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- vim.eclass 24 Mar 2011 17:43:29 -0000 1.195
+++ vim.eclass 28 Mar 2011 06:47:45 -0000 1.196
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.195 2011/03/24 17:43:29 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.196 2011/03/28 06:47:45 flameeyes Exp $
# Authors:
# Jim Ramsay <i.am@gentoo.org>
@@ -382,7 +382,7 @@
# autoconf-2.13 needed for this package -- bug 35319
# except it seems we actually need 2.5 now -- bug 53777
WANT_AUTOCONF=2.5 \
- make -j1 -C src autoconf || die "make autoconf failed"
+ emake -j1 -C src autoconf || die "make autoconf failed"
eend $?
# This should fix a sandbox violation (see bug 24447). The hvc
@@ -501,7 +501,7 @@
has src_configure ${TO_EXPORT} || vim_src_configure
# The following allows emake to be used
- make -j1 -C src auto/osdef.h objects || die "make failed"
+ emake -j1 -C src auto/osdef.h objects || die "make failed"
if [[ ${MY_PN} == "vim-core" ]] ; then
emake tools || die "emake tools failed"
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2011-07-13 1:06 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2011-07-13 1:06 UTC (permalink / raw
To: gentoo-commits
lack 11/07/13 01:06:31
Modified: vim.eclass
Log:
Fixup a minor typo.
Revision Changes Path
1.197 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.197&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.197&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.196&r2=1.197
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- vim.eclass 28 Mar 2011 06:47:45 -0000 1.196
+++ vim.eclass 13 Jul 2011 01:06:31 -0000 1.197
@@ -1,9 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.196 2011/03/28 06:47:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.197 2011/07/13 01:06:31 lack Exp $
# Authors:
-# Jim Ramsay <i.am@gentoo.org>
+# Jim Ramsay <lack@gentoo.org>
# Ryan Phillips <rphillips@gentoo.org>
# Seemant Kulleen <seemant@gentoo.org>
# Aron Griffis <agriffis@gentoo.org>
@@ -574,7 +574,7 @@
# 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}
+ rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
elif [[ ${MY_PN} == gvim ]] ; then
dobin src/gvim
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2011-07-13 4:22 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2011-07-13 4:22 UTC (permalink / raw
To: gentoo-commits
lack 11/07/13 04:22:33
Modified: vim.eclass
Log:
Altering vim patch logic to deal with monolithic patches (which include runtime
file changes too)
Revision Changes Path
1.198 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.198&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.198&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.197&r2=1.198
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- vim.eclass 13 Jul 2011 01:06:31 -0000 1.197
+++ vim.eclass 13 Jul 2011 04:22:33 -0000 1.198
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.197 2011/07/13 01:06:31 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.198 2011/07/13 04:22:33 lack Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -262,7 +262,12 @@
cvs_src_unpack
else
# Apply any patches available from vim.org for this version
- [[ -n "$VIM_ORG_PATCHES" ]] && apply_vim_patches
+ if [[ $VIM_ORG_PATCHES == *.patch.bz2 ]]; then
+ einfo "Applying monolithic patch ${VIM_ORG_PATCHES}"
+ epatch "${WORKDIR}/${VIM_ORG_PATCHES%.bz2}"
+ else
+ apply_vim_patches
+ fi
# Unpack the runtime snapshot if available (only for vim-core)
if [[ -n "$VIM_RUNTIME_SNAP" ]] ; then
@@ -273,8 +278,7 @@
# some reason on freebsd.
# --spb, 2004/12/18
tar xjf "${DISTDIR}"/${VIM_RUNTIME_SNAP}
- assert # this will check both parts of the pipeline; eend would not
- eend 0
+ eend $?
fi
fi
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2011-08-18 2:48 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2011-08-18 2:48 UTC (permalink / raw
To: gentoo-commits
lack 11/08/18 02:48:43
Modified: vim.eclass
Log:
Bug #378107: Build with >=perl-core/ExtUtils-ParseXS-3.20.0
This just takes the patches from the above build and rolls a single sed line
into the eclass instead.
Revision Changes Path
1.199 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.199&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.199&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.198&r2=1.199
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- vim.eclass 13 Jul 2011 04:22:33 -0000 1.198
+++ vim.eclass 18 Aug 2011 02:48:43 -0000 1.199
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.198 2011/07/13 04:22:33 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.199 2011/08/18 02:48:43 lack Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -356,6 +356,12 @@
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:/usr/bin/xsubpp:' \
+ "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+ fi
}
vim_src_unpack() {
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2011-08-20 15:46 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2011-08-20 15:46 UTC (permalink / raw
To: gentoo-commits
lack 11/08/20 15:46:21
Modified: vim.eclass
Log:
Followup to bug #378107: fix for EPREFIX.
Revision Changes Path
1.200 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.200&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.200&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.199&r2=1.200
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- vim.eclass 18 Aug 2011 02:48:43 -0000 1.199
+++ vim.eclass 20 Aug 2011 15:46:21 -0000 1.200
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.199 2011/08/18 02:48:43 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.200 2011/08/20 15:46:21 lack Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -359,7 +359,7 @@
# 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:/usr/bin/xsubpp:' \
+ sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
fi
}
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass
@ 2011-11-28 18:13 Jim Ramsay (lack)
0 siblings, 0 replies; 32+ messages in thread
From: Jim Ramsay (lack) @ 2011-11-28 18:13 UTC (permalink / raw
To: gentoo-commits
lack 11/11/28 18:13:42
Modified: vim.eclass
Log:
Migrating vim.eclass from bash-completion.eclass to bash-completion-r1.eclass
Also removing old blocker on 'app-vim/vimspell' which is no longer in the tree.
Revision Changes Path
1.201 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.201&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.201&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.200&r2=1.201
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- vim.eclass 20 Aug 2011 15:46:21 -0000 1.200
+++ vim.eclass 28 Nov 2011 18:13:42 -0000 1.201
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.200 2011/08/20 15:46:21 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.201 2011/11/28 18:13:42 lack Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -31,7 +31,7 @@
PYTHON_USE_WITH_OPT="python"
PYTHON_USE_WITH="threads"
fi
-inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion prefix python
+inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix python
HOMEPAGE="http://www.vim.org/"
SLOT="0"
@@ -95,7 +95,6 @@
acl? ( kernel_linux? ( sys-apps/acl ) )
ruby? ( =dev-lang/ruby-1.8* )
!<app-vim/align-30-r1
- !app-vim/vimspell
!<app-vim/vimbuddy-0.9.1-r1
!<app-vim/autoalign-11
!<app-vim/supertab-0.41"
@@ -625,9 +624,9 @@
# bash completion script, bug #79018.
if [[ ${MY_PN} == "vim-core" ]] ; then
- dobashcompletion "${FILESDIR}"/xxd-completion xxd
+ newbashcomp "${FILESDIR}"/xxd-completion xxd
else
- dobashcompletion "${FILESDIR}"/${MY_PN}-completion ${MY_PN}
+ newbashcomp "${FILESDIR}"/${MY_PN}-completion ${MY_PN}
fi
# We shouldn't be installing the ex or view man page symlinks, as they
# are managed by eselect-vi
@@ -723,12 +722,6 @@
echo
- # Display bash-completion message
- if [[ ${MY_PN} == "vim-core" ]] ; then
- export BASHCOMPLETION_NAME="xxd"
- fi
- bash-completion_pkg_postinst
-
# Make convenience symlinks
if [[ ${MY_PN} != "vim-core" ]] ; then
# But only for vim/gvim, bug #252724
^ permalink raw reply [flat|nested] 32+ messages in thread
end of thread, other threads:[~2011-11-28 18:14 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-07 15:01 [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass Ali Polatel (hawking)
-- strict thread matches above, loose matches on Subject: below --
2011-11-28 18:13 Jim Ramsay (lack)
2011-08-20 15:46 Jim Ramsay (lack)
2011-08-18 2:48 Jim Ramsay (lack)
2011-07-13 4:22 Jim Ramsay (lack)
2011-07-13 1:06 Jim Ramsay (lack)
2011-03-28 6:47 Diego Petteno (flameeyes)
2011-03-24 17:43 Jim Ramsay (lack)
2011-03-14 8:22 Tim Harder (radhermit)
2011-03-06 10:19 Tim Harder (radhermit)
2011-01-04 13:55 Jim Ramsay (lack)
2010-07-20 13:53 Jim Ramsay (lack)
2010-07-15 13:11 Jim Ramsay (lack)
2010-06-09 18:35 Jim Ramsay (lack)
2010-05-03 1:41 Jim Ramsay (lack)
2010-04-15 19:23 Jeremy Olexa (darkside)
2010-03-28 2:23 Jim Ramsay (lack)
2010-03-26 18:40 Jim Ramsay (lack)
2010-03-23 16:02 Jeremy Olexa (darkside)
2009-10-21 22:20 Jim Ramsay (lack)
2009-10-17 18:30 Jim Ramsay (lack)
2009-10-17 17:10 Jim Ramsay (lack)
2009-10-17 13:43 Jim Ramsay (lack)
2009-10-14 1:29 Jim Ramsay (lack)
2009-10-11 11:49 Markus Meier (maekke)
2009-05-18 17:02 Jim Ramsay (lack)
2008-10-10 13:44 Ali Polatel (hawking)
2008-07-26 14:20 Ali Polatel (hawking)
2008-04-06 9:22 Ali Polatel (hawking)
2008-03-03 15:09 Ali Polatel (hawking)
2008-01-09 21:14 Ali Polatel (hawking)
2007-09-27 9:32 Ali Polatel (hawking)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox