* [gentoo-commits] gentoo-x86 commit in eclass: vim-plugin.eclass
@ 2008-08-14 7:45 Ali Polatel (hawking)
0 siblings, 0 replies; 5+ messages in thread
From: Ali Polatel (hawking) @ 2008-08-14 7:45 UTC (permalink / raw
To: gentoo-commits
hawking 08/08/14 07:45:29
Modified: vim-plugin.eclass
Log:
quoting.
Revision Changes Path
1.22 eclass/vim-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-plugin.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-plugin.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-plugin.eclass?r1=1.21&r2=1.22
Index: vim-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- vim-plugin.eclass 7 May 2007 19:06:14 -0000 1.21
+++ vim-plugin.eclass 14 Aug 2008 07:45:28 -0000 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.21 2007/05/07 19:06:14 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.22 2008/08/14 07:45:28 hawking Exp $
#
# This eclass simplifies installation of app-vim plugins into
# /usr/share/vim/vimfiles. This is a version-independent directory
@@ -24,17 +24,17 @@
ebegin "Fixing file permissions"
# Make sure perms are good
- chmod -R a+rX ${S} || die "chmod failed"
- find ${S} -user 'portage' -exec chown root '{}' \; || die "chown failed"
+ chmod -R a+rX "${S}" || die "chmod failed"
+ find "${S}" -user 'portage' -exec chown root '{}' \; || die "chown failed"
if use userland_BSD || use userland_Darwin ; then
- find ${S} -group 'portage' -exec chgrp wheel '{}' \; || die "chgrp failed"
+ find "${S}" -group 'portage' -exec chgrp wheel '{}' \; || die "chgrp failed"
else
- find ${S} -group 'portage' -exec chgrp root '{}' \; || die "chgrp failed"
+ find "${S}" -group 'portage' -exec chgrp root '{}' \; || die "chgrp failed"
fi
eend $?
# Install non-vim-help-docs
- cd ${S}
+ cd "${S}"
for f in *; do
[[ -f "${f}" ]] || continue
if [[ "${f}" = *.html ]]; then
@@ -46,12 +46,12 @@
done
# Install remainder of plugin
- cd ${WORKDIR}
+ cd "${WORKDIR}"
dodir /usr/share/vim
- mv ${S} ${D}/usr/share/vim/vimfiles
+ mv "${S}" "${D}"/usr/share/vim/vimfiles
# Fix remaining bad permissions
- chmod -R -x+X ${D}/usr/share/vim/vimfiles/ || die "chmod failed"
+ chmod -R -x+X "${D}"/usr/share/vim/vimfiles/ || die "chmod failed"
}
vim-plugin_pkg_postinst() {
@@ -73,13 +73,13 @@
# /usr/share/vim/vimfiles/after/* comprised of the snippets in
# /usr/share/vim/vimfiles/after/*/*.d
update_vim_afterscripts() {
- local d f afterdir=${ROOT}/usr/share/vim/vimfiles/after
+ local d f afterdir="${ROOT}"/usr/share/vim/vimfiles/after
# Nothing to do if the dir isn't there
- [ -d ${afterdir} ] || return 0
+ [ -d "${afterdir}" ] || return 0
einfo "Updating scripts in /usr/share/vim/vimfiles/after"
- find ${afterdir} -type d -name \*.vim.d | \
+ find "${afterdir}" -type d -name \*.vim.d | \
while read d; do
echo '" Generated by update_vim_afterscripts' > "${d%.d}"
find "${d}" -name \*.vim -type f -maxdepth 1 -print0 | \
@@ -87,7 +87,7 @@
done
einfo "Removing dead scripts in /usr/share/vim/vimfiles/after"
- find ${afterdir} -type f -name \*.vim | \
+ find "${afterdir}" -type f -name \*.vim | \
while read f; do
[[ "$(head -n 1 ${f})" == '" Generated by update_vim_afterscripts' ]] \
|| continue
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim-plugin.eclass
@ 2008-08-30 7:59 Ali Polatel (hawking)
0 siblings, 0 replies; 5+ messages in thread
From: Ali Polatel (hawking) @ 2008-08-30 7:59 UTC (permalink / raw
To: gentoo-commits
hawking 08/08/30 07:59:19
Modified: vim-plugin.eclass
Log:
Bump default VIM_PLUGIN_VIM_VERSION to 7.0
Revision Changes Path
1.23 eclass/vim-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-plugin.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-plugin.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-plugin.eclass?r1=1.22&r2=1.23
Index: vim-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- vim-plugin.eclass 14 Aug 2008 07:45:28 -0000 1.22
+++ vim-plugin.eclass 30 Aug 2008 07:59:18 -0000 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.22 2008/08/14 07:45:28 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.23 2008/08/30 07:59:18 hawking Exp $
#
# This eclass simplifies installation of app-vim plugins into
# /usr/share/vim/vimfiles. This is a version-independent directory
@@ -10,7 +10,7 @@
inherit vim-doc
EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
-VIM_PLUGIN_VIM_VERSION="${VIM_PLUGIN_VIM_VERSION:-6.4}"
+VIM_PLUGIN_VIM_VERSION="${VIM_PLUGIN_VIM_VERSION:-7.0}"
IUSE=""
DEPEND="|| ( >=app-editors/vim-${VIM_PLUGIN_VIM_VERSION}
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim-plugin.eclass
@ 2010-10-29 6:44 Markus Duft (mduft)
0 siblings, 0 replies; 5+ messages in thread
From: Markus Duft (mduft) @ 2010-10-29 6:44 UTC (permalink / raw
To: gentoo-commits
mduft 10/10/29 06:44:06
Modified: vim-plugin.eclass
Log:
added prefix support. on prefix, use portage users/groups, not root/root/wheel
Revision Changes Path
1.24 eclass/vim-plugin.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim-plugin.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim-plugin.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim-plugin.eclass?r1=1.23&r2=1.24
Index: vim-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vim-plugin.eclass 30 Aug 2008 07:59:18 -0000 1.23
+++ vim-plugin.eclass 29 Oct 2010 06:44:06 -0000 1.24
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.23 2008/08/30 07:59:18 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.24 2010/10/29 06:44:06 mduft Exp $
#
# This eclass simplifies installation of app-vim plugins into
# /usr/share/vim/vimfiles. This is a version-independent directory
@@ -20,17 +20,34 @@
SLOT="0"
vim-plugin_src_install() {
+ has "${EAPI:-0}" 0 1 2 && use !prefix && ED="${D}"
+
local f
+ local _portage_user='portage'
+ local _portage_group='portage'
+ local _root=root
+ local _group=wheel
+
+ # no wheel group here.
+ if use userland_BSD || use userland_Darwin; then
+ _group=root
+ fi
+
+ # in prefix, we don't want to give away rights to root
+ if use prefix; then
+ _portage_user=${PORTAGE_USER}
+ _portage_group=${PORTAGE_GROUP}
+ _root=${PORTAGE_ROOT_USER}
+ _group=${_portage_group}
+ fi
ebegin "Fixing file permissions"
# Make sure perms are good
chmod -R a+rX "${S}" || die "chmod failed"
- find "${S}" -user 'portage' -exec chown root '{}' \; || die "chown failed"
- if use userland_BSD || use userland_Darwin ; then
- find "${S}" -group 'portage' -exec chgrp wheel '{}' \; || die "chgrp failed"
- else
- find "${S}" -group 'portage' -exec chgrp root '{}' \; || die "chgrp failed"
- fi
+ [[ ${_portage} != ${_root} ]] && \
+ find "${S}" -user ${_portage_user} -exec chown ${_root} '{}' \; || die "chown failed"
+ [[ ${_portage} != ${_group} ]] && \
+ find "${S}" -group ${_portage_group} -exec chgrp ${_group} '{}' \; || die "chgrp failed"
eend $?
# Install non-vim-help-docs
@@ -48,10 +65,10 @@
# Install remainder of plugin
cd "${WORKDIR}"
dodir /usr/share/vim
- mv "${S}" "${D}"/usr/share/vim/vimfiles
+ mv "${S}" "${ED}"/usr/share/vim/vimfiles
# Fix remaining bad permissions
- chmod -R -x+X "${D}"/usr/share/vim/vimfiles/ || die "chmod failed"
+ chmod -R -x+X "${ED}"/usr/share/vim/vimfiles/ || die "chmod failed"
}
vim-plugin_pkg_postinst() {
@@ -73,7 +90,8 @@
# /usr/share/vim/vimfiles/after/* comprised of the snippets in
# /usr/share/vim/vimfiles/after/*/*.d
update_vim_afterscripts() {
- local d f afterdir="${ROOT}"/usr/share/vim/vimfiles/after
+ has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
+ local d f afterdir="${EROOT}"/usr/share/vim/vimfiles/after
# Nothing to do if the dir isn't there
[ -d "${afterdir}" ] || return 0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim-plugin.eclass
@ 2010-10-29 7:01 Markus Duft (mduft)
0 siblings, 0 replies; 5+ messages in thread
From: Markus Duft (mduft) @ 2010-10-29 7:01 UTC (permalink / raw
To: gentoo-commits
mduft 10/10/29 07:01:08
Modified: vim-plugin.eclass
Log:
merge changes from prefix-tree, thanks radhermit for the review.
Revision Changes Path
1.25 eclass/vim-plugin.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim-plugin.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim-plugin.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim-plugin.eclass?r1=1.24&r2=1.25
Index: vim-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vim-plugin.eclass 29 Oct 2010 06:44:06 -0000 1.24
+++ vim-plugin.eclass 29 Oct 2010 07:01:08 -0000 1.25
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.24 2010/10/29 06:44:06 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.25 2010/10/29 07:01:08 mduft Exp $
#
# This eclass simplifies installation of app-vim plugins into
# /usr/share/vim/vimfiles. This is a version-independent directory
@@ -20,36 +20,22 @@
SLOT="0"
vim-plugin_src_install() {
- has "${EAPI:-0}" 0 1 2 && use !prefix && ED="${D}"
-
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
local f
- local _portage_user='portage'
- local _portage_group='portage'
- local _root=root
- local _group=wheel
-
- # no wheel group here.
- if use userland_BSD || use userland_Darwin; then
- _group=root
- fi
- # in prefix, we don't want to give away rights to root
- if use prefix; then
- _portage_user=${PORTAGE_USER}
- _portage_group=${PORTAGE_GROUP}
- _root=${PORTAGE_ROOT_USER}
- _group=${_portage_group}
+ if use !prefix || [[ ${EUID} -eq 0 ]] ; then
+ ebegin "Fixing file permissions"
+ # Make sure perms are good
+ chmod -R a+rX "${S}" || die "chmod failed"
+ find "${S}" -user 'portage' -exec chown root '{}' \; || die "chown failed"
+ if use userland_BSD || [[ ${CHOST} == *-darwin* ]] ; then
+ find "${S}" -group 'portage' -exec chgrp wheel '{}' \; || die "chgrp failed"
+ else
+ find "${S}" -group 'portage' -exec chgrp root '{}' \; || die "chgrp failed"
+ fi
+ eend $?
fi
- ebegin "Fixing file permissions"
- # Make sure perms are good
- chmod -R a+rX "${S}" || die "chmod failed"
- [[ ${_portage} != ${_root} ]] && \
- find "${S}" -user ${_portage_user} -exec chown ${_root} '{}' \; || die "chown failed"
- [[ ${_portage} != ${_group} ]] && \
- find "${S}" -group ${_portage_group} -exec chgrp ${_group} '{}' \; || die "chgrp failed"
- eend $?
-
# Install non-vim-help-docs
cd "${S}"
for f in *; do
@@ -78,25 +64,27 @@
}
vim-plugin_pkg_postrm() {
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
update_vim_helptags # from vim-doc
update_vim_afterscripts # see below
# Remove empty dirs; this allows
# /usr/share/vim to be removed if vim-core is unmerged
- find /usr/share/vim/vimfiles -depth -type d -exec rmdir {} \; 2>/dev/null
+ find "${EPREFIX}/usr/share/vim/vimfiles" -depth -type d -exec rmdir {} \; 2>/dev/null
}
# update_vim_afterscripts: create scripts in
# /usr/share/vim/vimfiles/after/* comprised of the snippets in
# /usr/share/vim/vimfiles/after/*/*.d
update_vim_afterscripts() {
- has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
local d f afterdir="${EROOT}"/usr/share/vim/vimfiles/after
# Nothing to do if the dir isn't there
[ -d "${afterdir}" ] || return 0
- einfo "Updating scripts in /usr/share/vim/vimfiles/after"
+ einfo "Updating scripts in ${EPREFIX}/usr/share/vim/vimfiles/after"
find "${afterdir}" -type d -name \*.vim.d | \
while read d; do
echo '" Generated by update_vim_afterscripts' > "${d%.d}"
@@ -104,7 +92,7 @@
sort -z | xargs -0 cat >> "${d%.d}"
done
- einfo "Removing dead scripts in /usr/share/vim/vimfiles/after"
+ einfo "Removing dead scripts in ${EPREFIX}/usr/share/vim/vimfiles/after"
find "${afterdir}" -type f -name \*.vim | \
while read f; do
[[ "$(head -n 1 ${f})" == '" Generated by update_vim_afterscripts' ]] \
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vim-plugin.eclass
@ 2011-01-16 18:18 Fabian Groffen (grobian)
0 siblings, 0 replies; 5+ messages in thread
From: Fabian Groffen (grobian) @ 2011-01-16 18:18 UTC (permalink / raw
To: gentoo-commits
grobian 11/01/16 18:18:13
Modified: vim-plugin.eclass
Log:
Fix logic error, resulting in bug #351401
In Prefix there is no user Portage, even not when the user runs as root,
in which case Portage would also run as root. Result, never try to fix
anything when running Prefix.
Revision Changes Path
1.26 eclass/vim-plugin.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim-plugin.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim-plugin.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim-plugin.eclass?r1=1.25&r2=1.26
Index: vim-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- vim-plugin.eclass 29 Oct 2010 07:01:08 -0000 1.25
+++ vim-plugin.eclass 16 Jan 2011 18:18:13 -0000 1.26
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.25 2010/10/29 07:01:08 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.26 2011/01/16 18:18:13 grobian Exp $
#
# This eclass simplifies installation of app-vim plugins into
# /usr/share/vim/vimfiles. This is a version-independent directory
@@ -23,7 +23,7 @@
has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
local f
- if use !prefix || [[ ${EUID} -eq 0 ]] ; then
+ if use !prefix && [[ ${EUID} -eq 0 ]] ; then
ebegin "Fixing file permissions"
# Make sure perms are good
chmod -R a+rX "${S}" || die "chmod failed"
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-01-16 18:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-29 7:01 [gentoo-commits] gentoo-x86 commit in eclass: vim-plugin.eclass Markus Duft (mduft)
-- strict thread matches above, loose matches on Subject: below --
2011-01-16 18:18 Fabian Groffen (grobian)
2010-10-29 6:44 Markus Duft (mduft)
2008-08-30 7:59 Ali Polatel (hawking)
2008-08-14 7:45 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