* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 652d54df1dd3658ac92db2d1bf0dfb49c5cbb4a8
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 17:42:40 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 17:42:40 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=652d54df
Fix man page title.
svn path=/eselect-emacs/; revision=1264
---
ctags.eselect.5 | 2 +-
emacs.eselect.5 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ctags.eselect.5 b/ctags.eselect.5
index 3f06aa8..927c887 100644
--- a/ctags.eselect.5
+++ b/ctags.eselect.5
@@ -2,7 +2,7 @@
.\" Distributed under the terms of the GNU General Public License v2
.\" $Id$
.\"
-.TH ESELECT 5 "April 2009" "Gentoo Linux" eselect
+.TH ctags.eselect 5 "April 2009" "Gentoo Linux" eselect
.SH NAME
ctags.eselect, etags.eselect \- The ctags and etags management module
for Gentoo's eselect
diff --git a/emacs.eselect.5 b/emacs.eselect.5
index 7bbaf1e..b242867 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -2,7 +2,7 @@
.\" Distributed under the terms of the GNU General Public License v2
.\" $Id$
.\"
-.TH ESELECT 5 "April 2009" "Gentoo Linux" eselect
+.TH emacs.eselect 5 "April 2009" "Gentoo Linux" eselect
.SH NAME
emacs.eselect \- The Emacs management module for Gentoo's eselect
.SH SYNOPSIS
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 6c2adaf419070fe9c5b7ecb15048d0ffb67c702b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 14:23:31 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 14:23:31 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=6c2adaf4
Use bold instead of italic for "ifunset".
svn path=/eselect-emacs/; revision=1263
---
emacs.eselect.5 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/emacs.eselect.5 b/emacs.eselect.5
index 338ec8f..7bbaf1e 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -17,7 +17,7 @@ emacs.eselect \- The Emacs management module for Gentoo's eselect
.B eselect emacs show
.br
.B eselect emacs update
-.RI [ ifunset ]
+.RB [ ifunset ]
.SH DESCRIPTION
.B eselect
is Gentoo's configuration and management tool. It features modules
@@ -67,10 +67,10 @@ Current target of GNU Emacs symlink:
emacs-22
.SH ACTION: UPDATE
.B eselect emacs update
-.RI [ ifunset ]
+.RB [ ifunset ]
.br
Update the emacs symlink to the last available version. If option
-.I ifunset
+.B ifunset
is given, an existing implementation is not overridden.
# eselect emacs update
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 261bc36fb01751f573a4859e52357d5e2bdd2814
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 05:47:21 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 05:47:21 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=261bc36f
Now the quoting should really really be right.
svn path=/eselect-emacs/; revision=1266
---
ctags.eselect | 8 ++++----
emacs.eselect | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ctags.eselect b/ctags.eselect
index 775af0a..07c386d 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -41,7 +41,7 @@ find_targets() {
local emacs
if [[ -L ${ROOT}${bindir}/emacs && \
-e $(canonicalise "${ROOT}${bindir}/emacs") ]]; then
- emacs=$(basename $(readlink "${ROOT}${bindir}/emacs") )
+ emacs=$(basename "$(readlink "${ROOT}${bindir}/emacs")")
[[ -f ${ROOT}${bindir}/${CTAGS}-${emacs} ]] && echo "${CTAGS}-${emacs}"
elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
[[ -f ${ROOT}${bindir}/${CTAGS}-xemacs ]] && echo "${CTAGS}-xemacs"
@@ -124,7 +124,7 @@ do_show() {
if [[ -L ${ROOT}${bindir}/${CTAGS} && \
-e $(canonicalise "${ROOT}${bindir}/${CTAGS}") ]]; then
write_kv_list_entry \
- $(basename $(readlink "${ROOT}${bindir}/${CTAGS}") ) ""
+ "$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")")" ""
elif [[ -e ${ROOT}${bindir}/${CTAGS} ]]; then
write_kv_list_entry \
"(not a symlink or target of symlink does not exist)" ""
@@ -150,7 +150,7 @@ do_list() {
for (( i = 0; i < ${#targets[@]}; i = i + 1 )); do
# Display a star to indicate the currently chosen version
[[ ${targets[i]} = \
- $(basename $(readlink "${ROOT}${bindir}/${CTAGS}") ) ]] \
+ $(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")") ]] \
&& targets[i]="${targets[i]} $(highlight '*')"
done
write_numbered_list "${targets[@]}"
@@ -199,7 +199,7 @@ do_update() {
local current=""
if [[ -L ${ROOT}${bindir}/${CTAGS} ]]; then
- current=$(basename $(readlink "${ROOT}${bindir}/${CTAGS}") )
+ current=$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")")
if [[ ! -e $(canonicalise "${ROOT}${bindir}/${CTAGS}") ]]; then
# clean up dead symlinks
remove_symlinks || die -q "Couldn't remove existing symlink"
diff --git a/emacs.eselect b/emacs.eselect
index 24dc635..78abd12 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -164,7 +164,7 @@ do_show() {
if [[ -L ${ROOT}${bindir}/emacs && \
-e $(canonicalise "${ROOT}${bindir}/emacs") ]]; then
write_kv_list_entry \
- $(basename $(readlink "${ROOT}${bindir}/emacs") ) ""
+ "$(basename "$(readlink "${ROOT}${bindir}/emacs")")" ""
elif [[ -e ${ROOT}${bindir}/emacs ]]; then
write_kv_list_entry \
"(not a symlink or target of symlink does not exist)" ""
@@ -192,7 +192,7 @@ do_list() {
for (( i = 0; i < ${#targets[@]}; i = i + 1 )); do
# Display a star to indicate the currently chosen version
[[ ${targets[i]} = \
- $(basename $(readlink "${ROOT}${bindir}/emacs") ) ]] \
+ $(basename "$(readlink "${ROOT}${bindir}/emacs")") ]] \
&& targets[i]="${targets[i]} $(highlight '*')"
done
write_numbered_list "${targets[@]}"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: cba02b5957769fa8a63da8dff606f3bcd4a5ebd4
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May 7 16:57:15 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 7 16:57:15 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=cba02b59
Ditto for ctags module.
svn path=/eselect-emacs/; revision=1271
---
ChangeLog | 1 +
ctags.eselect | 9 ++++-----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1b98136..0b2cd96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2009-05-07 Ulrich Mueller <ulm@gentoo.org>
+ * ctags.eselect (find_targets, do_show, do_update):
* emacs.eselect (do_show, do_update): "canonicalise" is not
necessary since "test -e" resolves symbolic links.
diff --git a/ctags.eselect b/ctags.eselect
index 0e3787a..9b837dd 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -39,8 +39,7 @@ find_targets() {
# currently active Emacs version (selected by emacs.eselect)
# The logic here is the same as in emacs.eselect, don't change it!
local emacs
- if [[ -L ${ROOT}${bindir}/emacs && \
- -e $(canonicalise "${ROOT}${bindir}/emacs") ]]; then
+ if [[ -L ${ROOT}${bindir}/emacs && -e ${ROOT}${bindir}/emacs ]]; then
emacs=$(basename "$(readlink "${ROOT}${bindir}/emacs")")
[[ -f ${ROOT}${bindir}/${CTAGS}-${emacs} ]] && echo "${CTAGS}-${emacs}"
elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
@@ -121,8 +120,8 @@ do_show() {
[[ $# -gt 0 ]] && die -q "Too many parameters"
write_list_start "Current target of ${CTAGS} symlink:"
- if [[ -L ${ROOT}${bindir}/${CTAGS} && \
- -e $(canonicalise "${ROOT}${bindir}/${CTAGS}") ]]; then
+ if [[ -L ${ROOT}${bindir}/${CTAGS} && -e ${ROOT}${bindir}/${CTAGS} ]]
+ then
write_kv_list_entry \
"$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")")" ""
elif [[ -e ${ROOT}${bindir}/${CTAGS} ]]; then
@@ -200,7 +199,7 @@ do_update() {
local current=""
if [[ -L ${ROOT}${bindir}/${CTAGS} ]]; then
current=$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")")
- if [[ ! -e $(canonicalise "${ROOT}${bindir}/${CTAGS}") ]]; then
+ if [[ ! -e ${ROOT}${bindir}/${CTAGS} ]]; then
# clean up dead symlinks
remove_symlinks || die -q "Couldn't remove existing symlink"
fi
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 6c5bc925357ea0732ab9574c3e389b84e091d09c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 16:38:51 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 16:38:51 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=6c5bc925
Use post-increment.
svn path=/eselect-emacs/; revision=1267
---
ctags.eselect | 2 +-
emacs.eselect | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ctags.eselect b/ctags.eselect
index 07c386d..ac82953 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -147,7 +147,7 @@ do_list() {
write_list_start "Available ${CTAGS} symlink targets:"
if [[ -n ${targets[@]} ]]; then
- for (( i = 0; i < ${#targets[@]}; i = i + 1 )); do
+ for (( i = 0; i < ${#targets[@]}; i++ )); do
# Display a star to indicate the currently chosen version
[[ ${targets[i]} = \
$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")") ]] \
diff --git a/emacs.eselect b/emacs.eselect
index 78abd12..c501592 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -189,7 +189,7 @@ do_list() {
write_list_start "Available Emacs symlink targets:"
if [[ -n ${targets[@]} ]]; then
- for (( i = 0; i < ${#targets[@]}; i = i + 1 )); do
+ for (( i = 0; i < ${#targets[@]}; i++ )); do
# Display a star to indicate the currently chosen version
[[ ${targets[i]} = \
$(basename "$(readlink "${ROOT}${bindir}/emacs")") ]] \
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: f0905413a83fb5ba2e0048983dda05304c79f438
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May 7 16:47:58 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 7 16:47:58 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f0905413
Remove unnecessary "canonicalise" calls.
svn path=/eselect-emacs/; revision=1270
---
ChangeLog | 7 ++++++-
emacs.eselect | 8 +++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a0a6f5e..1b98136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-07 Ulrich Mueller <ulm@gentoo.org>
+
+ * emacs.eselect (do_show, do_update): "canonicalise" is not
+ necessary since "test -e" resolves symbolic links.
+
2009-05-02 Ulrich Mueller <ulm@gentoo.org>
* Version 1.9 released.
@@ -12,7 +17,7 @@
2009-04-18 Ulrich Mueller <ulm@gentoo.org>
- * ctags.eselect (do_list): Always output a list header, even if
+ * ctags.eselect (do_list): Always output a list header, even if
the list of targets is empty.
(set_symlinks, do_list): Simplify syntax used for array index.
diff --git a/emacs.eselect b/emacs.eselect
index 724be1d..8e7a2ad 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -161,8 +161,7 @@ do_show() {
[[ $# -gt 0 ]] && die -q "Too many parameters"
write_list_start "Current target of Emacs symlink:"
- if [[ -L ${ROOT}${bindir}/emacs && \
- -e $(canonicalise "${ROOT}${bindir}/emacs") ]]; then
+ if [[ -L ${ROOT}${bindir}/emacs && -e ${ROOT}${bindir}/emacs ]]; then
write_kv_list_entry \
"$(basename "$(readlink "${ROOT}${bindir}/emacs")")" ""
elif [[ -e ${ROOT}${bindir}/emacs ]]; then
@@ -248,8 +247,7 @@ do_update() {
test_for_root
if [[ -L ${ROOT}${bindir}/emacs ]]; then
- [[ $1 == *if*unset && -e $(canonicalise "${ROOT}${bindir}/emacs") ]] \
- && return
+ [[ $1 == *if*unset && -e ${ROOT}${bindir}/emacs ]] && return
# this is not redundant: "update" is called in pkg_postrm() of emacs
# and should clean up any dead symlinks if no valid target exists
remove_symlinks || die -q "Couldn't remove existing symlink"
@@ -262,7 +260,7 @@ do_update() {
set_symlinks "${targets[${#targets[@]}-1]}" \
|| die -q "Couldn't set a new symlink"
elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
- # no Emacs target found -- link ctags, etags etc. to XEmacs versions
+ # no Emacs target found - link to XEmacs versions
set_symlinks xemacs nomain
fi
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 8bcbda43ead9921e2c30f80a3b1634392ea9acb7
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat May 2 11:52:59 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat May 2 11:52:59 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=8bcbda43
Version 1.9 released.
svn path=/eselect-emacs/; revision=1268
---
ChangeLog | 40 ++++++++++++++++++++++------------------
ctags.eselect | 8 ++++----
emacs.eselect | 2 +-
3 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1938480..a0a6f5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-02 Ulrich Mueller <ulm@gentoo.org>
+
+ * Version 1.9 released.
+
2009-04-20 Ulrich Mueller <ulm@gentoo.org>
* ctags.eselect (do_update): Enable pattern matching for the
@@ -19,7 +23,7 @@
2008-12-21 Ulrich Mueller <ulm@gentoo.org>
- * version 1.8
+ * Version 1.8 released.
2008-12-21 Christian Faulhammer <fauli@gentoo.org>
@@ -37,7 +41,7 @@
2008-12-19 Ulrich Mueller <ulm@gentoo.org>
- * version 1.7
+ * Version 1.7 released.
* ctags.eselect.5:
* emacs.eselect.5: Replace all direct font escapes by man macros.
@@ -56,7 +60,7 @@
2008-12-12 Ulrich Mueller <ulm@gentoo.org>
- * version 1.6
+ * Version 1.6 released.
* emacs.eselect (MANPAGELIST): Add ebrowse man page.
@@ -77,7 +81,7 @@
2008-05-25 Ulrich Mueller <ulm@gentoo.org>
- * version 1.5
+ * Version 1.5 released.
2008-05-21 Ulrich Mueller <ulm@gentoo.org>
@@ -86,7 +90,7 @@
2008-05-12 Ulrich Mueller <ulm@gentoo.org>
- * version 1.4
+ * Version 1.4 released.
2008-05-02 Ulrich Mueller <ulm@gentoo.org>
@@ -113,7 +117,7 @@
2007-11-20 Ulrich Mueller <ulm@gentoo.org>
- * version 1.3
+ * Version 1.3 released.
2007-10-08 Ulrich Mueller <ulm@gentoo.org>
@@ -130,7 +134,7 @@
2007-08-22 Ulrich Mueller <ulm@gentoo.org>
- * version 1.2
+ * Version 1.2 released.
* ctags.eselect.5: Update man page.
@@ -153,7 +157,7 @@
2007-06-29 Ulrich Mueller <ulm@gentoo.org>
- * version 1.1
+ * Version 1.1 released.
2007-06-22 Ulrich Mueller <ulm@gentoo.org>
@@ -171,7 +175,7 @@
2007-06-17 Ulrich Mueller <ulm@gentoo.org>
- * version 1.0
+ * Version 1.0 released.
* emacs.eselect (set_symlinks): Call env.eselect module;
it supports the "noldconfig" option since eselect version 1.0.10.
@@ -225,7 +229,7 @@
* emacs.eselect (xemacs_info): XEmacs detection into own function.
(do_list, do_show): Call it.
- * version 0.9
+ * Version 0.9 released.
* emacs.eselect: Added version number in comment.
(do_list): Added a comment about the highlighted star, that
@@ -240,7 +244,7 @@
2007-04-04 Ulrich Mueller <ulm@gentoo.org>
- * version 0.8
+ * Version 0.8 released.
2007-04-01 Ulrich Mueller <ulm@gentoo.org>
@@ -252,7 +256,7 @@
* emacs.eselect.5: Fixed typo and capitalised "Emacs" where
appropriate. Added copyright notice.
- * version 0.7
+ * Version 0.7 released.
2007-03-28 Ulrich Mueller <ulm@gentoo.org>
@@ -260,7 +264,7 @@
* emacs.eselect (do_set, do_update): Undo previous change.
- * version 0.6
+ * Version 0.6 released.
2007-03-27 Ulrich Mueller <ulm@gentoo.org>
@@ -274,13 +278,13 @@
2007-03-24 Ulrich Mueller <ulm@gentoo.org>
- * version 0.5
+ * Version 0.5 released.
2007-03-22 Ulrich Mueller <ulm@gentoo.org>
* emacs.eselect: Added some comments.
- * version 0.4
+ * Version 0.4 released.
* emacs.eselect (set_man_symlinks): Handling of compression
extensions made more robust.
@@ -293,7 +297,7 @@
2007-03-19 Christian Faulhammer <opfer@gentoo.org>
- * version 0.3
+ * Version 0.3 released.
2007-03-19 Ulrich Mueller <ulm@gentoo.org>
@@ -309,7 +313,7 @@
from ".emacs-${SLOT}" to "-emacs-${SLOT}".
(remove_symlinks): Removal of man page symlinks simplified.
- * version 0.2
+ * Version 0.2 released.
2007-03-17 Ulrich Mueller <ulm@gentoo.org>
@@ -331,7 +335,7 @@
2007-03-15 Christian Faulhammer <opfer@gentoo.org>
- * version 0.1
+ * Version 0.1 released.
* emacs.eselect: New file, based on Vi's eselect module.
Has actions:
diff --git a/ctags.eselect b/ctags.eselect
index ac82953..0e3787a 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -45,7 +45,7 @@ find_targets() {
[[ -f ${ROOT}${bindir}/${CTAGS}-${emacs} ]] && echo "${CTAGS}-${emacs}"
elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
[[ -f ${ROOT}${bindir}/${CTAGS}-xemacs ]] && echo "${CTAGS}-xemacs"
- elif [[ ${CTAGS} == etags ]]; then
+ elif [[ ${CTAGS} = etags ]]; then
# We are called as etags module, but no (X)Emacs is installed.
# Return an empty list in this case, because we don't want
# exuberant-ctags as default for etags (for ctags it's fine).
@@ -193,7 +193,7 @@ describe_update() {
}
do_update() {
- [[ -z $1 || $1 == norecursion ]] || die -q "Usage error"
+ [[ -z $1 || $1 = norecursion ]] || die -q "Usage error"
[[ $# -gt 1 ]] && die -q "Too many parameters"
test_for_root
@@ -205,7 +205,7 @@ do_update() {
remove_symlinks || die -q "Couldn't remove existing symlink"
fi
elif [[ -e ${ROOT}${bindir}/${CTAGS} ]]; then
- if ! [[ ${CTAGS} == ctags && $(uname) == FreeBSD ]]; then
+ if ! [[ ${CTAGS} = ctags && $(uname) = FreeBSD ]]; then
die -q "${ROOT}${bindir}/${CTAGS} exists but is not a symlink"
fi
# On FreeBSD ctags is a real file, installed by freebsd-ubin
@@ -227,7 +227,7 @@ do_update() {
fi
# Call "eselect etags update" from the ctags module and vice versa
- [[ $1 == norecursion ]] && return
+ [[ $1 = norecursion ]] && return
case ${CTAGS} in
ctags) CTAGS=etags do_update norecursion ;;
etags) CTAGS=ctags do_update norecursion ;;
diff --git a/emacs.eselect b/emacs.eselect
index c501592..724be1d 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -243,7 +243,7 @@ describe_update_options() {
}
do_update() {
- [[ -z $1 || $1 == ifunset || $1 == --if-unset ]] || die -q "Usage error"
+ [[ -z $1 || $1 = ifunset || $1 = --if-unset ]] || die -q "Usage error"
[[ $# -gt 1 ]] && die -q "Too many parameters"
test_for_root
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 55b4a00a8f25d7f032787de4264d2e958d400675
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May 7 18:21:37 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 7 18:21:37 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=55b4a00a
Document the new option.
svn path=/eselect-emacs/; revision=1274
---
ChangeLog | 1 +
ctags.eselect.5 | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8276590..acb0cba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
option "ifunset" with the same meaning as for the emacs module.
* emacs.eselect (do_update): Call the ctags module also in the
case when option "ifunset" was specified, bug 268064.
+ * ctags.eselect.5: Document the new option.
* ctags.eselect (find_targets, do_show, do_update):
* emacs.eselect (do_show, do_update): "canonicalise" is not
diff --git a/ctags.eselect.5 b/ctags.eselect.5
index 927c887..0165343 100644
--- a/ctags.eselect.5
+++ b/ctags.eselect.5
@@ -2,7 +2,7 @@
.\" Distributed under the terms of the GNU General Public License v2
.\" $Id$
.\"
-.TH ctags.eselect 5 "April 2009" "Gentoo Linux" eselect
+.TH ctags.eselect 5 "May 2009" "Gentoo Linux" eselect
.SH NAME
ctags.eselect, etags.eselect \- The ctags and etags management module
for Gentoo's eselect
@@ -18,6 +18,7 @@ for Gentoo's eselect
.B eselect ctags show
.br
.B eselect ctags update
+.RB [ ifunset ]
.SH DESCRIPTION
.B eselect
is Gentoo's configuration and management tool. It features modules
@@ -66,10 +67,13 @@ Current target of symlink:
exuberant-ctags
.SH ACTION: UPDATE
.B eselect ctags update
+.RB [ ifunset ]
.br
Update the ctags symlink. For an update only the version is changed,
but not the provider (i.e. Emacs vs Exuberant). At the moment only
-(X)Emacs offers several concurrent versions.
+(X)Emacs offers several concurrent versions. If option
+.B ifunset
+is given, an existing implementation is not overridden.
# eselect ctags update
.br
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 7d9e1c2de7f305fed074610f4d0f266e949cfd30
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 11 16:48:26 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon May 11 16:48:26 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=7d9e1c2d
Whitespace.
svn path=/eselect-emacs/; revision=1276
---
ctags.eselect | 2 +-
emacs.eselect | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ctags.eselect b/ctags.eselect
index 8980475..f86039c 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -30,7 +30,7 @@ man1dir=/usr/share/man/man1
DESCRIPTION="Manage ${bindir}/${CTAGS} implementations"
MAINTAINER="emacs@gentoo.org"
SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
+VERSION=$(svn_date_to_version "${SVN_DATE}")
find_targets() {
# Return the list of available ctags implementations
diff --git a/emacs.eselect b/emacs.eselect
index 9b15d58..91bfcd6 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -28,7 +28,7 @@ envdir=/etc/env.d
DESCRIPTION="Manage ${bindir}/emacs version"
MAINTAINER="emacs@gentoo.org"
SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
+VERSION=$(svn_date_to_version "${SVN_DATE}")
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: af482c4ea0aefbd06daa9bfcf34cdb4bfc1ad7d9
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May 7 17:32:29 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 7 17:32:29 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=af482c4e
Call the ctags module also in the case when option "ifunset" was specified, bug 268064.
svn path=/eselect-emacs/; revision=1272
---
ChangeLog | 5 ++++
ctags.eselect | 69 ++++++++++++++++++++++++++++++++------------------------
emacs.eselect | 36 ++++++++++++++++-------------
3 files changed, 64 insertions(+), 46 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0b2cd96..8276590 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-05-07 Ulrich Mueller <ulm@gentoo.org>
+ * ctags.eselect (do_update, describe_update_options): Support new
+ option "ifunset" with the same meaning as for the emacs module.
+ * emacs.eselect (do_update): Call the ctags module also in the
+ case when option "ifunset" was specified, bug 268064.
+
* ctags.eselect (find_targets, do_show, do_update):
* emacs.eselect (do_show, do_update): "canonicalise" is not
necessary since "test -e" resolves symbolic links.
diff --git a/ctags.eselect b/ctags.eselect
index 9b837dd..8980475 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -191,44 +191,53 @@ describe_update() {
echo "Automatically update the ${CTAGS} symlink"
}
+describe_update_options() {
+ echo "ifunset : Do not override currently set version"
+}
+
do_update() {
- [[ -z $1 || $1 = norecursion ]] || die -q "Usage error"
- [[ $# -gt 1 ]] && die -q "Too many parameters"
+ [[ -z $1 || $1 = ifunset || $1 = --if-unset ]] || die -q "Usage error"
+ [[ -z $2 || $2 = norecursion ]] || die -q "Usage error"
+ [[ $# -gt 2 ]] && die -q "Too many parameters"
test_for_root
- local current=""
- if [[ -L ${ROOT}${bindir}/${CTAGS} ]]; then
- current=$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")")
- if [[ ! -e ${ROOT}${bindir}/${CTAGS} ]]; then
- # clean up dead symlinks
- remove_symlinks || die -q "Couldn't remove existing symlink"
- fi
- elif [[ -e ${ROOT}${bindir}/${CTAGS} ]]; then
- if ! [[ ${CTAGS} = ctags && $(uname) = FreeBSD ]]; then
- die -q "${ROOT}${bindir}/${CTAGS} exists but is not a symlink"
+ if ! [[ $1 == *if*unset \
+ && -L ${ROOT}${bindir}/${CTAGS} && -e ${ROOT}${bindir}/${CTAGS} ]]
+ then
+ local current=""
+ if [[ -L ${ROOT}${bindir}/${CTAGS} ]]; then
+ current=$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")")
+ if [[ ! -e ${ROOT}${bindir}/${CTAGS} ]]; then
+ # clean up dead symlinks
+ remove_symlinks || die -q "Couldn't remove existing symlink"
+ fi
+ elif [[ -e ${ROOT}${bindir}/${CTAGS} ]]; then
+ if ! [[ ${CTAGS} = ctags && $(uname) = FreeBSD ]]; then
+ die -q "${ROOT}${bindir}/${CTAGS} exists but is not a symlink"
+ fi
+ # On FreeBSD ctags is a real file, installed by freebsd-ubin
+ current=nolink
fi
- # On FreeBSD ctags is a real file, installed by freebsd-ubin
- current=nolink
- fi
-
- # For an "update" only the version should be changed, but not the
- # provider (i.e. Emacs vs Exuberant). At the moment only (X)Emacs
- # offers several concurrent versions.
- local i target targets=( $(find_targets) )
- if [[ ${#targets[@]} -gt 0 && ${current} != nolink ]]; then
- target=${targets[0]}
- [[ ${current} == ${CTAGS}-*emacs* ]] && current=${CTAGS}-*emacs*
- for i in ${targets[@]}; do
- [[ ${i} == ${current} ]] && target=${i}
- done
- set_symlinks "${target}" || die -q "Couldn't set a new symlink"
+ # For an "update" only the version should be changed, but not the
+ # provider (i.e. Emacs vs Exuberant). At the moment only (X)Emacs
+ # offers several concurrent versions.
+
+ local i target targets=( $(find_targets) )
+ if [[ ${#targets[@]} -gt 0 && ${current} != nolink ]]; then
+ target=${targets[0]}
+ [[ ${current} == ${CTAGS}-*emacs* ]] && current=${CTAGS}-*emacs*
+ for i in ${targets[@]}; do
+ [[ ${i} == ${current} ]] && target=${i}
+ done
+ set_symlinks "${target}" || die -q "Couldn't set a new symlink"
+ fi
fi
# Call "eselect etags update" from the ctags module and vice versa
- [[ $1 = norecursion ]] && return
+ [[ $2 = norecursion ]] && return
case ${CTAGS} in
- ctags) CTAGS=etags do_update norecursion ;;
- etags) CTAGS=ctags do_update norecursion ;;
+ ctags) CTAGS=etags do_update "$1" norecursion ;;
+ etags) CTAGS=ctags do_update "$1" norecursion ;;
esac
}
diff --git a/emacs.eselect b/emacs.eselect
index 8e7a2ad..be2ee31 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -246,24 +246,28 @@ do_update() {
[[ $# -gt 1 ]] && die -q "Too many parameters"
test_for_root
- if [[ -L ${ROOT}${bindir}/emacs ]]; then
- [[ $1 == *if*unset && -e ${ROOT}${bindir}/emacs ]] && return
- # this is not redundant: "update" is called in pkg_postrm() of emacs
- # and should clean up any dead symlinks if no valid target exists
- remove_symlinks || die -q "Couldn't remove existing symlink"
- elif [[ -e ${ROOT}${bindir}/emacs ]]; then
- die -q "${ROOT}${bindir}/emacs exists but is not a symlink"
- fi
+ if ! [[ $1 == *if*unset \
+ && -L ${ROOT}${bindir}/emacs && -e ${ROOT}${bindir}/emacs ]]
+ then
+ if [[ -L ${ROOT}${bindir}/emacs ]]; then
+ # this is not redundant: "update" is called in pkg_postrm()
+ # of emacs and should clean up any dead symlinks if no
+ # valid target exists
+ remove_symlinks || die -q "Couldn't remove existing symlink"
+ elif [[ -e ${ROOT}${bindir}/emacs ]]; then
+ die -q "${ROOT}${bindir}/emacs exists but is not a symlink"
+ fi
- local targets=( $(find_targets) )
- if [[ ${#targets[@]} -gt 0 ]]; then
- set_symlinks "${targets[${#targets[@]}-1]}" \
- || die -q "Couldn't set a new symlink"
- elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
+ local targets=( $(find_targets) )
+ if [[ ${#targets[@]} -gt 0 ]]; then
+ set_symlinks "${targets[${#targets[@]}-1]}" \
+ || die -q "Couldn't set a new symlink"
+ elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
# no Emacs target found - link to XEmacs versions
- set_symlinks xemacs nomain
+ set_symlinks xemacs nomain
+ fi
fi
- # ctags symlinks are handled in an own module now
- do_action ctags update
+ # ctags and etags symlinks are handled in an own module
+ do_action ctags update "$@"
}
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 3f0e89146f006c259bc790aa592b60da405a428e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May 7 18:18:27 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 7 18:18:27 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=3f0e8914
Fix it properly.
svn path=/eselect-emacs/; revision=1273
---
emacs.eselect | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/emacs.eselect b/emacs.eselect
index be2ee31..9b15d58 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -246,28 +246,27 @@ do_update() {
[[ $# -gt 1 ]] && die -q "Too many parameters"
test_for_root
- if ! [[ $1 == *if*unset \
- && -L ${ROOT}${bindir}/emacs && -e ${ROOT}${bindir}/emacs ]]
- then
- if [[ -L ${ROOT}${bindir}/emacs ]]; then
- # this is not redundant: "update" is called in pkg_postrm()
- # of emacs and should clean up any dead symlinks if no
- # valid target exists
- remove_symlinks || die -q "Couldn't remove existing symlink"
- elif [[ -e ${ROOT}${bindir}/emacs ]]; then
- die -q "${ROOT}${bindir}/emacs exists but is not a symlink"
+ if [[ -L ${ROOT}${bindir}/emacs ]]; then
+ if [[ $1 == *if*unset && -e ${ROOT}${bindir}/emacs ]]; then
+ do_action ctags update ifunset
+ return
fi
+ # this is not redundant: "update" is called in pkg_postrm() of emacs
+ # and should clean up any dead symlinks if no valid target exists
+ remove_symlinks || die -q "Couldn't remove existing symlink"
+ elif [[ -e ${ROOT}${bindir}/emacs ]]; then
+ die -q "${ROOT}${bindir}/emacs exists but is not a symlink"
+ fi
- local targets=( $(find_targets) )
- if [[ ${#targets[@]} -gt 0 ]]; then
- set_symlinks "${targets[${#targets[@]}-1]}" \
- || die -q "Couldn't set a new symlink"
- elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
+ local targets=( $(find_targets) )
+ if [[ ${#targets[@]} -gt 0 ]]; then
+ set_symlinks "${targets[${#targets[@]}-1]}" \
+ || die -q "Couldn't set a new symlink"
+ elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
# no Emacs target found - link to XEmacs versions
- set_symlinks xemacs nomain
- fi
+ set_symlinks xemacs nomain
fi
# ctags and etags symlinks are handled in an own module
- do_action ctags update "$@"
+ do_action ctags update
}
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: bbce68528ec7a9df26e36f6103aaa83ea47ae2e0
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May 7 19:39:51 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 7 19:39:51 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=bbce6852
Version 1.10 released.
svn path=/eselect-emacs/; revision=1275
---
ChangeLog | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index acb0cba..3849ab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2009-05-07 Ulrich Mueller <ulm@gentoo.org>
+ * Version 1.10 released.
+
* ctags.eselect (do_update, describe_update_options): Support new
option "ifunset" with the same meaning as for the emacs module.
* emacs.eselect (do_update): Call the ctags module also in the
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: c34a0370c62b0f3faec3c07b71b3936d707154fa
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 7 11:51:04 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 11:51:04 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=c34a0370
Version 1.11 released.
svn path=/eselect-emacs/; revision=1451
---
ChangeLog | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 380d6d8..afa3e47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2009-11-07 Ulrich Mueller <ulm@gentoo.org>
+ * Version 1.11 released.
+
* emacs.eselect (do_list, do_show):
* ctags.eselect (do_list): Support brief output mode, bug 292100.
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 0c92c83f32030905fadb4173263a08e22c8ef60e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 6 18:00:33 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Nov 6 18:00:33 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=0c92c83f
Support brief output mode, bug 292100.
svn path=/eselect-emacs/; revision=1449
---
ChangeLog | 5 +++++
ctags.eselect | 18 +++++++-----------
emacs.eselect | 32 +++++++++++++++++---------------
3 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3849ab1..d7fde51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-06 Ulrich Mueller <ulm@gentoo.org>
+
+ * emacs.eselect (do_list, do_show):
+ * ctags.eselect (do_list): Support brief output mode, bug 292100.
+
2009-05-07 Ulrich Mueller <ulm@gentoo.org>
* Version 1.10 released.
diff --git a/ctags.eselect b/ctags.eselect
index 4a13c79..e61709e 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -144,18 +144,14 @@ do_list() {
local i targets
targets=( $(find_targets) )
+ for (( i = 0; i < ${#targets[@]}; i++ )); do
+ # Highlight the currently chosen version
+ [[ ${targets[i]} = \
+ $(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")") ]] \
+ && targets[i]=$(highlight_marker "${targets[i]}")
+ done
write_list_start "Available ${CTAGS} symlink targets:"
- if [[ ${#targets[@]} -gt 0 ]]; then
- for (( i = 0; i < ${#targets[@]}; i++ )); do
- # Display a star to indicate the currently chosen version
- [[ ${targets[i]} = \
- $(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")") ]] \
- && targets[i]="${targets[i]} $(highlight '*')"
- done
- write_numbered_list "${targets[@]}"
- else
- write_kv_list_entry "(none found)" ""
- fi
+ write_numbered_list -m "(none found)" "${targets[@]}"
}
### set action ###
diff --git a/emacs.eselect b/emacs.eselect
index 1e9a3b3..b51a109 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -170,8 +170,11 @@ do_show() {
else
write_kv_list_entry "(unset)" ""
fi
- xemacs_info
- #vim_info
+
+ #if ! is_output_mode brief; then
+ xemacs_info
+ #vim_info
+ #fi
}
### list action ###
@@ -186,20 +189,19 @@ do_list() {
local i targets
targets=( $(find_targets) )
+ for (( i = 0; i < ${#targets[@]}; i++ )); do
+ # Highlight the currently chosen version
+ [[ ${targets[i]} = \
+ $(basename "$(readlink "${ROOT}${bindir}/emacs")") ]] \
+ && targets[i]=$(highlight_marker "${targets[i]}")
+ done
write_list_start "Available Emacs symlink targets:"
- if [[ ${#targets[@]} -gt 0 ]]; then
- for (( i = 0; i < ${#targets[@]}; i++ )); do
- # Display a star to indicate the currently chosen version
- [[ ${targets[i]} = \
- $(basename "$(readlink "${ROOT}${bindir}/emacs")") ]] \
- && targets[i]="${targets[i]} $(highlight '*')"
- done
- write_numbered_list "${targets[@]}"
- else
- write_kv_list_entry "(none found)" ""
- fi
- xemacs_info
- #vim_info
+ write_numbered_list -m "(none found)" "${targets[@]}"
+
+ #if ! is_output_mode brief; then
+ xemacs_info
+ #vim_info
+ #fi
}
### set action ###
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: a0b997d3c751efe360c8fdf36433d4a808473749
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 7 11:50:22 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 11:50:22 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=a0b997d3
Uncomment tests for is_output_mode.
svn path=/eselect-emacs/; revision=1450
---
ChangeLog | 2 +-
emacs.eselect | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d7fde51..380d6d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2009-11-06 Ulrich Mueller <ulm@gentoo.org>
+2009-11-07 Ulrich Mueller <ulm@gentoo.org>
* emacs.eselect (do_list, do_show):
* ctags.eselect (do_list): Support brief output mode, bug 292100.
diff --git a/emacs.eselect b/emacs.eselect
index b51a109..8ffa0bd 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -171,10 +171,10 @@ do_show() {
write_kv_list_entry "(unset)" ""
fi
- #if ! is_output_mode brief; then
+ if ! is_output_mode brief; then
xemacs_info
#vim_info
- #fi
+ fi
}
### list action ###
@@ -198,10 +198,10 @@ do_list() {
write_list_start "Available Emacs symlink targets:"
write_numbered_list -m "(none found)" "${targets[@]}"
- #if ! is_output_mode brief; then
+ if ! is_output_mode brief; then
xemacs_info
#vim_info
- #fi
+ fi
}
### set action ###
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: cccbd50adbda9087774dc81e5b46602f318f5044
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 09:25:49 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 09:25:49 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=cccbd50a
Use EROOT and EPREFIX throughout.
svn path=/eselect-emacs/; revision=1456
---
ChangeLog | 5 ++++
ctags.eselect | 52 +++++++++++++++++++++++++-------------------------
emacs.eselect | 59 ++++++++++++++++++++++++++++-----------------------------
3 files changed, 60 insertions(+), 56 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index afa3e47..73b51cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-14 Ulrich Mueller <ulm@gentoo.org>
+
+ * ctags.eselect:
+ * emacs.eselect: Use EROOT and EPREFIX throughout.
+
2009-11-07 Ulrich Mueller <ulm@gentoo.org>
* Version 1.11 released.
diff --git a/ctags.eselect b/ctags.eselect
index e61709e..1033a4c 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -39,11 +39,11 @@ find_targets() {
# currently active Emacs version (selected by emacs.eselect)
# The logic here is the same as in emacs.eselect, don't change it!
local emacs
- if [[ -L ${ROOT}${bindir}/emacs && -e ${ROOT}${bindir}/emacs ]]; then
- emacs=$(basename "$(readlink "${ROOT}${bindir}/emacs")")
- [[ -f ${ROOT}${bindir}/${CTAGS}-${emacs} ]] && echo "${CTAGS}-${emacs}"
- elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
- [[ -f ${ROOT}${bindir}/${CTAGS}-xemacs ]] && echo "${CTAGS}-xemacs"
+ if [[ -L ${EROOT}${bindir}/emacs && -e ${EROOT}${bindir}/emacs ]]; then
+ emacs=$(basename "$(readlink "${EROOT}${bindir}/emacs")")
+ [[ -f ${EROOT}${bindir}/${CTAGS}-${emacs} ]] && echo "${CTAGS}-${emacs}"
+ elif [[ -f ${EROOT}${bindir}/xemacs ]]; then
+ [[ -f ${EROOT}${bindir}/${CTAGS}-xemacs ]] && echo "${CTAGS}-xemacs"
elif [[ ${CTAGS} = etags ]]; then
# We are called as etags module, but no (X)Emacs is installed.
# Return an empty list in this case, because we don't want
@@ -53,31 +53,31 @@ find_targets() {
fi
# Exuberant ctags
- [[ -f ${ROOT}${bindir}/exuberant-ctags ]] && echo exuberant-ctags
+ [[ -f ${EROOT}${bindir}/exuberant-ctags ]] && echo exuberant-ctags
}
remove_symlinks() {
# Remove existing symlinks to binary and man page
- rm -f "${ROOT}${bindir}/${CTAGS}" \
- "${ROOT}${man1dir}"/${CTAGS}.1*
+ rm -f "${EROOT}${bindir}/${CTAGS}" \
+ "${EROOT}${man1dir}"/${CTAGS}.1*
}
set_bin_symlinks() {
# Set symlink to binary
local target=${1}
- ln -s "${target}" "${ROOT}${bindir}/${CTAGS}" \
- || die "Couldn't set ${target} ${ROOT}${bindir}/${CTAGS} symlink"
+ ln -s "${target}" "${EROOT}${bindir}/${CTAGS}" \
+ || die "Couldn't set ${target} ${EROOT}${bindir}/${CTAGS} symlink"
}
set_man_symlinks() {
# Set symlink to man page
local target=${1} extension i
- for i in "${ROOT}${man1dir}"/${target}.1*; do
+ for i in "${EROOT}${man1dir}"/${target}.1*; do
if [[ -f ${i} ]]; then
# target file exists; determine compress extension
extension=${i##*/${target}.1}
ln -s "${target}.1${extension}" \
- "${ROOT}${man1dir}/${CTAGS}.1${extension}"
+ "${EROOT}${man1dir}/${CTAGS}.1${extension}"
fi
done
}
@@ -95,7 +95,7 @@ set_symlinks() {
fi
# is the target valid, i.e. does a ctags binary with this name exist?
- [[ -f ${ROOT}${bindir}/${target} ]] \
+ [[ -f ${EROOT}${bindir}/${target} ]] \
|| die -q "Target \"$1\" doesn't appear to be valid!"
echo "Switching ${CTAGS} to ${target} ..."
@@ -107,7 +107,7 @@ set_symlinks() {
test_for_root() {
# checks if the user has rights to modify /usr/bin/
- [[ -w ${ROOT}${bindir} ]] || die -q "You need root privileges!"
+ [[ -w ${EROOT}${bindir} ]] || die -q "You need root privileges!"
}
### show action ###
@@ -120,11 +120,11 @@ do_show() {
[[ $# -gt 0 ]] && die -q "Too many parameters"
write_list_start "Current target of ${CTAGS} symlink:"
- if [[ -L ${ROOT}${bindir}/${CTAGS} && -e ${ROOT}${bindir}/${CTAGS} ]]
+ if [[ -L ${EROOT}${bindir}/${CTAGS} && -e ${EROOT}${bindir}/${CTAGS} ]]
then
write_kv_list_entry \
- "$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")")" ""
- elif [[ -e ${ROOT}${bindir}/${CTAGS} ]]; then
+ "$(basename "$(readlink "${EROOT}${bindir}/${CTAGS}")")" ""
+ elif [[ -e ${EROOT}${bindir}/${CTAGS} ]]; then
write_kv_list_entry \
"(not a symlink or target of symlink does not exist)" ""
else
@@ -147,7 +147,7 @@ do_list() {
for (( i = 0; i < ${#targets[@]}; i++ )); do
# Highlight the currently chosen version
[[ ${targets[i]} = \
- $(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")") ]] \
+ $(basename "$(readlink "${EROOT}${bindir}/${CTAGS}")") ]] \
&& targets[i]=$(highlight_marker "${targets[i]}")
done
write_list_start "Available ${CTAGS} symlink targets:"
@@ -173,9 +173,9 @@ do_set() {
[[ $# -gt 1 ]] && die -q "Too many parameters"
test_for_root
- if [[ -e ${ROOT}${bindir}/${CTAGS} && ! -L ${ROOT}${bindir}/${CTAGS} ]]
+ if [[ -e ${EROOT}${bindir}/${CTAGS} && ! -L ${EROOT}${bindir}/${CTAGS} ]]
then
- die -q "${ROOT}${bindir}/${CTAGS} exists but is not a symlink"
+ die -q "${EROOT}${bindir}/${CTAGS} exists but is not a symlink"
fi
set_symlinks "$1" || die -q "Couldn't set a new symlink"
@@ -198,18 +198,18 @@ do_update() {
test_for_root
if ! [[ $1 == *if*unset \
- && -L ${ROOT}${bindir}/${CTAGS} && -e ${ROOT}${bindir}/${CTAGS} ]]
+ && -L ${EROOT}${bindir}/${CTAGS} && -e ${EROOT}${bindir}/${CTAGS} ]]
then
local current=""
- if [[ -L ${ROOT}${bindir}/${CTAGS} ]]; then
- current=$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")")
- if [[ ! -e ${ROOT}${bindir}/${CTAGS} ]]; then
+ if [[ -L ${EROOT}${bindir}/${CTAGS} ]]; then
+ current=$(basename "$(readlink "${EROOT}${bindir}/${CTAGS}")")
+ if [[ ! -e ${EROOT}${bindir}/${CTAGS} ]]; then
# clean up dead symlinks
remove_symlinks || die -q "Couldn't remove existing symlink"
fi
- elif [[ -e ${ROOT}${bindir}/${CTAGS} ]]; then
+ elif [[ -e ${EROOT}${bindir}/${CTAGS} ]]; then
if ! [[ ${CTAGS} = ctags && $(uname) = FreeBSD ]]; then
- die -q "${ROOT}${bindir}/${CTAGS} exists but is not a symlink"
+ die -q "${EROOT}${bindir}/${CTAGS} exists but is not a symlink"
fi
# On FreeBSD ctags is a real file, installed by freebsd-ubin
current=nolink
diff --git a/emacs.eselect b/emacs.eselect
index 8ffa0bd..21d604e 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -37,32 +37,32 @@ MANPAGELIST="emacs emacsclient ebrowse gfdl"
find_targets() {
# Return the list of available Emacs binaries
local j
- for j in "${ROOT}${bindir}"/emacs-[0-9]*; do
+ for j in "${EROOT}${bindir}"/emacs-[0-9]*; do
[[ -f ${j} ]] && basename ${j}
done
}
remove_infopath() {
# When cleaning symlinks this takes care of the info documentation settings
- rm -f "${ROOT}${envdir}/50emacs"
+ rm -f "${EROOT}${envdir}/50emacs"
}
# Define INFOPATH environment variable in env file
set_infopath() {
- [[ -d ${ROOT}${infodir}/$1 ]] || return 1
- echo "INFOPATH=${infodir}/$1" > "${ROOT}${envdir}/50emacs"
+ [[ -d ${EROOT}${infodir}/$1 ]] || return 1
+ echo "INFOPATH=${EPREFIX}${infodir}/$1" >"${EROOT}${envdir}/50emacs"
}
remove_symlinks() {
# Remove existing symlinks to binaries, man pages,
# and the env file (own function)
local f
- rm -f "${ROOT}${bindir}/emacs"
+ rm -f "${EROOT}${bindir}/emacs"
for f in ${BINARYLIST}; do
- rm -f "${ROOT}${bindir}/${f}"
+ rm -f "${EROOT}${bindir}/${f}"
done
for f in ${MANPAGELIST}; do
- rm -f "${ROOT}${man1dir}"/${f}.1*
+ rm -f "${EROOT}${man1dir}"/${f}.1*
done
remove_infopath
}
@@ -72,9 +72,9 @@ set_bin_symlinks() {
local target=${1} f
for f in ${BINARYLIST}; do
# set symlink only if target binary actually exists
- if [[ -f ${ROOT}${bindir}/${f}-${target} ]]; then
- ln -s "${f}-${target}" "${ROOT}${bindir}/${f}" || die \
- "Couldn't set ${f}-${target} ${ROOT}${bindir}/${f} symlink"
+ if [[ -f ${EROOT}${bindir}/${f}-${target} ]]; then
+ ln -s "${f}-${target}" "${EROOT}${bindir}/${f}" || die \
+ "Couldn't set ${f}-${target} ${EROOT}${bindir}/${f} symlink"
fi
done
}
@@ -83,12 +83,12 @@ set_man_symlinks() {
# Set symlinks to man pages
local target=${1} extension f i
for f in ${MANPAGELIST}; do
- for i in "${ROOT}${man1dir}"/${f}-${target}.1*; do
+ for i in "${EROOT}${man1dir}"/${f}-${target}.1*; do
if [[ -f ${i} ]]; then
# target file exists; determine compress extension
extension=${i##*/${f}-${target}.1}
ln -s "${f}-${target}.1${extension}" \
- "${ROOT}${man1dir}/${f}.1${extension}"
+ "${EROOT}${man1dir}/${f}.1${extension}"
fi
done
done
@@ -107,7 +107,7 @@ set_symlinks() {
fi
# is the target valid, i.e. does an Emacs binary with this name exist?
- [[ -f ${ROOT}${bindir}/${target} ]] \
+ [[ -f ${EROOT}${bindir}/${target} ]] \
|| die -q "Target \"${1}\" doesn't appear to be valid!"
echo "Switching emacs to ${target} ..."
@@ -115,15 +115,14 @@ set_symlinks() {
# the main /usr/bin/emacs symlink is only set for Emacs binaries
# (but not for other providers of auxiliary programs, e.g., XEmacs)
if [[ -z ${nomain} ]]; then
- ln -s "${target}" "${ROOT}${bindir}/emacs" \
- || die "Couldn't set ${target} ${ROOT}${bindir}/emacs symlink"
+ ln -s "${target}" "${EROOT}${bindir}/emacs" \
+ || die "Couldn't set ${target} ${EROOT}${bindir}/emacs symlink"
fi
set_bin_symlinks "${target}"
set_man_symlinks "${target}"
set_infopath "${target}"
# update /etc/profile.env from /etc/env.d files
- # requires >=eselect-1.0.10 for "noldconfig" option
do_action env update noldconfig
return 0
@@ -132,7 +131,7 @@ set_symlinks() {
xemacs_info() {
# This is just informational to tell that XEmacs has been found,
# a wish from graaff
- if [[ -e ${ROOT}${bindir}/xemacs ]]; then
+ if [[ -e ${EROOT}${bindir}/xemacs ]]; then
echo
write_list_start "XEmacs is also installed"
fi
@@ -140,7 +139,7 @@ xemacs_info() {
vim_info() {
# Don't take this too serious
- if [[ -e ${ROOT}${bindir}/vi ]]; then
+ if [[ -e ${EROOT}${bindir}/vi ]]; then
echo
write_list_start "Vi found, your system is in real trouble now! ;)"
fi
@@ -148,7 +147,7 @@ vim_info() {
test_for_root() {
# checks if the user has rights to modify /usr/bin/
- [[ -w ${ROOT}${bindir} ]] || die -q "You need root privileges!"
+ [[ -w ${EROOT}${bindir} ]] || die -q "You need root privileges!"
}
### show action ###
@@ -161,10 +160,10 @@ do_show() {
[[ $# -gt 0 ]] && die -q "Too many parameters"
write_list_start "Current target of Emacs symlink:"
- if [[ -L ${ROOT}${bindir}/emacs && -e ${ROOT}${bindir}/emacs ]]; then
+ if [[ -L ${EROOT}${bindir}/emacs && -e ${EROOT}${bindir}/emacs ]]; then
write_kv_list_entry \
- "$(basename "$(readlink "${ROOT}${bindir}/emacs")")" ""
- elif [[ -e ${ROOT}${bindir}/emacs ]]; then
+ "$(basename "$(readlink "${EROOT}${bindir}/emacs")")" ""
+ elif [[ -e ${EROOT}${bindir}/emacs ]]; then
write_kv_list_entry \
"(not a symlink or target of symlink does not exist)" ""
else
@@ -192,7 +191,7 @@ do_list() {
for (( i = 0; i < ${#targets[@]}; i++ )); do
# Highlight the currently chosen version
[[ ${targets[i]} = \
- $(basename "$(readlink "${ROOT}${bindir}/emacs")") ]] \
+ $(basename "$(readlink "${EROOT}${bindir}/emacs")") ]] \
&& targets[i]=$(highlight_marker "${targets[i]}")
done
write_list_start "Available Emacs symlink targets:"
@@ -223,8 +222,8 @@ do_set() {
[[ $# -gt 1 ]] && die -q "Too many parameters"
test_for_root
- if [[ -e ${ROOT}${bindir}/emacs && ! -L ${ROOT}${bindir}/emacs ]]; then
- die -q "${ROOT}${bindir}/emacs exists but is not a symlink"
+ if [[ -e ${EROOT}${bindir}/emacs && ! -L ${EROOT}${bindir}/emacs ]]; then
+ die -q "${EROOT}${bindir}/emacs exists but is not a symlink"
fi
set_symlinks "${1}" || die -q "Couldn't set a new symlink"
@@ -248,23 +247,23 @@ do_update() {
[[ $# -gt 1 ]] && die -q "Too many parameters"
test_for_root
- if [[ -L ${ROOT}${bindir}/emacs ]]; then
- if [[ $1 == *if*unset && -e ${ROOT}${bindir}/emacs ]]; then
+ if [[ -L ${EROOT}${bindir}/emacs ]]; then
+ if [[ $1 == *if*unset && -e ${EROOT}${bindir}/emacs ]]; then
do_action ctags update ifunset
return
fi
# this is not redundant: "update" is called in pkg_postrm() of emacs
# and should clean up any dead symlinks if no valid target exists
remove_symlinks || die -q "Couldn't remove existing symlink"
- elif [[ -e ${ROOT}${bindir}/emacs ]]; then
- die -q "${ROOT}${bindir}/emacs exists but is not a symlink"
+ elif [[ -e ${EROOT}${bindir}/emacs ]]; then
+ die -q "${EROOT}${bindir}/emacs exists but is not a symlink"
fi
local targets=( $(find_targets) )
if [[ ${#targets[@]} -gt 0 ]]; then
set_symlinks "${targets[${#targets[@]}-1]}" \
|| die -q "Couldn't set a new symlink"
- elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
+ elif [[ -f ${EROOT}${bindir}/xemacs ]]; then
# no Emacs target found - link to XEmacs versions
set_symlinks xemacs nomain
fi
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 07a1b7fab40767369485d55dcbf31aa364d8d0aa
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 4 10:26:59 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Jun 4 10:26:59 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=07a1b7fa
Tiny syntax tweak in testing for empty array.
svn path=/eselect-emacs/; revision=1280
---
ctags.eselect | 2 +-
emacs.eselect | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ctags.eselect b/ctags.eselect
index f86039c..4a13c79 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -145,7 +145,7 @@ do_list() {
targets=( $(find_targets) )
write_list_start "Available ${CTAGS} symlink targets:"
- if [[ -n ${targets[@]} ]]; then
+ if [[ ${#targets[@]} -gt 0 ]]; then
for (( i = 0; i < ${#targets[@]}; i++ )); do
# Display a star to indicate the currently chosen version
[[ ${targets[i]} = \
diff --git a/emacs.eselect b/emacs.eselect
index 91bfcd6..1e9a3b3 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -187,7 +187,7 @@ do_list() {
targets=( $(find_targets) )
write_list_start "Available Emacs symlink targets:"
- if [[ -n ${targets[@]} ]]; then
+ if [[ ${#targets[@]} -gt 0 ]]; then
for (( i = 0; i < ${#targets[@]}; i++ )); do
# Display a star to indicate the currently chosen version
[[ ${targets[i]} = \
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: c2ad2a29b86d07178818b64bab6a246f8204477e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 22:20:40 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 22:20:40 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=c2ad2a29
Release everything unter GPL-2 or later, as for eselect itself.
svn path=/eselect-emacs/; revision=1527
---
ChangeLog | 2 +-
Makefile | 2 +-
ctags.eselect | 2 +-
ctags.eselect.5 | 2 +-
emacs.eselect | 2 +-
emacs.eselect.5 | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 269b509..5b0b269 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -389,5 +389,5 @@
Automatically set correct INFOPATH.
Copyright 2007-2010 Gentoo Foundation
-Distributed under the terms of the GNU General Public License v2
+Distributed under the terms of the GNU General Public License v2 or later
$Id$
diff --git a/Makefile b/Makefile
index c88c6b5..13dddd8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
# Copyright 2007-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
+# Distributed under the terms of the GNU General Public License v2 or later
# $Id$
PN = eselect-emacs
diff --git a/ctags.eselect b/ctags.eselect
index 0d647d2..7c7643c 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -1,6 +1,6 @@
# -*-eselect-*-
# Copyright 2005-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
+# Distributed under the terms of the GNU General Public License v2 or later
# $Id$
#
# DOCUMENTATION
diff --git a/ctags.eselect.5 b/ctags.eselect.5
index d634d27..e54d9c1 100644
--- a/ctags.eselect.5
+++ b/ctags.eselect.5
@@ -1,5 +1,5 @@
.\" Copyright 2007-2010 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
+.\" Distributed under the terms of the GNU General Public License v2 or later
.\" $Id$
.\"
.TH ctags.eselect 5 "May 2009" "Gentoo Linux" eselect
diff --git a/emacs.eselect b/emacs.eselect
index 1f01328..0f8f06b 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -1,6 +1,6 @@
# -*-eselect-*-
# Copyright 2005-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
+# Distributed under the terms of the GNU General Public License v2 or later
# $Id$
#
# DOCUMENTATION
diff --git a/emacs.eselect.5 b/emacs.eselect.5
index bebcd99..1b68371 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -1,5 +1,5 @@
.\" Copyright 2007-2010 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
+.\" Distributed under the terms of the GNU General Public License v2 or later
.\" $Id$
.\"
.TH emacs.eselect 5 "April 2009" "Gentoo Linux" eselect
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 3c7609d49dbb5e7fe89e1fa3c8ff32d0cf5376da
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 19:47:21 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 19:47:21 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=3c7609d4
Version 1.12 released.
svn path=/eselect-emacs/; revision=1458
---
ChangeLog | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 07330ca..9ad528d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-20 Ulrich Mueller <ulm@gentoo.org>
+
+ * Version 1.12 released.
+
2009-11-14 Ulrich Mueller <ulm@gentoo.org>
* ctags.eselect:
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 7781f97077e6b19c642d61f49eaa29ab8b976bdc
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 12:18:12 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 12:18:12 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=7781f970
Remove now unnecessary global variables for directories.
svn path=/eselect-emacs/; revision=1457
---
ChangeLog | 4 ++-
ctags.eselect | 56 ++++++++++++++++++++++--------------------------
emacs.eselect | 65 ++++++++++++++++++++++++++------------------------------
3 files changed, 59 insertions(+), 66 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 73b51cc..07330ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
2009-11-14 Ulrich Mueller <ulm@gentoo.org>
* ctags.eselect:
- * emacs.eselect: Use EROOT and EPREFIX throughout.
+ * emacs.eselect: Use EROOT and EPREFIX throughout; these variables
+ exist in >=eselect-1.2. Remove now unnecessary global variables
+ for directories. See bug 251847.
2009-11-07 Ulrich Mueller <ulm@gentoo.org>
diff --git a/ctags.eselect b/ctags.eselect
index 1033a4c..989b74d 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -24,10 +24,7 @@
#CTAGS=${ESELECT_MODULE_NAME:-$(basename "${BASH_SOURCE[0]%.*}")}
CTAGS=ctags
-bindir=/usr/bin
-man1dir=/usr/share/man/man1
-
-DESCRIPTION="Manage ${bindir}/${CTAGS} implementations"
+DESCRIPTION="Manage /usr/bin/${CTAGS} implementations"
MAINTAINER="emacs@gentoo.org"
SVN_DATE='$Date$'
VERSION=$(svn_date_to_version "${SVN_DATE}")
@@ -39,11 +36,11 @@ find_targets() {
# currently active Emacs version (selected by emacs.eselect)
# The logic here is the same as in emacs.eselect, don't change it!
local emacs
- if [[ -L ${EROOT}${bindir}/emacs && -e ${EROOT}${bindir}/emacs ]]; then
- emacs=$(basename "$(readlink "${EROOT}${bindir}/emacs")")
- [[ -f ${EROOT}${bindir}/${CTAGS}-${emacs} ]] && echo "${CTAGS}-${emacs}"
- elif [[ -f ${EROOT}${bindir}/xemacs ]]; then
- [[ -f ${EROOT}${bindir}/${CTAGS}-xemacs ]] && echo "${CTAGS}-xemacs"
+ if [[ -L ${EROOT}/usr/bin/emacs && -e ${EROOT}/usr/bin/emacs ]]; then
+ emacs=$(basename "$(readlink "${EROOT}/usr/bin/emacs")")
+ [[ -f ${EROOT}/usr/bin/${CTAGS}-${emacs} ]] && echo "${CTAGS}-${emacs}"
+ elif [[ -f ${EROOT}/usr/bin/xemacs ]]; then
+ [[ -f ${EROOT}/usr/bin/${CTAGS}-xemacs ]] && echo "${CTAGS}-xemacs"
elif [[ ${CTAGS} = etags ]]; then
# We are called as etags module, but no (X)Emacs is installed.
# Return an empty list in this case, because we don't want
@@ -53,31 +50,30 @@ find_targets() {
fi
# Exuberant ctags
- [[ -f ${EROOT}${bindir}/exuberant-ctags ]] && echo exuberant-ctags
+ [[ -f ${EROOT}/usr/bin/exuberant-ctags ]] && echo exuberant-ctags
}
remove_symlinks() {
# Remove existing symlinks to binary and man page
- rm -f "${EROOT}${bindir}/${CTAGS}" \
- "${EROOT}${man1dir}"/${CTAGS}.1*
+ rm -f "${EROOT}/usr/bin/${CTAGS}" "${EROOT}"/usr/share/man/man1/${CTAGS}.1*
}
set_bin_symlinks() {
# Set symlink to binary
local target=${1}
- ln -s "${target}" "${EROOT}${bindir}/${CTAGS}" \
- || die "Couldn't set ${target} ${EROOT}${bindir}/${CTAGS} symlink"
+ ln -s "${target}" "${EROOT}/usr/bin/${CTAGS}" \
+ || die "Couldn't set ${target} ${EROOT}/usr/bin/${CTAGS} symlink"
}
set_man_symlinks() {
# Set symlink to man page
local target=${1} extension i
- for i in "${EROOT}${man1dir}"/${target}.1*; do
+ for i in "${EROOT}"/usr/share/man/man1/${target}.1*; do
if [[ -f ${i} ]]; then
# target file exists; determine compress extension
extension=${i##*/${target}.1}
ln -s "${target}.1${extension}" \
- "${EROOT}${man1dir}/${CTAGS}.1${extension}"
+ "${EROOT}/usr/share/man/man1/${CTAGS}.1${extension}"
fi
done
}
@@ -95,7 +91,7 @@ set_symlinks() {
fi
# is the target valid, i.e. does a ctags binary with this name exist?
- [[ -f ${EROOT}${bindir}/${target} ]] \
+ [[ -f ${EROOT}/usr/bin/${target} ]] \
|| die -q "Target \"$1\" doesn't appear to be valid!"
echo "Switching ${CTAGS} to ${target} ..."
@@ -107,7 +103,7 @@ set_symlinks() {
test_for_root() {
# checks if the user has rights to modify /usr/bin/
- [[ -w ${EROOT}${bindir} ]] || die -q "You need root privileges!"
+ [[ -w ${EROOT}/usr/bin ]] || die -q "You need root privileges!"
}
### show action ###
@@ -120,11 +116,11 @@ do_show() {
[[ $# -gt 0 ]] && die -q "Too many parameters"
write_list_start "Current target of ${CTAGS} symlink:"
- if [[ -L ${EROOT}${bindir}/${CTAGS} && -e ${EROOT}${bindir}/${CTAGS} ]]
+ if [[ -L ${EROOT}/usr/bin/${CTAGS} && -e ${EROOT}/usr/bin/${CTAGS} ]]
then
write_kv_list_entry \
- "$(basename "$(readlink "${EROOT}${bindir}/${CTAGS}")")" ""
- elif [[ -e ${EROOT}${bindir}/${CTAGS} ]]; then
+ "$(basename "$(readlink "${EROOT}/usr/bin/${CTAGS}")")" ""
+ elif [[ -e ${EROOT}/usr/bin/${CTAGS} ]]; then
write_kv_list_entry \
"(not a symlink or target of symlink does not exist)" ""
else
@@ -147,7 +143,7 @@ do_list() {
for (( i = 0; i < ${#targets[@]}; i++ )); do
# Highlight the currently chosen version
[[ ${targets[i]} = \
- $(basename "$(readlink "${EROOT}${bindir}/${CTAGS}")") ]] \
+ $(basename "$(readlink "${EROOT}/usr/bin/${CTAGS}")") ]] \
&& targets[i]=$(highlight_marker "${targets[i]}")
done
write_list_start "Available ${CTAGS} symlink targets:"
@@ -173,9 +169,9 @@ do_set() {
[[ $# -gt 1 ]] && die -q "Too many parameters"
test_for_root
- if [[ -e ${EROOT}${bindir}/${CTAGS} && ! -L ${EROOT}${bindir}/${CTAGS} ]]
+ if [[ -e ${EROOT}/usr/bin/${CTAGS} && ! -L ${EROOT}/usr/bin/${CTAGS} ]]
then
- die -q "${EROOT}${bindir}/${CTAGS} exists but is not a symlink"
+ die -q "${EROOT}/usr/bin/${CTAGS} exists but is not a symlink"
fi
set_symlinks "$1" || die -q "Couldn't set a new symlink"
@@ -198,18 +194,18 @@ do_update() {
test_for_root
if ! [[ $1 == *if*unset \
- && -L ${EROOT}${bindir}/${CTAGS} && -e ${EROOT}${bindir}/${CTAGS} ]]
+ && -L ${EROOT}/usr/bin/${CTAGS} && -e ${EROOT}/usr/bin/${CTAGS} ]]
then
local current=""
- if [[ -L ${EROOT}${bindir}/${CTAGS} ]]; then
- current=$(basename "$(readlink "${EROOT}${bindir}/${CTAGS}")")
- if [[ ! -e ${EROOT}${bindir}/${CTAGS} ]]; then
+ if [[ -L ${EROOT}/usr/bin/${CTAGS} ]]; then
+ current=$(basename "$(readlink "${EROOT}/usr/bin/${CTAGS}")")
+ if [[ ! -e ${EROOT}/usr/bin/${CTAGS} ]]; then
# clean up dead symlinks
remove_symlinks || die -q "Couldn't remove existing symlink"
fi
- elif [[ -e ${EROOT}${bindir}/${CTAGS} ]]; then
+ elif [[ -e ${EROOT}/usr/bin/${CTAGS} ]]; then
if ! [[ ${CTAGS} = ctags && $(uname) = FreeBSD ]]; then
- die -q "${EROOT}${bindir}/${CTAGS} exists but is not a symlink"
+ die -q "${EROOT}/usr/bin/${CTAGS} exists but is not a symlink"
fi
# On FreeBSD ctags is a real file, installed by freebsd-ubin
current=nolink
diff --git a/emacs.eselect b/emacs.eselect
index 21d604e..530b4bb 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -20,12 +20,7 @@
# do_update(): Set the target to the highest version available
# (optionally: only if not set)
-bindir=/usr/bin
-man1dir=/usr/share/man/man1
-infodir=/usr/share/info
-envdir=/etc/env.d
-
-DESCRIPTION="Manage ${bindir}/emacs version"
+DESCRIPTION="Manage /usr/bin/emacs version"
MAINTAINER="emacs@gentoo.org"
SVN_DATE='$Date$'
VERSION=$(svn_date_to_version "${SVN_DATE}")
@@ -37,32 +32,32 @@ MANPAGELIST="emacs emacsclient ebrowse gfdl"
find_targets() {
# Return the list of available Emacs binaries
local j
- for j in "${EROOT}${bindir}"/emacs-[0-9]*; do
+ for j in "${EROOT}"/usr/bin/emacs-[0-9]*; do
[[ -f ${j} ]] && basename ${j}
done
}
remove_infopath() {
# When cleaning symlinks this takes care of the info documentation settings
- rm -f "${EROOT}${envdir}/50emacs"
+ rm -f "${EROOT}/etc/env.d/50emacs"
}
# Define INFOPATH environment variable in env file
set_infopath() {
- [[ -d ${EROOT}${infodir}/$1 ]] || return 1
- echo "INFOPATH=${EPREFIX}${infodir}/$1" >"${EROOT}${envdir}/50emacs"
+ [[ -d ${EROOT}/usr/share/info/$1 ]] || return 1
+ echo "INFOPATH=${EPREFIX}/usr/share/info/$1" >"${EROOT}/etc/env.d/50emacs"
}
remove_symlinks() {
# Remove existing symlinks to binaries, man pages,
# and the env file (own function)
local f
- rm -f "${EROOT}${bindir}/emacs"
+ rm -f "${EROOT}/usr/bin/emacs"
for f in ${BINARYLIST}; do
- rm -f "${EROOT}${bindir}/${f}"
+ rm -f "${EROOT}/usr/bin/${f}"
done
for f in ${MANPAGELIST}; do
- rm -f "${EROOT}${man1dir}"/${f}.1*
+ rm -f "${EROOT}"/usr/share/man/man1/${f}.1*
done
remove_infopath
}
@@ -72,9 +67,9 @@ set_bin_symlinks() {
local target=${1} f
for f in ${BINARYLIST}; do
# set symlink only if target binary actually exists
- if [[ -f ${EROOT}${bindir}/${f}-${target} ]]; then
- ln -s "${f}-${target}" "${EROOT}${bindir}/${f}" || die \
- "Couldn't set ${f}-${target} ${EROOT}${bindir}/${f} symlink"
+ if [[ -f ${EROOT}/usr/bin/${f}-${target} ]]; then
+ ln -s "${f}-${target}" "${EROOT}/usr/bin/${f}" || die \
+ "Couldn't set ${f}-${target} ${EROOT}/usr/bin/${f} symlink"
fi
done
}
@@ -83,12 +78,12 @@ set_man_symlinks() {
# Set symlinks to man pages
local target=${1} extension f i
for f in ${MANPAGELIST}; do
- for i in "${EROOT}${man1dir}"/${f}-${target}.1*; do
+ for i in "${EROOT}"/usr/share/man/man1/${f}-${target}.1*; do
if [[ -f ${i} ]]; then
# target file exists; determine compress extension
extension=${i##*/${f}-${target}.1}
ln -s "${f}-${target}.1${extension}" \
- "${EROOT}${man1dir}/${f}.1${extension}"
+ "${EROOT}/usr/share/man/man1/${f}.1${extension}"
fi
done
done
@@ -107,7 +102,7 @@ set_symlinks() {
fi
# is the target valid, i.e. does an Emacs binary with this name exist?
- [[ -f ${EROOT}${bindir}/${target} ]] \
+ [[ -f ${EROOT}/usr/bin/${target} ]] \
|| die -q "Target \"${1}\" doesn't appear to be valid!"
echo "Switching emacs to ${target} ..."
@@ -115,8 +110,8 @@ set_symlinks() {
# the main /usr/bin/emacs symlink is only set for Emacs binaries
# (but not for other providers of auxiliary programs, e.g., XEmacs)
if [[ -z ${nomain} ]]; then
- ln -s "${target}" "${EROOT}${bindir}/emacs" \
- || die "Couldn't set ${target} ${EROOT}${bindir}/emacs symlink"
+ ln -s "${target}" "${EROOT}/usr/bin/emacs" \
+ || die "Couldn't set ${target} ${EROOT}/usr/bin/emacs symlink"
fi
set_bin_symlinks "${target}"
set_man_symlinks "${target}"
@@ -131,7 +126,7 @@ set_symlinks() {
xemacs_info() {
# This is just informational to tell that XEmacs has been found,
# a wish from graaff
- if [[ -e ${EROOT}${bindir}/xemacs ]]; then
+ if [[ -e ${EROOT}/usr/bin/xemacs ]]; then
echo
write_list_start "XEmacs is also installed"
fi
@@ -139,7 +134,7 @@ xemacs_info() {
vim_info() {
# Don't take this too serious
- if [[ -e ${EROOT}${bindir}/vi ]]; then
+ if [[ -e ${EROOT}/usr/bin/vi ]]; then
echo
write_list_start "Vi found, your system is in real trouble now! ;)"
fi
@@ -147,7 +142,7 @@ vim_info() {
test_for_root() {
# checks if the user has rights to modify /usr/bin/
- [[ -w ${EROOT}${bindir} ]] || die -q "You need root privileges!"
+ [[ -w ${EROOT}/usr/bin ]] || die -q "You need root privileges!"
}
### show action ###
@@ -160,10 +155,10 @@ do_show() {
[[ $# -gt 0 ]] && die -q "Too many parameters"
write_list_start "Current target of Emacs symlink:"
- if [[ -L ${EROOT}${bindir}/emacs && -e ${EROOT}${bindir}/emacs ]]; then
+ if [[ -L ${EROOT}/usr/bin/emacs && -e ${EROOT}/usr/bin/emacs ]]; then
write_kv_list_entry \
- "$(basename "$(readlink "${EROOT}${bindir}/emacs")")" ""
- elif [[ -e ${EROOT}${bindir}/emacs ]]; then
+ "$(basename "$(readlink "${EROOT}/usr/bin/emacs")")" ""
+ elif [[ -e ${EROOT}/usr/bin/emacs ]]; then
write_kv_list_entry \
"(not a symlink or target of symlink does not exist)" ""
else
@@ -191,7 +186,7 @@ do_list() {
for (( i = 0; i < ${#targets[@]}; i++ )); do
# Highlight the currently chosen version
[[ ${targets[i]} = \
- $(basename "$(readlink "${EROOT}${bindir}/emacs")") ]] \
+ $(basename "$(readlink "${EROOT}/usr/bin/emacs")") ]] \
&& targets[i]=$(highlight_marker "${targets[i]}")
done
write_list_start "Available Emacs symlink targets:"
@@ -222,8 +217,8 @@ do_set() {
[[ $# -gt 1 ]] && die -q "Too many parameters"
test_for_root
- if [[ -e ${EROOT}${bindir}/emacs && ! -L ${EROOT}${bindir}/emacs ]]; then
- die -q "${EROOT}${bindir}/emacs exists but is not a symlink"
+ if [[ -e ${EROOT}/usr/bin/emacs && ! -L ${EROOT}/usr/bin/emacs ]]; then
+ die -q "${EROOT}/usr/bin/emacs exists but is not a symlink"
fi
set_symlinks "${1}" || die -q "Couldn't set a new symlink"
@@ -247,23 +242,23 @@ do_update() {
[[ $# -gt 1 ]] && die -q "Too many parameters"
test_for_root
- if [[ -L ${EROOT}${bindir}/emacs ]]; then
- if [[ $1 == *if*unset && -e ${EROOT}${bindir}/emacs ]]; then
+ if [[ -L ${EROOT}/usr/bin/emacs ]]; then
+ if [[ $1 == *if*unset && -e ${EROOT}/usr/bin/emacs ]]; then
do_action ctags update ifunset
return
fi
# this is not redundant: "update" is called in pkg_postrm() of emacs
# and should clean up any dead symlinks if no valid target exists
remove_symlinks || die -q "Couldn't remove existing symlink"
- elif [[ -e ${EROOT}${bindir}/emacs ]]; then
- die -q "${EROOT}${bindir}/emacs exists but is not a symlink"
+ elif [[ -e ${EROOT}/usr/bin/emacs ]]; then
+ die -q "${EROOT}/usr/bin/emacs exists but is not a symlink"
fi
local targets=( $(find_targets) )
if [[ ${#targets[@]} -gt 0 ]]; then
set_symlinks "${targets[${#targets[@]}-1]}" \
|| die -q "Couldn't set a new symlink"
- elif [[ -f ${EROOT}${bindir}/xemacs ]]; then
+ elif [[ -f ${EROOT}/usr/bin/xemacs ]]; then
# no Emacs target found - link to XEmacs versions
set_symlinks xemacs nomain
fi
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: c69ecc853371ce012262f0bfde052492207b4c9c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 9 18:30:22 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Dec 9 18:30:22 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=c69ecc85
Add manpages installed by Emacs 23. Version 1.13 released.
svn path=/eselect-emacs/; revision=1482
---
ChangeLog | 8 ++++++++
emacs.eselect | 5 +++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9ad528d..d804ecd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-09 Ulrich Mueller <ulm@gentoo.org>
+
+ * Version 1.13 released.
+
+ * emacs.eselect (MANPAGELIST): Add manpages installed by Emacs 23.
+ (MANPAGELIST_OLD): New variable, move "gfdl" to it.
+ (remove_symlinks): Remove also files listed in MANPAGELIST_OLD.
+
2009-11-20 Ulrich Mueller <ulm@gentoo.org>
* Version 1.12 released.
diff --git a/emacs.eselect b/emacs.eselect
index 530b4bb..bfa3918 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -27,7 +27,8 @@ VERSION=$(svn_date_to_version "${SVN_DATE}")
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
-MANPAGELIST="emacs emacsclient ebrowse gfdl"
+MANPAGELIST="emacs emacsclient b2m ebrowse rcs-checkin grep-changelog"
+MANPAGELIST_OLD="gfdl"
find_targets() {
# Return the list of available Emacs binaries
@@ -56,7 +57,7 @@ remove_symlinks() {
for f in ${BINARYLIST}; do
rm -f "${EROOT}/usr/bin/${f}"
done
- for f in ${MANPAGELIST}; do
+ for f in ${MANPAGELIST} ${MANPAGELIST_OLD}; do
rm -f "${EROOT}"/usr/share/man/man1/${f}.1*
done
remove_infopath
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 9c619cbac9dd5f349647515a7e0c8a475839e9eb
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 10:43:44 2010 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 10:43:44 2010 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=9c619cba
Add svn keywords. Update copyright years.
svn path=/eselect-emacs/; revision=1520
---
ChangeLog | 3 ++-
Makefile | 3 ++-
ctags.eselect | 3 ++-
ctags.eselect.5 | 2 +-
emacs.eselect | 3 ++-
emacs.eselect.5 | 2 +-
6 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d804ecd..269b509 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -388,5 +388,6 @@
Automatically symlink man pages.
Automatically set correct INFOPATH.
-Copyright 2007-2009 Gentoo Foundation
+Copyright 2007-2010 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2
+$Id$
diff --git a/Makefile b/Makefile
index b4fe327..c88c6b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
-# Copyright 2007-2008 Gentoo Foundation
+# Copyright 2007-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
PN = eselect-emacs
PV = $(shell sed '/^[ \t]*\* .*[Vv]ersion/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' \
diff --git a/ctags.eselect b/ctags.eselect
index 989b74d..0d647d2 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -1,4 +1,5 @@
-# Copyright 2005-2009 Gentoo Foundation
+# -*-eselect-*-
+# Copyright 2005-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
#
diff --git a/ctags.eselect.5 b/ctags.eselect.5
index 0165343..d634d27 100644
--- a/ctags.eselect.5
+++ b/ctags.eselect.5
@@ -1,4 +1,4 @@
-.\" Copyright 2007-2009 Gentoo Foundation
+.\" Copyright 2007-2010 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2
.\" $Id$
.\"
diff --git a/emacs.eselect b/emacs.eselect
index bfa3918..1f01328 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -1,4 +1,5 @@
-# Copyright 2005-2009 Gentoo Foundation
+# -*-eselect-*-
+# Copyright 2005-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
#
diff --git a/emacs.eselect.5 b/emacs.eselect.5
index b242867..bebcd99 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -1,4 +1,4 @@
-.\" Copyright 2007-2009 Gentoo Foundation
+.\" Copyright 2007-2010 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2
.\" $Id$
.\"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 755f5501b5045d71a477f72f08763cdceac964aa
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 23:14:16 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 23:14:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=755f5501
Add missing pair of quotes in do_list().
svn path=/eselect-emacs/; revision=1670
---
ChangeLog | 5 +++++
ctags.eselect | 2 +-
emacs.eselect | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d1a0639..5ee5854 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-16 Ulrich Mueller <ulm@gentoo.org>
+
+ * ctags.eselect (do_list):
+ * emacs.eselect (do_list): Add missing pair of quotes.
+
2009-12-09 Ulrich Mueller <ulm@gentoo.org>
* Version 1.13 released.
diff --git a/ctags.eselect b/ctags.eselect
index 7474940..720ae11 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -144,7 +144,7 @@ do_list() {
for (( i = 0; i < ${#targets[@]}; i++ )); do
# Highlight the currently chosen version
[[ ${targets[i]} = \
- $(basename "$(readlink "${EROOT}/usr/bin/${CTAGS}")") ]] \
+ "$(basename "$(readlink "${EROOT}/usr/bin/${CTAGS}")")" ]] \
&& targets[i]=$(highlight_marker "${targets[i]}")
done
write_list_start "Available ${CTAGS} symlink targets:"
diff --git a/emacs.eselect b/emacs.eselect
index d1d0ea7..fb7ba6c 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -188,7 +188,7 @@ do_list() {
for (( i = 0; i < ${#targets[@]}; i++ )); do
# Highlight the currently chosen version
[[ ${targets[i]} = \
- $(basename "$(readlink "${EROOT}/usr/bin/emacs")") ]] \
+ "$(basename "$(readlink "${EROOT}/usr/bin/emacs")")" ]] \
&& targets[i]=$(highlight_marker "${targets[i]}")
done
write_list_start "Available Emacs symlink targets:"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: fa46a560333b331e12a59d8b432ac805ab25f495
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 23:11:15 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 23:11:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=fa46a560
Update copyright years.
svn path=/eselect-emacs/; revision=1669
---
ChangeLog | 2 +-
Makefile | 2 +-
ctags.eselect | 2 +-
ctags.eselect.5 | 2 +-
emacs.eselect | 2 +-
emacs.eselect.5 | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5b0b269..d1a0639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -388,6 +388,6 @@
Automatically symlink man pages.
Automatically set correct INFOPATH.
-Copyright 2007-2010 Gentoo Foundation
+Copyright 2007-2011 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2 or later
$Id$
diff --git a/Makefile b/Makefile
index 13dddd8..3543fb3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2007-2010 Gentoo Foundation
+# Copyright 2007-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
# $Id$
diff --git a/ctags.eselect b/ctags.eselect
index 7c7643c..7474940 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -1,5 +1,5 @@
# -*-eselect-*-
-# Copyright 2005-2010 Gentoo Foundation
+# Copyright 2005-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
# $Id$
#
diff --git a/ctags.eselect.5 b/ctags.eselect.5
index e54d9c1..cd541e5 100644
--- a/ctags.eselect.5
+++ b/ctags.eselect.5
@@ -1,4 +1,4 @@
-.\" Copyright 2007-2010 Gentoo Foundation
+.\" Copyright 2007-2011 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2 or later
.\" $Id$
.\"
diff --git a/emacs.eselect b/emacs.eselect
index 0f8f06b..d1d0ea7 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -1,5 +1,5 @@
# -*-eselect-*-
-# Copyright 2005-2010 Gentoo Foundation
+# Copyright 2005-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 or later
# $Id$
#
diff --git a/emacs.eselect.5 b/emacs.eselect.5
index 1b68371..5ce00eb 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -1,4 +1,4 @@
-.\" Copyright 2007-2010 Gentoo Foundation
+.\" Copyright 2007-2011 Gentoo Foundation
.\" Distributed under the terms of the GNU General Public License v2 or later
.\" $Id$
.\"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 16:06 Sebastian Pipping
0 siblings, 0 replies; 54+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 32a33a3dce253b14569fdceaa5eb8aef2fefbe81
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 6 08:55:05 2012 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Mar 6 08:55:05 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=32a33a3d
Update version numbers in examples in man pages.
Change man pages and ChangeLog to UTF-8 encoding.
Update copyright headers.
svn path=/eselect-emacs/; revision=1724
---
ChangeLog | 101 +++++++++++++++++++++++++++++--------------------------
Makefile | 4 +-
ctags.eselect | 4 +-
ctags.eselect.5 | 11 +++---
emacs.eselect | 4 +-
emacs.eselect.5 | 27 ++++++++-------
6 files changed, 79 insertions(+), 72 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5ee5854..1b350a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
-2011-12-16 Ulrich Mueller <ulm@gentoo.org>
+2012-03-06 Ulrich Müller <ulm@gentoo.org>
+
+ * ctags.eselect.5:
+ * emacs.eselect.5: Update version numbers in examples.
+
+2011-12-16 Ulrich Müller <ulm@gentoo.org>
* ctags.eselect (do_list):
* emacs.eselect (do_list): Add missing pair of quotes.
-2009-12-09 Ulrich Mueller <ulm@gentoo.org>
+2009-12-09 Ulrich Müller <ulm@gentoo.org>
* Version 1.13 released.
@@ -11,25 +16,25 @@
(MANPAGELIST_OLD): New variable, move "gfdl" to it.
(remove_symlinks): Remove also files listed in MANPAGELIST_OLD.
-2009-11-20 Ulrich Mueller <ulm@gentoo.org>
+2009-11-20 Ulrich Müller <ulm@gentoo.org>
* Version 1.12 released.
-2009-11-14 Ulrich Mueller <ulm@gentoo.org>
+2009-11-14 Ulrich Müller <ulm@gentoo.org>
* ctags.eselect:
* emacs.eselect: Use EROOT and EPREFIX throughout; these variables
exist in >=eselect-1.2. Remove now unnecessary global variables
for directories. See bug 251847.
-2009-11-07 Ulrich Mueller <ulm@gentoo.org>
+2009-11-07 Ulrich Müller <ulm@gentoo.org>
* Version 1.11 released.
* emacs.eselect (do_list, do_show):
* ctags.eselect (do_list): Support brief output mode, bug 292100.
-2009-05-07 Ulrich Mueller <ulm@gentoo.org>
+2009-05-07 Ulrich Müller <ulm@gentoo.org>
* Version 1.10 released.
@@ -43,11 +48,11 @@
* emacs.eselect (do_show, do_update): "canonicalise" is not
necessary since "test -e" resolves symbolic links.
-2009-05-02 Ulrich Mueller <ulm@gentoo.org>
+2009-05-02 Ulrich Müller <ulm@gentoo.org>
* Version 1.9 released.
-2009-04-20 Ulrich Mueller <ulm@gentoo.org>
+2009-04-20 Ulrich Müller <ulm@gentoo.org>
* ctags.eselect (do_update): Enable pattern matching for the
ctags-*emacs* versions, as it was intended from the beginning.
@@ -55,7 +60,7 @@
* ctags.eselect:
* emacs.eselect: Remove unnecessary quotes and other small fixes.
-2009-04-18 Ulrich Mueller <ulm@gentoo.org>
+2009-04-18 Ulrich Müller <ulm@gentoo.org>
* ctags.eselect (do_list): Always output a list header, even if
the list of targets is empty.
@@ -66,7 +71,7 @@
(do_update): Pass target name instead of number to set_symlinks.
(set_symlinks, do_list): Simplify syntax used for array index.
-2008-12-21 Ulrich Mueller <ulm@gentoo.org>
+2008-12-21 Ulrich Müller <ulm@gentoo.org>
* Version 1.8 released.
@@ -77,14 +82,14 @@
root is not needed but root access rights.
(vim_info): Add a smiley to make clear that it is a joke.
-2008-12-21 Ulrich Mueller <ulm@gentoo.org>
+2008-12-21 Ulrich Müller <ulm@gentoo.org>
* ctags.eselect (bindir, man1dir):
* emacs.eselect (bindir, man1dir, infodir, envdir): New variables
for directory names. This will facilitate using this package on
Gentoo Prefix, bug 251847.
-2008-12-19 Ulrich Mueller <ulm@gentoo.org>
+2008-12-19 Ulrich Müller <ulm@gentoo.org>
* Version 1.7 released.
@@ -92,7 +97,7 @@
* emacs.eselect.5: Replace all direct font escapes by man macros.
Put two spaces after sentence ends. Minor formatting changes.
-2008-12-16 Ulrich Mueller <ulm@gentoo.org>
+2008-12-16 Ulrich Müller <ulm@gentoo.org>
* ctags.eselect (find_targets, do_show, do_list, do_update):
* emacs.eselect (do_show, do_list): Use readlink instead of
@@ -103,18 +108,18 @@
(do_update): Call set_symlinks with the new option, if no explicit
target was found.
-2008-12-12 Ulrich Mueller <ulm@gentoo.org>
+2008-12-12 Ulrich Müller <ulm@gentoo.org>
* Version 1.6 released.
* emacs.eselect (MANPAGELIST): Add ebrowse man page.
-2008-09-14 Ulrich Mueller <ulm@gentoo.org>
+2008-09-14 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (do_set): Be less verbose: emacs-updater is
mentioned in the man page, no need to repeat it here.
-2008-08-11 Ulrich Mueller <ulm@gentoo.org>
+2008-08-11 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (do_set): Move the note (from previous change) to
the end of the function. Fix a typo and slightly change wording.
@@ -124,20 +129,20 @@
* emacs.eselect.5, emacs.eselect: Add a note about emacs-updater's
rebuild functionality in connection with the set action.
-2008-05-25 Ulrich Mueller <ulm@gentoo.org>
+2008-05-25 Ulrich Müller <ulm@gentoo.org>
* Version 1.5 released.
-2008-05-21 Ulrich Mueller <ulm@gentoo.org>
+2008-05-21 Ulrich Müller <ulm@gentoo.org>
* ctags.eselect (do_update): Call etags from ctags and vice versa.
* ctags.eselect.5: Update man page.
-2008-05-12 Ulrich Mueller <ulm@gentoo.org>
+2008-05-12 Ulrich Müller <ulm@gentoo.org>
* Version 1.4 released.
-2008-05-02 Ulrich Mueller <ulm@gentoo.org>
+2008-05-02 Ulrich Müller <ulm@gentoo.org>
* ctags.eselect (find_targets): Don't return anything for etags
if there is no Emacs variant installed.
@@ -148,23 +153,23 @@
* ctags.eselect (do_set): Always die if ctags is not a symlink.
(do_update): Remove additional test for real file under FreeBSD.
-2008-05-01 Ulrich Mueller <ulm@gentoo.org>
+2008-05-01 Ulrich Müller <ulm@gentoo.org>
* Makefile (etags.eselect, etags.eselect.5): New targets.
(DISTFILES): Add Makefile to list.
-2008-04-30 Ulrich Mueller <ulm@gentoo.org>
+2008-04-30 Ulrich Müller <ulm@gentoo.org>
* ctags.eselect: Generalise for both ctags and etags,
suggestion by Hans de Graaff.
* emacs.eselect (do_set, do_update): Call etags module.
* ctags.eselect.5, emacs.eselect.5: Update man pages.
-2007-11-20 Ulrich Mueller <ulm@gentoo.org>
+2007-11-20 Ulrich Müller <ulm@gentoo.org>
* Version 1.3 released.
-2007-10-08 Ulrich Mueller <ulm@gentoo.org>
+2007-10-08 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (do_show, do_list): Previous change commented out.
@@ -172,12 +177,12 @@
* emacs.eselect: Warn people that their system is infected by Vi
-2007-08-24 Ulrich Mueller <ulm@gentoo.org>
+2007-08-24 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect.5, ctags.eselect.5: Action "show" has no
parameters.
-2007-08-22 Ulrich Mueller <ulm@gentoo.org>
+2007-08-22 Ulrich Müller <ulm@gentoo.org>
* Version 1.2 released.
@@ -186,7 +191,7 @@
* ctags.eselect (do_set, do_update): Handle the FreeBSD case where
/usr/bin/ctags is a real file.
-2007-08-19 Ulrich Mueller <ulm@gentoo.org>
+2007-08-19 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect.5: Update man page accordingly.
@@ -195,16 +200,16 @@
compatibility. (According to the eselect team, hyphens should not
be used.)
-2007-07-09 Ulrich Mueller <ulm@gentoo.org>
+2007-07-09 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect.5, ctags.eselect.5: Canonical order, section
"SEE ALSO" last.
-2007-06-29 Ulrich Mueller <ulm@gentoo.org>
+2007-06-29 Ulrich Müller <ulm@gentoo.org>
* Version 1.1 released.
-2007-06-22 Ulrich Mueller <ulm@gentoo.org>
+2007-06-22 Ulrich Müller <ulm@gentoo.org>
* Makefile (DISTFILES): Add ctags.eselect and ctags.eselect.5.
@@ -218,7 +223,7 @@
* emacs.eselect (do_show, do_list, do_set, do_update): Test for
number of parameters. Quote variables correctly.
-2007-06-17 Ulrich Mueller <ulm@gentoo.org>
+2007-06-17 Ulrich Müller <ulm@gentoo.org>
* Version 1.0 released.
@@ -229,7 +234,7 @@
* Makefile (DISTFILES): Undo previous change.
-2007-06-10 Ulrich Mueller <ulm@gentoo.org>
+2007-06-10 Ulrich Müller <ulm@gentoo.org>
* env-emacs.eselect: New file, taken from env.eselect of
eselect-1.0.9, extended to support the --no-ldconfig option.
@@ -262,7 +267,7 @@
* Makefile: Added a comment.
-2007-05-24 Ulrich Mueller <ulm@gentoo.org>
+2007-05-24 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (xemacs_info): Use write_list_start function.
Honour ${ROOT}.
@@ -283,27 +288,27 @@
* emacs.eselect.5: Added a note about that behaviour in man page.
-2007-04-16 Ulrich Mueller <ulm@gentoo.org>
+2007-04-16 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect.5: Updated e-mail address in man page.
-2007-04-04 Ulrich Mueller <ulm@gentoo.org>
+2007-04-04 Ulrich Müller <ulm@gentoo.org>
* Version 0.8 released.
-2007-04-01 Ulrich Mueller <ulm@gentoo.org>
+2007-04-01 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (set_symlinks): Check for range of array and
display error message.
-2007-03-29 Ulrich Mueller <ulm@gentoo.org>
+2007-03-29 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect.5: Fixed typo and capitalised "Emacs" where
appropriate. Added copyright notice.
* Version 0.7 released.
-2007-03-28 Ulrich Mueller <ulm@gentoo.org>
+2007-03-28 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect.5: Added man page.
@@ -311,7 +316,7 @@
* Version 0.6 released.
-2007-03-27 Ulrich Mueller <ulm@gentoo.org>
+2007-03-27 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (set_symlinks): env.eselect seems to be buggy; use
env-update instead.
@@ -321,11 +326,11 @@
* emacs.eselect (set_symlinks): Call env.eselect to update the
environment from env.d files.
-2007-03-24 Ulrich Mueller <ulm@gentoo.org>
+2007-03-24 Ulrich Müller <ulm@gentoo.org>
* Version 0.5 released.
-2007-03-22 Ulrich Mueller <ulm@gentoo.org>
+2007-03-22 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect: Added some comments.
@@ -334,7 +339,7 @@
* emacs.eselect (set_man_symlinks): Handling of compression
extensions made more robust.
-2007-03-21 Ulrich Mueller <ulm@gentoo.org>
+2007-03-21 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (set_symlinks, set_bin_symlinks)
(set_man_symlinks): Make linking to XEmacs auxiliary programs
@@ -344,13 +349,13 @@
* Version 0.3 released.
-2007-03-19 Ulrich Mueller <ulm@gentoo.org>
+2007-03-19 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (set_infopath): Test if Info directory exists.
(find_targets, set_symlinks): Use emacs-${SLOT} instead of
emacs-emacs-${SLOT} as symlink target.
-2007-03-18 Ulrich Mueller <ulm@gentoo.org>
+2007-03-18 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (set_bin_symlinks, set_symlinks, do_update):
If Emacs was not found, link {c,e}tags to XEmacs versions.
@@ -360,14 +365,14 @@
* Version 0.2 released.
-2007-03-17 Ulrich Mueller <ulm@gentoo.org>
+2007-03-17 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (do_update): Update to the newest available
version.
(remove_infopath): New function.
(remove_symlinks): Cleanup env.d file in do_update().
-2007-03-16 Ulrich Mueller <ulm@gentoo.org>
+2007-03-16 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (remove_symlinks, set_man_symlinks): Remove man
symlinks with all possible compress extensions. Honour ${ROOT} in
@@ -393,6 +398,6 @@
Automatically symlink man pages.
Automatically set correct INFOPATH.
-Copyright 2007-2011 Gentoo Foundation
-Distributed under the terms of the GNU General Public License v2 or later
+Copyright 2007-2012 Gentoo Foundation
+Distributed under the terms of the GNU GPL version 2 or later
$Id$
diff --git a/Makefile b/Makefile
index 3543fb3..060235c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-# Copyright 2007-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2 or later
+# Copyright 2007-2012 Gentoo Foundation
+# Distributed under the terms of the GNU GPL version 2 or later
# $Id$
PN = eselect-emacs
diff --git a/ctags.eselect b/ctags.eselect
index 720ae11..480e1c9 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -1,6 +1,6 @@
# -*-eselect-*-
-# Copyright 2005-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2 or later
+# Copyright 2005-2012 Gentoo Foundation
+# Distributed under the terms of the GNU GPL version 2 or later
# $Id$
#
# DOCUMENTATION
diff --git a/ctags.eselect.5 b/ctags.eselect.5
index cd541e5..9c9bb18 100644
--- a/ctags.eselect.5
+++ b/ctags.eselect.5
@@ -1,8 +1,9 @@
+.\" -*- coding: utf-8 -*-
.\" Copyright 2007-2011 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2 or later
+.\" Distributed under the terms of the GNU GPL version 2 or later
.\" $Id$
.\"
-.TH ctags.eselect 5 "May 2009" "Gentoo Linux" eselect
+.TH ctags.eselect 5 "March 2012" "Gentoo Linux" eselect
.SH NAME
ctags.eselect, etags.eselect \- The ctags and etags management module
for Gentoo's eselect
@@ -40,7 +41,7 @@ List all installed ctags versions.
.br
Available ctags symlink targets:
.br
- [1] ctags-emacs-22 *
+ [1] ctags-emacs-23 *
[2] exuberant-ctags
.SH ACTION: SET
.B eselect ctags set
@@ -79,7 +80,7 @@ is given, an existing implementation is not overridden.
.br
Switching ctags to exuberant-ctags ...
.br
-Switching etags to etags-emacs-22 ...
+Switching etags to etags-emacs-23 ...
.SH BUGS
Under FreeBSD,
.B eselect ctags
@@ -93,7 +94,7 @@ does work though.)
does not display any valid targets if there is no Emacs variant
installed. This is a feature.
.SH AUTHOR
-Ulrich Mueller <ulm@gentoo.org>
+Ulrich Müller <ulm@gentoo.org>
.SH SEE ALSO
.BR eselect (1),
.BR emacs.eselect (5)
diff --git a/emacs.eselect b/emacs.eselect
index fb7ba6c..33f93c8 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -1,6 +1,6 @@
# -*-eselect-*-
-# Copyright 2005-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2 or later
+# Copyright 2005-2012 Gentoo Foundation
+# Distributed under the terms of the GNU GPL version 2 or later
# $Id$
#
# DOCUMENTATION
diff --git a/emacs.eselect.5 b/emacs.eselect.5
index 5ce00eb..d6585dc 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -1,8 +1,9 @@
-.\" Copyright 2007-2011 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2 or later
+.\" -*- coding: utf-8 -*-
+.\" Copyright 2007-2012 Gentoo Foundation
+.\" Distributed under the terms of the GNU GPL version 2 or later
.\" $Id$
.\"
-.TH emacs.eselect 5 "April 2009" "Gentoo Linux" eselect
+.TH emacs.eselect 5 "March 2012" "Gentoo Linux" eselect
.SH NAME
emacs.eselect \- The Emacs management module for Gentoo's eselect
.SH SYNOPSIS
@@ -33,8 +34,8 @@ been found on your system.
Available GNU Emacs symlink targets:
.br
[1] emacs-18
- [2] emacs-21 *
- [3] emacs-22
+ [2] emacs-23 *
+ [3] emacs-24
.SH ACTION: SET
.B eselect emacs set
.I target
@@ -50,11 +51,11 @@ to remerge all needed packages.
# eselect emacs set 3
.br
-Switching emacs to emacs-22 ...
+Switching emacs to emacs-24 ...
.br
-Switching ctags to ctags-emacs-22 ...
+Switching ctags to ctags-emacs-24 ...
.br
-Switching etags to etags-emacs-22 ...
+Switching etags to etags-emacs-24 ...
.SH ACTION: SHOW
.B eselect emacs show
.br
@@ -64,7 +65,7 @@ Print the currently activated Emacs version.
.br
Current target of GNU Emacs symlink:
.br
- emacs-22
+ emacs-24
.SH ACTION: UPDATE
.B eselect emacs update
.RB [ ifunset ]
@@ -75,15 +76,15 @@ is given, an existing implementation is not overridden.
# eselect emacs update
.br
-Switching emacs to emacs-22 ...
+Switching emacs to emacs-24 ...
.br
-Switching ctags to ctags-emacs-22 ...
+Switching ctags to ctags-emacs-24 ...
.br
-Switching etags to etags-emacs-22 ...
+Switching etags to etags-emacs-24 ...
.SH AUTHORS
Christian Faulhammer <fauli@gentoo.org>
.br
-Ulrich Mueller <ulm@gentoo.org>
+Ulrich Müller <ulm@gentoo.org>
.SH SEE ALSO
.BR eselect (1),
.BR ctags.eselect (5)
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-05-06 18:47 Ulrich Mueller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Mueller @ 2012-05-06 18:47 UTC (permalink / raw
To: gentoo-commits
commit: af89bbc2c5148b8c2b3591c60892b891ff1eacbb
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 6 18:37:57 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 6 18:47:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=af89bbc2
Drop subversion keywords. Change VERSION in *.eselect to PV.
---
ChangeLog | 6 +++++-
Makefile | 1 -
ctags.eselect | 3 +--
ctags.eselect.5 | 3 ---
emacs.eselect | 4 +---
emacs.eselect.5 | 3 ---
6 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1b350a4..8ef2c09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-06 Ulrich Müller <ulm@gentoo.org>
+
+ * ctags.eselect (VERSION):
+ * emacs.eselect (VERSION): Change to PV. Remove SVN_DATE.
+
2012-03-06 Ulrich Müller <ulm@gentoo.org>
* ctags.eselect.5:
@@ -400,4 +405,3 @@
Copyright 2007-2012 Gentoo Foundation
Distributed under the terms of the GNU GPL version 2 or later
-$Id$
diff --git a/Makefile b/Makefile
index 060235c..c6f923f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
# Copyright 2007-2012 Gentoo Foundation
# Distributed under the terms of the GNU GPL version 2 or later
-# $Id$
PN = eselect-emacs
PV = $(shell sed '/^[ \t]*\* .*[Vv]ersion/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' \
diff --git a/ctags.eselect b/ctags.eselect
index 480e1c9..291f724 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -27,8 +27,7 @@ CTAGS=ctags
DESCRIPTION="Manage /usr/bin/${CTAGS} implementations"
MAINTAINER="emacs@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}")
+VERSION="1.13"
find_targets() {
# Return the list of available ctags implementations
diff --git a/ctags.eselect.5 b/ctags.eselect.5
index 9c9bb18..5e859b1 100644
--- a/ctags.eselect.5
+++ b/ctags.eselect.5
@@ -1,7 +1,6 @@
.\" -*- coding: utf-8 -*-
.\" Copyright 2007-2011 Gentoo Foundation
.\" Distributed under the terms of the GNU GPL version 2 or later
-.\" $Id$
.\"
.TH ctags.eselect 5 "March 2012" "Gentoo Linux" eselect
.SH NAME
@@ -98,5 +97,3 @@ Ulrich Müller <ulm@gentoo.org>
.SH SEE ALSO
.BR eselect (1),
.BR emacs.eselect (5)
-.SH REVISION
-$Id$
diff --git a/emacs.eselect b/emacs.eselect
index 33f93c8..fd640fc 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -1,7 +1,6 @@
# -*-eselect-*-
# Copyright 2005-2012 Gentoo Foundation
# Distributed under the terms of the GNU GPL version 2 or later
-# $Id$
#
# DOCUMENTATION
# Following actions possible
@@ -23,8 +22,7 @@
DESCRIPTION="Manage /usr/bin/emacs version"
MAINTAINER="emacs@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}")
+VERSION="1.13"
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
diff --git a/emacs.eselect.5 b/emacs.eselect.5
index d6585dc..a91a1cb 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -1,7 +1,6 @@
.\" -*- coding: utf-8 -*-
.\" Copyright 2007-2012 Gentoo Foundation
.\" Distributed under the terms of the GNU GPL version 2 or later
-.\" $Id$
.\"
.TH emacs.eselect 5 "March 2012" "Gentoo Linux" eselect
.SH NAME
@@ -88,5 +87,3 @@ Ulrich Müller <ulm@gentoo.org>
.SH SEE ALSO
.BR eselect (1),
.BR ctags.eselect (5)
-.SH REVISION
-$Id$
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-06-22 15:53 Ulrich Mueller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Mueller @ 2012-06-22 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 479cea3b09d2e1c4389e2578a6f144dd3bc0329a
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 15:55:19 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 15:55:19 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=479cea3b
Extract version number from emacs.eselect.
---
ChangeLog | 4 ++++
Makefile | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8ef2c09..a8b41fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-22 Ulrich Müller <ulm@gentoo.org>
+
+ * Makefile (PV): Extract version number from emacs.eselect.
+
2012-05-06 Ulrich Müller <ulm@gentoo.org>
* ctags.eselect (VERSION):
diff --git a/Makefile b/Makefile
index c6f923f..cb247f1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU GPL version 2 or later
PN = eselect-emacs
-PV = $(shell sed '/^[ \t]*\* .*[Vv]ersion/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' \
- ChangeLog)
+PV = $(shell sed '/^[ \t]*VERSION=/!d;s/.*="\?\([^ \t"]*\).*/\1/;q' \
+ emacs.eselect)
P = $(PN)-$(PV)
MODULES = emacs.eselect ctags.eselect etags.eselect
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-06-22 15:53 Ulrich Mueller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Mueller @ 2012-06-22 15:53 UTC (permalink / raw
To: gentoo-commits
commit: d1e9046c4fb23043c7f553dacc863f8653a40165
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 15:58:00 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 15:58:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=d1e9046c
Version 1.14 released.
---
ChangeLog | 2 ++
ctags.eselect | 2 +-
emacs.eselect | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a8b41fd..8c2313a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-06-22 Ulrich Müller <ulm@gentoo.org>
+ * Version 1.14 released.
+
* Makefile (PV): Extract version number from emacs.eselect.
2012-05-06 Ulrich Müller <ulm@gentoo.org>
diff --git a/ctags.eselect b/ctags.eselect
index 291f724..2fbd087 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -27,7 +27,7 @@ CTAGS=ctags
DESCRIPTION="Manage /usr/bin/${CTAGS} implementations"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.13"
+VERSION="1.14"
find_targets() {
# Return the list of available ctags implementations
diff --git a/emacs.eselect b/emacs.eselect
index fd640fc..6ac68d2 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -22,7 +22,7 @@
DESCRIPTION="Manage /usr/bin/emacs version"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.13"
+VERSION="1.14"
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-06-22 16:24 Ulrich Mueller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Mueller @ 2012-06-22 16:24 UTC (permalink / raw
To: gentoo-commits
commit: 6a6902b10f3c3c420974e725a561116c29d72879
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 16:27:22 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 16:29:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=6a6902b1
Drop SVN Id keyword from ctags.eselect.
---
ctags.eselect | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/ctags.eselect b/ctags.eselect
index 291f724..a4a49fa 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -1,7 +1,6 @@
# -*-eselect-*-
# Copyright 2005-2012 Gentoo Foundation
# Distributed under the terms of the GNU GPL version 2 or later
-# $Id$
#
# DOCUMENTATION
# Following actions possible
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-06-22 16:24 Ulrich Mueller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Mueller @ 2012-06-22 16:24 UTC (permalink / raw
To: gentoo-commits
commit: 125a9c56c5b9f41d5ca0258a7f5fc9b0896a3158
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 15:58:00 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 16:29:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=125a9c56
Version 1.14 released.
---
ChangeLog | 2 ++
ctags.eselect | 2 +-
emacs.eselect | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a8b41fd..8c2313a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-06-22 Ulrich Müller <ulm@gentoo.org>
+ * Version 1.14 released.
+
* Makefile (PV): Extract version number from emacs.eselect.
2012-05-06 Ulrich Müller <ulm@gentoo.org>
diff --git a/ctags.eselect b/ctags.eselect
index a4a49fa..9db3f9c 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -26,7 +26,7 @@ CTAGS=ctags
DESCRIPTION="Manage /usr/bin/${CTAGS} implementations"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.13"
+VERSION="1.14"
find_targets() {
# Return the list of available ctags implementations
diff --git a/emacs.eselect b/emacs.eselect
index fd640fc..6ac68d2 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -22,7 +22,7 @@
DESCRIPTION="Manage /usr/bin/emacs version"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.13"
+VERSION="1.14"
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2012-06-22 16:24 Ulrich Mueller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Mueller @ 2012-06-22 16:24 UTC (permalink / raw
To: gentoo-commits
commit: fb00b7b72a960ce2fb2be5d0b629a3d1623a1b5f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 15:55:19 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 16:29:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=fb00b7b7
Extract version number from emacs.eselect.
---
ChangeLog | 4 ++++
Makefile | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8ef2c09..a8b41fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-22 Ulrich Müller <ulm@gentoo.org>
+
+ * Makefile (PV): Extract version number from emacs.eselect.
+
2012-05-06 Ulrich Müller <ulm@gentoo.org>
* ctags.eselect (VERSION):
diff --git a/Makefile b/Makefile
index c6f923f..cb247f1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU GPL version 2 or later
PN = eselect-emacs
-PV = $(shell sed '/^[ \t]*\* .*[Vv]ersion/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' \
- ChangeLog)
+PV = $(shell sed '/^[ \t]*VERSION=/!d;s/.*="\?\([^ \t"]*\).*/\1/;q' \
+ emacs.eselect)
P = $(PN)-$(PV)
MODULES = emacs.eselect ctags.eselect etags.eselect
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2013-04-01 12:21 Ulrich Mueller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Mueller @ 2013-04-01 12:21 UTC (permalink / raw
To: gentoo-commits
commit: bab507676f7c22f94e4457b7aafb5d53c26401c3
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 1 12:21:35 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 1 12:21:35 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=bab50767
Don't use braces for positional parameters.
---
ctags.eselect | 6 +++---
emacs.eselect | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ctags.eselect b/ctags.eselect
index 9db3f9c..30c227d 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -59,14 +59,14 @@ remove_symlinks() {
set_bin_symlinks() {
# Set symlink to binary
- local target=${1}
+ local target=$1
ln -s "${target}" "${EROOT}/usr/bin/${CTAGS}" \
|| die "Couldn't set ${target} ${EROOT}/usr/bin/${CTAGS} symlink"
}
set_man_symlinks() {
# Set symlink to man page
- local target=${1} extension i
+ local target=$1 extension i
for i in "${EROOT}"/usr/share/man/man1/${target}.1*; do
if [[ -f ${i} ]]; then
# target file exists; determine compress extension
@@ -85,7 +85,7 @@ set_symlinks() {
# numeric index, find the target's name
targets=( $(find_targets) )
[[ ${target} -ge 1 && ${target} -le ${#targets[@]} ]] \
- || die -q "Number out of range: ${1}"
+ || die -q "Number out of range: $1"
target=${targets[target-1]}
fi
diff --git a/emacs.eselect b/emacs.eselect
index 6ac68d2..3ed6e06 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -64,7 +64,7 @@ remove_symlinks() {
set_bin_symlinks() {
# Set symlinks to binaries in /usr/bin/
- local target=${1} f
+ local target=$1 f
for f in ${BINARYLIST}; do
# set symlink only if target binary actually exists
if [[ -f ${EROOT}/usr/bin/${f}-${target} ]]; then
@@ -76,7 +76,7 @@ set_bin_symlinks() {
set_man_symlinks() {
# Set symlinks to man pages
- local target=${1} extension f i
+ local target=$1 extension f i
for f in ${MANPAGELIST}; do
for i in "${EROOT}"/usr/share/man/man1/${f}-${target}.1*; do
if [[ -f ${i} ]]; then
@@ -97,13 +97,13 @@ set_symlinks() {
# numeric index, find the target's name
targets=( $(find_targets) )
[[ ${target} -ge 1 && ${target} -le ${#targets[@]} ]] \
- || die -q "Number out of range: ${1}"
+ || die -q "Number out of range: $1"
target=${targets[target-1]}
fi
# is the target valid, i.e. does an Emacs binary with this name exist?
[[ -f ${EROOT}/usr/bin/${target} ]] \
- || die -q "Target \"${1}\" doesn't appear to be valid!"
+ || die -q "Target \"$1\" doesn't appear to be valid!"
echo "Switching emacs to ${target} ..."
remove_symlinks || die -q "Couldn't remove existing symlink"
@@ -221,7 +221,7 @@ do_set() {
die -q "${EROOT}/usr/bin/emacs exists but is not a symlink"
fi
- set_symlinks "${1}" || die -q "Couldn't set a new symlink"
+ set_symlinks "$1" || die -q "Couldn't set a new symlink"
# ctags symlinks are handled in an own module now
do_action ctags update
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-02-17 17:46 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-02-17 17:46 UTC (permalink / raw
To: gentoo-commits
commit: 512eba0509208d3f4cf2e13a856d0de24f9bf7e3
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 17:46:37 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 17:46:37 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=512eba05
Update copyright years.
---
ChangeLog | 2 +-
Makefile | 2 +-
ctags.eselect | 2 +-
ctags.eselect.5 | 4 ++--
emacs.eselect | 2 +-
emacs.eselect.5 | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8c2313a..8062a16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -409,5 +409,5 @@
Automatically symlink man pages.
Automatically set correct INFOPATH.
-Copyright 2007-2012 Gentoo Foundation
+Copyright 2007-2014 Gentoo Foundation
Distributed under the terms of the GNU GPL version 2 or later
diff --git a/Makefile b/Makefile
index cb247f1..8022fb0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2007-2012 Gentoo Foundation
+# Copyright 2007-2014 Gentoo Foundation
# Distributed under the terms of the GNU GPL version 2 or later
PN = eselect-emacs
diff --git a/ctags.eselect b/ctags.eselect
index 30c227d..68a779f 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -1,5 +1,5 @@
# -*-eselect-*-
-# Copyright 2005-2012 Gentoo Foundation
+# Copyright 2005-2014 Gentoo Foundation
# Distributed under the terms of the GNU GPL version 2 or later
#
# DOCUMENTATION
diff --git a/ctags.eselect.5 b/ctags.eselect.5
index 5e859b1..841cf2b 100644
--- a/ctags.eselect.5
+++ b/ctags.eselect.5
@@ -1,8 +1,8 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2007-2011 Gentoo Foundation
+.\" Copyright 2007-2014 Gentoo Foundation
.\" Distributed under the terms of the GNU GPL version 2 or later
.\"
-.TH ctags.eselect 5 "March 2012" "Gentoo Linux" eselect
+.TH ctags.eselect 5 "February 2014" "Gentoo Linux" eselect
.SH NAME
ctags.eselect, etags.eselect \- The ctags and etags management module
for Gentoo's eselect
diff --git a/emacs.eselect b/emacs.eselect
index 3ed6e06..b0f520f 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -1,5 +1,5 @@
# -*-eselect-*-
-# Copyright 2005-2012 Gentoo Foundation
+# Copyright 2005-2014 Gentoo Foundation
# Distributed under the terms of the GNU GPL version 2 or later
#
# DOCUMENTATION
diff --git a/emacs.eselect.5 b/emacs.eselect.5
index a91a1cb..a79e44c 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -1,8 +1,8 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2007-2012 Gentoo Foundation
+.\" Copyright 2007-2014 Gentoo Foundation
.\" Distributed under the terms of the GNU GPL version 2 or later
.\"
-.TH emacs.eselect 5 "March 2012" "Gentoo Linux" eselect
+.TH emacs.eselect 5 "February 2014" "Gentoo Linux" eselect
.SH NAME
emacs.eselect \- The Emacs management module for Gentoo's eselect
.SH SYNOPSIS
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-02-17 21:38 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-02-17 21:38 UTC (permalink / raw
To: gentoo-commits
commit: ce1acf67ee9e29b6da7f846ea7dd124a215007f0
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 18:43:25 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 18:43:25 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=ce1acf67
Use xz for compression of tarball.
* Makefile (dist): Use xz for compression.
(clean): Remove *.xz.
---
ChangeLog | 5 +++++
Makefile | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8062a16..8e00232 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-17 Ulrich Müller <ulm@gentoo.org>
+
+ * Makefile (dist): Use xz for compression.
+ (clean): Remove *.xz.
+
2012-06-22 Ulrich Müller <ulm@gentoo.org>
* Version 1.14 released.
diff --git a/Makefile b/Makefile
index 8022fb0..984a1e0 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ etags.eselect.5: ctags.eselect.5
cp $< $@
dist: $(DISTFILES)
- tar -cjf $(P).tar.bz2 --transform='s%^%$(P)/%' $^
- tar -tjvf $(P).tar.bz2
+ tar -cJf $(P).tar.xz --transform='s%^%$(P)/%' $^
+ tar -tJvf $(P).tar.xz
clean:
- -rm -f *~ *.tmp *.gz *.bz2
+ -rm -f *~ *.tmp *.gz *.bz2 *.xz
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-02-17 21:38 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-02-17 21:38 UTC (permalink / raw
To: gentoo-commits
commit: 38dfbfb46db3a4f8b8a7cf118ba65bdde78b02a8
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 18:44:57 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 18:44:57 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=38dfbfb4
New module for gnuserv/gnuclient.
* gnuclient.eselect: New file, eselect module for
gnuserv/gnuclient, bug 177936.
* gnuclient.eselect.5: New file, man page.
* Makefile (MODULES, MANPAGES, DISTFILES): Update.
---
ChangeLog | 5 ++
Makefile | 7 +-
gnuclient.eselect | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++
gnuclient.eselect.5 | 80 +++++++++++++++++++++
4 files changed, 291 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8e00232..3ac52d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-02-17 Ulrich Müller <ulm@gentoo.org>
+ * gnuclient.eselect: New file, eselect module for
+ gnuserv/gnuclient, bug 177936.
+ * gnuclient.eselect.5: New file, man page.
+ * Makefile (MODULES, MANPAGES, DISTFILES): Update.
+
* Makefile (dist): Use xz for compression.
(clean): Remove *.xz.
diff --git a/Makefile b/Makefile
index 984a1e0..e59e7cd 100644
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,11 @@ PV = $(shell sed '/^[ \t]*VERSION=/!d;s/.*="\?\([^ \t"]*\).*/\1/;q' \
emacs.eselect)
P = $(PN)-$(PV)
-MODULES = emacs.eselect ctags.eselect etags.eselect
-MANPAGES = emacs.eselect.5 ctags.eselect.5 etags.eselect.5
+MODULES = emacs.eselect ctags.eselect etags.eselect gnuclient.eselect
+MANPAGES = emacs.eselect.5 ctags.eselect.5 etags.eselect.5 gnuclient.eselect.5
-DISTFILES = emacs.eselect ctags.eselect emacs.eselect.5 ctags.eselect.5 \
+DISTFILES = emacs.eselect ctags.eselect gnuclient.eselect \
+ emacs.eselect.5 ctags.eselect.5 gnuclient.eselect.5 \
ChangeLog Makefile
.PHONY: all dist clean
diff --git a/gnuclient.eselect b/gnuclient.eselect
new file mode 100644
index 0000000..27420cf
--- /dev/null
+++ b/gnuclient.eselect
@@ -0,0 +1,202 @@
+# -*-eselect-*-
+# Copyright 2005-2014 Gentoo Foundation
+# Distributed under the terms of the GNU GPL version 2 or later
+#
+# DOCUMENTATION
+# Following actions possible
+# * show do_show()
+# * list do_list()
+# * set do_set()
+# * update do_update()
+#
+# Behaviour:
+# do_show():
+# Checks if /usr/bin/gnuclient is a link and if the target exists,
+# if yes, it outputs the currently linked gnuclient implementation.
+# If it is no symlink, the user is told so, the same if there is
+# no /usr/bin/gnuclient or the target does not exist.
+# do_list(): List all available gnuclient implementations.
+# do_set(): Set a version to be target of the symlink.
+# do_update(): Set the target to the "best" available version.
+
+DESCRIPTION="Manage /usr/bin/gnuclient implementations"
+MAINTAINER="emacs@gentoo.org"
+VERSION="1.14"
+
+BINARYLIST="gnuclient gnudoit gnuattach"
+MANPAGELIST="gnuclient gnudoit gnuattach gnuserv"
+
+find_targets() {
+ # Return the list of available gnuclient implementations
+ local j
+ for j in gnuclient-{emacs,xemacs}; do
+ [[ -f ${EROOT}/usr/bin/${j} ]] && echo ${j}
+ done
+}
+
+remove_symlinks() {
+ # Remove existing symlinks to binaries and man pages
+ local f
+ for f in ${BINARYLIST}; do
+ rm -f "${EROOT}/usr/bin/${f}"
+ done
+ for f in ${MANPAGELIST}; do
+ rm -f "${EROOT}"/usr/share/man/man1/${f}.1*
+ done
+}
+
+set_bin_symlinks() {
+ # Set symlinks to binaries
+ local target=${1#gnuclient-} f
+ for f in ${BINARYLIST}; do
+ # set symlink only if target binary actually exists
+ if [[ -f ${EROOT}/usr/bin/${f}-${target} ]]; then
+ ln -s "${f}-${target}" "${EROOT}/usr/bin/${f}" || die \
+ "Couldn't set ${f}-${target} ${EROOT}/usr/bin/${f} symlink"
+ fi
+ done
+}
+
+set_man_symlinks() {
+ # Set symlinks to man pages
+ local target=${1#gnuclient-} extension f i
+ for f in ${MANPAGELIST}; do
+ for i in "${EROOT}"/usr/share/man/man1/${f}-${target}.1*; do
+ if [[ -f ${i} ]]; then
+ # target file exists; determine compress extension
+ extension=${i##*/${f}-${target}.1}
+ ln -s "${f}-${target}.1${extension}" \
+ "${EROOT}/usr/share/man/man1/${f}.1${extension}"
+ fi
+ done
+ done
+}
+
+set_symlinks() {
+ # Set symlinks to binaries and man pages
+ local target=$1 targets
+ # target may be specified by its name or its index
+ if is_number "${target}"; then
+ # numeric index, find the target's name
+ targets=( $(find_targets) )
+ [[ ${target} -ge 1 && ${target} -le ${#targets[@]} ]] \
+ || die -q "Number out of range: $1"
+ target=${targets[target-1]}
+ fi
+
+ # is the target valid, i.e. does a gnuclient binary with this name exist?
+ [[ -f ${EROOT}/usr/bin/${target} ]] \
+ || die -q "Target \"$1\" doesn't appear to be valid!"
+
+ echo "Switching gnuclient to ${target} ..."
+ remove_symlinks || die -q "Couldn't remove existing symlink"
+ set_bin_symlinks "${target}"
+ set_man_symlinks "${target}"
+ return 0
+}
+
+test_for_root() {
+ # checks if the user has rights to modify /usr/bin/
+ [[ -w ${EROOT}/usr/bin ]] || die -q "You need root privileges!"
+}
+
+### show action ###
+
+describe_show() {
+ echo "Show the current target of the gnuclient symlink"
+}
+
+do_show() {
+ [[ $# -gt 0 ]] && die -q "Too many parameters"
+
+ write_list_start "Current target of gnuclient symlink:"
+ if [[ -L ${EROOT}/usr/bin/gnuclient && -e ${EROOT}/usr/bin/gnuclient ]]
+ then
+ write_kv_list_entry \
+ "$(basename "$(readlink "${EROOT}/usr/bin/gnuclient")")" ""
+ elif [[ -e ${EROOT}/usr/bin/gnuclient ]]; then
+ write_kv_list_entry \
+ "(not a symlink or target of symlink does not exist)" ""
+ else
+ write_kv_list_entry "(unset)" ""
+ fi
+}
+
+### list action ###
+
+describe_list() {
+ echo "List available gnuclient symlink targets"
+}
+
+do_list() {
+ [[ $# -gt 0 ]] && die -q "Too many parameters"
+
+ local i targets
+ targets=( $(find_targets) )
+
+ for (( i = 0; i < ${#targets[@]}; i++ )); do
+ # Highlight the currently chosen version
+ [[ ${targets[i]} = \
+ "$(basename "$(readlink "${EROOT}/usr/bin/gnuclient")")" ]] \
+ && targets[i]=$(highlight_marker "${targets[i]}")
+ done
+ write_list_start "Available gnuclient symlink targets:"
+ write_numbered_list -m "(none found)" "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+ echo "Set a new gnuclient symlink"
+}
+
+describe_set_options() {
+ echo "target : Target name or number (from 'list' action)"
+}
+
+describe_set_parameters() {
+ echo "<target>"
+}
+
+do_set() {
+ [[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to"
+ [[ $# -gt 1 ]] && die -q "Too many parameters"
+ test_for_root
+
+ if [[ -e ${EROOT}/usr/bin/gnuclient && ! -L ${EROOT}/usr/bin/gnuclient ]]
+ then
+ die -q "${EROOT}/usr/bin/gnuclient exists but is not a symlink"
+ fi
+
+ set_symlinks "$1" || die -q "Couldn't set a new symlink"
+}
+
+### update action ###
+
+describe_update() {
+ echo "Automatically update the gnuclient symlink"
+}
+
+describe_update_options() {
+ echo "ifunset : Do not override currently set version"
+}
+
+do_update() {
+ [[ -z $1 || $1 = ifunset || $1 = --if-unset ]] || die -q "Usage error"
+ [[ $# -gt 1 ]] && die -q "Too many parameters"
+ test_for_root
+
+ if [[ -L ${EROOT}/usr/bin/gnuclient ]]; then
+ if [[ $1 == *if*unset && -e ${EROOT}/usr/bin/gnuclient ]]; then
+ return 0
+ fi
+ remove_symlinks || die -q "Couldn't remove existing symlink"
+ elif [[ -e ${EROOT}/usr/bin/gnuclient ]]; then
+ die -q "${EROOT}/usr/bin/gnuclient exists but is not a symlink"
+ fi
+
+ local targets=( $(find_targets) )
+ if [[ ${#targets[@]} -gt 0 ]]; then
+ set_symlinks "${targets[0]}" || die -q "Couldn't set a new symlink"
+ fi
+}
diff --git a/gnuclient.eselect.5 b/gnuclient.eselect.5
new file mode 100644
index 0000000..de6bcaf
--- /dev/null
+++ b/gnuclient.eselect.5
@@ -0,0 +1,80 @@
+.\" -*- coding: utf-8 -*-
+.\" Copyright 2007-2014 Gentoo Foundation
+.\" Distributed under the terms of the GNU GPL version 2 or later
+.\"
+.TH gnuclient.eselect 5 "February 2014" "Gentoo Linux" eselect
+.SH NAME
+gnuclient.eselect \- The gnuserv/gnuclient module for Gentoo's eselect
+.SH SYNOPSIS
+.B eselect gnuclient
+.RB [ help | usage | version ]
+.br
+.B eselect gnuclient list
+.br
+.B eselect gnuclient set
+.I target
+.br
+.B eselect gnuclient show
+.br
+.B eselect gnuclient update
+.RB [ ifunset ]
+.SH DESCRIPTION
+.B eselect
+is Gentoo's configuration and management tool. It features modules
+that care for the individual administrative tasks.
+
+.B gnuserv
+and
+.B gnuclient
+are a server and client that allow the user to request a running
+(X)Emacs process to edit the named files or evaluate lisp forms.
+.SH ACTION: LIST
+.B eselect gnuclient list
+.br
+List all installed gnuclient versions.
+
+# eselect gnuclient list
+.br
+Available gnuclient symlink targets:
+.br
+ [1] gnuclient-emacs
+ [2] gnuclient-xemacs *
+.SH ACTION: SET
+.B eselect gnuclient set
+.I target
+.br
+Activate the selected gnuclient version.
+.I target
+can be either an identification number given by
+.B eselect gnuclient list
+or the name of one installed version.
+
+# eselect gnuclient set 1
+.br
+Switching gnuclient to gnuclient-emacs ...
+.SH ACTION: SHOW
+.B eselect gnuclient show
+.br
+Print the currently activated gnuclient version.
+
+# eselect gnuclient show
+.br
+Current target of symlink:
+.br
+ gnuclient-emacs
+.SH ACTION: UPDATE
+.B eselect gnuclient update
+.RB [ ifunset ]
+.br
+Update the gnuclient symlink. If option
+.B ifunset
+is given, an existing implementation is not overridden.
+
+# eselect gnuclient update
+.br
+Switching gnuclient to gnuclient-emacs ...
+.SH AUTHOR
+Ulrich Müller <ulm@gentoo.org>
+.SH SEE ALSO
+.BR eselect (1),
+.BR gnuserv (1)
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-02-17 21:38 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-02-17 21:38 UTC (permalink / raw
To: gentoo-commits
commit: 4a14a8427766bdcb4791a034bcecc5e2d3551a50
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 19:34:02 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 19:34:02 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=4a14a842
Version 1.15 released.
---
ChangeLog | 2 ++
ctags.eselect | 2 +-
emacs.eselect | 2 +-
gnuclient.eselect | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3ac52d9..a079d0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2014-02-17 Ulrich Müller <ulm@gentoo.org>
+ * Version 1.15 released.
+
* gnuclient.eselect: New file, eselect module for
gnuserv/gnuclient, bug 177936.
* gnuclient.eselect.5: New file, man page.
diff --git a/ctags.eselect b/ctags.eselect
index 68a779f..4c1641f 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -26,7 +26,7 @@ CTAGS=ctags
DESCRIPTION="Manage /usr/bin/${CTAGS} implementations"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.14"
+VERSION="1.15"
find_targets() {
# Return the list of available ctags implementations
diff --git a/emacs.eselect b/emacs.eselect
index b0f520f..2834c37 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -22,7 +22,7 @@
DESCRIPTION="Manage /usr/bin/emacs version"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.14"
+VERSION="1.15"
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
diff --git a/gnuclient.eselect b/gnuclient.eselect
index 27420cf..d6e9374 100644
--- a/gnuclient.eselect
+++ b/gnuclient.eselect
@@ -21,7 +21,7 @@
DESCRIPTION="Manage /usr/bin/gnuclient implementations"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.14"
+VERSION="1.15"
BINARYLIST="gnuclient gnudoit gnuattach"
MANPAGELIST="gnuclient gnudoit gnuattach gnuserv"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-03-13 13:15 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-03-13 13:15 UTC (permalink / raw
To: gentoo-commits
commit: 039c9ba08fb383286120aa1d6de8f2861b77f08f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 13:20:02 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 13:20:02 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=039c9ba0
Recognise man pages named like the main binary as emacs.1 targets.
* emacs.eselect (MANPAGELIST): Now equal to BINARYLIST.
(remove_symlinks): Explicitly include "emacs" in for loops.
(set_symlinks): Also recognise man pages named like the main
binary as possible targets for the emacs.1 symlink.
---
ChangeLog | 7 +++++++
emacs.eselect | 20 +++++++++++++-------
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a079d0c..ce628ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-03-13 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs.eselect (MANPAGELIST): Now equal to BINARYLIST.
+ (remove_symlinks): Explicitly include "emacs" in for loops.
+ (set_symlinks): Also recognise man pages named like the main
+ binary as possible targets for the emacs.1 symlink.
+
2014-02-17 Ulrich Müller <ulm@gentoo.org>
* Version 1.15 released.
diff --git a/emacs.eselect b/emacs.eselect
index 2c656b7..524c4c3 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -26,7 +26,7 @@ VERSION="1.15"
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
-MANPAGELIST="emacs emacsclient b2m ebrowse rcs-checkin grep-changelog"
+MANPAGELIST="${BINARYLIST}"
MANPAGELIST_OLD="gfdl"
find_targets() {
@@ -52,12 +52,11 @@ remove_symlinks() {
# Remove existing symlinks to binaries, man pages,
# and the env file (own function)
local f
- rm -f "${EROOT}/usr/bin/emacs"
- for f in ${BINARYLIST}; do
+ for f in emacs ${BINARYLIST}; do
rm -f "${EROOT}/usr/bin/${f}"
done
- for f in ${MANPAGELIST} ${MANPAGELIST_OLD}; do
- rm -f "${EROOT}"/usr/share/man/man1/${f}.1*
+ for f in emacs ${MANPAGELIST} ${MANPAGELIST_OLD}; do
+ rm -f "${EROOT}/usr/share/man/man1/${f}.1"*
done
remove_infopath
}
@@ -77,7 +76,7 @@ set_bin_symlinks() {
set_man_symlinks() {
# Set symlinks to man pages
local target=$1 suffix f i
- for f in ${MANPAGELIST}; do
+ for f in emacs ${MANPAGELIST}; do
for i in "${EROOT}/usr/share/man/man1/${f}-${target}.1"*; do
if [[ -f ${i} ]]; then
# target file exists; determine compression suffix
@@ -91,7 +90,7 @@ set_man_symlinks() {
set_symlinks() {
# Set symlinks to binaries and man pages, update info path
- local target=$1 nomain=$2 targets
+ local target=$1 nomain=$2 targets suffix i
# target may be specified by its name or its index
if is_number "${target}"; then
# numeric index, find the target's name
@@ -112,6 +111,13 @@ set_symlinks() {
if [[ -z ${nomain} ]]; then
ln -s "${target}" "${EROOT}/usr/bin/emacs" \
|| die "Couldn't set ${target} ${EROOT}/usr/bin/emacs symlink"
+ for i in "${EROOT}/usr/share/man/man1/${target}.1"*; do
+ if [[ -f ${i} ]]; then
+ suffix=${i##*/"${target}.1"}
+ ln -s "${target}.1${suffix}" \
+ "${EROOT}/usr/share/man/man1/emacs.1${suffix}"
+ fi
+ done
fi
set_bin_symlinks "${target}"
set_man_symlinks "${target}"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-03-13 13:15 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-03-13 13:15 UTC (permalink / raw
To: gentoo-commits
commit: a39be3311dee653baae716781f189e06aa4a99b9
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 12:48:37 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 12:48:37 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=a39be331
Rename variable "extension" to "suffix" throughout. Adjust quoting.
---
ctags.eselect | 12 ++++++------
emacs.eselect | 12 ++++++------
gnuclient.eselect | 12 ++++++------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ctags.eselect b/ctags.eselect
index 4c1641f..c857849 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -66,13 +66,13 @@ set_bin_symlinks() {
set_man_symlinks() {
# Set symlink to man page
- local target=$1 extension i
- for i in "${EROOT}"/usr/share/man/man1/${target}.1*; do
+ local target=$1 suffix i
+ for i in "${EROOT}/usr/share/man/man1/${target}.1"*; do
if [[ -f ${i} ]]; then
- # target file exists; determine compress extension
- extension=${i##*/${target}.1}
- ln -s "${target}.1${extension}" \
- "${EROOT}/usr/share/man/man1/${CTAGS}.1${extension}"
+ # target file exists; determine compression suffix
+ suffix=${i##*/"${target}.1"}
+ ln -s "${target}.1${suffix}" \
+ "${EROOT}/usr/share/man/man1/${CTAGS}.1${suffix}"
fi
done
}
diff --git a/emacs.eselect b/emacs.eselect
index 2834c37..2c656b7 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -76,14 +76,14 @@ set_bin_symlinks() {
set_man_symlinks() {
# Set symlinks to man pages
- local target=$1 extension f i
+ local target=$1 suffix f i
for f in ${MANPAGELIST}; do
- for i in "${EROOT}"/usr/share/man/man1/${f}-${target}.1*; do
+ for i in "${EROOT}/usr/share/man/man1/${f}-${target}.1"*; do
if [[ -f ${i} ]]; then
- # target file exists; determine compress extension
- extension=${i##*/${f}-${target}.1}
- ln -s "${f}-${target}.1${extension}" \
- "${EROOT}/usr/share/man/man1/${f}.1${extension}"
+ # target file exists; determine compression suffix
+ suffix=${i##*/"${f}-${target}.1"}
+ ln -s "${f}-${target}.1${suffix}" \
+ "${EROOT}/usr/share/man/man1/${f}.1${suffix}"
fi
done
done
diff --git a/gnuclient.eselect b/gnuclient.eselect
index d6e9374..258c7ff 100644
--- a/gnuclient.eselect
+++ b/gnuclient.eselect
@@ -59,14 +59,14 @@ set_bin_symlinks() {
set_man_symlinks() {
# Set symlinks to man pages
- local target=${1#gnuclient-} extension f i
+ local target=${1#gnuclient-} suffix f i
for f in ${MANPAGELIST}; do
- for i in "${EROOT}"/usr/share/man/man1/${f}-${target}.1*; do
+ for i in "${EROOT}/usr/share/man/man1/${f}-${target}.1"*; do
if [[ -f ${i} ]]; then
- # target file exists; determine compress extension
- extension=${i##*/${f}-${target}.1}
- ln -s "${f}-${target}.1${extension}" \
- "${EROOT}/usr/share/man/man1/${f}.1${extension}"
+ # target file exists; determine compression suffix
+ suffix=${i##*/"${f}-${target}.1"}
+ ln -s "${f}-${target}.1${suffix}" \
+ "${EROOT}/usr/share/man/man1/${f}.1${suffix}"
fi
done
done
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-03-13 13:49 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-03-13 13:49 UTC (permalink / raw
To: gentoo-commits
commit: 33d9a43d1fb95d47a51f5eb80008d1c725c86217
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 13:55:27 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 13:55:27 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=33d9a43d
Fix typo in ChangeLog.
---
ChangeLog | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index ce628ea..90145bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
2014-03-13 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (MANPAGELIST): Now equal to BINARYLIST.
- (remove_symlinks): Explicitly include "emacs" in for loops.
+ (remove_symlinks): Explicitly include "emacs" in for-loops.
(set_symlinks): Also recognise man pages named like the main
binary as possible targets for the emacs.1 symlink.
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-03-13 16:34 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-03-13 16:34 UTC (permalink / raw
To: gentoo-commits
commit: 115b9e6a631a0d6477eeb11304d94087bcda8e47
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 16:36:04 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 16:36:04 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=115b9e6a
Version 1.16 released.
---
ChangeLog | 2 ++
ctags.eselect | 2 +-
emacs.eselect | 2 +-
gnuclient.eselect | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 90145bf..a56d94d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2014-03-13 Ulrich Müller <ulm@gentoo.org>
+ * Version 1.16 released.
+
* emacs.eselect (MANPAGELIST): Now equal to BINARYLIST.
(remove_symlinks): Explicitly include "emacs" in for-loops.
(set_symlinks): Also recognise man pages named like the main
diff --git a/ctags.eselect b/ctags.eselect
index c857849..9d32fe4 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -26,7 +26,7 @@ CTAGS=ctags
DESCRIPTION="Manage /usr/bin/${CTAGS} implementations"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.15"
+VERSION="1.16"
find_targets() {
# Return the list of available ctags implementations
diff --git a/emacs.eselect b/emacs.eselect
index 524c4c3..275d456 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -22,7 +22,7 @@
DESCRIPTION="Manage /usr/bin/emacs version"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.15"
+VERSION="1.16"
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
diff --git a/gnuclient.eselect b/gnuclient.eselect
index 258c7ff..59d02ae 100644
--- a/gnuclient.eselect
+++ b/gnuclient.eselect
@@ -21,7 +21,7 @@
DESCRIPTION="Manage /usr/bin/gnuclient implementations"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.15"
+VERSION="1.16"
BINARYLIST="gnuclient gnudoit gnuattach"
MANPAGELIST="gnuclient gnudoit gnuattach gnuserv"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-03-18 8:51 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-03-18 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 9994aaf7751cc12d9f5c86e88a8a3703be04a5d0
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 18 08:55:56 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 18 08:55:56 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=9994aaf7
Remove obsolete MANPAGELIST_OLD variable.
* emacs.eselect (MANPAGELIST_OLD): Remove variable, the gfdl.1
man page is no longer installed since 2009.
(remove_symlinks): Remove MANPAGELIST_OLD.
---
ChangeLog | 6 ++++++
emacs.eselect | 3 +--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a56d94d..bdf3f9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-18 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs.eselect (MANPAGELIST_OLD): Remove variable, the gfdl.1
+ man page is no longer installed since 2009.
+ (remove_symlinks): Remove MANPAGELIST_OLD.
+
2014-03-13 Ulrich Müller <ulm@gentoo.org>
* Version 1.16 released.
diff --git a/emacs.eselect b/emacs.eselect
index 275d456..de37cd5 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -27,7 +27,6 @@ VERSION="1.16"
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
MANPAGELIST="${BINARYLIST}"
-MANPAGELIST_OLD="gfdl"
find_targets() {
# Return the list of available Emacs binaries
@@ -55,7 +54,7 @@ remove_symlinks() {
for f in emacs ${BINARYLIST}; do
rm -f "${EROOT}/usr/bin/${f}"
done
- for f in emacs ${MANPAGELIST} ${MANPAGELIST_OLD}; do
+ for f in emacs ${MANPAGELIST}; do
rm -f "${EROOT}/usr/share/man/man1/${f}.1"*
done
remove_infopath
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-04-08 13:13 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-04-08 13:13 UTC (permalink / raw
To: gentoo-commits
commit: a2897617562d0ad1586aa706c8439bb58ce530fe
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 8 06:25:39 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 8 06:25:39 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=a2897617
Don't look for emacs-${target}.1 as emacs.1 man page target.
* emacs.eselect (set_man_symlinks): Omit emacs-${target}.1 from
the list; the symlink for the emacs.1 man page is handled by
set_symlinks() already.
---
ChangeLog | 6 ++++++
emacs.eselect | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index bdf3f9a..a5ffff7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-08 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs.eselect (set_man_symlinks): Omit emacs-${target}.1 from
+ the list; the symlink for the emacs.1 man page is handled by
+ set_symlinks() already.
+
2014-03-18 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (MANPAGELIST_OLD): Remove variable, the gfdl.1
diff --git a/emacs.eselect b/emacs.eselect
index de37cd5..aad1587 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -75,7 +75,7 @@ set_bin_symlinks() {
set_man_symlinks() {
# Set symlinks to man pages
local target=$1 suffix f i
- for f in emacs ${MANPAGELIST}; do
+ for f in ${MANPAGELIST}; do
for i in "${EROOT}/usr/share/man/man1/${f}-${target}.1"*; do
if [[ -f ${i} ]]; then
# target file exists; determine compression suffix
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-10-28 18:50 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-10-28 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 6c9331075f5cfd2cdca6c979d97dcaf81fc4e710
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 28 18:43:26 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 28 18:43:26 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=6c933107
Version 1.17 released.
---
ChangeLog | 4 ++++
ctags.eselect | 2 +-
emacs.eselect | 2 +-
gnuclient.eselect | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a5ffff7..71547e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-28 Ulrich Müller <ulm@gentoo.org>
+
+ * Version 1.17 released.
+
2014-04-08 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (set_man_symlinks): Omit emacs-${target}.1 from
diff --git a/ctags.eselect b/ctags.eselect
index 9d32fe4..fd6f9b7 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -26,7 +26,7 @@ CTAGS=ctags
DESCRIPTION="Manage /usr/bin/${CTAGS} implementations"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.16"
+VERSION="1.17"
find_targets() {
# Return the list of available ctags implementations
diff --git a/emacs.eselect b/emacs.eselect
index aad1587..4b3a8e9 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -22,7 +22,7 @@
DESCRIPTION="Manage /usr/bin/emacs version"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.16"
+VERSION="1.17"
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
diff --git a/gnuclient.eselect b/gnuclient.eselect
index 59d02ae..cc0a7e0 100644
--- a/gnuclient.eselect
+++ b/gnuclient.eselect
@@ -21,7 +21,7 @@
DESCRIPTION="Manage /usr/bin/gnuclient implementations"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.16"
+VERSION="1.17"
BINARYLIST="gnuclient gnudoit gnuattach"
MANPAGELIST="gnuclient gnudoit gnuattach gnuserv"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-12-19 7:28 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-12-19 7:28 UTC (permalink / raw
To: gentoo-commits
commit: 4960049828e80af4326158ae1e4df8e6498b9da1
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 19 07:17:25 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 19 07:17:25 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=49600498
New etags.eselect.5 file.
* etags.eselect.5: New file, includes ctags.eselect man page via
"so" request.
* Makefile (DISTFILES): Add etags.eselect.5.
(etags.eselect.5): Remove make target.
---
ChangeLog | 5 +++++
Makefile | 5 +----
etags.eselect.5 | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 135fca4..9c96e6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-12-19 Ulrich Müller <ulm@gentoo.org>
+ * etags.eselect.5: New file, includes ctags.eselect man page via
+ "so" request.
+ * Makefile (DISTFILES): Add etags.eselect.5.
+ (etags.eselect.5): Remove make target.
+
* ctags.eselect (find_targets, do_update): Have a special case for
etags only in the update action. Otherwise, display all targets
for it, even if no Emacs variant is installed.
diff --git a/Makefile b/Makefile
index e59e7cd..8017391 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ MODULES = emacs.eselect ctags.eselect etags.eselect gnuclient.eselect
MANPAGES = emacs.eselect.5 ctags.eselect.5 etags.eselect.5 gnuclient.eselect.5
DISTFILES = emacs.eselect ctags.eselect gnuclient.eselect \
- emacs.eselect.5 ctags.eselect.5 gnuclient.eselect.5 \
+ emacs.eselect.5 ctags.eselect.5 etags.eselect.5 gnuclient.eselect.5 \
ChangeLog Makefile
.PHONY: all dist clean
@@ -20,9 +20,6 @@ all: $(MODULES) $(MANPAGES)
etags.eselect: ctags.eselect
sed -e "/^CTAGS=/s/ctags/etags/" $< >$@
-etags.eselect.5: ctags.eselect.5
- cp $< $@
-
dist: $(DISTFILES)
tar -cJf $(P).tar.xz --transform='s%^%$(P)/%' $^
tar -tJvf $(P).tar.xz
diff --git a/etags.eselect.5 b/etags.eselect.5
new file mode 100644
index 0000000..826c281
--- /dev/null
+++ b/etags.eselect.5
@@ -0,0 +1 @@
+.so man5/ctags.eselect.5
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-12-19 7:28 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-12-19 7:28 UTC (permalink / raw
To: gentoo-commits
commit: 5bbc24170c922ca97642ac3afd2f7ac896861b5e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 19 07:20:48 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 19 07:20:48 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=5bbc2417
Use OSTYPE instead of uname to determine the system type.
* ctags.eselect (do_update): Use OSTYPE bash variable instead of
uname to determine the system type, in order to be consistent with
eselect proper.
---
ChangeLog | 4 ++++
ctags.eselect | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 9c96e6b..68db727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-12-19 Ulrich Müller <ulm@gentoo.org>
+ * ctags.eselect (do_update): Use OSTYPE bash variable instead of
+ uname to determine the system type, in order to be consistent with
+ eselect proper.
+
* etags.eselect.5: New file, includes ctags.eselect man page via
"so" request.
* Makefile (DISTFILES): Add etags.eselect.5.
diff --git a/ctags.eselect b/ctags.eselect
index 8384e16..2bfc946 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -197,7 +197,7 @@ do_update() {
remove_symlinks || die -q "Couldn't remove existing symlink"
fi
elif [[ -e ${EROOT}/usr/bin/${CTAGS} ]]; then
- if ! [[ ${CTAGS} = ctags && $(uname) = FreeBSD ]]; then
+ if ! [[ ${CTAGS} = ctags && ${OSTYPE} = freebsd* ]]; then
die -q "${EROOT}/usr/bin/${CTAGS} exists but is not a symlink"
fi
# On FreeBSD ctags is a real file, installed by freebsd-ubin
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-12-19 7:28 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-12-19 7:28 UTC (permalink / raw
To: gentoo-commits
commit: cb12846c46545f39ddcdc3b0d08dc390670c271f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 19 06:54:15 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 19 06:54:15 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=cb12846c
Use consistent style with a single equals sign for tests.
---
ctags.eselect | 6 +++---
emacs.eselect | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ctags.eselect b/ctags.eselect
index fd6f9b7..5325536 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -192,7 +192,7 @@ do_update() {
[[ $# -gt 2 ]] && die -q "Too many parameters"
test_for_root
- if ! [[ $1 == *if*unset \
+ if ! [[ $1 = *if*unset \
&& -L ${EROOT}/usr/bin/${CTAGS} && -e ${EROOT}/usr/bin/${CTAGS} ]]
then
local current=""
@@ -217,9 +217,9 @@ do_update() {
local i target targets=( $(find_targets) )
if [[ ${#targets[@]} -gt 0 && ${current} != nolink ]]; then
target=${targets[0]}
- [[ ${current} == ${CTAGS}-*emacs* ]] && current=${CTAGS}-*emacs*
+ [[ ${current} = ${CTAGS}-*emacs* ]] && current=${CTAGS}-*emacs*
for i in ${targets[@]}; do
- [[ ${i} == ${current} ]] && target=${i}
+ [[ ${i} = ${current} ]] && target=${i}
done
set_symlinks "${target}" || die -q "Couldn't set a new symlink"
fi
diff --git a/emacs.eselect b/emacs.eselect
index 4b3a8e9..7b63e59 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -248,7 +248,7 @@ do_update() {
test_for_root
if [[ -L ${EROOT}/usr/bin/emacs ]]; then
- if [[ $1 == *if*unset && -e ${EROOT}/usr/bin/emacs ]]; then
+ if [[ $1 = *if*unset && -e ${EROOT}/usr/bin/emacs ]]; then
do_action ctags update ifunset
return
fi
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-12-19 7:28 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-12-19 7:28 UTC (permalink / raw
To: gentoo-commits
commit: 960a580d531793678bdb407b8fee58ea538993a8
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 19 07:00:25 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 19 07:00:25 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=960a580d
Special case etags only in the update action.
* ctags.eselect (find_targets, do_update): Have a special case for
etags only in the update action. Otherwise, display all targets
for it, even if no Emacs variant is installed.
* ctags.eselect.5: Update.
---
ChangeLog | 7 +++++++
ctags.eselect | 13 ++++++-------
ctags.eselect.5 | 6 +++---
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 71547e6..135fca4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-19 Ulrich Müller <ulm@gentoo.org>
+
+ * ctags.eselect (find_targets, do_update): Have a special case for
+ etags only in the update action. Otherwise, display all targets
+ for it, even if no Emacs variant is installed.
+ * ctags.eselect.5: Update.
+
2014-10-28 Ulrich Müller <ulm@gentoo.org>
* Version 1.17 released.
diff --git a/ctags.eselect b/ctags.eselect
index 5325536..8384e16 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -40,12 +40,6 @@ find_targets() {
[[ -f ${EROOT}/usr/bin/${CTAGS}-${emacs} ]] && echo "${CTAGS}-${emacs}"
elif [[ -f ${EROOT}/usr/bin/xemacs ]]; then
[[ -f ${EROOT}/usr/bin/${CTAGS}-xemacs ]] && echo "${CTAGS}-xemacs"
- elif [[ ${CTAGS} = etags ]]; then
- # We are called as etags module, but no (X)Emacs is installed.
- # Return an empty list in this case, because we don't want
- # exuberant-ctags as default for etags (for ctags it's fine).
- # Also, vi purists wouldn't want an etags symlink.
- return
fi
# Exuberant ctags
@@ -215,7 +209,12 @@ do_update() {
# offers several concurrent versions.
local i target targets=( $(find_targets) )
- if [[ ${#targets[@]} -gt 0 && ${current} != nolink ]]; then
+ # We don't want exuberant-ctags as default for etags. Also, vi
+ # purists wouldn't want an etags symlink. Therefore, don't update
+ # the etags symlink unless there is an (X)Emacs provider.
+ if [[ ${#targets[@]} -gt 0 && ${current} != nolink ]] \
+ && ! [[ ${CTAGS} = etags && ${targets[0]} != ${CTAGS}-*emacs* ]]
+ then
target=${targets[0]}
[[ ${current} = ${CTAGS}-*emacs* ]] && current=${CTAGS}-*emacs*
for i in ${targets[@]}; do
diff --git a/ctags.eselect.5 b/ctags.eselect.5
index 88da8ed..bcdb55b 100644
--- a/ctags.eselect.5
+++ b/ctags.eselect.5
@@ -89,9 +89,9 @@ is a real binary, owned by package freebsd-ubin.
.RB ( "eselect etags"
does work though.)
-.B eselect etags
-does not display any valid targets if there is no Emacs variant
-installed. This is a feature.
+.B eselect etags update
+does not update the target if there is no Emacs variant installed.
+This is a feature.
.SH AUTHOR
Ulrich Müller <ulm@gentoo.org>
.SH SEE ALSO
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-12-19 7:28 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-12-19 7:28 UTC (permalink / raw
To: gentoo-commits
commit: ab17068557e39e4d068495ceabb922660c3390b8
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 19 06:46:09 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 19 06:46:09 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=ab170685
Update example in ctags man page.
---
ctags.eselect.5 | 6 +++---
emacs.eselect.5 | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ctags.eselect.5 b/ctags.eselect.5
index 841cf2b..88da8ed 100644
--- a/ctags.eselect.5
+++ b/ctags.eselect.5
@@ -2,7 +2,7 @@
.\" Copyright 2007-2014 Gentoo Foundation
.\" Distributed under the terms of the GNU GPL version 2 or later
.\"
-.TH ctags.eselect 5 "February 2014" "Gentoo Linux" eselect
+.TH ctags.eselect 5 "December 2014" "Gentoo Linux" eselect
.SH NAME
ctags.eselect, etags.eselect \- The ctags and etags management module
for Gentoo's eselect
@@ -40,7 +40,7 @@ List all installed ctags versions.
.br
Available ctags symlink targets:
.br
- [1] ctags-emacs-23 *
+ [1] ctags-emacs-24 *
[2] exuberant-ctags
.SH ACTION: SET
.B eselect ctags set
@@ -79,7 +79,7 @@ is given, an existing implementation is not overridden.
.br
Switching ctags to exuberant-ctags ...
.br
-Switching etags to etags-emacs-23 ...
+Switching etags to etags-emacs-24 ...
.SH BUGS
Under FreeBSD,
.B eselect ctags
diff --git a/emacs.eselect.5 b/emacs.eselect.5
index a79e44c..1348e85 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -2,7 +2,7 @@
.\" Copyright 2007-2014 Gentoo Foundation
.\" Distributed under the terms of the GNU GPL version 2 or later
.\"
-.TH emacs.eselect 5 "February 2014" "Gentoo Linux" eselect
+.TH emacs.eselect 5 "December 2014" "Gentoo Linux" eselect
.SH NAME
emacs.eselect \- The Emacs management module for Gentoo's eselect
.SH SYNOPSIS
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-12-19 19:03 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-12-19 19:03 UTC (permalink / raw
To: gentoo-commits
commit: cd591102e51a75cce7842b95abd3d11ee025f81f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 19 18:55:41 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 19 18:55:41 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=cd591102
Version 1.18 released.
---
ChangeLog | 2 ++
ctags.eselect | 2 +-
emacs.eselect | 2 +-
gnuclient.eselect | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 68db727..74d87b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2014-12-19 Ulrich Müller <ulm@gentoo.org>
+ * Version 1.18 released.
+
* ctags.eselect (do_update): Use OSTYPE bash variable instead of
uname to determine the system type, in order to be consistent with
eselect proper.
diff --git a/ctags.eselect b/ctags.eselect
index 2bfc946..d2b286e 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -26,7 +26,7 @@ CTAGS=ctags
DESCRIPTION="Manage /usr/bin/${CTAGS} implementations"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.17"
+VERSION="1.18"
find_targets() {
# Return the list of available ctags implementations
diff --git a/emacs.eselect b/emacs.eselect
index 7b63e59..b93436f 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -22,7 +22,7 @@
DESCRIPTION="Manage /usr/bin/emacs version"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.17"
+VERSION="1.18"
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
diff --git a/gnuclient.eselect b/gnuclient.eselect
index cc0a7e0..f4d36e8 100644
--- a/gnuclient.eselect
+++ b/gnuclient.eselect
@@ -21,7 +21,7 @@
DESCRIPTION="Manage /usr/bin/gnuclient implementations"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.17"
+VERSION="1.18"
BINARYLIST="gnuclient gnudoit gnuattach"
MANPAGELIST="gnuclient gnudoit gnuattach gnuserv"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2014-12-23 9:55 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2014-12-23 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 09a669fa7de086dd995d71c48614d3868d487451
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 23 09:59:16 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 23 09:59:16 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=09a669fa
Simplify Makefile.
* Makefile (all): Explicitly depend on etags.eselect.
(MODULES, MANPAGES): Remove variables.
---
ChangeLog | 5 +++++
Makefile | 6 ++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 74d87b7..897e2e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-23 Ulrich Müller <ulm@gentoo.org>
+
+ * Makefile (all): Explicitly depend on etags.eselect.
+ (MODULES, MANPAGES): Remove variables.
+
2014-12-19 Ulrich Müller <ulm@gentoo.org>
* Version 1.18 released.
diff --git a/Makefile b/Makefile
index 8017391..f89ad59 100644
--- a/Makefile
+++ b/Makefile
@@ -6,16 +6,14 @@ PV = $(shell sed '/^[ \t]*VERSION=/!d;s/.*="\?\([^ \t"]*\).*/\1/;q' \
emacs.eselect)
P = $(PN)-$(PV)
-MODULES = emacs.eselect ctags.eselect etags.eselect gnuclient.eselect
-MANPAGES = emacs.eselect.5 ctags.eselect.5 etags.eselect.5 gnuclient.eselect.5
-
DISTFILES = emacs.eselect ctags.eselect gnuclient.eselect \
emacs.eselect.5 ctags.eselect.5 etags.eselect.5 gnuclient.eselect.5 \
ChangeLog Makefile
+
.PHONY: all dist clean
-all: $(MODULES) $(MANPAGES)
+all: etags.eselect
etags.eselect: ctags.eselect
sed -e "/^CTAGS=/s/ctags/etags/" $< >$@
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2018-09-16 14:50 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2018-09-16 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 0418189cb5350cb8a760336db248c8588a64fddb
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 14:48:36 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 14:48:36 2018 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=0418189c
Update copyright notices to follow the new policy.
ChangeLog | 1 -
Makefile | 2 +-
ctags.eselect | 2 +-
ctags.eselect.5 | 2 +-
emacs.eselect | 2 +-
emacs.eselect.5 | 2 +-
gnuclient.eselect | 2 +-
gnuclient.eselect.5 | 2 +-
8 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 897e2e4..f78ae66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -469,5 +469,4 @@
Automatically symlink man pages.
Automatically set correct INFOPATH.
-Copyright 2007-2014 Gentoo Foundation
Distributed under the terms of the GNU GPL version 2 or later
diff --git a/Makefile b/Makefile
index f89ad59..dd6d4cd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2007-2014 Gentoo Foundation
+# Copyright 2007-2014 Gentoo Authors
# Distributed under the terms of the GNU GPL version 2 or later
PN = eselect-emacs
diff --git a/ctags.eselect b/ctags.eselect
index d2b286e..6cd3a88 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -1,5 +1,5 @@
# -*-eselect-*-
-# Copyright 2005-2014 Gentoo Foundation
+# Copyright 2005-2014 Gentoo Authors
# Distributed under the terms of the GNU GPL version 2 or later
#
# DOCUMENTATION
diff --git a/ctags.eselect.5 b/ctags.eselect.5
index bcdb55b..82f62db 100644
--- a/ctags.eselect.5
+++ b/ctags.eselect.5
@@ -1,5 +1,5 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2007-2014 Gentoo Foundation
+.\" Copyright 2007-2014 Gentoo Authors
.\" Distributed under the terms of the GNU GPL version 2 or later
.\"
.TH ctags.eselect 5 "December 2014" "Gentoo Linux" eselect
diff --git a/emacs.eselect b/emacs.eselect
index b93436f..dfffb58 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -1,5 +1,5 @@
# -*-eselect-*-
-# Copyright 2005-2014 Gentoo Foundation
+# Copyright 2005-2014 Gentoo Authors
# Distributed under the terms of the GNU GPL version 2 or later
#
# DOCUMENTATION
diff --git a/emacs.eselect.5 b/emacs.eselect.5
index 1348e85..fb2bea5 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -1,5 +1,5 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2007-2014 Gentoo Foundation
+.\" Copyright 2007-2014 Gentoo Authors
.\" Distributed under the terms of the GNU GPL version 2 or later
.\"
.TH emacs.eselect 5 "December 2014" "Gentoo Linux" eselect
diff --git a/gnuclient.eselect b/gnuclient.eselect
index f4d36e8..7094714 100644
--- a/gnuclient.eselect
+++ b/gnuclient.eselect
@@ -1,5 +1,5 @@
# -*-eselect-*-
-# Copyright 2005-2014 Gentoo Foundation
+# Copyright 2005-2014 Gentoo Authors
# Distributed under the terms of the GNU GPL version 2 or later
#
# DOCUMENTATION
diff --git a/gnuclient.eselect.5 b/gnuclient.eselect.5
index de6bcaf..8d8314a 100644
--- a/gnuclient.eselect.5
+++ b/gnuclient.eselect.5
@@ -1,5 +1,5 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2007-2014 Gentoo Foundation
+.\" Copyright 2007-2014 Gentoo Authors
.\" Distributed under the terms of the GNU GPL version 2 or later
.\"
.TH gnuclient.eselect 5 "February 2014" "Gentoo Linux" eselect
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2021-07-31 17:39 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2021-07-31 17:39 UTC (permalink / raw
To: gentoo-commits
commit: db0e1f18245abd3288fa76135fc048ec1f495aa4
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 17:34:07 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 17:34:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=db0e1f18
Set symbolic links to C header files
* emacs.eselect (set_header_symlinks): New function, set symbolic
links to C header files. Bug 805491.
(set_symlinks): Call it.
(remove_symlinks): Remove symlinks to header files.
(HEADERLIST): New variable.
Bug: https://bugs.gentoo.org/805491
Reported-by: akater <nuclearspace <AT> gmail.com>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ChangeLog | 8 ++++++++
emacs.eselect | 16 ++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index f78ae66..b04b0fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-07-31 Ulrich Müller <ulm@gentoo.org>
+
+ * emacs.eselect (set_header_symlinks): New function, set symbolic
+ links to C header files. Bug 805491.
+ (set_symlinks): Call it.
+ (remove_symlinks): Remove symlinks to header files.
+ (HEADERLIST): New variable.
+
2014-12-23 Ulrich Müller <ulm@gentoo.org>
* Makefile (all): Explicitly depend on etags.eselect.
diff --git a/emacs.eselect b/emacs.eselect
index dfffb58..775fd49 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -27,6 +27,7 @@ VERSION="1.18"
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
MANPAGELIST="${BINARYLIST}"
+HEADERLIST="emacs-module.h"
find_targets() {
# Return the list of available Emacs binaries
@@ -57,6 +58,9 @@ remove_symlinks() {
for f in emacs ${MANPAGELIST}; do
rm -f "${EROOT}/usr/share/man/man1/${f}.1"*
done
+ for f in ${HEADERLIST}; do
+ rm -f "${EROOT}/usr/include/${f}"
+ done
remove_infopath
}
@@ -87,6 +91,17 @@ set_man_symlinks() {
done
}
+set_header_symlinks() {
+ # Set symlinks to header files in /usr/include/
+ local target=$1 f
+ for f in ${HEADERLIST}; do
+ if [[ -f ${EROOT}/usr/include/${target}/${f} ]]; then
+ ln -s "${target}/${f}" "${EROOT}/usr/include/${f}" \
+ || die "Couldn't set ${EROOT}/usr/include/${f} symlink"
+ fi
+ done
+}
+
set_symlinks() {
# Set symlinks to binaries and man pages, update info path
local target=$1 nomain=$2 targets suffix i
@@ -120,6 +135,7 @@ set_symlinks() {
fi
set_bin_symlinks "${target}"
set_man_symlinks "${target}"
+ set_header_symlinks "${target}"
set_infopath "${target}"
# update /etc/profile.env from /etc/env.d files
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2021-08-02 8:05 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2021-08-02 8:05 UTC (permalink / raw
To: gentoo-commits
commit: 7de39e6e66f747261d24932397ba7db553f100b9
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 2 07:28:52 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 2 07:28:52 2021 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=7de39e6e
Version 1.19 released
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ChangeLog | 4 ++++
ctags.eselect | 4 ++--
ctags.eselect.5 | 4 ++--
emacs.eselect | 4 ++--
emacs.eselect.5 | 4 ++--
gnuclient.eselect | 4 ++--
gnuclient.eselect.5 | 4 ++--
7 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b04b0fa..bdee010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-08-02 Ulrich Müller <ulm@gentoo.org>
+
+ * Version 1.19 released.
+
2021-07-31 Ulrich Müller <ulm@gentoo.org>
* emacs.eselect (set_header_symlinks): New function, set symbolic
diff --git a/ctags.eselect b/ctags.eselect
index 6cd3a88..72c95c9 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -1,5 +1,5 @@
# -*-eselect-*-
-# Copyright 2005-2014 Gentoo Authors
+# Copyright 2005-2021 Gentoo Authors
# Distributed under the terms of the GNU GPL version 2 or later
#
# DOCUMENTATION
@@ -26,7 +26,7 @@ CTAGS=ctags
DESCRIPTION="Manage /usr/bin/${CTAGS} implementations"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.18"
+VERSION="1.19"
find_targets() {
# Return the list of available ctags implementations
diff --git a/ctags.eselect.5 b/ctags.eselect.5
index 82f62db..5032ca3 100644
--- a/ctags.eselect.5
+++ b/ctags.eselect.5
@@ -1,8 +1,8 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2007-2014 Gentoo Authors
+.\" Copyright 2007-2021 Gentoo Authors
.\" Distributed under the terms of the GNU GPL version 2 or later
.\"
-.TH ctags.eselect 5 "December 2014" "Gentoo Linux" eselect
+.TH ctags.eselect 5 "August 2021" "Gentoo Linux" eselect
.SH NAME
ctags.eselect, etags.eselect \- The ctags and etags management module
for Gentoo's eselect
diff --git a/emacs.eselect b/emacs.eselect
index 775fd49..f3880ed 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -1,5 +1,5 @@
# -*-eselect-*-
-# Copyright 2005-2014 Gentoo Authors
+# Copyright 2005-2021 Gentoo Authors
# Distributed under the terms of the GNU GPL version 2 or later
#
# DOCUMENTATION
@@ -22,7 +22,7 @@
DESCRIPTION="Manage /usr/bin/emacs version"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.18"
+VERSION="1.19"
# ctags and etags are handled in their own module
BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
diff --git a/emacs.eselect.5 b/emacs.eselect.5
index fb2bea5..d1c1598 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -1,8 +1,8 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2007-2014 Gentoo Authors
+.\" Copyright 2007-2021 Gentoo Authors
.\" Distributed under the terms of the GNU GPL version 2 or later
.\"
-.TH emacs.eselect 5 "December 2014" "Gentoo Linux" eselect
+.TH emacs.eselect 5 "August 2021" "Gentoo Linux" eselect
.SH NAME
emacs.eselect \- The Emacs management module for Gentoo's eselect
.SH SYNOPSIS
diff --git a/gnuclient.eselect b/gnuclient.eselect
index 7094714..5dec28b 100644
--- a/gnuclient.eselect
+++ b/gnuclient.eselect
@@ -1,5 +1,5 @@
# -*-eselect-*-
-# Copyright 2005-2014 Gentoo Authors
+# Copyright 2005-2021 Gentoo Authors
# Distributed under the terms of the GNU GPL version 2 or later
#
# DOCUMENTATION
@@ -21,7 +21,7 @@
DESCRIPTION="Manage /usr/bin/gnuclient implementations"
MAINTAINER="emacs@gentoo.org"
-VERSION="1.18"
+VERSION="1.19"
BINARYLIST="gnuclient gnudoit gnuattach"
MANPAGELIST="gnuclient gnudoit gnuattach gnuserv"
diff --git a/gnuclient.eselect.5 b/gnuclient.eselect.5
index 8d8314a..5991bce 100644
--- a/gnuclient.eselect.5
+++ b/gnuclient.eselect.5
@@ -1,8 +1,8 @@
.\" -*- coding: utf-8 -*-
-.\" Copyright 2007-2014 Gentoo Authors
+.\" Copyright 2007-2021 Gentoo Authors
.\" Distributed under the terms of the GNU GPL version 2 or later
.\"
-.TH gnuclient.eselect 5 "February 2014" "Gentoo Linux" eselect
+.TH gnuclient.eselect 5 "August 2021" "Gentoo Linux" eselect
.SH NAME
gnuclient.eselect \- The gnuserv/gnuclient module for Gentoo's eselect
.SH SYNOPSIS
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /
@ 2023-08-21 6:31 Ulrich Müller
0 siblings, 0 replies; 54+ messages in thread
From: Ulrich Müller @ 2023-08-21 6:31 UTC (permalink / raw
To: gentoo-commits
commit: f544817c6c3bf6820f349feffbbde2a73f2b7fd5
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 19:56:37 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 19:56:37 2023 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=f544817c
Avoid "&& die"
* ctags.eselect (do_show, do_list, do_set, do_update):
* emacs.eselect (do_show, do_list, do_set, do_update):
Use positive condition for argument checks.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ChangeLog | 6 ++++++
ctags.eselect | 12 ++++++------
emacs.eselect | 10 +++++-----
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bdee010..d954d17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-08-20 Ulrich Müller <ulm@gentoo.org>
+
+ * ctags.eselect (do_show, do_list, do_set, do_update):
+ * emacs.eselect (do_show, do_list, do_set, do_update):
+ Use positive condition for argument checks.
+
2021-08-02 Ulrich Müller <ulm@gentoo.org>
* Version 1.19 released.
diff --git a/ctags.eselect b/ctags.eselect
index 72c95c9..99be1a6 100644
--- a/ctags.eselect
+++ b/ctags.eselect
@@ -1,5 +1,5 @@
# -*-eselect-*-
-# Copyright 2005-2021 Gentoo Authors
+# Copyright 2005-2023 Gentoo Authors
# Distributed under the terms of the GNU GPL version 2 or later
#
# DOCUMENTATION
@@ -106,7 +106,7 @@ describe_show() {
}
do_show() {
- [[ $# -gt 0 ]] && die -q "Too many parameters"
+ [[ $# -eq 0 ]] || die -q "Too many parameters"
write_list_start "Current target of ${CTAGS} symlink:"
if [[ -L ${EROOT}/usr/bin/${CTAGS} && -e ${EROOT}/usr/bin/${CTAGS} ]]
@@ -128,7 +128,7 @@ describe_list() {
}
do_list() {
- [[ $# -gt 0 ]] && die -q "Too many parameters"
+ [[ $# -eq 0 ]] || die -q "Too many parameters"
local i targets
targets=( $(find_targets) )
@@ -158,8 +158,8 @@ describe_set_parameters() {
}
do_set() {
- [[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to"
- [[ $# -gt 1 ]] && die -q "Too many parameters"
+ [[ -n $1 ]] || die -q "You didn't tell me what to set the symlink to"
+ [[ $# -le 1 ]] || die -q "Too many parameters"
test_for_root
if [[ -e ${EROOT}/usr/bin/${CTAGS} && ! -L ${EROOT}/usr/bin/${CTAGS} ]]
@@ -183,7 +183,7 @@ describe_update_options() {
do_update() {
[[ -z $1 || $1 = ifunset || $1 = --if-unset ]] || die -q "Usage error"
[[ -z $2 || $2 = norecursion ]] || die -q "Usage error"
- [[ $# -gt 2 ]] && die -q "Too many parameters"
+ [[ $# -le 2 ]] || die -q "Too many parameters"
test_for_root
if ! [[ $1 = *if*unset \
diff --git a/emacs.eselect b/emacs.eselect
index f3880ed..7c5139c 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -173,7 +173,7 @@ describe_show() {
}
do_show() {
- [[ $# -gt 0 ]] && die -q "Too many parameters"
+ [[ $# -eq 0 ]] || die -q "Too many parameters"
write_list_start "Current target of Emacs symlink:"
if [[ -L ${EROOT}/usr/bin/emacs && -e ${EROOT}/usr/bin/emacs ]]; then
@@ -199,7 +199,7 @@ describe_list() {
}
do_list() {
- [[ $# -gt 0 ]] && die -q "Too many parameters"
+ [[ $# -eq 0 ]] || die -q "Too many parameters"
local i targets
targets=( $(find_targets) )
@@ -234,8 +234,8 @@ describe_set_parameters() {
}
do_set() {
- [[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to"
- [[ $# -gt 1 ]] && die -q "Too many parameters"
+ [[ -n $1 ]] || die -q "You didn't tell me what to set the symlink to"
+ [[ $# -le 1 ]] || die -q "Too many parameters"
test_for_root
if [[ -e ${EROOT}/usr/bin/emacs && ! -L ${EROOT}/usr/bin/emacs ]]; then
@@ -260,7 +260,7 @@ describe_update_options() {
do_update() {
[[ -z $1 || $1 = ifunset || $1 = --if-unset ]] || die -q "Usage error"
- [[ $# -gt 1 ]] && die -q "Too many parameters"
+ [[ $# -le 1 ]] || die -q "Too many parameters"
test_for_root
if [[ -L ${EROOT}/usr/bin/emacs ]]; then
^ permalink raw reply related [flat|nested] 54+ messages in thread
end of thread, other threads:[~2023-08-21 6:32 UTC | newest]
Thread overview: 54+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-06 16:06 [gentoo-commits] proj/emacs-tools:eselect-emacs commit in: / Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2023-08-21 6:31 Ulrich Müller
2021-08-02 8:05 Ulrich Müller
2021-07-31 17:39 Ulrich Müller
2018-09-16 14:50 Ulrich Müller
2014-12-23 9:55 Ulrich Müller
2014-12-19 19:03 Ulrich Müller
2014-12-19 7:28 Ulrich Müller
2014-12-19 7:28 Ulrich Müller
2014-12-19 7:28 Ulrich Müller
2014-12-19 7:28 Ulrich Müller
2014-12-19 7:28 Ulrich Müller
2014-10-28 18:50 Ulrich Müller
2014-04-08 13:13 Ulrich Müller
2014-03-18 8:51 Ulrich Müller
2014-03-13 16:34 Ulrich Müller
2014-03-13 13:49 Ulrich Müller
2014-03-13 13:15 Ulrich Müller
2014-03-13 13:15 Ulrich Müller
2014-02-17 21:38 Ulrich Müller
2014-02-17 21:38 Ulrich Müller
2014-02-17 21:38 Ulrich Müller
2014-02-17 17:46 Ulrich Müller
2013-04-01 12:21 Ulrich Mueller
2012-06-22 16:24 Ulrich Mueller
2012-06-22 16:24 Ulrich Mueller
2012-06-22 16:24 Ulrich Mueller
2012-06-22 15:53 Ulrich Mueller
2012-06-22 15:53 Ulrich Mueller
2012-05-06 18:47 Ulrich Mueller
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox