[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2023-08-21 Thread Ulrich Müller 
commit: f544817c6c3bf6820f349feffbbde2a73f2b7fd5
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Aug 20 19:56:37 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Aug 20 19:56:37 2023 +
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  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  
+
+   * 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  
 
* 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

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2021-08-02 Thread Ulrich Müller 
commit: 7de39e6e66f747261d24932397ba7db553f100b9
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Aug  2 07:28:52 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Aug  2 07:28:52 2021 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=7de39e6e

Version 1.19 released

Signed-off-by: Ulrich Müller  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  
+
+   * Version 1.19 released.
+
 2021-07-31  Ulrich Müller  
 
* 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="em...@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="em...@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="em...@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

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2021-07-31 Thread Ulrich Müller 
commit: db0e1f18245abd3288fa76135fc048ec1f495aa4
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jul 31 17:34:07 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jul 31 17:34:07 2021 +
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  gmail.com>
Signed-off-by: Ulrich Müller  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  
+
+   * 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  
 
* 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

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2018-09-16 Thread Ulrich Müller 
commit: 0418189cb5350cb8a760336db248c8588a64fddb
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Sep 16 14:48:36 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Sep 16 14:48:36 2018 +
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

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-12-23 Thread Ulrich Müller 
commit: 09a669fa7de086dd995d71c48614d3868d487451
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Tue Dec 23 09:59:16 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Tue Dec 23 09:59:16 2014 +
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  u...@gentoo.org
+
+   * Makefile (all): Explicitly depend on etags.eselect.
+   (MODULES, MANPAGES): Remove variables.
+
 2014-12-19  Ulrich Müller  u...@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/ $ $@

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-12-19 Thread Ulrich Müller 
commit: cd591102e51a75cce7842b95abd3d11ee025f81f
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Fri Dec 19 18:55:41 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Fri Dec 19 18:55:41 2014 +
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  u...@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=em...@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=em...@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=em...@gentoo.org
-VERSION=1.17
+VERSION=1.18
 
 BINARYLIST=gnuclient gnudoit gnuattach
 MANPAGELIST=gnuclient gnudoit gnuattach gnuserv

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-12-18 Thread Ulrich Müller 
commit: 960a580d531793678bdb407b8fee58ea538993a8
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Fri Dec 19 07:00:25 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Fri Dec 19 07:00:25 2014 +
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  u...@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  u...@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 u...@gentoo.org
 .SH SEE ALSO

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-12-18 Thread Ulrich Müller 
commit: cb12846c46545f39ddcdc3b0d08dc390670c271f
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Fri Dec 19 06:54:15 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Fri Dec 19 06:54:15 2014 +
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

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-12-18 Thread Ulrich Müller 
commit: ab17068557e39e4d068495ceabb922660c3390b8
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Fri Dec 19 06:46:09 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Fri Dec 19 06:46:09 2014 +
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

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-12-18 Thread Ulrich Müller 
commit: 5bbc24170c922ca97642ac3afd2f7ac896861b5e
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Fri Dec 19 07:20:48 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Fri Dec 19 07:20:48 2014 +
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  u...@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

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-12-18 Thread Ulrich Müller 
commit: 4960049828e80af4326158ae1e4df8e6498b9da1
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Fri Dec 19 07:17:25 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Fri Dec 19 07:17:25 2014 +
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  u...@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 000..826c281
--- /dev/null
+++ b/etags.eselect.5
@@ -0,0 +1 @@
+.so man5/ctags.eselect.5

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-10-28 Thread Ulrich Müller 
commit: 6c9331075f5cfd2cdca6c979d97dcaf81fc4e710
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Tue Oct 28 18:43:26 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Tue Oct 28 18:43:26 2014 +
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 a57..71547e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-28  Ulrich Müller  u...@gentoo.org
+
+   * Version 1.17 released.
+
 2014-04-08  Ulrich Müller  u...@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=em...@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=em...@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=em...@gentoo.org
-VERSION=1.16
+VERSION=1.17
 
 BINARYLIST=gnuclient gnudoit gnuattach
 MANPAGELIST=gnuclient gnudoit gnuattach gnuserv

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-04-08 Thread Ulrich Müller 
commit: a2897617562d0ad1586aa706c8439bb58ce530fe
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Tue Apr  8 06:25:39 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Tue Apr  8 06:25:39 2014 +
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..a57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-08  Ulrich Müller  u...@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  u...@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

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-03-18 Thread Ulrich Müller 
commit: 9994aaf7751cc12d9f5c86e88a8a3703be04a5d0
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Tue Mar 18 08:55:56 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Tue Mar 18 08:55:56 2014 +
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  u...@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  u...@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

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-03-13 Thread Ulrich Müller 
commit: a39be3311dee653baae716781f189e06aa4a99b9
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Thu Mar 13 12:48:37 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Thu Mar 13 12:48:37 2014 +
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

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-03-13 Thread Ulrich Müller 
commit: 039c9ba08fb383286120aa1d6de8f2861b77f08f
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Thu Mar 13 13:20:02 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Thu Mar 13 13:20:02 2014 +
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  u...@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  u...@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}

[gentoo-commits] proj/emacs-tools:eselect-emacs commit in: /

2014-03-13 Thread Ulrich Müller 
commit: 33d9a43d1fb95d47a51f5eb80008d1c725c86217
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Thu Mar 13 13:55:27 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Thu Mar 13 13:55:27 2014 +
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  u...@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.