[gentoo-commits] proj/eselect:master commit in: misc/, /

[Ulrich Müller]

commit: 88eb5c77a9aa08a1e69bc41aea73c78e8e7a26f4
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Nov  5 17:31:24 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Nov  5 17:31:24 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=88eb5c77

eselect-mode: Doc fix

* misc/eselect-mode.el: Doc fix.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 4 
 misc/eselect-mode.el | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c0fe120..da11122 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2023-11-05  Ulrich Müller  
+
+   * misc/eselect-mode.el: Doc fix.
+
 2023-10-06  Ulrich Müller  
 
* misc/eselect-mode.el (eselect-mode, eselect-mode-hook):

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index d6fc68e..6ffa88f 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -131,6 +131,8 @@
  (replace-match (concat "\\1-" year) t nil nil 1)
 
 (defun eselect-mode-before-save ()
+  "Function to be called before saving a buffer.
+This will be added to the `write-contents-functions' hook."
   (when eselect-mode-fix-whitespace
 (delete-trailing-whitespace))
   (when eselect-mode-update-copyright

[gentoo-commits] proj/eselect:master commit in: misc/, /

[Ulrich Müller]

commit: aa4697a70dec32ad6e7e371899968afc7fe338e6
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Oct  6 07:38:41 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Oct  6 07:38:41 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=aa4697a7

eselect-mode: Use #' for quoting of function names

* misc/eselect-mode.el (eselect-mode, eselect-mode-hook):
Sharp-quote the function names.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 3 +++
 misc/eselect-mode.el | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 13bbc97..c0fe120 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2023-10-06  Ulrich Müller  
 
+   * misc/eselect-mode.el (eselect-mode, eselect-mode-hook):
+   Sharp-quote the function names.
+
* misc/eselect-mode.el (eselect-mode-add-font-lock): New function.
(eselect-mode-hook): Add it, instead of an anonymous function.
 

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index 06843df..d6fc68e 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -143,7 +143,7 @@
 ;;;###autoload
 (define-derived-mode eselect-mode sh-mode "Eselect"
   "Major mode for .eselect files."
-  (add-hook 'write-contents-functions 'eselect-mode-before-save t t)
+  (add-hook 'write-contents-functions #'eselect-mode-before-save t t)
   (sh-set-shell "bash")
   (setq tab-width 4)
   (setq indent-tabs-mode t))
@@ -152,7 +152,7 @@
   "Add `eselect-mode' font-lock keywords for the current buffer."
   (font-lock-add-keywords nil eselect-mode-font-lock-keywords))
 
-(add-hook 'eselect-mode-hook 'eselect-mode-add-font-lock)
+(add-hook 'eselect-mode-hook #'eselect-mode-add-font-lock)
 
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.eselect\\'" . eselect-mode))

[gentoo-commits] proj/eselect:master commit in: misc/, /

[Ulrich Müller]

commit: 2f9084ac529bcd514a3546a9d7f9a376f1c4a5d5
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Oct  6 07:36:28 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Oct  6 07:36:28 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=2f9084ac

eselect-mode: Use named function in hook variable

* misc/eselect-mode.el (eselect-mode-add-font-lock): New function.
(eselect-mode-hook): Add it, instead of an anonymous function.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 5 +
 misc/eselect-mode.el | 7 ---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65307ec..13bbc97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-10-06  Ulrich Müller  
+
+   * misc/eselect-mode.el (eselect-mode-add-font-lock): New function.
+   (eselect-mode-hook): Add it, instead of an anonymous function.
+
 2023-09-13  Ulrich Müller  
 
* configure.ac: Update version to 1.4.27.

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index e59c90c..06843df 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -148,10 +148,11 @@
   (setq tab-width 4)
   (setq indent-tabs-mode t))
 
-(add-hook 'eselect-mode-hook
- (lambda () (font-lock-add-keywords
- nil eselect-mode-font-lock-keywords)))
+(defun eselect-mode-add-font-lock ()
+  "Add `eselect-mode' font-lock keywords for the current buffer."
+  (font-lock-add-keywords nil eselect-mode-font-lock-keywords))
 
+(add-hook 'eselect-mode-hook 'eselect-mode-add-font-lock)
 
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.eselect\\'" . eselect-mode))

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 93d289022f27bde243c5632095f41905c4645ba7
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Sep 13 18:11:14 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Sep 13 18:11:14 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=93d28902

Update version to 1.4.27

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 5 +
 configure.ac | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 71ce655..65307ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-09-13  Ulrich Müller  
+
+   * configure.ac: Update version to 1.4.27.
+   * Tagged 1.4.27 release.
+
 2023-09-09  Ulrich Müller  
 
* modules/profile.eselect (set_symlink): Selecting an experimental

diff --git a/configure.ac b/configure.ac
index 91912c0..a28ff1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.26, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.27, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 077cf083c2512d30f7339a80b91229bf3b673b7e
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Sep 13 18:10:49 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Sep 13 18:10:49 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=077cf083

Update NEWS

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 8 
 1 file changed, 8 insertions(+)

diff --git a/NEWS b/NEWS
index 3bae57a..801a7a8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,14 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.27:
+Bug fixes:
+- Fixed bug #913480: Selecting an experimental profile no longer requires
+the --force option.
+
+New features:
+- Lexical binding enabled in eselect-mode.
+
 1.4.26:
 New features:
 - Updated list of editors in editor and visual modules (bug #911792).

[gentoo-commits] proj/eselect:master commit in: misc/, /

[Ulrich Müller]

commit: e8d1843145399daeee83fb6793074bf80b06cad3
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Aug 24 21:35:38 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Aug 25 08:39:59 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=e8d18431

eselect-mode: Enable lexical binding

* misc/eselect-mode.el: Enable lexical binding.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 2 ++
 misc/eselect-mode.el | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 670bbcf..f9ee3f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2023-08-24  Ulrich Müller  
 
+   * misc/eselect-mode.el: Enable lexical binding.
+
* misc/eselect-mode.el (eselect-mode): Refer to sh-mode directly,
instead of shell-script-mode which is its alias.
 

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index 57791f8..e59c90c 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -1,4 +1,4 @@
-;;; eselect-mode.el --- edit eselect files
+;;; eselect-mode.el --- edit eselect files  -*-lexical-binding:t-*-
 
 ;; Copyright 2006-2023 Gentoo Authors
 

[gentoo-commits] proj/eselect:master commit in: misc/, /

[Ulrich Müller]

commit: 78b2c7b63e382bf3dd989b2f680ccdff356a39cc
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Aug 24 17:31:49 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Aug 24 17:31:49 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=78b2c7b6

eselect-mode: Refer to sh-mode instead of shell-script-mode

* misc/eselect-mode.el (eselect-mode): Refer to sh-mode directly,
instead of shell-script-mode which is its alias.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 5 +
 misc/eselect-mode.el | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e534492..670bbcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-08-24  Ulrich Müller  
+
+   * misc/eselect-mode.el (eselect-mode): Refer to sh-mode directly,
+   instead of shell-script-mode which is its alias.
+
 2023-08-22  Ulrich Müller  
 
* doc/developer-guide.txt: Update documentation for "has".

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index bfcf494..57791f8 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -141,7 +141,7 @@
   nil)
 
 ;;;###autoload
-(define-derived-mode eselect-mode shell-script-mode "Eselect"
+(define-derived-mode eselect-mode sh-mode "Eselect"
   "Major mode for .eselect files."
   (add-hook 'write-contents-functions 'eselect-mode-before-save t t)
   (sh-set-shell "bash")

[gentoo-commits] proj/eselect:master commit in: /, doc/

[Ulrich Müller]

commit: 91eda5f425a87a067dd07e0f9a71c288bd3350d5
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Aug 22 09:42:01 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Aug 22 09:42:01 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=91eda5f4

Update documentation for "has"

* doc/developer-guide.txt: Update documentation for "has".

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog   | 4 
 doc/developer-guide.txt | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cce6fb2..e534492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2023-08-22  Ulrich Müller  
+
+   * doc/developer-guide.txt: Update documentation for "has".
+
 2023-08-09  Ulrich Müller  
 
* configure.ac: Update version to 1.4.26.

diff --git a/doc/developer-guide.txt b/doc/developer-guide.txt
index 16393cb..50f8bdd 100644
--- a/doc/developer-guide.txt
+++ b/doc/developer-guide.txt
@@ -371,8 +371,8 @@ These are implemented in ``libs/tests.bash``.
 The ``has`` function
 
 
-The ``has`` utility function is like Portage's ``hasq``. It returns true
-if and only if the first parameter is equal to any of the remaining
+The ``has`` utility function is like its Portage equivalent. It returns
+true if and only if the first parameter is equal to any of the remaining
 parameters.
 
 The ``is_function`` function

[gentoo-commits] proj/eselect:master commit in: /, doc/

[Ulrich Müller]

commit: 31feb189bf0b4610bc1b04f7b6e18f0fd827533c
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Aug 22 09:42:01 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Aug 22 09:42:01 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=31feb189

Update documentation for "has"

* doc/developer-guide.txt: Update documentation for "has".

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog   | 4 
 doc/developer-guide.txt | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cce6fb2..e534492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2023-08-22  Ulrich Müller  
+
+   * doc/developer-guide.txt: Update documentation for "has".
+
 2023-08-09  Ulrich Müller  
 
* configure.ac: Update version to 1.4.26.

diff --git a/doc/developer-guide.txt b/doc/developer-guide.txt
index 16393cb..50f8bdd 100644
--- a/doc/developer-guide.txt
+++ b/doc/developer-guide.txt
@@ -371,8 +371,8 @@ These are implemented in ``libs/tests.bash``.
 The ``has`` function
 
 
-The ``has`` utility function is like Portage's ``hasq``. It returns true
-if and only if the first parameter is equal to any of the remaining
+The ``has`` utility function is like its Portage equivalent. It returns
+true if and only if the first parameter is equal to any of the remaining
 parameters.
 
 The ``is_function`` function

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: f980eea0771c728d69c170ab95a8a376623a4667
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Aug  9 15:25:53 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Aug  9 15:25:53 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=f980eea0

Update NEWS

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 4 
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index 501858d..3bae57a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.26:
+New features:
+- Updated list of editors in editor and visual modules (bug #911792).
+
 1.4.25:
 Bug fixes:
 - Fixed bug #908401: More robust file type detection in env module.

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: ade79584b8723ad5bd8690f99a1a6f2d9ff0ef52
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Aug  9 15:26:21 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Aug  9 15:26:21 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=ade79584

Update version to 1.4.26

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 5 +
 configure.ac | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aa50140..cce6fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-08-09  Ulrich Müller  
+
+   * configure.ac: Update version to 1.4.26.
+   * Tagged 1.4.26 release.
+
 2023-08-07  Ulrich Müller  
 
* modules/editor.eselect (EDITOR_LIST):

diff --git a/configure.ac b/configure.ac
index b561481..91912c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.25, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.26, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /, modules/

[Ulrich Müller]

commit: e1577d699cfc3eb60b245c8488062a43e8cece22
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Aug  7 16:21:04 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Aug  7 16:21:04 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=e1577d69

Update lists in editor and visual modules

* modules/editor.eselect (EDITOR_LIST):
* modules/visual.eselect (EDITOR_LIST): Add vim; drop ed, ex, vi
and xemacs. Bug 911792.

Bug: https://bugs.gentoo.org/911792
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 6 ++
 modules/editor.eselect | 4 ++--
 modules/visual.eselect | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 932edc3..aa50140 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-08-07  Ulrich Müller  
+
+   * modules/editor.eselect (EDITOR_LIST):
+   * modules/visual.eselect (EDITOR_LIST): Add vim; drop ed, ex, vi
+   and xemacs. Bug 911792.
+
 2023-07-08  Ulrich Müller  
 
* bin/eselect.in (PATH): Avoid subshell.

diff --git a/modules/editor.eselect b/modules/editor.eselect
index 488d598..4304fb5 100644
--- a/modules/editor.eselect
+++ b/modules/editor.eselect
@@ -1,11 +1,11 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2009-2020 Gentoo Authors
+# Copyright 2009-2023 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 EDITOR_VAR="EDITOR"
 EDITOR_ENVFILE="/etc/env.d/99editor"
 # list of most common cases only
-EDITOR_LIST="nano ed emacs ex vi xemacs"
+EDITOR_LIST="nano emacs vim"
 
 inherit editor-variable
 

diff --git a/modules/visual.eselect b/modules/visual.eselect
index 527793e..01c25b5 100644
--- a/modules/visual.eselect
+++ b/modules/visual.eselect
@@ -1,11 +1,11 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2009-2021 Gentoo Authors
+# Copyright 2009-2023 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 EDITOR_VAR="VISUAL"
 EDITOR_ENVFILE="/etc/env.d/99editor"
 # list of most common cases only
-EDITOR_LIST="nano emacs vi xemacs"
+EDITOR_LIST="nano emacs vim"
 
 inherit editor-variable
 

[gentoo-commits] proj/eselect:master commit in: bin/, /

[Ulrich Müller]

commit: c6ee01faaeabcab22b29e8d3f671ba6fd7d00724
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jul  8 06:19:02 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jul  8 06:19:02 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=c6ee01fa

Avoid subshell on startup

* bin/eselect.in (PATH): Avoid subshell.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 4 
 bin/eselect.in | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 65a49f0..932edc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2023-07-08  Ulrich Müller  
+
+   * bin/eselect.in (PATH): Avoid subshell.
+
 2023-06-12  Ulrich Müller  
 
* configure.ac: Update version to 1.4.25.

diff --git a/bin/eselect.in b/bin/eselect.in
index 36581e1..ee26b80 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -62,7 +62,8 @@ umask +rx
 # Sanitise PATH: We don't want to execute Portage's internal helpers
 # if we're called from an ebuild.
 IFS=:
-read -r -d '' -a path < <(printf '%s\0' "${PATH}")
+# Append ${IFS} to prevent any trailing empty field from being dropped
+set -f; path=(${PATH}${IFS}); set +f
 for i in "${!path[@]}"; do
[[ ${path[i]} == */portage?(/*)/ebuild-helpers?(/*) ]] && unset 
"path[i]"
 done

[gentoo-commits] proj/eselect:master commit in: modules/

[Ulrich Müller]

commit: 35f7c112e5a0ee16e680e6ed7321b88332b86450
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jun 12 17:34:59 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jun 12 17:34:59 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=35f7c112

env.eselect: Fix typos in comments

Signed-off-by: Ulrich Müller  gentoo.org>

 modules/env.eselect | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/env.eselect b/modules/env.eselect
index 7161e10..21369d2 100644
--- a/modules/env.eselect
+++ b/modules/env.eselect
@@ -36,8 +36,8 @@ PRELINK="${EROOT}/etc/prelink.conf"
 # Keep all stored LDPATHS
 ESELECT_LDPATH=( )
 
-# is_envd_file()
-# Return successfuly when file can be sourced.
+# is_envfile()
+# Return successfully when file can be sourced.
 is_envfile() {
local mime envfile=${1}
 
@@ -58,7 +58,7 @@ is_envfile() {
 }
 
 # update_envvar_classes()
-# Update the contents of *_CLASS based on env,d files.
+# Update the contents of *_CLASS based on env.d files.
 update_envvar_classes() {
local -a envfiles
local value

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 76d1a10983c076fe4d3af825797ae444f7aefb05
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jun 12 16:03:23 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jun 12 16:03:23 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=76d1a109

Update NEWS

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 7db32f6..501858d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.25:
+Bug fixes:
+- Fixed bug #908401: More robust file type detection in env module.
+
+New features:
+- eselect-mode can update copyright years before writing a file.
+
 1.4.24:
 Bug fixes:
 - Don't append a spurious newline to PATH.

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 9fc05b47a0a76cf8a00471ccb66e2455c44d8516
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jun 12 16:03:53 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jun 12 16:03:53 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=9fc05b47

Update version to 1.4.25

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 3 +++
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 96cee04..65a49f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2023-06-12  Ulrich Müller  
 
+   * configure.ac: Update version to 1.4.25.
+   * Tagged 1.4.25 release.
+
* modules/env.eselect (is_envfile): Make detection of text file
more robust. Bug 908401.
 

diff --git a/configure.ac b/configure.ac
index 7d4ad6e..b561481 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.24, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.25, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: misc/, /

[Ulrich Müller]

commit: 4ebe3143212afa53ffc2f88156cc69a4f383375b
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jun 12 15:48:17 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jun 12 15:48:17 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=4ebe3143

eselect-mode: Update copyright years before writing a file

* misc/eselect-mode.el (eselect, eselect-mode-fix-whitespace)
(eselect-mode-update-copyright): New custom group and variables.
(eselect-mode-copyright-regexp): New variable.
(eselect-mode-update-copyright): New function, mostly copied from
ebuild-mode-update-copyright in ebuild-mode.el.
(eselect-mode-before-save): Make fixing of whitespace conditional.
Update copyright years when customised to do so.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 10 ++
 misc/eselect-mode.el | 53 ++--
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 87efe93..fd75fe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-06-12  Ulrich Müller  
+
+   * misc/eselect-mode.el (eselect, eselect-mode-fix-whitespace)
+   (eselect-mode-update-copyright): New custom group and variables.
+   (eselect-mode-copyright-regexp): New variable.
+   (eselect-mode-update-copyright): New function, mostly copied from
+   ebuild-mode-update-copyright in ebuild-mode.el.
+   (eselect-mode-before-save): Make fixing of whitespace conditional.
+   Update copyright years when customised to do so.
+
 2023-06-07  Ulrich Müller  
 
* bin/eselect.in (PATH): Use printf instead of echo.

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index d7ea649..d2df858 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -1,6 +1,6 @@
 ;;; eselect-mode.el --- edit eselect files
 
-;; Copyright 2006-2022 Gentoo Authors
+;; Copyright 2006-2023 Gentoo Authors
 
 ;; Author: Matthew Kennedy 
 ;; Diego Pettenò 
@@ -31,6 +31,26 @@
 (require 'sh-script)
 (require 'font-lock)
 
+;;; Variables.
+
+(defgroup eselect nil
+  "Major mode for Gentoo eselect modules."
+  :group 'languages)
+
+(defcustom eselect-mode-fix-whitespace t
+  "If non-nil, delete trailing whitespace before writing a file."
+  :type 'boolean
+  :group 'eselect)
+
+(defcustom eselect-mode-update-copyright t
+  "If non-nil, update copyright years before writing a file."
+  :type 'boolean
+  :group 'eselect)
+
+(defvar eselect-mode-copyright-regexp
+  "^#[ \t]*Copyright[ \t]+\\([1-9][0-9]+\\)\\(?:-\\([1-9][0-9]+\\)\\)?\
+[ \t]+\\(.*\\.*\\)")
+
 ;;; Font-lock.
 
 (defvar eselect-mode-keywords-warn
@@ -86,8 +106,37 @@
 
 ;;; Mode definitions.
 
+(defun eselect-mode-update-copyright ()
+  "Update the copyright notice in the file's header."
+  (save-excursion
+(goto-char (point-min))
+(let ((case-fold-search nil))
+  (when (re-search-forward eselect-mode-copyright-regexp 400 t)
+   (let* ((y1 (string-to-number (match-string 1)))
+  (y2 (and (match-string 2)
+   (string-to-number (match-string 2
+  (year (save-match-data (format-time-string "%Y" nil t)))
+  (y (string-to-number year)))
+ (if y2
+ ;; Update range of years
+ (if (or (> 2005 y1) (>= y1 y2) (> y2 y))
+ (lwarn 'eselect :warning
+"Suspicious range of copyright years: %d-%d" y1 y2)
+   (if (/= y2 y)
+   (replace-match year t t nil 2)))
+   ;; Update single year and convert to range if necessary
+   (if (or (> 2005 y1) (> y1 y))
+   (lwarn 'eselect :warning "Suspicious copyright year: %d" y1)
+ (if (/= y1 y)
+ (replace-match (concat "\\1-" year) t nil nil 1)
+
 (defun eselect-mode-before-save ()
-  (delete-trailing-whitespace)
+  (when eselect-mode-fix-whitespace
+(delete-trailing-whitespace))
+  (when eselect-mode-update-copyright
+(eselect-mode-update-copyright)
+;; call it only once per buffer
+(set (make-local-variable 'eselect-mode-update-copyright) nil))
   ;; return nil, otherwise the file is presumed to be written
   nil)
 

[gentoo-commits] proj/eselect:master commit in: /, modules/

[Ulrich Müller]

commit: cc4270eeb9b737ecd4332b417524976ede25a323
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jun 12 15:56:19 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jun 12 15:56:19 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=cc4270ee

env.eselect: More robust file type detection

* modules/env.eselect (is_envfile): Make detection of text file
more robust. Bug 908401.

Bug: https://bugs.gentoo.org/908401
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog   | 3 +++
 modules/env.eselect | 9 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5532ba..96cee04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2023-06-12  Ulrich Müller  
 
+   * modules/env.eselect (is_envfile): Make detection of text file
+   more robust. Bug 908401.
+
* misc/eselect-mode.el (eselect-mode): Drop XEmacs compatibility
code.
 

diff --git a/modules/env.eselect b/modules/env.eselect
index 6334d7c..7161e10 100644
--- a/modules/env.eselect
+++ b/modules/env.eselect
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 2005-2023 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 inherit config multilib package-manager
@@ -46,9 +46,10 @@ is_envfile() {
[[ -n ${envfile##*~} ]] || return 1
[[ ${envfile##*.} != bak ]] || return 1
 
-   mime=$(POSIXLY_CORRECT=1 file -i "${envfile}" \
-   | cut -d ' ' -f 2 | sed -e 's/;$//')
-   if ! has ${mime} ${MIME_WHITELIST}; then
+   mime=$(POSIXLY_CORRECT=1 file -bi -e soft "${envfile}") \
+   || die "'file' command failed"
+   mime=${mime%%;*}
+   if ! has "${mime}" ${MIME_WHITELIST}; then
echo "Skipping non-text file ${envfile}."
return 1
fi

[gentoo-commits] proj/eselect:master commit in: /, misc/

[Ulrich Müller]

commit: b2ae3184ccfcb1ff932f207ca432ebbf964de0c1
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jun 12 15:51:59 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jun 12 15:51:59 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=b2ae3184

eselect-mode: Drop XEmacs compatibility code

* misc/eselect-mode.el (eselect-mode): Drop XEmacs compatibility
code.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 3 +++
 misc/eselect-mode.el | 5 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fd75fe3..a5532ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2023-06-12  Ulrich Müller  
 
+   * misc/eselect-mode.el (eselect-mode): Drop XEmacs compatibility
+   code.
+
* misc/eselect-mode.el (eselect, eselect-mode-fix-whitespace)
(eselect-mode-update-copyright): New custom group and variables.
(eselect-mode-copyright-regexp): New variable.

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index d2df858..bfcf494 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -143,10 +143,7 @@
 ;;;###autoload
 (define-derived-mode eselect-mode shell-script-mode "Eselect"
   "Major mode for .eselect files."
-  (if (not (featurep 'xemacs))
-  (add-hook 'write-contents-functions 'eselect-mode-before-save t t)
-(make-local-hook 'write-contents-hooks)
-(add-hook 'write-contents-hooks 'eselect-mode-before-save t t))
+  (add-hook 'write-contents-functions 'eselect-mode-before-save t t)
   (sh-set-shell "bash")
   (setq tab-width 4)
   (setq indent-tabs-mode t))

[gentoo-commits] proj/eselect:master commit in: bin/, /

[Ulrich Müller]

commit: 9869b3f98c95ec154b7ac5b2af8bcf6201d8127a
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Jun  7 08:50:02 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Jun  7 08:50:02 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=9869b3f9

Use printf instead of echo

* bin/eselect.in (PATH): Use printf instead of echo

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 2 ++
 bin/eselect.in | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aba58d1..87efe93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2023-06-07  Ulrich Müller  
 
+   * bin/eselect.in (PATH): Use printf instead of echo.
+
* configure.ac: Update version to 1.4.24.
* Tagged 1.4.24 release.
 

diff --git a/bin/eselect.in b/bin/eselect.in
index 41d53d7..36581e1 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -62,7 +62,7 @@ umask +rx
 # Sanitise PATH: We don't want to execute Portage's internal helpers
 # if we're called from an ebuild.
 IFS=:
-read -r -d '' -a path < <(echo -n "${PATH}")
+read -r -d '' -a path < <(printf '%s\0' "${PATH}")
 for i in "${!path[@]}"; do
[[ ${path[i]} == */portage?(/*)/ebuild-helpers?(/*) ]] && unset 
"path[i]"
 done

[gentoo-commits] proj/eselect:master commit in: bin/, /

[Ulrich Müller]

commit: 55bc97298c80da3a0b26fb44ee86ce6a27a4cc6a
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Jun  7 07:22:03 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Jun  7 07:22:03 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=55bc9729

Don't append a spurious newline to PATH

* bin/eselect.in (PATH): Don't append a spurious newline.

Fixes: 81dc05871392f5acbf5fadb5bb1991c737e42a5f
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 4 
 bin/eselect.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b0ed346..ef5914e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2023-06-07  Ulrich Müller  
+
+   * bin/eselect.in (PATH): Don't append a spurious newline.
+
 2023-06-06  Ulrich Müller  
 
* configure.ac: Update version to 1.4.23.

diff --git a/bin/eselect.in b/bin/eselect.in
index 483a572..41d53d7 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -62,7 +62,7 @@ umask +rx
 # Sanitise PATH: We don't want to execute Portage's internal helpers
 # if we're called from an ebuild.
 IFS=:
-read -r -d '' -a path <<<"${PATH}"
+read -r -d '' -a path < <(echo -n "${PATH}")
 for i in "${!path[@]}"; do
[[ ${path[i]} == */portage?(/*)/ebuild-helpers?(/*) ]] && unset 
"path[i]"
 done

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: f6d55a0b76d5aabce25010fffa8e5b70fb84d236
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Jun  7 07:24:10 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Jun  7 07:24:10 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=f6d55a0b

Update NEWS

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 4 
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index 82ba396..7db32f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.24:
+Bug fixes:
+- Don't append a spurious newline to PATH.
+
 1.4.23:
 New features:
 - Don't autodetect bash and env-update at configure time (bug #905934).

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 90cda551761d10a029d2126ed4de753d9f604489
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Jun  7 07:26:03 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Jun  7 07:26:03 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=90cda551

Update version to 1.4.24

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 3 +++
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ef5914e..aba58d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2023-06-07  Ulrich Müller  
 
+   * configure.ac: Update version to 1.4.24.
+   * Tagged 1.4.24 release.
+
* bin/eselect.in (PATH): Don't append a spurious newline.
 
 2023-06-06  Ulrich Müller  

diff --git a/configure.ac b/configure.ac
index 5fbad80..7d4ad6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.23, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.24, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 11d9c679a5f0877aa8c8d211153cc843495e74b9
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jun  6 18:36:07 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jun  6 18:36:07 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=11d9c679

Update NEWS

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index f64f210..82ba396 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.23:
+New features:
+- Don't autodetect bash and env-update at configure time (bug #905934).
+- Sanitise PATH, remove Portage's internal ebuild-helpers dir from it.
+- Add subsection about module testing to developer guide (bug #907844).
+
 1.4.22:
 New features:
 - Disable colour if NO_COLOR is set in the environment.

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 5cae50348afa7111655857e429c2c1a067cd6c88
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jun  6 18:36:28 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jun  6 18:36:28 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=5cae5034

Update version to 1.4.23

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 5 +
 configure.ac | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fe99690..b0ed346 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-06-06  Ulrich Müller  
+
+   * configure.ac: Update version to 1.4.23.
+   * Tagged 1.4.23 release.
+
 2023-06-05  Ulrich Müller  
 
* bin/eselect.in (PATH): Sanitise, remove Portage's internal

diff --git a/configure.ac b/configure.ac
index 3d5741b..5fbad80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.22, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.23, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: bin/, /

[Ulrich Müller]

commit: 58e82125a8adfa89585468f3e6609f46896d313a
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jun  5 17:47:02 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jun  5 17:47:02 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=58e82125

Quote argument of ":" command

* bin/eselect.in (EPREFIX): Quote argument of ":" command.
This avoids globbing, see: https://www.shellcheck.net/wiki/SC2223
Add some more quotes throughout.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 6 ++
 bin/eselect.in | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index afa6885..701fb9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-06-05  Ulrich Müller  
+
+   * bin/eselect.in (EPREFIX): Quote argument of ":" command.
+   This avoids globbing, see: https://www.shellcheck.net/wiki/SC2223
+   Add some more quotes throughout.
+
 2023-06-04  Ulrich Müller  
 
* doc/developer-guide.txt: Add subsection about module testing.

diff --git a/bin/eselect.in b/bin/eselect.in
index 9109627..c59a09d 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -45,7 +45,7 @@ ESELECT_KILL_TARGET="$$"
 # prefix for the build host. EPREFIX defaults to the same, but can be
 # overridden at runtime when building for a different prefix.
 BROOT="@EPREFIX@"
-: ${EPREFIX="${BROOT}"}
+: "${EPREFIX="${BROOT}"}"
 EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}"
 
 # Remove all alias definitions. Unset functions and variables that are
@@ -126,7 +126,7 @@ unset suffix
 if [[ -z ${action} ]]; then
binname=$(basename "$0")
for prefix in config update{,r} manage 'read'; do
-   if [[ ${binname##${prefix}-} != ${binname} ]]; then
+   if [[ ${binname##${prefix}-} != "${binname}" ]]; then
action=$(basename "$0")
action=${action##${prefix}-}
break
@@ -145,7 +145,7 @@ while [[ ${1##--} != "$1" ]]; do
colour=*|color=*|colour|color)
# accept all arguments that are valid for ls or emerge
case ${1#*=} in
-   yes|y|always|force|$1) colour=yes ;;
+   yes|y|always|force|"$1") colour=yes ;;
no|n|never|none) colour=no ;;
auto|tty|if-tty) colour="" ;;
*) die -q "Invalid argument for ${1%%=*} 
option" ;;

[gentoo-commits] proj/eselect:master commit in: /, bin/

[Ulrich Müller]

commit: 81dc05871392f5acbf5fadb5bb1991c737e42a5f
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jun  5 17:59:33 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jun  5 17:59:33 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=81dc0587

Sanitise PATH

* bin/eselect.in (PATH): Sanitise, remove Portage's internal
ebuild-helpers dir from it.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  |  3 +++
 bin/eselect.in | 13 -
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 701fb9c..fe99690 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2023-06-05  Ulrich Müller  
 
+   * bin/eselect.in (PATH): Sanitise, remove Portage's internal
+   ebuild-helpers dir from it.
+
* bin/eselect.in (EPREFIX): Quote argument of ":" command.
This avoids globbing, see: https://www.shellcheck.net/wiki/SC2223
Add some more quotes throughout.

diff --git a/bin/eselect.in b/bin/eselect.in
index c59a09d..483a572 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -53,13 +53,24 @@ EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}"
 "unalias" -a
 unset -f rm
 unset CDPATH GLOBIGNORE
-IFS=$' \t\n'
 
 shopt -s extglob
 shopt -s expand_aliases
 
 umask +rx
 
+# Sanitise PATH: We don't want to execute Portage's internal helpers
+# if we're called from an ebuild.
+IFS=:
+read -r -d '' -a path <<<"${PATH}"
+for i in "${!path[@]}"; do
+   [[ ${path[i]} == */portage?(/*)/ebuild-helpers?(/*) ]] && unset 
"path[i]"
+done
+PATH="${path[*]}"
+unset i path
+
+IFS=$' \t\n'
+
 # Save stderr file descriptor
 if (( BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 1 || BASH_VERSINFO[0] > 4 ))
 then

[gentoo-commits] proj/eselect:master commit in: doc/, /

[Ulrich Müller]

commit: 5f3a0c3cbf4c85b69a3937b792a37ae8d95d6b8a
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jun  4 17:35:26 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jun  4 17:35:26 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=5f3a0c3c

Add subsection about module testing to developer guide

* doc/developer-guide.txt: Add subsection about module testing.
Thanks to torsi  fi.uba.ar for the suggestion. Bug 907844.

Original-author: Lemon Lime  fi.uba.ar>
Closes: https://bugs.gentoo.org/907844
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog   | 5 +
 doc/developer-guide.txt | 8 
 2 files changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ce13578..afa6885 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-06-04  Ulrich Müller  
+
+   * doc/developer-guide.txt: Add subsection about module testing.
+   Thanks to to...@fi.uba.ar for the suggestion. Bug 907844.
+
 2023-05-11  Ulrich Müller  
 
* bin/eselect.in: Update shebang to use EPREFIX. Bug 905934.

diff --git a/doc/developer-guide.txt b/doc/developer-guide.txt
index 694b64d..16393cb 100644
--- a/doc/developer-guide.txt
+++ b/doc/developer-guide.txt
@@ -164,6 +164,14 @@ All modules contributed to eselect should have a header 
indicating
 copyright. This must be an exact copy of the header in the above
 example (except for the years, of course).
 
+Adding modules for testing
+--
+
+eselect modules can be manually added to the system. This is specially
+useful when an eselect module is being developed and needs testing.
+Copying (or symlinking) the eselect module to ``~/.eselect/modules/``
+will make eselect aware of it.
+
 Standard action names
 -
 

[gentoo-commits] proj/eselect:master commit in: libs/, bin/, /

[Ulrich Müller]

commit: ad863d288f29bcca776369dec7765dbb0174ba82
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu May 11 17:04:20 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu May 11 17:04:20 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=ad863d28

Don't autodetect bash and env-update at configure time

* bin/eselect.in: Update shebang to use EPREFIX. Bug 905934.
* bin/Makefile.am (dosed): Don't substitute BASH.
* libs/package-manager.bash.in (env_update): Don't use an absolute
path for env-update.
* libs/Makefile.am (dosed): Don't substitute ENV_UPDATE.
* configure.ac: Drop checks for bash and env-update paths.

Bug: https://bugs.gentoo.org/905934
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog|  7 +++
 bin/Makefile.am  |  3 +--
 bin/eselect.in   |  2 +-
 configure.ac | 12 
 libs/Makefile.am |  1 -
 libs/package-manager.bash.in |  4 ++--
 6 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0684481..ce13578 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2023-05-11  Ulrich Müller  
 
+   * bin/eselect.in: Update shebang to use EPREFIX. Bug 905934.
+   * bin/Makefile.am (dosed): Don't substitute BASH.
+   * libs/package-manager.bash.in (env_update): Don't use an absolute
+   path for env-update.
+   * libs/Makefile.am (dosed): Don't substitute ENV_UPDATE.
+   * configure.ac: Drop checks for bash and env-update paths.
+
* libs/Makefile.am (dosed): Don't substitute PORTAGEQ, it no
longer exists in configure.
 

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 20902c1..a4bf2a2 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,8 +1,7 @@
 bin_SCRIPTS = eselect
 EXTRA_DIST = eselect.in
 
-dosed = @SED@ -e 's%\@BASH\@%$(BASH)%g' \
- -e 's%\@DATADIR\@%$(datadir)%g' \
+dosed = @SED@ -e 's%\@DATADIR\@%$(datadir)%g' \
  -e 's%\@EPREFIX\@%$(EPREFIX)%g' \
  -e 's%\@VERSION\@%$(VERSION)$(EXTRAVERSION)%g'
 

diff --git a/bin/eselect.in b/bin/eselect.in
index 7a74098..9109627 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@EPREFIX@/bin/bash
 # -*-eselect-*-  vim: ft=eselect
 # Copyright (c) 2005-2023 Gentoo Authors
 #

diff --git a/configure.ac b/configure.ac
index e767884..3d5741b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,15 +8,6 @@ test x$prefix = xNONE && prefix="$ac_default_prefix"
 test x$datadir = xNONE && datadir="$ac_default_datadir"
 test x$sysconfdir = xNONE && sysconfdir="$ac_default_sysconfdir"
 
-# BASH may already be set in the shell, if the admin then changes the
-# the /bin/sh symlink to a non-bash shell, all hell will break lose.
-# thanks to James Rowe for the heads up.
-unset BASH
-AC_PATH_PROGS(BASH, bash)
-if test x$BASH = x; then
-AC_MSG_ERROR([bash is required])
-fi
-
 # AC_PROG_SED doesn't work here, because on Gentoo FreeBSD systems it
 # is confused by a wrapper script that is in the PATH at build time.
 AC_CHECK_PROGS(SED, [gsed sed])
@@ -31,9 +22,6 @@ else
 AC_MSG_ERROR([GNU sed is required])
 fi
 
-AC_PATH_PROG(ENV_UPDATE, env-update, /usr/sbin/env-update,
-  [$PATH:$prefix/sbin:/usr/sbin])
-
 CANONICALISE=""
 # realpath is included with Coreutils since version 8.15 (2012)
 AC_CHECK_PROGS(REALPATH, [grealpath realpath])

diff --git a/libs/Makefile.am b/libs/Makefile.am
index c5f3de3..debaa1d 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -28,7 +28,6 @@ EXTRA_DIST = \
 
 dosed = @SED@ \
-e 's%\@SED\@%@SED@%g' \
-   -e 's%\@ENV_UPDATE\@%@ENV_UPDATE@%g' \
-e 's%\@CANONICALISE\@%@CANONICALISE@%g' \
-e 's%\@libdir\@%@libdir@%g'
 

diff --git a/libs/package-manager.bash.in b/libs/package-manager.bash.in
index c32fcb4..7688b96 100644
--- a/libs/package-manager.bash.in
+++ b/libs/package-manager.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2021 Gentoo Authors
+# Copyright (c) 2005-2023 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #
@@ -209,7 +209,7 @@ env_update() {
local noldconfig
[[ $1 -ne 0 ]] || noldconfig=y
case $(package_manager) in
-   portage) "@ENV_UPDATE@" ${noldconfig:+--no-ldconfig} ;;
+   portage) env-update ${noldconfig:+--no-ldconfig} ;;
pkgcore) pmaint env-update ${noldconfig:+--skip-ldconfig} ;;
paludis) return 127 ;;
esac

[gentoo-commits] proj/eselect:master commit in: libs/, /

[Ulrich Müller]

commit: 9a77220d8ef4f4cca4e95be0af8e67571cc5f5ad
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu May 11 16:59:57 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu May 11 16:59:57 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=9a77220d

Don't substitute PORTAGEQ in libs

* libs/Makefile.am (dosed): Don't substitute PORTAGEQ, it no
longer exists in configure.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 5 +
 libs/Makefile.am | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f807496..0684481 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-05-11  Ulrich Müller  
+
+   * libs/Makefile.am (dosed): Don't substitute PORTAGEQ, it no
+   longer exists in configure.
+
 2023-03-20  Ulrich Müller  
 
* configure.ac: Update version to 1.4.22.

diff --git a/libs/Makefile.am b/libs/Makefile.am
index 6ebd08e..c5f3de3 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -28,7 +28,6 @@ EXTRA_DIST = \
 
 dosed = @SED@ \
-e 's%\@SED\@%@SED@%g' \
-   -e 's%\@PORTAGEQ\@%@PORTAGEQ@%g' \
-e 's%\@ENV_UPDATE\@%@ENV_UPDATE@%g' \
-e 's%\@CANONICALISE\@%@CANONICALISE@%g' \
-e 's%\@libdir\@%@libdir@%g'

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: b3f814db7a968633ada66e97aa05e9769240af26
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Mar 20 17:17:43 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Mar 20 17:17:43 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=b3f814db

Update version to 1.4.22

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 5 +
 configure.ac | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3057a22..f807496 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-03-20  Ulrich Müller  
+
+   * configure.ac: Update version to 1.4.22.
+   * Tagged 1.4.22 release.
+
 2023-03-16  Ulrich Müller  
 
* bin/eselect.in (trap): Don't output a message, because die()

diff --git a/configure.ac b/configure.ac
index 4a0fc9a..e767884 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.21, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.22, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: cae12e63a7776767c5920fc4bf634753d8423a21
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Mar 20 17:17:08 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Mar 20 17:17:08 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=cae12e63

Update NEWS

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index 382cc12..f64f210 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.22:
+New features:
+- Disable colour if NO_COLOR is set in the environment.
+- Allow to specify modules by an absolute path (bug #901205).
+- New "update" action in kernel module (bug #901209).
+
 1.4.21:
 Bug fixes:
 - Fixed a byte-compile warning in eselect-mode.

[gentoo-commits] proj/eselect:master commit in: bin/, /

[Ulrich Müller]

commit: b2d7c42e744cee752b2ad364c98e1d5541316732
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Mar 16 17:06:52 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Mar 16 17:06:52 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=b2d7c42e

Remove useless exit message

* bin/eselect.in (trap): Don't output a message, because die()
is verbose enough. Thanks to Florian Schmaus for the suggestion.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 5 +
 bin/eselect.in | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7bb4ea4..3057a22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-03-16  Ulrich Müller  
+
+   * bin/eselect.in (trap): Don't output a message, because die()
+   is verbose enough. Thanks to Florian Schmaus for the suggestion.
+
 2023-03-14  Florian Schmaus  
 
* modules/kernel.eselect (do_update, describe_update)

diff --git a/bin/eselect.in b/bin/eselect.in
index 888977c..7a74098 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -73,7 +73,7 @@ inherit manip output path-manipulation tests
 
 # Sneaky trick to make die in subshells work. If you don't get
 # it, don't ask...
-trap 'echo "exiting" >&2; exit 250' 15
+trap 'exit 250' 15
 
 # es_do_usage
 # Display eselect usage

[gentoo-commits] proj/eselect:master commit in: modules/, /, man/

[Ulrich Müller]

commit: d5bd4e5f8d28c3fc6e7d15d639538ac9b6459e7a
Author: Florian Schmaus  gentoo  org>
AuthorDate: Tue Mar 14 10:02:59 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Mar 15 11:04:22 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=d5bd4e5f

New "update" action in kernel module

* modules/kernel.eselect (do_update, describe_update)
(describe_update_options): New action, attempts to update the
/usr/src/linux symlink to point to the sources of the running
kernel. Bug 901209.
* man/kernel.eselect.5: Document it.

Thanks to ulm for helpful suggestions when working on this
functionality.

Bug: https://bugs.gentoo.org/901209
Signed-off-by: Florian Schmaus  gentoo.org>
[Tweaked bash syntax. Fixed highlighting in man page.]
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  |  6 +
 man/kernel.eselect.5   | 16 ++--
 modules/kernel.eselect | 71 +-
 3 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 913494f..7bb4ea4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2023-03-14  Florian Schmaus  
 
+   * modules/kernel.eselect (do_update, describe_update)
+   (describe_update_options): New action, attempts to update the
+   /usr/src/linux symlink to point to the sources of the running
+   kernel. Bug 901209.
+   * man/kernel.eselect.5: Document it.
+
* libs/core.bash.in (find_module): Allow to specify an absolute
path as the module's filename, bug 901205.
 

diff --git a/man/kernel.eselect.5 b/man/kernel.eselect.5
index b3c5aa5..75d992f 100644
--- a/man/kernel.eselect.5
+++ b/man/kernel.eselect.5
@@ -1,7 +1,7 @@
-.\" Copyright 2005-2020 Gentoo Authors
+.\" Copyright 2005-2023 Gentoo Authors
 .\" Distributed under the terms of the GNU GPL version 2 or later
 .\"
-.TH kernel.eselect 5 "April 2009" "Gentoo Linux" eselect
+.TH kernel.eselect 5 "March 2023" "Gentoo Linux" eselect
 .SH NAME
 kernel.eselect \- The kernel symlink management module for Gentoo's eselect
 .SH SYNOPSIS
@@ -14,6 +14,9 @@ kernel.eselect \- The kernel symlink management module for 
Gentoo's eselect
 .I target
 .br
 .B eselect kernel show
+.br
+.B eselect kernel update
+.RB [ ifunset ]
 .SH DESCRIPTION
 .B eselect
 is Gentoo's configuration and management tool.  It features modules
@@ -45,6 +48,15 @@ output).
 .B eselect kernel show
 .br
 Show the currently selected kernel.
+.SH ACTION: UPDATE
+.B eselect kernel update
+.RB [ ifunset ]
+.br
+Updates the /usr/src/linux symlink to point to the sources of the
+running kernel.  If option
+.B ifunset
+is given, then the symlink will only be updated if it is not currently
+pointing to a valid kernel source tree.
 .SH AUTHOR
 Aaron Walker 
 .SH SEE ALSO

diff --git a/modules/kernel.eselect b/modules/kernel.eselect
index 64b5e77..e181886 100644
--- a/modules/kernel.eselect
+++ b/modules/kernel.eselect
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 2005-2023 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 DESCRIPTION="Manage the /usr/src/linux symlink"
@@ -125,3 +125,72 @@ do_set() {
 
set_symlink "$1" || die -q "Couldn't set a new symlink"
 }
+
+### update action ###
+
+describe_update() {
+   echo "Update the kernel symlink to running kernel"
+}
+
+describe_update_options() {
+   echo "ifunset: Do not override currently set version"
+}
+
+do_update() {
+   [[ -z $1 || $1 == ifunset ]] || die -q "Usage error"
+   [[ $# -gt 1 ]] && die -q "Too many parameters"
+   test_for_root
+
+   if [[ -e ${EROOT}/usr/src/linux ]]; then
+   if [[ ! -L ${EROOT}/usr/src/linux ]]; then
+   # we have something strange
+   die -q "${EROOT}/usr/src/linux exists but is not a 
symlink"
+   fi
+
+   if [[ $1 == ifunset ]]; then
+   # The /usr/src/linux symlink exists, points to a path 
that
+   # exists, and 'ifunset' is provided. Nothing to do.
+   return
+   fi
+   fi
+
+   local targets=( $(find_targets) )
+   [[ ${#targets[@]} -gt 0 ]] || die -q "No target kernel-source trees 
found"
+
+   local running_kernel_release
+   running_kernel_release=$(uname -r) || die -q "uname failed with $?"
+   local running_kernel_symlink_target="linux-${running_kernel_release}"
+
+   if [[ -e ${EROOT}/usr/src/linux ]]; then
+   local current_target
+   current_target=$(basename "$(canonicalise 
"${EROOT}/usr/src/linux")")
+   if [[ ${current_target} == "${running_kernel_symlink_target}" 
]]; then
+   # The /usr/src/linux symlink already points to the 
running
+   # kernel's sources. Nothing to do.
+   return
+   fi
+   fi
+
+   

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: e49f345a6e26ea143f43394480ae0b7d98bbe265
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Mar 14 20:24:26 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Mar 14 20:24:26 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=e49f345a

ChangeLog: Add reference to bug 901205

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 57a53fc..913494f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2023-03-14  Florian Schmaus  
 
* libs/core.bash.in (find_module): Allow to specify an absolute
-   path as the module's filename.
+   path as the module's filename, bug 901205.
 
 2023-02-28  Ulrich Müller  
 

[gentoo-commits] proj/eselect:master commit in: /, libs/

[Ulrich Müller]

commit: c7e76fc0b9add97eda8cf406cbd168a1997e9ae3
Author: Florian Schmaus  gentoo  org>
AuthorDate: Tue Mar 14 14:23:07 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Mar 14 16:54:40 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=c7e76fc0

Allow to specify modules by path

* libs/core.bash.in (find_module): Allow to specify an absolute
path as the module's filename.

Bug: https://bugs.gentoo.org/901205
Signed-off-by: Florian Schmaus  gentoo.org>
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog |  5 +
 libs/core.bash.in | 11 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aab936d..57a53fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-03-14  Florian Schmaus  
+
+   * libs/core.bash.in (find_module): Allow to specify an absolute
+   path as the module's filename.
+
 2023-02-28  Ulrich Müller  
 
* bin/eselect.in: Disable colours if NO_COLOR is nonempty.

diff --git a/libs/core.bash.in b/libs/core.bash.in
index 740354e..2800cc5 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2020 Gentoo Authors
+# Copyright (c) 2005-2023 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #
@@ -69,6 +69,15 @@ die() {
 # Find module and echo its filename. Die if module doesn't exist.
 find_module() {
local modname=$1 modpath
+
+   if [[ ${modname} == */* ]]; then
+   if [[ ${modname} == *.eselect && -f ${modname} ]]; then
+   echo "${modname}"
+   return
+   fi
+   die -q "Can't load module ${modname}"
+   fi
+
for modpath in "${ESELECT_MODULES_PATH[@]}"; do
if [[ -f ${modpath}/${modname}.eselect ]]; then
echo "${modpath}/${modname}.eselect"

[gentoo-commits] proj/eselect:master commit in: libs/, /

[Ulrich Müller]

commit: ea6e42593c5d070462f450341b561bb415ad1bac
Author: Florian Schmaus  gentoo  org>
AuthorDate: Tue Mar 14 14:23:07 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Mar 14 16:52:06 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=ea6e4259

Allow to specify modules by path

* libs/core.bash.in (find_module): Allow to specify an absolute
path as the module's filename.

Bug: https://bugs.gentoo.org/901205
Signed-off-by: Florian Schmaus  gentoo.org>
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog |  5 +
 libs/core.bash.in | 11 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aab936d..4b57867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-03-14  Ulrich Müller  
+
+   * libs/core.bash.in (find_module): Allow to specify an absolute
+   path as the module's filename.
+
 2023-02-28  Ulrich Müller  
 
* bin/eselect.in: Disable colours if NO_COLOR is nonempty.

diff --git a/libs/core.bash.in b/libs/core.bash.in
index 740354e..2800cc5 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2020 Gentoo Authors
+# Copyright (c) 2005-2023 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #
@@ -69,6 +69,15 @@ die() {
 # Find module and echo its filename. Die if module doesn't exist.
 find_module() {
local modname=$1 modpath
+
+   if [[ ${modname} == */* ]]; then
+   if [[ ${modname} == *.eselect && -f ${modname} ]]; then
+   echo "${modname}"
+   return
+   fi
+   die -q "Can't load module ${modname}"
+   fi
+
for modpath in "${ESELECT_MODULES_PATH[@]}"; do
if [[ -f ${modpath}/${modname}.eselect ]]; then
echo "${modpath}/${modname}.eselect"

[gentoo-commits] proj/eselect:master commit in: bin/, /

[Ulrich Müller]

commit: ed29a63568537bb2f4e341ad1415060402b4c21f
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Feb 28 18:06:25 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Feb 28 18:06:25 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=ed29a635

Support NO_COLOR

* bin/eselect.in: Disable colours if NO_COLOR is nonempty.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 4 
 bin/eselect.in | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 64a5b5e..aab936d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2023-02-28  Ulrich Müller  
+
+   * bin/eselect.in: Disable colours if NO_COLOR is nonempty.
+
 2023-02-27  Ulrich Müller  
 
* configure.ac: Update version to 1.4.21.

diff --git a/bin/eselect.in b/bin/eselect.in
index a521a6f..888977c 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -136,6 +136,7 @@ if [[ -z ${action} ]]; then
 fi
 
 # parse global options
+colour=""
 while [[ ${1##--} != "$1" ]]; do
case ${1##--} in
brief)
@@ -185,6 +186,8 @@ fi
 
 # enable colour output and get width of terminal iff stdout is a tty
 if [[ -t 1 ]]; then
+   # command line option overrides NO_COLOR variable
+   [[ -z ${colour} && -n ${NO_COLOR} ]] && colour=no
colours ${colour:-yes}
init_columns
 else

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: b139066702785bd19338e0db796672a6b66322ef
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Feb 27 17:13:46 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Feb 27 17:13:46 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=b1390667

Update NEWS

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 8 
 1 file changed, 8 insertions(+)

diff --git a/NEWS b/NEWS
index 9e1396c..382cc12 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,14 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.21:
+Bug fixes:
+- Fixed a byte-compile warning in eselect-mode.
+
+New features:
+- Allow EPREFIX to be overridden for manipulating prefixed ROOT.
+- New global option --eprefix.
+
 1.4.20:
 Bug fixes:
 - Error out if --root has no option argument.

[gentoo-commits] proj/eselect:master commit in: bin/, /

[Ulrich Müller]

commit: 92ef7eeca4e90e8ce65fd0b00f438878f94d5e7c
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Feb 27 17:14:32 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Feb 27 17:14:32 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=92ef7eec

Update version to 1.4.21

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 3 +++
 bin/eselect.in | 2 +-
 configure.ac   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 141e377..64a5b5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2023-02-27  Ulrich Müller  
 
+   * configure.ac: Update version to 1.4.21.
+   * Tagged 1.4.21 release.
+
* misc/eselect.bashcomp (_eselect): Add --eprefix and --root
options.
 

diff --git a/bin/eselect.in b/bin/eselect.in
index 8afbd7e..a521a6f 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -105,7 +105,7 @@ es_do_help() {
 es_do_version() {
echo "eselect ${ESELECT_VERSION}"
echo
-   echo "Copyright (c) 2005-2020 Gentoo Authors."
+   echo "Copyright (c) 2005-2023 Gentoo Authors."
echo "Distributed under the terms of the GNU GPL version 2 or later."
 }
 

diff --git a/configure.ac b/configure.ac
index 00fd2d8..4a0fc9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.20, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.21, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /, misc/

[Ulrich Müller]

commit: 3ac9bf6ea721335a5ad7e6d924cb3a5950a8ac13
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Feb 27 17:11:25 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Feb 27 17:11:25 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=3ac9bf6e

Update option list in bash completion

* misc/eselect.bashcomp (_eselect): Add --eprefix and --root
options.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog | 5 +
 misc/eselect.bashcomp | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b442b8b..141e377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-02-27  Ulrich Müller  
+
+   * misc/eselect.bashcomp (_eselect): Add --eprefix and --root
+   options.
+
 2023-02-26  Ulrich Müller  
 
* bin/eselect.in: New global option --eprefix.

diff --git a/misc/eselect.bashcomp b/misc/eselect.bashcomp
index 7e33285..3ef614e 100644
--- a/misc/eselect.bashcomp
+++ b/misc/eselect.bashcomp
@@ -1,5 +1,5 @@
 # -*- mode: sh; indent-tabs-mode: nil; -*-  vim: set ft=sh tw=80 sw=4 et :
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 2005-2023 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 # bash command-line completion for eselect
@@ -8,7 +8,7 @@
 
 _eselect() {
 local cur sedcmd2 sedcmd3 possibles
-local options="--brief --color= --colour="
+local options="--brief --color= --colour= --eprefix= --root="
 COMPREPLY=()
 cur="${COMP_WORDS[COMP_CWORD]}"
 sedcmd2='s/^  \([[:alnum:]-][[:alnum:]_-]*\)[[:space:],].*$/\1/p'

[gentoo-commits] proj/eselect:master commit in: bin/, /

[Ulrich Müller]

commit: 69150409a534e24107080c5650bbd12bcc8e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Feb 26 23:14:02 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Feb 26 23:38:35 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=69150409

Allow EPREFIX to be overridden for manipulating prefixed ROOT

* bin/eselect.in: Allow EPREFIX to be overridden for manipulating
prefixed ROOT.

Signed-off-by: James Le Cuirot  gentoo.org>
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 5 +
 bin/eselect.in | 7 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6fcf0db..41d4bab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-02-26  James Le Cuirot  
+
+   * bin/eselect.in: Allow EPREFIX to be overridden for manipulating
+   prefixed ROOT.
+
 2022-05-01  Ulrich Müller  
 
* misc/eselect-mode.el (eselect-mode): For GNU Emacs, use

diff --git a/bin/eselect.in b/bin/eselect.in
index 4caa87e..6a0fdbc 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -41,8 +41,11 @@ ESELECT_VERSION="@VERSION@"
 ESELECT_BINARY_NAME="$0"
 ESELECT_KILL_TARGET="$$"
 
-# Support variables for Gentoo Prefix
-EPREFIX="@EPREFIX@"
+# Support variables for Gentoo Prefix. BROOT is hardcoded as the
+# prefix for the build host. EPREFIX defaults to the same, but can be
+# overridden at runtime when building for a different prefix.
+BROOT="@EPREFIX@"
+: ${EPREFIX="${BROOT}"}
 EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}"
 
 # Remove all alias definitions. Unset functions and variables that are

[gentoo-commits] proj/eselect:master commit in: man/, doc/, /, bin/

[Ulrich Müller]

commit: 72ca0786ec4fe322088efb201d87308d9199ca6a
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Feb 26 23:57:12 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Feb 26 23:57:12 2023 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=72ca0786

New global option --eprefix

* bin/eselect.in: New global option --eprefix.
(es_do_help): Document it.
* doc/user-guide.txt:
* man/eselect.1: Document the --eprefix option.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  |  7 +++
 bin/eselect.in | 10 +-
 doc/user-guide.txt |  9 +
 man/eselect.1  | 13 +++--
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 41d4bab..b442b8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-02-26  Ulrich Müller  
+
+   * bin/eselect.in: New global option --eprefix.
+   (es_do_help): Document it.
+   * doc/user-guide.txt:
+   * man/eselect.1: Document the --eprefix option.
+
 2023-02-26  James Le Cuirot  
 
* bin/eselect.in: Allow EPREFIX to be overridden for manipulating

diff --git a/bin/eselect.in b/bin/eselect.in
index 6a0fdbc..8afbd7e 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -1,6 +1,6 @@
 #!@BASH@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2022 Gentoo Authors
+# Copyright (c) 2005-2023 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #
@@ -91,6 +91,8 @@ es_do_help() {
write_kv_list_entry "--brief" "Make output shorter"
write_kv_list_entry "--colour=" \
"Enable or disable colour output (default 'auto')"
+   write_kv_list_entry "--eprefix=" \
+   "Override the EPREFIX variable for a cross-prefix build"
write_kv_list_entry "--root=" \
"The target root path for eselect's operations"
echo
@@ -152,6 +154,12 @@ while [[ ${1##--} != "$1" ]]; do
[[ -z ${action} ]] || die -q "Too many parameters"
action=${1##--}
;;
+   eprefix=*|eprefix)
+   [[ ${1#*=} == "$1" ]] && die -q "Option $1 requires an 
argument"
+   # set EPREFIX and recalculate EROOT
+   EPREFIX=${1#*=}
+   EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}"
+   ;;
root=*|root)
[[ ${1#*=} == "$1" ]] && die -q "Option $1 requires an 
argument"
# set ROOT and recalculate EROOT

diff --git a/doc/user-guide.txt b/doc/user-guide.txt
index 16c2629..2932b7f 100644
--- a/doc/user-guide.txt
+++ b/doc/user-guide.txt
@@ -91,11 +91,12 @@ eselect should be called as shown below: ::
 eselect []   
 
 eselect features consistently named actions among most of its modules.
-There are only three global options as of now; --brief, which makes
+There are only four global options as of now; --brief, which makes
 eselect's output shorter (e.g., to use it as input for other programs);
---colour, which controls coloured output; and --root, which specifies
-the path that eselect should use as the target root filesystem for its
-operations.
+--colour, which controls coloured output; --eprefix, which allows to
+override the EPREFIX variable for a cross-prefix build; and --root,
+which specifies the path that eselect should use as the target root
+filesystem for its operations.
 
 The following are standard action names -- each module may provide a
 subset of these actions:

diff --git a/man/eselect.1 b/man/eselect.1
index fad2aac..a331dee 100644
--- a/man/eselect.1
+++ b/man/eselect.1
@@ -1,8 +1,8 @@
 .\" -*- coding: utf-8 -*-
-.\" Copyright 2005-2022 Gentoo Authors
+.\" Copyright 2005-2023 Gentoo Authors
 .\" Distributed under the terms of the GNU GPL version 2 or later
 .\"
-.TH ESELECT 1 "January 2022" "Gentoo Linux" eselect
+.TH ESELECT 1 "February 2023" "Gentoo Linux" eselect
 .SH NAME
 eselect \- Gentoo's multi\-purpose configuration and management tool
 .SH SYNOPSIS
@@ -33,6 +33,15 @@ The default is
 for which colour output is enabled only if standard output is
 connected to a terminal.
 .TP
+.BI \-\-eprefix= path
+The
+.I path
+that eselect should use as the offset-prefix path for its operations.
+Only relevant for a cross-prefix build.  If neither this option nor the
+.I EPREFIX
+environment variable are specified, the hardcoded prefix of the build
+host is used as a default.
+.TP
 .BI \-\-root= path
 The
 .I path

[gentoo-commits] proj/eselect:master commit in: misc/, /

[Ulrich Müller]

commit: 2052ab77d3856593ae6c41d305377058d22ed0d2
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun May  1 17:15:38 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun May  1 17:15:38 2022 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=2052ab77

Drop XEmacs compatibility code in eselect-mode

* misc/eselect-mode.el (eselect-mode-before-save):
Call delete-trailing-whitespace which exists in XEmacs 21.5.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 2 ++
 misc/eselect-mode.el | 6 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83b0289..4ef1610 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
* misc/eselect-mode.el (eselect-mode): For GNU Emacs, use
write-contents-functions instead of obsolete write-contents-hooks.
+   (eselect-mode-before-save): Call delete-trailing-whitespace which
+   exists in XEmacs 21.5.
 
 2022-01-08  Ulrich Müller  
 

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index 50e88d6..3bdac81 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -96,11 +96,7 @@
 ;;; Mode definitions.
 
 (defun eselect-mode-before-save ()
-  ;;(delete-trailing-whitespace)   ; doesn't exist in XEmacs
-  (save-excursion
-(goto-char (point-min))
-(while (re-search-forward "[ \t]+$" nil t)
-  (delete-region (match-beginning 0) (point
+  (delete-trailing-whitespace)
   ;; return nil, otherwise the file is presumed to be written
   nil)
 

[gentoo-commits] proj/eselect:master commit in: /, misc/

[Ulrich Müller]

commit: 03dd0b50c278ae49bfcae50fb53eb7fb42ca3829
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun May  1 17:32:10 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun May  1 17:32:10 2022 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=03dd0b50

eselect-mode: Remove eselect-mode-make-keywords-list function

* misc/eselect-mode.el (eselect-mode-make-keywords-list): Remove.
(eselect-mode-font-lock-keywords): Inline its code. \< \> around
a regexp can be obtained via the paren option of regexp-opt.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog|  3 +++
 misc/eselect-mode.el | 15 +++
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ef1610..6fcf0db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
write-contents-functions instead of obsolete write-contents-hooks.
(eselect-mode-before-save): Call delete-trailing-whitespace which
exists in XEmacs 21.5.
+   (eselect-mode-make-keywords-list): Remove function.
+   (eselect-mode-font-lock-keywords): Inline its code. \< \> around
+   a regexp can be obtained via the paren option of regexp-opt.
 
 2022-01-08  Ulrich Müller  
 

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index 3bdac81..d7ea649 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -69,20 +69,11 @@
  "get_repo_news_dir" "env_update")
 font-lock-type-face))
 
-(defun eselect-mode-make-keywords-list (keywords-list face
-  prefix suffix)
-  ;; based on `generic-make-keywords-list' from generic.el
-  ;; Note: XEmacs doesn't have generic.el
-  (unless (listp keywords-list)
-(error "Keywords argument must be a list of strings"))
-  (cons (concat prefix "\\<"
-   (regexp-opt keywords-list t)
-   "\\>" suffix)
-   face))
-
 (defvar eselect-mode-font-lock-keywords
   (mapcar
-   (lambda (x) (apply 'eselect-mode-make-keywords-list x))
+   (lambda (x)
+ (cons (regexp-opt (car x) 'words)
+  (cadr x)))
(list
 eselect-mode-keywords-warn
 eselect-mode-keywords-core

[gentoo-commits] proj/eselect:master commit in: /, misc/

[Ulrich Müller]

commit: 197e833501a270c0f828eb097eacb14679ae1ba2
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun May  1 17:11:21 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun May  1 17:11:21 2022 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=197e8335

Fix a byte-compile warning in eselect-mode

* misc/eselect-mode.el (eselect-mode): For GNU Emacs, use
write-contents-functions instead of obsolete write-contents-hooks.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 5 +
 misc/eselect-mode.el | 9 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8089935..83b0289 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-05-01  Ulrich Müller  
+
+   * misc/eselect-mode.el (eselect-mode): For GNU Emacs, use
+   write-contents-functions instead of obsolete write-contents-hooks.
+
 2022-01-08  Ulrich Müller  
 
* configure.ac: Update version to 1.4.20.

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index 667411b..50e88d6 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -1,6 +1,6 @@
 ;;; eselect-mode.el --- edit eselect files
 
-;; Copyright 2006-2020 Gentoo Authors
+;; Copyright 2006-2022 Gentoo Authors
 
 ;; Author: Matthew Kennedy 
 ;; Diego Pettenò 
@@ -107,9 +107,10 @@
 ;;;###autoload
 (define-derived-mode eselect-mode shell-script-mode "Eselect"
   "Major mode for .eselect files."
-  (if (featurep 'xemacs)
-  (make-local-hook 'write-contents-hooks))
-  (add-hook 'write-contents-hooks 'eselect-mode-before-save t t)
+  (if (not (featurep 'xemacs))
+  (add-hook 'write-contents-functions 'eselect-mode-before-save t t)
+(make-local-hook 'write-contents-hooks)
+(add-hook 'write-contents-hooks 'eselect-mode-before-save t t))
   (sh-set-shell "bash")
   (setq tab-width 4)
   (setq indent-tabs-mode t))

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 18f8049b2a7db469beaec27804ad2969508f3e44
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan  8 21:20:23 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan  8 21:20:23 2022 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=18f8049b

Update version to 1.4.20

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 3 +++
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ac7c78b..8089935 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2022-01-08  Ulrich Müller  
 
+   * configure.ac: Update version to 1.4.20.
+   * Tagged 1.4.20 release.
+
* bin/eselect.in: Error out if --root has no option argument.
 
* configure.ac: Update version to 1.4.19.

diff --git a/configure.ac b/configure.ac
index 6ee7e08..00fd2d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.19, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.20, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 10ba3349d46544b4932fa36efef76685150b9df7
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan  8 21:20:05 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan  8 21:20:05 2022 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=10ba3349

Update NEWS

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 4 
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index ec35fb6..9e1396c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.20:
+Bug fixes:
+- Error out if --root has no option argument.
+
 1.4.19:
 Bug fixes:
 - Fixed bug #830707: Avoid empty root path in profile module.

[gentoo-commits] proj/eselect:master commit in: bin/, /

[Ulrich Müller]

commit: 62501cdddf09cd92689fb5e8f87c4369fd636cf5
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan  8 20:53:12 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan  8 20:53:12 2022 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=62501cdd

Error out if --root has no option argument

* bin/eselect.in: Error out if --root has no option argument.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 2 ++
 bin/eselect.in | 1 +
 2 files changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d40ac8d..ac7c78b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2022-01-08  Ulrich Müller  
 
+   * bin/eselect.in: Error out if --root has no option argument.
+
* configure.ac: Update version to 1.4.19.
* Tagged 1.4.19 release.
 

diff --git a/bin/eselect.in b/bin/eselect.in
index 3422197..4caa87e 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -150,6 +150,7 @@ while [[ ${1##--} != "$1" ]]; do
action=${1##--}
;;
root=*|root)
+   [[ ${1#*=} == "$1" ]] && die -q "Option $1 requires an 
argument"
# set ROOT and recalculate EROOT
ROOT=${1#*=}
EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}"

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 9f400f67f09805f7b55666e205d282d73b32143e
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan  8 17:03:12 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan  8 17:03:12 2022 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=9f400f67

Update version to 1.4.19

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 3 +++
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0f0579d..d40ac8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2022-01-08  Ulrich Müller  
 
+   * configure.ac: Update version to 1.4.19.
+   * Tagged 1.4.19 release.
+
* bin/eselect.in: New global option --root.
(es_do_help): Document it.
* doc/user-guide.txt:

diff --git a/configure.ac b/configure.ac
index 8bc63b0..6ee7e08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.18, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.19, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 5c8b0fe13e678ef26e87464895a461e4d8afed32
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan  8 17:02:09 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan  8 17:02:09 2022 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=5c8b0fe1

Update NEWS

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 35f0538..ec35fb6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.19:
+Bug fixes:
+- Fixed bug #830707: Avoid empty root path in profile module.
+
+New features:
+- New global option --root.
+
 1.4.18:
 New features:
 - Prefer realpath to readlink in configure check.

[gentoo-commits] proj/eselect:master commit in: /, man/, doc/, bin/

[Ulrich Müller]

commit: 285b2c59ed8234d1480012ca3020cbd4368a9d16
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan  8 11:42:39 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan  8 11:56:11 2022 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=285b2c59

New global option --root

* bin/eselect.in: New global option --root.
(es_do_help): Document it.
* doc/user-guide.txt:
* man/eselect.1: Document the --root option.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  |  7 +++
 bin/eselect.in |  9 -
 doc/user-guide.txt | 10 +++---
 man/eselect.1  | 12 ++--
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2a8be3d..0f0579d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-01-08  Ulrich Müller  
+
+   * bin/eselect.in: New global option --root.
+   (es_do_help): Document it.
+   * doc/user-guide.txt:
+   * man/eselect.1: Document the --root option.
+
 2022-01-07  Ulrich Müller  
 
* modules/profile.eselect (set_symlink): Don't call canonicalise

diff --git a/bin/eselect.in b/bin/eselect.in
index 5d3fc9b..3422197 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -1,6 +1,6 @@
 #!@BASH@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2020 Gentoo Authors
+# Copyright (c) 2005-2022 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #
@@ -88,6 +88,8 @@ es_do_help() {
write_kv_list_entry "--brief" "Make output shorter"
write_kv_list_entry "--colour=" \
"Enable or disable colour output (default 'auto')"
+   write_kv_list_entry "--root=" \
+   "The target root path for eselect's operations"
echo
# display all available eselect modules
do_action modules list
@@ -147,6 +149,11 @@ while [[ ${1##--} != "$1" ]]; do
[[ -z ${action} ]] || die -q "Too many parameters"
action=${1##--}
;;
+   root=*|root)
+   # set ROOT and recalculate EROOT
+   ROOT=${1#*=}
+   EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}"
+   ;;
"")
# -- indicates end of options
shift

diff --git a/doc/user-guide.txt b/doc/user-guide.txt
index 8ec35c4..16c2629 100644
--- a/doc/user-guide.txt
+++ b/doc/user-guide.txt
@@ -91,10 +91,14 @@ eselect should be called as shown below: ::
 eselect []   
 
 eselect features consistently named actions among most of its modules.
-There are only two global options as of now; --brief, which makes
+There are only three global options as of now; --brief, which makes
 eselect's output shorter (e.g., to use it as input for other programs);
-and --colour, which controls coloured output. The following are standard
-action names -- each module may provide a subset of these actions:
+--colour, which controls coloured output; and --root, which specifies
+the path that eselect should use as the target root filesystem for its
+operations.
+
+The following are standard action names -- each module may provide a
+subset of these actions:
 
 help
 Print the module's help screen.

diff --git a/man/eselect.1 b/man/eselect.1
index 22a2fcb..fad2aac 100644
--- a/man/eselect.1
+++ b/man/eselect.1
@@ -1,8 +1,8 @@
 .\" -*- coding: utf-8 -*-
-.\" Copyright 2005-2020 Gentoo Authors
+.\" Copyright 2005-2022 Gentoo Authors
 .\" Distributed under the terms of the GNU GPL version 2 or later
 .\"
-.TH ESELECT 1 "October 2011" "Gentoo Linux" eselect
+.TH ESELECT 1 "January 2022" "Gentoo Linux" eselect
 .SH NAME
 eselect \- Gentoo's multi\-purpose configuration and management tool
 .SH SYNOPSIS
@@ -32,6 +32,14 @@ The default is
 .BR auto ,
 for which colour output is enabled only if standard output is
 connected to a terminal.
+.TP
+.BI \-\-root= path
+The
+.I path
+that eselect should use as the target root filesystem for its operations.
+If not specified, the value of the
+.I ROOT
+environment variable is used as a default.
 .SH BUILT-INS
 .TP
 .B help

[gentoo-commits] proj/eselect:master commit in: modules/, /

[Ulrich Müller]

commit: de93ee70c59ad7207210f12b8238d87072054671
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Jan  7 14:10:20 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Jan  7 14:10:20 2022 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=de93ee70

Fix canonicalise call in profile module

* modules/profile.eselect (set_symlink): Don't call canonicalise
with an empty argument, bug 830707.

Bug: https://bugs.gentoo.org/830707
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog   | 5 +
 modules/profile.eselect | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 668b7e8..2a8be3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-01-07  Ulrich Müller  
+
+   * modules/profile.eselect (set_symlink): Don't call canonicalise
+   with an empty argument, bug 830707.
+
 2021-12-28  Ulrich Müller  
 
* configure.ac: Update version to 1.4.18.

diff --git a/modules/profile.eselect b/modules/profile.eselect
index 3b87441..f33f8d1 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 2005-2022 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 # This is a portage-only module.
@@ -137,7 +137,8 @@ set_symlink() {
"${MAKE_PROFILE}" \
|| die -q "Couldn't set new ${MAKE_PROFILE} symlink"
# check if the resulting symlink is sane
-   [[ $(canonicalise "${MAKE_PROFILE}") != "$(canonicalise "${EROOT}")"/* 
]] \
+   local eroot=$(canonicalise "${EROOT:-/}")
+   [[ $(canonicalise "${MAKE_PROFILE}") != "${eroot%/}"/* ]] \
&& [[ -z ${force} ]] \
&& write_warning_msg "Strange path. Check ${MAKE_PROFILE} 
symlink"
 

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 0f1ae9117f1256cd9247ed4cfb944dbe107b84d6
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Dec 28 09:04:36 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Dec 28 09:04:36 2021 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=0f1ae911

Update version to 1.4.18

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 5 +
 configure.ac | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index dc70d61..668b7e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-12-28  Ulrich Müller  
+
+   * configure.ac: Update version to 1.4.18.
+   * Tagged 1.4.18 release.
+
 2021-10-24  Ulrich Müller  
 
* modules/visual.eselect (EDITOR_LIST): Don't use absolute paths.

diff --git a/configure.ac b/configure.ac
index 48522e6..8bc63b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.17, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.18, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: eaa80176847ddd7c389ad7de178f0234bedfec2b
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Dec 28 09:04:18 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Dec 28 09:04:18 2021 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=eaa80176

Update NEWS

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 04a081f..35f0538 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.18:
+New features:
+- Prefer realpath to readlink in configure check.
+- New options "new" and "all" in news module list action (bug #771075).
+- Recognise loongarch*/loong in package-manager lib.
+- Don't use absolute paths in visual module.
+
 1.4.17:
 Bug fixes:
 - Fixed bug #718920: Handling of stacked runlevels in rc module.

[gentoo-commits] proj/eselect:master commit in: modules/, /

[Ulrich Müller]

commit: 612152aacc400899dcb4d42f2c75acd63ae75033
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Oct 24 10:03:31 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Oct 24 10:03:31 2021 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=612152aa

Don't use absolute paths in visual module

* modules/visual.eselect (EDITOR_LIST): Don't use absolute paths.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 4 
 modules/visual.eselect | 7 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f2ea0b6..dc70d61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-10-24  Ulrich Müller  
+
+   * modules/visual.eselect (EDITOR_LIST): Don't use absolute paths.
+
 2021-08-24  Ulrich Müller  
 
* libs/package-manager.bash.in (arch): Recognise loongarch*/loong.

diff --git a/modules/visual.eselect b/modules/visual.eselect
index 00cd835..527793e 100644
--- a/modules/visual.eselect
+++ b/modules/visual.eselect
@@ -1,14 +1,11 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2009-2020 Gentoo Authors
+# Copyright 2009-2021 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 EDITOR_VAR="VISUAL"
 EDITOR_ENVFILE="/etc/env.d/99editor"
 # list of most common cases only
-EDITOR_LIST="/bin/nano
-   /usr/bin/emacs
-   /usr/bin/vi
-   /usr/bin/xemacs"
+EDITOR_LIST="nano emacs vi xemacs"
 
 inherit editor-variable
 

[gentoo-commits] proj/eselect:master commit in: /, libs/

[Ulrich Müller]

commit: a49477f39d3f000cc2ca57f18aafbd66656aba05
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Aug 24 12:13:08 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Aug 24 12:13:08 2021 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=a49477f3

Recognise loongarch*/loong in package-manager lib

* libs/package-manager.bash.in (arch): Recognise loongarch*/loong.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 4 
 libs/package-manager.bash.in | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index dfdfe47..f2ea0b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-08-24  Ulrich Müller  
+
+   * libs/package-manager.bash.in (arch): Recognise loongarch*/loong.
+
 2021-02-17  Ulrich Müller  
 
* modules/news.eselect (do_list): Recognise "new" and "all"

diff --git a/libs/package-manager.bash.in b/libs/package-manager.bash.in
index 35a1e11..c32fcb4 100644
--- a/libs/package-manager.bash.in
+++ b/libs/package-manager.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2020 Gentoo Authors
+# Copyright (c) 2005-2021 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #
@@ -76,6 +76,7 @@ arch() {
hppa*)  ret=hppa;;
i?86)   ret=x86 ;;
ia64*)  ret=ia64;;
+   loongarch*) ret=loong   ;;
m68k*)  ret=m68k;;
mips*)  ret=mips;;
nios2)  ret=nios2   ;;

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 18cb2b5b6b5538b9aa1680181eb36e3c5e7b30c7
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Dec 18 16:42:14 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Dec 18 16:42:14 2020 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=18cb2b5b

Prefer realpath in configure check.

* configure.ac (REALPATH, READLINK): Prefer realpath to readlink,
because the former is included with Coreutils since version 8.15.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog|  5 +
 configure.ac | 34 +-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e15e521..90109e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-12-18  Ulrich Müller  
+
+   * configure.ac (REALPATH, READLINK): Prefer realpath to readlink,
+   because the former is included with Coreutils since version 8.15.
+
 2020-12-16  Ulrich Müller  
 
* configure.ac: Update version to 1.4.17.

diff --git a/configure.ac b/configure.ac
index 79cb10b..48522e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,25 +34,25 @@ fi
 AC_PATH_PROG(ENV_UPDATE, env-update, /usr/sbin/env-update,
   [$PATH:$prefix/sbin:/usr/sbin])
 
-AC_CHECK_PROGS(READLINK, [greadlink readlink])
-if test x$READLINK != x; then
-AC_MSG_CHECKING([whether $READLINK supports -f])
-if $READLINK -f . >/dev/null 2>&1; then
-AC_MSG_RESULT(yes)
-else
-AC_MSG_RESULT(no)
-READLINK=""
-fi
-fi
-if test x$READLINK = x; then
-AC_CHECK_PROGS(REALPATH, realpath)
-fi
-if test x$READLINK != x; then
-CANONICALISE="$READLINK -f"
-elif test x$REALPATH != x; then
+CANONICALISE=""
+# realpath is included with Coreutils since version 8.15 (2012)
+AC_CHECK_PROGS(REALPATH, [grealpath realpath])
+if test x$REALPATH != x; then
 CANONICALISE="$REALPATH"
 else
-AC_MSG_ERROR([Either GNU readlink or realpath is required])
+AC_CHECK_PROGS(READLINK, [greadlink readlink])
+if test x$READLINK != x; then
+AC_MSG_CHECKING([whether $READLINK supports -f])
+if $READLINK -f . >/dev/null 2>&1; then
+AC_MSG_RESULT(yes)
+CANONICALISE="$READLINK -f"
+else
+AC_MSG_RESULT(no)
+fi
+fi
+fi
+if test "x$CANONICALISE" = x; then
+AC_MSG_ERROR([Either realpath or GNU readlink is required])
 fi
 AC_SUBST(CANONICALISE)
 

[gentoo-commits] proj/eselect:master commit in: modules/, /

[Ulrich Müller]

commit: 74aa11482d3ab7cdbe44b85027e5b8c20ce82bb4
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Feb 19 13:31:07 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Feb 19 13:31:07 2021 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=74aa1148

news.eselect: Support "new" and "all" options in list action

* modules/news.eselect (do_list): Recognise "new" and "all"
options, bug 771075.
(describe_list_options): New function.

Bug: https://bugs.gentoo.org/771075
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog|  6 ++
 modules/news.eselect | 21 +
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 90109e8..dfdfe47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-02-17  Ulrich Müller  
+
+   * modules/news.eselect (do_list): Recognise "new" and "all"
+   options, bug 771075.
+   (describe_list_options): New function.
+
 2020-12-18  Ulrich Müller  
 
* configure.ac (REALPATH, READLINK): Prefer realpath to readlink,

diff --git a/modules/news.eselect b/modules/news.eselect
index f941a8c..5125431 100644
--- a/modules/news.eselect
+++ b/modules/news.eselect
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 2005-2021 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 inherit package-manager
@@ -171,16 +171,30 @@ describe_list() {
echo "List news items"
 }
 
+describe_list_options() {
+   echo "new : List unread news items"
+   echo "all : List all news items (default)"
+}
+
 do_list() {
-   local item stat repo dir header line format title posted i=1
+   local item stat repo dir header line format title posted unread i=0 n=0
local cols=${COLUMNS:-80} ifs_save=${IFS}
local -a repos dirs
 
+   case $1 in
+   new) unread=1 ;;
+   all|"") ;;
+   *) write_warning_msg "Bad option: $1" ;;
+   esac
+
set -- $(find_items unread read)
write_list_start "News items:"
for item; do
+   (( i++ ))
stat=${item%%/*}; item=${item#*/}
repo=${item%%/*}; item=${item#*/}
+   [[ ! ${unread} || ${stat} = unread ]] || continue
+   (( n++ ))
find_repo_dir "${repo}"
title="(${item} - no title)"
posted=${item:0:10}
@@ -215,9 +229,8 @@ do_list() {
else
write_numbered_list_entry ${i} "   ${line}"
fi
-   (( i++ ))
done
-   [[ $# -eq 0 ]] && ! is_output_mode brief \
+   [[ ${n} -eq 0 ]] && ! is_output_mode brief \
&& write_kv_list_entry "(none found)" ""
 }
 

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 633c22046e7139b78810706ba3134d21ffa9fd59
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Dec 16 11:34:47 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Dec 16 11:34:47 2020 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=633c2204

Update NEWS.

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 4 
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index 9806fcd..04a081f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.17:
+Bug fixes:
+- Fixed bug #718920: Handling of stacked runlevels in rc module.
+
 1.4.16:
 Bug fixes:
 - Fixed bug #701382: Add missing quotes in rc module.

[gentoo-commits] proj/eselect:master commit in: libs/, bin/, /, modules/, doc/, misc/, man/

[Ulrich Müller]

commit: 3ea2cdf4b80fd7f1285bf9d129788cb8ccb92c9f
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Dec 16 11:34:21 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Dec 16 11:34:21 2020 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=3ea2cdf4

Update copyright years.

Signed-off-by: Ulrich Müller  gentoo.org>

 README | 2 +-
 bin/eselect.in | 4 ++--
 doc/developer-guide.txt| 2 +-
 libs/config.bash.in| 2 +-
 libs/core.bash.in  | 2 +-
 libs/default.eselect.in| 2 +-
 libs/editor-variable.bash.in   | 2 +-
 libs/manip.bash.in | 2 +-
 libs/multilib.bash.in  | 2 +-
 libs/output.bash.in| 2 +-
 libs/package-manager.bash.in   | 2 +-
 libs/path-manipulation.bash.in | 2 +-
 libs/skel.bash.in  | 2 +-
 libs/tests.bash.in | 2 +-
 man/editor.eselect.5   | 2 +-
 man/env.eselect.5  | 2 +-
 man/eselect.1  | 2 +-
 man/kernel.eselect.5   | 2 +-
 man/news.eselect.5 | 2 +-
 man/pager.eselect.5| 2 +-
 man/profile.eselect.5  | 2 +-
 man/rc.eselect.5   | 2 +-
 man/visual.eselect.5   | 2 +-
 misc/eselect-mode.el   | 2 +-
 misc/eselect.bashcomp  | 2 +-
 modules/config.eselect | 2 +-
 modules/cow.eselect| 2 +-
 modules/editor.eselect | 2 +-
 modules/env.eselect| 2 +-
 modules/kernel.eselect | 2 +-
 modules/locale.eselect | 2 +-
 modules/modules.eselect| 2 +-
 modules/news.eselect   | 2 +-
 modules/pager.eselect  | 2 +-
 modules/profile.eselect| 2 +-
 modules/rc.eselect | 2 +-
 modules/visual.eselect | 2 +-
 37 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/README b/README
index bfcb6f9..e9f2a76 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ See ``doc/``. Use ``make html`` for HTML versions.
 Copyright
 -
 
-eselect is Copyright (c) 2005-2019 Gentoo Authors. This code is
+eselect is Copyright (c) 2005-2020 Gentoo Authors. This code is
 distributed under the terms of the `GNU General Public License,
 version 2 or later`__.
 

diff --git a/bin/eselect.in b/bin/eselect.in
index f9d4d0b..5d3fc9b 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -1,6 +1,6 @@
 #!@BASH@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2019 Gentoo Authors
+# Copyright (c) 2005-2020 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #
@@ -98,7 +98,7 @@ es_do_help() {
 es_do_version() {
echo "eselect ${ESELECT_VERSION}"
echo
-   echo "Copyright (c) 2005-2019 Gentoo Authors."
+   echo "Copyright (c) 2005-2020 Gentoo Authors."
echo "Distributed under the terms of the GNU GPL version 2 or later."
 }
 

diff --git a/doc/developer-guide.txt b/doc/developer-guide.txt
index ffe095c..694b64d 100644
--- a/doc/developer-guide.txt
+++ b/doc/developer-guide.txt
@@ -31,7 +31,7 @@ and ``set``, plus the standard ``help``, ``usage``, and 
``version``
 actions, and is installed to ``$(datadir)/eselect/modules/`` ::
 
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2005-2019 Gentoo Authors
+# Copyright 2005-2020 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 DESCRIPTION="Manage the /usr/src/linux symlink"

diff --git a/libs/config.bash.in b/libs/config.bash.in
index 78d2d75..9e36aa2 100644
--- a/libs/config.bash.in
+++ b/libs/config.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2019 Gentoo Authors
+# Copyright (c) 2005-2020 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/core.bash.in b/libs/core.bash.in
index 46c08bd..740354e 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2019 Gentoo Authors
+# Copyright (c) 2005-2020 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/default.eselect.in b/libs/default.eselect.in
index 8c34ef4..45636f6 100644
--- a/libs/default.eselect.in
+++ b/libs/default.eselect.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2019 Gentoo Authors
+# Copyright (c) 2005-2020 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/editor-variable.bash.in b/libs/editor-variable.bash.in
index a3bfdc7..b7420b1 100644
--- a/libs/editor-variable.bash.in
+++ b/libs/editor-variable.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2019 Gentoo Authors
+# Copyright (c) 2005-2020 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/manip.bash.in b/libs/manip.bash.in
index 2c16001..e7dc730 100644
--- a/libs/manip.bash.in
+++ b/libs/manip.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 20c9b61f7d2c140ec0f14062e4ca2332c4d796a8
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Dec 16 11:35:17 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Dec 16 11:35:17 2020 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=20c9b61f

Update version to 1.4.17.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 5 +
 configure.ac | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d037d6a..e15e521 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-12-16  Ulrich Müller  
+
+   * configure.ac: Update version to 1.4.17.
+   * Tagged 1.4.17 release.
+
 2020-04-23  Ulrich Müller  
 
* modules/rc.eselect (is_script): Test whether the script is a

diff --git a/configure.ac b/configure.ac
index 62b5c23..79cb10b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.16, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.17, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: modules/, /

[Ulrich Müller]

commit: e757ab1145cc4c6ce7b2c2005220ae59792e218e
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Apr 23 12:40:28 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Apr 23 12:40:28 2020 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=e757ab11

rc.eselect: Test for regular file.

* modules/rc.eselect (is_script): Test whether the script is a
regular file, bug 718920.

Bug: https://bugs.gentoo.org/718920
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 5 +
 modules/rc.eselect | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 86ffd88..d037d6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-23  Ulrich Müller  
+
+   * modules/rc.eselect (is_script): Test whether the script is a
+   regular file, bug 718920.
+
 2019-11-28  Ulrich Müller  
 
* configure.ac: Update version to 1.4.16.

diff --git a/modules/rc.eselect b/modules/rc.eselect
index 4a3c16d..a606cfa 100644
--- a/modules/rc.eselect
+++ b/modules/rc.eselect
@@ -35,6 +35,7 @@ is_script() {
[[ -n ${file} \
 && ${file%%.sh} = "${file}" \
 && ${file%%\~} = "${file}" \
+&& -f ${file} \
 && -x ${file} ]] \
&& read line <"${file}" \
&& [[ ${line} =~ ^#!.*(runscript|openrc-run) ]]

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 969f65e66f807f1607dcc08230544f92c69fe0ef
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Nov 28 19:11:02 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Nov 28 19:11:02 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=969f65e6

Update NEWS.

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 36d1379..9806fcd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.16:
+Bug fixes:
+- Fixed bug #701382: Add missing quotes in rc module.
+
+New features:
+- Documentation is now dual-licensed under GPL-2+ or CC-BY-SA-4.0.
+
 1.4.15:
 New features:
 - Allow selection of news item by its number or name.

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 0f91ddb921d67cf1c19bd40434a2bd8499e1dca3
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Nov 28 19:14:50 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Nov 28 19:14:50 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=0f91ddb9

Update version to 1.4.16.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 3 +++
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aaa31db..86ffd88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2019-11-28  Ulrich Müller  
 
+   * configure.ac: Update version to 1.4.16.
+   * Tagged 1.4.16 release.
+
* README: Documentation is now dual-licensed under GPL-2+ or
CC-BY-SA-4.0. Update URI of GPL-2 license text.
 

diff --git a/configure.ac b/configure.ac
index 55065a3..62b5c23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.15, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.16, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 45930f33e4db86b44c03133a85dda7fd3c9b0196
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Nov 28 13:35:36 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Nov 28 13:35:36 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=45930f33

Update CC-BY-SA to version 4.0.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog | 3 +++
 README| 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6292c9a..e9f1f8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2019-11-28  Ulrich Müller  
 
+   * README: Documentation is now dual-licensed under GPL-2+ or
+   CC-BY-SA-4.0. Update URI of GPL-2 license text.
+
* modules/rc.eselect (show_script_status): Quote strings to
prevent globbing, bug 701382.
 

diff --git a/README b/README
index 1ef30e6..bfcb6f9 100644
--- a/README
+++ b/README
@@ -20,10 +20,10 @@ version 2 or later`__.
 
 The documentation in the ``doc/`` directory is dual-licensed. It can
 be distributed either under the above terms, or (at your option) under
-the `Creative Commons Attribution-ShareAlike 3.0 Unported License`__.
+the `Creative Commons Attribution-ShareAlike 4.0 International License`__.
 
-__ http://www.gnu.org/licenses/gpl-2.0
-__ http://creativecommons.org/licenses/by-sa/3.0/
+__ https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+__ https://creativecommons.org/licenses/by-sa/4.0/
 
 Style Notes
 ---

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: afaad1201ab3d8d3ab27bee8269ab837435beb95
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Nov 28 13:39:43 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Nov 28 13:39:43 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=afaad120

Changelog: Whitespace fixes.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e9f1f8e..aaa31db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,7 +108,7 @@
 2017-06-18  Ulrich Müller  
 
* libs/package-manager.bash.in (arch): Map nios2 to nios2 (as it
-   is called in profiles/arch.list) rather than nios.
+   is called in profiles/arch.list) rather than nios.
 
 2017-05-22  Ulrich Müller  
 
@@ -132,7 +132,7 @@
* configure.ac: Update version to 1.4.9.
* Tagged 1.4.9 release.
 
-2017-03-21  Mike Frysinger 
+2017-03-21  Mike Frysinger  
 
* libs/package-manager.bash.in (arch): Fill out arch matches
a bit more.
@@ -737,7 +737,7 @@
 2011-03-13  Ulrich Müller  
 
* modules/profile.eselect: Support make.profile in both the /etc
-   and the /etc/portage directory.
+   and the /etc/portage directory.
(DESCRIPTION): Don't mention explicit path.
(get_symlink_location): New function, sets MAKE_PROFILE variable.
(do_show, do_set): Call get_symlink_location.

[gentoo-commits] proj/eselect:master commit in: /, modules/

[Ulrich Müller]

commit: 4201251a4b29d50f90616f6d40b1112fd3620749
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Nov 28 13:16:05 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Nov 28 13:16:05 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=4201251a

rc.eselect: Add missing quotes.

* modules/rc.eselect (show_script_status): Quote strings to
prevent globbing, bug 701382.

Bug: https://bugs.gentoo.org/701382
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog  | 5 +
 modules/rc.eselect | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dbddf71..6292c9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-28  Ulrich Müller  
+
+   * modules/rc.eselect (show_script_status): Quote strings to
+   prevent globbing, bug 701382.
+
 2019-09-04  Ulrich Müller  
 
* configure.ac: Update version to 1.4.15.

diff --git a/modules/rc.eselect b/modules/rc.eselect
index 53f08c4..4a3c16d 100644
--- a/modules/rc.eselect
+++ b/modules/rc.eselect
@@ -74,13 +74,13 @@ show_script_status() {
done
case ${status} in
stopped)
-   write_kv_list_entry ${script} [${x}]
+   write_kv_list_entry ${script} "[${x}]"
;;
started)
-   write_kv_list_entry ${script} "$(highlight [${x}])"
+   write_kv_list_entry ${script} "$(highlight "[${x}]")"
;;
*)
-   write_kv_list_entry ${script} "$(highlight_warning 
[${x}])"
+   write_kv_list_entry ${script} "$(highlight_warning 
"[${x}]")"
;;
esac
 }

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 27cbba882bc5b80cfe845af89ee44f3cad90a88c
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Sep  4 10:03:37 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Sep  4 10:03:37 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=27cbba88

Update autotools versions.

* autogen.bash (WANT_AUTOCONF, WANT_AUTOMAKE): Update versions.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 4 
 autogen.bash | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cbb6229..d459f08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-09-04  Ulrich Müller  
+
+   * autogen.bash (WANT_AUTOCONF, WANT_AUTOMAKE): Update versions.
+
 2019-09-02  Ulrich Müller  
 
* libs/editor-variable.bash.in (find_in_path): New function, looks

diff --git a/autogen.bash b/autogen.bash
index eec7f3c..a5a1c19 100755
--- a/autogen.bash
+++ b/autogen.bash
@@ -34,10 +34,10 @@ run mkdir -p config
 run $(get libtoolize) --copy --force --automake
 rm -f config.cache
 
-run $(get aclocal 1.15 1.14 1.13 1.12)
+run $(get aclocal 1.16 1.15 1.14)
 # run $(get autoheader 2.59)
-WANT_AUTOCONF=2.5 run $(get autoconf 2.69 2.68 2.67 2.65)
-WANT_AUTOMAKE=1.12 run $(get automake 1.15 1.14 1.13 1.12) \
+WANT_AUTOCONF=2.5 run $(get autoconf 2.69 2.68 2.67)
+WANT_AUTOMAKE=1.14 run $(get automake 1.16 1.15 1.14) \
  -a -c -W no-portability
 
 echo "Success. Now run ./configure --help"

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: e47a5681b849c4b878ff795bf15de320103126a2
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Sep  4 10:05:09 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Sep  4 10:05:09 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=e47a5681

Update version to 1.4.15.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 3 +++
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d459f08..dbddf71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2019-09-04  Ulrich Müller  
 
+   * configure.ac: Update version to 1.4.15.
+   * Tagged 1.4.15 release.
+
* autogen.bash (WANT_AUTOCONF, WANT_AUTOMAKE): Update versions.
 
 2019-09-02  Ulrich Müller  

diff --git a/configure.ac b/configure.ac
index 6085e4d..55065a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.14, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.15, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 98110187e82caf464f08641769824459e02934d5
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Sep  4 09:46:51 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Sep  4 09:46:51 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=98110187

Update NEWS.

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index d993860..36d1379 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.15:
+New features:
+- Allow selection of news item by its number or name.
+- Support command names without path in editor-variable library.
+- Commands in editor and pager modules are listed without path.
+
 1.4.14:
 Bug fixes:
 - Fixed bug #662996: Example in profile.eselect(5) man page.

[gentoo-commits] proj/eselect:master commit in: libs/, man/, /, modules/

[Ulrich Müller]

commit: 0905154aae24c2f17b137b45f5a1dd11fb4774fb
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Sep  2 10:25:45 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Sep  2 10:25:45 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=0905154a

Support relative pathnames in editor-variable library.

* libs/editor-variable.bash.in (find_in_path): New function, looks
up its first argument in EDITOR_PATH, and tests if it exists.
(find_targets, do_set): Use it.
* modules/pager.eselect (EDITOR_LIST):
* modules/editor.eselect (EDITOR_LIST): Don't use absolute paths.
* man/editor.eselect.5:
* man/pager.eselect.5: Update.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 10 ++
 libs/editor-variable.bash.in | 47 
 man/editor.eselect.5 | 14 ++---
 man/pager.eselect.5  | 13 ++--
 modules/editor.eselect   |  7 +--
 modules/pager.eselect|  2 +-
 6 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 94f8577..cbb6229 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2019-09-02  Ulrich Müller  
+
+   * libs/editor-variable.bash.in (find_in_path): New function, looks
+   up its first argument in EDITOR_PATH, and tests if it exists.
+   (find_targets, do_set): Use it.
+   * modules/pager.eselect (EDITOR_LIST):
+   * modules/editor.eselect (EDITOR_LIST): Don't use absolute paths.
+   * man/editor.eselect.5:
+   * man/pager.eselect.5: Update.
+
 2019-05-26  Ulrich Müller  
 
* modules/news.eselect (do_read, do_unread): Allow specification

diff --git a/libs/editor-variable.bash.in b/libs/editor-variable.bash.in
index ac71ecf..a3bfdc7 100644
--- a/libs/editor-variable.bash.in
+++ b/libs/editor-variable.bash.in
@@ -21,26 +21,49 @@
 # EDITOR_VAR is the name of the environment variable, e.g. "EDITOR".
 # EDITOR_ENVFILE is the path to the config file where the variable should be
 # stored, e.g. "/etc/env.d/99editor". Several modules may share the same file.
-# EDITOR_LIST is a space-separated list of available programs (full pathnames)
-# e.g. "/bin/nano /usr/bin/emacs /usr/bin/vi". Alternatively, items can be of
-# the form "name:/path/to/binary".
+# EDITOR_LIST is a space-separated list of available programs (with or without
+# full pathname), e.g., "nano emacs /usr/bin/vi". Alternatively, items can be
+# of the form "name:/path/to/binary".
 # EDITOR_PATH (optional) is a colon-separated list of directories where to
 # search for available programs. Default is "/bin:/usr/bin".
 
 inherit config
 
+# find file in EDITOR_PATH
+find_in_path() {
+   local file=$1
+
+   # do we already have an absolute path?
+   if [[ ${file} == /* ]]; then
+   [[ -f ${ROOT}${file} ]]
+   return
+   fi
+
+   # try to find it
+   local IFS=:
+   for dir in ${EDITOR_PATH-/bin:/usr/bin}; do
+   [[ -f ${EROOT}${dir}/${file} ]] && return 0
+   done
+   return 1
+}
+
 # find a list of valid targets
 find_targets() {
-   local cur i
+   local cur i file
 
for i in ${EDITOR_LIST}; do
-   [[ -f ${EROOT}${i#*:} ]] && echo "${EPREFIX}${i%%:*}"
+   file=${i#*:}
+   [[ ${file} == /* ]] && file=${EPREFIX}${file}
+   if find_in_path "${file}"; then
+   [[ ${i} == *:* ]] && echo "${i%%:*}" || echo "${file}"
+   fi
done
 
# also output the current value if it isn't in our list
cur=$(read_env_value)
-   [[ -n ${cur} && ${EDITOR_LIST} != *:* && -f ${ROOT}${cur} ]] \
+   [[ -n ${cur} && ${EDITOR_LIST} != *:* ]] \
&& ! has "${cur#${EPREFIX}}" ${EDITOR_LIST} \
+   && find_in_path "${cur}" \
&& echo "${cur}"
 }
 
@@ -130,18 +153,8 @@ do_set() {
fi
 
if [[ ${EDITOR_LIST} != *:* ]]; then
-   # is the target an absolute path? if not, try to find it
-   if [[ ${target} != /* ]]; then
-   local ifs_save=${IFS} IFS=:
-   for dir in ${EDITOR_PATH-/bin:/usr/bin}; do
-   [[ -f ${EROOT}${dir}/${target} ]] || continue
-   target=${EPREFIX}${dir}/${target}
-   break
-   done
-   IFS=${ifs_save}
-   fi
# target is valid if it's a path to an existing binary
-   [[ ${target} == /* && -f ${ROOT}${target} ]] \
+   find_in_path "${target}" \
|| die -q "Target \"${target}\" doesn't appear to be 
valid!"
else
# target is valid only if it's in our list

diff --git a/man/editor.eselect.5 b/man/editor.eselect.5
index 218500a..8a296f1 100644
--- a/man/editor.eselect.5
+++ b/man/editor.eselect.5
@@ -2,7 

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 31602a6128d92b5540231e08ca3e7dce0c225bd4
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Sep  2 10:08:46 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Sep  2 10:08:46 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=31602a61

ChangeLog: Use UTF-8.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc42d2a..94f8577 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,20 @@
-2019-05-26  Ulrich Mueller  
+2019-05-26  Ulrich Müller  
 
* modules/news.eselect (do_read, do_unread): Allow specification
of item by its number or name.
(describe_read_options, describe_unread_options): Document it.
 
-2019-02-17  Ulrich Mueller  
+2019-02-17  Ulrich Müller  
 
* configure.ac: Update version to 1.4.14.
* Tagged 1.4.14 release.
 
-2019-02-13  Ulrich Mueller  
+2019-02-13  Ulrich Müller  
 
* libs/output.bash.in (colours): Display warning messages in
yellow, in order to distinguish from errors which are red.
 
-2018-12-22  Ulrich Mueller  
+2018-12-22  Ulrich Müller  
 
* modules/profile.eselect (set_symlink): Warn about deprecated
profiles, bug 673568.

[gentoo-commits] proj/eselect:master commit in: /, man/, modules/, libs/

[Ulrich Müller]

commit: 7dd4e2a14dabdc7f2358c1d5d690e4c8dabfd79c
Author: Ulrich Müller  kph  uni-mainz  de>
AuthorDate: Mon Sep  2 10:25:45 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Sep  2 10:25:45 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=7dd4e2a1

Support relative pathnames in editor-variable library.

* libs/editor-variable.bash.in (find_in_path): New function, looks
up its first argument in EDITOR_PATH, and tests if it exists.
(find_targets, do_set): Use it.
* modules/pager.eselect (EDITOR_LIST):
* modules/editor.eselect (EDITOR_LIST): Don't use absolute paths.
* man/editor.eselect.5:
* man/pager.eselect.5: Update.

Signed-off-by: Ulrich Müller  kph.uni-mainz.de>

 ChangeLog| 10 ++
 libs/editor-variable.bash.in | 45 +++-
 man/editor.eselect.5 | 14 +++---
 man/pager.eselect.5  | 13 +++--
 modules/editor.eselect   |  7 +--
 modules/pager.eselect|  2 +-
 6 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 94f8577..cbb6229 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2019-09-02  Ulrich Müller  
+
+   * libs/editor-variable.bash.in (find_in_path): New function, looks
+   up its first argument in EDITOR_PATH, and tests if it exists.
+   (find_targets, do_set): Use it.
+   * modules/pager.eselect (EDITOR_LIST):
+   * modules/editor.eselect (EDITOR_LIST): Don't use absolute paths.
+   * man/editor.eselect.5:
+   * man/pager.eselect.5: Update.
+
 2019-05-26  Ulrich Müller  
 
* modules/news.eselect (do_read, do_unread): Allow specification

diff --git a/libs/editor-variable.bash.in b/libs/editor-variable.bash.in
index ac71ecf..a57e51d 100644
--- a/libs/editor-variable.bash.in
+++ b/libs/editor-variable.bash.in
@@ -21,26 +21,47 @@
 # EDITOR_VAR is the name of the environment variable, e.g. "EDITOR".
 # EDITOR_ENVFILE is the path to the config file where the variable should be
 # stored, e.g. "/etc/env.d/99editor". Several modules may share the same file.
-# EDITOR_LIST is a space-separated list of available programs (full pathnames)
-# e.g. "/bin/nano /usr/bin/emacs /usr/bin/vi". Alternatively, items can be of
-# the form "name:/path/to/binary".
+# EDITOR_LIST is a space-separated list of available programs (with or without
+# full pathname), e.g., "nano emacs /usr/bin/vi". Alternatively, items can be
+# of the form "name:/path/to/binary".
 # EDITOR_PATH (optional) is a colon-separated list of directories where to
 # search for available programs. Default is "/bin:/usr/bin".
 
 inherit config
 
+# find file in EDITOR_PATH
+find_in_path() {
+   local file=$1
+
+   # do we already have an absolute path?
+   if [[ ${file} == /* ]]; then
+   [[ -f ${ROOT}${file} ]]
+   return
+   fi
+
+   # try to find it
+   local IFS=:
+   for dir in ${EDITOR_PATH-/bin:/usr/bin}; do
+   [[ -f ${EROOT}${dir}/${file} ]] && return 0
+   done
+   return 1
+}
+
 # find a list of valid targets
 find_targets() {
-   local cur i
+   local cur i file
 
for i in ${EDITOR_LIST}; do
-   [[ -f ${EROOT}${i#*:} ]] && echo "${EPREFIX}${i%%:*}"
+   file=${i#*:}
+   [[ ${file} == /* ]] && file=${EPREFIX}${file}
+   find_in_path "${file}" && echo "${file}"
done
 
# also output the current value if it isn't in our list
cur=$(read_env_value)
-   [[ -n ${cur} && ${EDITOR_LIST} != *:* && -f ${ROOT}${cur} ]] \
+   [[ -n ${cur} && ${EDITOR_LIST} != *:* ]] \
&& ! has "${cur#${EPREFIX}}" ${EDITOR_LIST} \
+   && find_in_path "${cur}" \
&& echo "${cur}"
 }
 
@@ -130,18 +151,8 @@ do_set() {
fi
 
if [[ ${EDITOR_LIST} != *:* ]]; then
-   # is the target an absolute path? if not, try to find it
-   if [[ ${target} != /* ]]; then
-   local ifs_save=${IFS} IFS=:
-   for dir in ${EDITOR_PATH-/bin:/usr/bin}; do
-   [[ -f ${EROOT}${dir}/${target} ]] || continue
-   target=${EPREFIX}${dir}/${target}
-   break
-   done
-   IFS=${ifs_save}
-   fi
# target is valid if it's a path to an existing binary
-   [[ ${target} == /* && -f ${ROOT}${target} ]] \
+   find_in_path "${target}" \
|| die -q "Target \"${target}\" doesn't appear to be 
valid!"
else
# target is valid only if it's in our list

diff --git a/man/editor.eselect.5 b/man/editor.eselect.5
index 218500a..8a296f1 100644
--- a/man/editor.eselect.5
+++ b/man/editor.eselect.5
@@ -2,7 +2,7 @@
 .\" Copyright 2009-2019 Gentoo Authors
 .\" Distributed under the 

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 6329e9dd9d432ba6a6ca2a4700e87e1affe02e01
Author: Ulrich Müller  kph  uni-mainz  de>
AuthorDate: Mon Sep  2 10:08:46 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Sep  2 10:08:46 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=6329e9dd

ChangeLog: Use UTF-8.

Signed-off-by: Ulrich Müller  kph.uni-mainz.de>

 ChangeLog | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc42d2a..94f8577 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,20 @@
-2019-05-26  Ulrich Mueller  
+2019-05-26  Ulrich Müller  
 
* modules/news.eselect (do_read, do_unread): Allow specification
of item by its number or name.
(describe_read_options, describe_unread_options): Document it.
 
-2019-02-17  Ulrich Mueller  
+2019-02-17  Ulrich Müller  
 
* configure.ac: Update version to 1.4.14.
* Tagged 1.4.14 release.
 
-2019-02-13  Ulrich Mueller  
+2019-02-13  Ulrich Müller  
 
* libs/output.bash.in (colours): Display warning messages in
yellow, in order to distinguish from errors which are red.
 
-2018-12-22  Ulrich Mueller  
+2018-12-22  Ulrich Müller  
 
* modules/profile.eselect (set_symlink): Warn about deprecated
profiles, bug 673568.

[gentoo-commits] proj/eselect:master commit in: modules/, /

[Ulrich Müller]

commit: 61cb8c82e0ecb918b84a5ecdd7bf2f574bfe5212
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun May 26 15:13:43 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun May 26 15:13:43 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=61cb8c82

Allow specification of news item by its name.

* modules/news.eselect (do_read, do_unread): Allow specification
of item by its number or name.
(describe_read_options, describe_unread_options): Document it.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog|  6 ++
 modules/news.eselect | 42 --
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 20ecfab..bc42d2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-26  Ulrich Mueller  
+
+   * modules/news.eselect (do_read, do_unread): Allow specification
+   of item by its number or name.
+   (describe_read_options, describe_unread_options): Document it.
+
 2019-02-17  Ulrich Mueller  
 
* configure.ac: Update version to 1.4.14.

diff --git a/modules/news.eselect b/modules/news.eselect
index 5f3303b..15e5cb6 100644
--- a/modules/news.eselect
+++ b/modules/news.eselect
@@ -251,7 +251,7 @@ describe_read_options() {
echo "--raw : Output in raw format"
echo "new : Read unread news items (default)"
echo "all : Read all news items"
-   echo "item : Number of item (from 'list' action)"
+   echo "item : Item name or number (from 'list' action)"
 }
 
 describe_read_parameters() {
@@ -285,10 +285,21 @@ do_read() {
fi
 
for i; do
-   if ! is_number "${i}" || [[ ${i} -lt 1 || ${i} -gt ${#items[@]} 
]]
-   then
-   write_warning_msg "Bad item number: ${i}"
-   continue
+   if is_number "${i}"; then
+   if (( i < 1 || i > n )); then
+   write_warning_msg "Bad item number: ${i}"
+   continue
+   fi
+   else
+   # item can be specified by name
+   item=${i}
+   for (( i = 1; i <= n; i++ )); do
+   [[ ${items[i-1]#*/*/} = "${item}" ]] && break
+   done
+   if (( i > n )); then
+   write_warning_msg "Item not found: ${item}"
+   continue
+   fi
fi
item=${items[--i]}
stat=${item%%/*}; item=${item#*/}
@@ -373,7 +384,7 @@ describe_unread() {
 
 describe_unread_options() {
echo "all : Mark all news items as unread"
-   echo "item : Number of item (from 'list' action)"
+   echo "item : Item name or number (from 'list' action)"
 }
 
 describe_unread_parameters() {
@@ -393,10 +404,21 @@ do_unread() {
fi
 
for i; do
-   if ! is_number "${i}" || [[ ${i} -lt 1 || ${i} -gt ${#items[@]} 
]]
-   then
-   write_warning_msg "Bad item number: ${i}"
-   continue
+   if is_number "${i}"; then
+   if (( i < 1 || i > n )); then
+   write_warning_msg "Bad item number: ${i}"
+   continue
+   fi
+   else
+   # item can be specified by name
+   item=${i}
+   for (( i = 1; i <= n; i++ )); do
+   [[ ${items[i-1]#*/*/} = "${item}" ]] && break
+   done
+   if (( i > n )); then
+   write_warning_msg "Item not found: ${item}"
+   continue
+   fi
fi
item=${items[--i]}
stat=${item%%/*}; item=${item#*/}

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 46bec985e659bf14d987800a54aadcce5ff37e33
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Feb 17 07:42:52 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Feb 17 07:42:52 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=46bec985

Update version to 1.4.14.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog| 5 +
 configure.ac | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 446cd31..20ecfab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-17  Ulrich Mueller  
+
+   * configure.ac: Update version to 1.4.14.
+   * Tagged 1.4.14 release.
+
 2019-02-13  Ulrich Mueller  
 
* libs/output.bash.in (colours): Display warning messages in

diff --git a/configure.ac b/configure.ac
index 76635be..6085e4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.13, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.14, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 870fddee2d04b4893d5581e4510684b1701b8284
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Feb 17 07:42:26 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Feb 17 07:42:26 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=870fddee

Update NEWS.

Signed-off-by: Ulrich Müller  gentoo.org>

 NEWS | 8 
 1 file changed, 8 insertions(+)

diff --git a/NEWS b/NEWS
index f9ca432..d993860 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,14 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.14:
+Bug fixes:
+- Fixed bug #662996: Example in profile.eselect(5) man page.
+
+New features:
+- In profile module, warn about deprecated profiles (bug #673568).
+- Display warning messages in yellow instead of red.
+
 1.4.13:
 New features:
 - New get_libdir() function in multilib library.

[gentoo-commits] proj/eselect:master commit in: doc/, man/, misc/, /, modules/, libs/, bin/

[Ulrich Müller]

commit: 14b42c332c33eb0a40658bdc51552e1021692291
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Feb 13 20:50:31 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Feb 13 20:50:31 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=14b42c33

Update copyright years.

Signed-off-by: Ulrich Müller  gentoo.org>

 README | 2 +-
 bin/eselect.in | 4 ++--
 doc/developer-guide.txt| 2 +-
 libs/config.bash.in| 2 +-
 libs/core.bash.in  | 2 +-
 libs/default.eselect.in| 2 +-
 libs/editor-variable.bash.in   | 2 +-
 libs/manip.bash.in | 2 +-
 libs/multilib.bash.in  | 2 +-
 libs/output.bash.in| 2 +-
 libs/package-manager.bash.in   | 2 +-
 libs/path-manipulation.bash.in | 2 +-
 libs/skel.bash.in  | 2 +-
 libs/tests.bash.in | 2 +-
 man/editor.eselect.5   | 2 +-
 man/env.eselect.5  | 2 +-
 man/eselect.1  | 2 +-
 man/kernel.eselect.5   | 2 +-
 man/news.eselect.5 | 2 +-
 man/pager.eselect.5| 2 +-
 man/profile.eselect.5  | 2 +-
 man/rc.eselect.5   | 2 +-
 man/visual.eselect.5   | 2 +-
 misc/eselect-mode.el   | 2 +-
 misc/eselect.bashcomp  | 2 +-
 modules/config.eselect | 2 +-
 modules/cow.eselect| 2 +-
 modules/editor.eselect | 2 +-
 modules/env.eselect| 2 +-
 modules/kernel.eselect | 2 +-
 modules/locale.eselect | 2 +-
 modules/modules.eselect| 2 +-
 modules/news.eselect   | 2 +-
 modules/pager.eselect  | 2 +-
 modules/profile.eselect| 2 +-
 modules/rc.eselect | 2 +-
 modules/visual.eselect | 2 +-
 37 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/README b/README
index b063481..1ef30e6 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ See ``doc/``. Use ``make html`` for HTML versions.
 Copyright
 -
 
-eselect is Copyright (c) 2005-2018 Gentoo Authors. This code is
+eselect is Copyright (c) 2005-2019 Gentoo Authors. This code is
 distributed under the terms of the `GNU General Public License,
 version 2 or later`__.
 

diff --git a/bin/eselect.in b/bin/eselect.in
index fc8785b..f9d4d0b 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -1,6 +1,6 @@
 #!@BASH@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2018 Gentoo Authors
+# Copyright (c) 2005-2019 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #
@@ -98,7 +98,7 @@ es_do_help() {
 es_do_version() {
echo "eselect ${ESELECT_VERSION}"
echo
-   echo "Copyright (c) 2005-2018 Gentoo Authors."
+   echo "Copyright (c) 2005-2019 Gentoo Authors."
echo "Distributed under the terms of the GNU GPL version 2 or later."
 }
 

diff --git a/doc/developer-guide.txt b/doc/developer-guide.txt
index abeccc2..ffe095c 100644
--- a/doc/developer-guide.txt
+++ b/doc/developer-guide.txt
@@ -31,7 +31,7 @@ and ``set``, plus the standard ``help``, ``usage``, and 
``version``
 actions, and is installed to ``$(datadir)/eselect/modules/`` ::
 
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2005-2018 Gentoo Authors
+# Copyright 2005-2019 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 DESCRIPTION="Manage the /usr/src/linux symlink"

diff --git a/libs/config.bash.in b/libs/config.bash.in
index 37858a1..78d2d75 100644
--- a/libs/config.bash.in
+++ b/libs/config.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2018 Gentoo Authors
+# Copyright (c) 2005-2019 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/core.bash.in b/libs/core.bash.in
index 44171d1..46c08bd 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2018 Gentoo Authors
+# Copyright (c) 2005-2019 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/default.eselect.in b/libs/default.eselect.in
index 07601ad..8c34ef4 100644
--- a/libs/default.eselect.in
+++ b/libs/default.eselect.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2018 Gentoo Authors
+# Copyright (c) 2005-2019 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/editor-variable.bash.in b/libs/editor-variable.bash.in
index 12c9418..ac71ecf 100644
--- a/libs/editor-variable.bash.in
+++ b/libs/editor-variable.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2018 Gentoo Authors
+# Copyright (c) 2005-2019 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/manip.bash.in b/libs/manip.bash.in
index 16f2671..2c16001 100644
--- a/libs/manip.bash.in
+++ b/libs/manip.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect

[gentoo-commits] proj/eselect:master commit in: modules/, /

[Ulrich Müller]

commit: bbfcc313401c27755a2832c100ad20772bad586c
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Feb 13 20:39:26 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Feb 13 20:39:26 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=bbfcc313

Warn about deprecated profiles.

* modules/profile.eselect (set_symlink): Warn about deprecated
profiles, bug 673568.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog   | 5 +
 modules/profile.eselect | 7 +++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8a3eb59..84673d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-22  Ulrich Mueller  
+
+   * modules/profile.eselect (set_symlink): Warn about deprecated
+   profiles, bug 673568.
+
 2018-08-07  Ulrich Müller  
 
* man/profile.eselect.5: Update examples, bug 662996.

diff --git a/modules/profile.eselect b/modules/profile.eselect
index b88cc2b..68b0826 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -116,6 +116,13 @@ set_symlink() {
[[ ! -d ${repopath}/profiles/${target} ]] \
&& die -q "No profile directory for target \"${target}\""
 
+   if [[ -f ${repopath}/profiles/${target}/deprecated ]]; then
+   local upgrade=$(sed 1q 
"${repopath}/profiles/${target}/deprecated")
+   write_warning_msg "Profile ${target} is deprecated"
+   [[ -n ${upgrade} ]] \
+   && write_warning_msg "Recommending upgrade to 
${upgrade}"
+   fi
+
# we must call remove_symlink() here instead of calling it from
# do_set(), since if the link is removed, we cannot reliably
# determine ${arch} in find_targets()

[gentoo-commits] proj/eselect:master commit in: /, libs/

[Ulrich Müller]

commit: 50fd0e9ae91c7d953278eaba90716e7f5fa4ebb4
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Feb 13 20:43:08 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Feb 13 20:43:08 2019 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=50fd0e9a

Output warning messages in yellow.

* libs/output.bash.in (colours): Display warning messages in
yellow, in order to distinguish from errors which are red.

Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog   | 5 +
 libs/output.bash.in | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 84673d3..446cd31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-13  Ulrich Mueller  
+
+   * libs/output.bash.in (colours): Display warning messages in
+   yellow, in order to distinguish from errors which are red.
+
 2018-12-22  Ulrich Mueller  
 
* modules/profile.eselect (set_symlink): Warn about deprecated

diff --git a/libs/output.bash.in b/libs/output.bash.in
index 2d32bc6..2f6fc02 100644
--- a/libs/output.bash.in
+++ b/libs/output.bash.in
@@ -20,8 +20,8 @@ colours() {
COLOUR_NORMAL=$(tput sgr0)
COLOUR_BOLD=$(tput bold)
COLOUR_HI=$(tput setaf 4)${COLOUR_BOLD} # blue
-   COLOUR_WARN=$(tput setaf 1)${COLOUR_BOLD} # red
-   COLOUR_ERROR=${COLOUR_WARN}
+   COLOUR_WARN=$(tput setaf 3)${COLOUR_BOLD} # yellow
+   COLOUR_ERROR=$(tput setaf 1)${COLOUR_BOLD} # red
COLOUR_LIST_HEADER=$(tput setaf 2)${COLOUR_BOLD} # green
COLOUR_LIST_LEFT=${COLOUR_BOLD}
COLOUR_LIST_RIGHT=${COLOUR_NORMAL}

[gentoo-commits] proj/eselect:master commit in: misc/

[Ulrich Müller]

commit: e0c3320098d6a91661035eb54377bbfcf8b93ff2
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Dec  9 22:35:05 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Dec  9 22:35:05 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=e0c33200

Use simplified copyright notice for GLEP 76 compliance.

Signed-off-by: Ulrich Müller  gentoo.org>

 misc/eselect-mode.el | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index 77eeed9..d914d83 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -1,9 +1,6 @@
 ;;; eselect-mode.el --- edit eselect files
 
-;; Copyright 2006 Matthew Kennedy
-;; Copyright 2006 Diego Pettenò
-;; Copyright 2007-2012 Christian Faulhammer
-;; Copyright 2007-2018 Ulrich Müller
+;; Copyright 2006-2018 Gentoo Authors
 
 ;; Author: Matthew Kennedy 
 ;; Diego Pettenò 

[gentoo-commits] proj/eselect:master commit in: doc/, libs/, /, modules/, man/, misc/, bin/

[Ulrich Müller]

commit: 8c36a771d720a7a86662ab7bf431cb86cd9874e5
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Sep 16 14:25:59 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Sep 16 14:25:59 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=8c36a771

Update copyright notices to follow the new policy.

 README | 2 +-
 bin/eselect.in | 4 ++--
 doc/developer-guide.txt| 4 ++--
 libs/config.bash.in| 2 +-
 libs/core.bash.in  | 2 +-
 libs/default.eselect.in| 2 +-
 libs/editor-variable.bash.in   | 2 +-
 libs/manip.bash.in | 2 +-
 libs/multilib.bash.in  | 2 +-
 libs/output.bash.in| 2 +-
 libs/package-manager.bash.in   | 2 +-
 libs/path-manipulation.bash.in | 2 +-
 libs/skel.bash.in  | 2 +-
 libs/tests.bash.in | 2 +-
 man/editor.eselect.5   | 2 +-
 man/env.eselect.5  | 2 +-
 man/eselect.1  | 2 +-
 man/kernel.eselect.5   | 2 +-
 man/news.eselect.5 | 2 +-
 man/pager.eselect.5| 2 +-
 man/profile.eselect.5  | 2 +-
 man/rc.eselect.5   | 2 +-
 man/visual.eselect.5   | 2 +-
 misc/eselect-mode.el   | 5 -
 misc/eselect.bashcomp  | 2 +-
 modules/config.eselect | 2 +-
 modules/cow.eselect| 2 +-
 modules/editor.eselect | 2 +-
 modules/env.eselect| 2 +-
 modules/kernel.eselect | 2 +-
 modules/locale.eselect | 2 +-
 modules/modules.eselect| 2 +-
 modules/news.eselect   | 2 +-
 modules/pager.eselect  | 2 +-
 modules/profile.eselect| 2 +-
 modules/rc.eselect | 2 +-
 modules/visual.eselect | 2 +-
 37 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/README b/README
index 57498d3..b063481 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ See ``doc/``. Use ``make html`` for HTML versions.
 Copyright
 -
 
-eselect is Copyright (c) 2005-2018 Gentoo Foundation. This code is
+eselect is Copyright (c) 2005-2018 Gentoo Authors. This code is
 distributed under the terms of the `GNU General Public License,
 version 2 or later`__.
 

diff --git a/bin/eselect.in b/bin/eselect.in
index 432f4e8..fc8785b 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -1,6 +1,6 @@
 #!@BASH@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2018 Gentoo Foundation
+# Copyright (c) 2005-2018 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #
@@ -98,7 +98,7 @@ es_do_help() {
 es_do_version() {
echo "eselect ${ESELECT_VERSION}"
echo
-   echo "Copyright (c) 2005-2018 Gentoo Foundation."
+   echo "Copyright (c) 2005-2018 Gentoo Authors."
echo "Distributed under the terms of the GNU GPL version 2 or later."
 }
 

diff --git a/doc/developer-guide.txt b/doc/developer-guide.txt
index 076c5ca..abeccc2 100644
--- a/doc/developer-guide.txt
+++ b/doc/developer-guide.txt
@@ -31,12 +31,12 @@ and ``set``, plus the standard ``help``, ``usage``, and 
``version``
 actions, and is installed to ``$(datadir)/eselect/modules/`` ::
 
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2005-2012 Gentoo Foundation
+# Copyright 2005-2018 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 DESCRIPTION="Manage the /usr/src/linux symlink"
 MAINTAINER="esel...@gentoo.org"
-VERSION="20120307"
+VERSION="20180916"
 
 # find a list of kernel symlink targets
 find_targets() {

diff --git a/libs/config.bash.in b/libs/config.bash.in
index 33a2695..37858a1 100644
--- a/libs/config.bash.in
+++ b/libs/config.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2018 Gentoo Foundation
+# Copyright (c) 2005-2018 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/core.bash.in b/libs/core.bash.in
index 6f77626..44171d1 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2018 Gentoo Foundation
+# Copyright (c) 2005-2018 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/default.eselect.in b/libs/default.eselect.in
index b889f95..07601ad 100644
--- a/libs/default.eselect.in
+++ b/libs/default.eselect.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2018 Gentoo Foundation
+# Copyright (c) 2005-2018 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/editor-variable.bash.in b/libs/editor-variable.bash.in
index 61bd981..12c9418 100644
--- a/libs/editor-variable.bash.in
+++ b/libs/editor-variable.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2018 Gentoo Foundation
+# Copyright (c) 2005-2018 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git 

[gentoo-commits] proj/eselect:master commit in: /, man/

[Ulrich Müller]

commit: 0ff1f8eca0e85fbb4c0841490419e9ba3292aa2c
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Aug  7 12:01:40 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Aug  7 12:01:40 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=0ff1f8ec

Update profile.eselect(5) examples.

* man/profile.eselect.5: Update examples, bug 662996.

 ChangeLog |  4 
 man/profile.eselect.5 | 10 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f59bd41..8a3eb59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-07  Ulrich Müller  
+
+   * man/profile.eselect.5: Update examples, bug 662996.
+
 2018-05-29  Ulrich Müller  
 
* configure.ac: Update version to 1.4.13.

diff --git a/man/profile.eselect.5 b/man/profile.eselect.5
index 9dd9936..8ad3b46 100644
--- a/man/profile.eselect.5
+++ b/man/profile.eselect.5
@@ -1,7 +1,7 @@
 .\" Copyright 2005-2018 Gentoo Foundation
 .\" Distributed under the terms of the GNU GPL version 2 or later
 .\"
-.TH profile.eselect 5 "April 2009" "Gentoo Linux" eselect
+.TH profile.eselect 5 "August 2018" "Gentoo Linux" eselect
 .SH NAME
 profile.eselect \- The profile management module for Gentoo's eselect
 .SH SYNOPSIS
@@ -28,7 +28,9 @@ profiles.
 # eselect profile list
 .br
 Available profile symlink targets:
-  [1]   default\-linux/amd64/2005.0
+  [1]   default/linux/amd64/17.0 (stable)
+  [2]   default/linux/amd64/17.0/hardened (stable)
+  [3]   default/linux/amd64/17.0/desktop (stable) *
 .SH ACTION: SET
 .B eselect profile set
 .RB [ \-\-force ]
@@ -46,8 +48,8 @@ Show your system's currently active profile.
 
 # eselect profile show
 .br
-Current make.profile symlink:
-  /usr/portage/profiles/default\-linux/amd64/2005.0
+Current /etc/portage/make.profile symlink:
+  default/linux/amd64/17.0/desktop
 .SH AUTHORS
 Danny van Dyk 
 .br

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 8e1c663a75aad586e7da5dd22b8a1a29dc3beb01
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue May 29 16:40:39 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue May 29 16:40:39 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=8e1c663a

Update NEWS.

 NEWS | 4 
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index c25a81a..f9ca432 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.13:
+New features:
+- New get_libdir() function in multilib library.
+
 1.4.12:
 Bug fixes:
 - Workaround for bug #645240: OpenRC commands not in PATH in rc module.

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 02dd9b7a37caa0f037312df8d84e9803167941eb
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue May 29 16:41:41 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue May 29 16:41:41 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=02dd9b7a

Update version to 1.4.13.

 ChangeLog| 3 +++
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 821e7c9..f59bd41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2018-05-29  Ulrich Müller  
 
+   * configure.ac: Update version to 1.4.13.
+   * Tagged 1.4.13 release.
+
* doc/developer-guide.txt: Replace the term "dep atom" by
"package dependency specification".
 

diff --git a/configure.ac b/configure.ac
index 062ef5d..76635be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.12, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.13, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: doc/, misc/, /, libs/

[Ulrich Müller]

commit: cd03bb12fa2799c76987346f6834b78fda9285a7
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue May 29 16:33:42 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue May 29 16:33:42 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=cd03bb12

New get_libdir function.

* libs/multilib.bash.in (get_libdir): New function.
* doc/developer-guide.txt: Describe it.
* libs/Makefile.am (dosed): Substitute @libdir@.
* misc/eselect-mode.el (eselect-mode-keywords-multilib):
Add get_libdir.

 ChangeLog   | 8 
 doc/developer-guide.txt | 6 ++
 libs/Makefile.am| 3 ++-
 libs/multilib.bash.in   | 7 +++
 misc/eselect-mode.el| 2 +-
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d94fe63..4f6510e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-05-29  Ulrich Müller  
+
+   * libs/multilib.bash.in (get_libdir): New function.
+   * doc/developer-guide.txt: Describe it.
+   * libs/Makefile.am (dosed): Substitute @libdir@.
+   * misc/eselect-mode.el (eselect-mode-keywords-multilib):
+   Add get_libdir.
+
 2018-01-24  Ulrich Müller  
 
* configure.ac: Update version to 1.4.12.

diff --git a/doc/developer-guide.txt b/doc/developer-guide.txt
index ddef9f7..408b2a7 100644
--- a/doc/developer-guide.txt
+++ b/doc/developer-guide.txt
@@ -473,6 +473,12 @@ used architecture. By default it uses /etc/ld.so.conf to 
obtain all
 valid libdirs. If this fails due to a missing or broken file, this
 function uses ``uname`` to determine the architecture.
 
+The ``get_libdir`` function
+,,,
+
+The ``get_libdir`` function prints the basename of the libdir path that
+was passed to eselect's configure.
+
 Package-manager functions
 -
 

diff --git a/libs/Makefile.am b/libs/Makefile.am
index 027ef73..6ebd08e 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -30,7 +30,8 @@ dosed = @SED@ \
-e 's%\@SED\@%@SED@%g' \
-e 's%\@PORTAGEQ\@%@PORTAGEQ@%g' \
-e 's%\@ENV_UPDATE\@%@ENV_UPDATE@%g' \
-   -e 's%\@CANONICALISE\@%@CANONICALISE@%g'
+   -e 's%\@CANONICALISE\@%@CANONICALISE@%g' \
+   -e 's%\@libdir\@%@libdir@%g'
 
 %.bash : %.bash.in
@$(dosed) $< > $@

diff --git a/libs/multilib.bash.in b/libs/multilib.bash.in
index 4225adb..e84670e 100644
--- a/libs/multilib.bash.in
+++ b/libs/multilib.bash.in
@@ -28,3 +28,10 @@ list_libdirs() {
done
echo "${libdirs[@]}"
 }
+
+# get_libdir
+# Print the basename of the libdir path
+get_libdir() {
+   local libdir="@libdir@"
+   echo "${libdir##*/}"
+}

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index b51b60b..762137a 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -61,7 +61,7 @@
 font-lock-type-face))
 
 (defvar eselect-mode-keywords-multilib
-  '(("list_libdirs")
+  '(("list_libdirs" "get_libdir")
 font-lock-type-face))
 
 (defvar eselect-mode-keywords-package-manager

[gentoo-commits] proj/eselect:master commit in: doc/, /

[Ulrich Müller]

commit: 75d2ff149684a5b0650abc8256931ae4a224c610
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue May 29 16:35:59 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue May 29 16:35:59 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=75d2ff14

Replace "dep atom" by "package dependency specification".

* doc/developer-guide.txt: Replace the term "dep atom" by
"package dependency specification".

 ChangeLog   | 3 +++
 doc/developer-guide.txt | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f6510e..821e7c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2018-05-29  Ulrich Müller  
 
+   * doc/developer-guide.txt: Replace the term "dep atom" by
+   "package dependency specification".
+
* libs/multilib.bash.in (get_libdir): New function.
* doc/developer-guide.txt: Describe it.
* libs/Makefile.am (dosed): Substitute @libdir@.

diff --git a/doc/developer-guide.txt b/doc/developer-guide.txt
index 408b2a7..076c5ca 100644
--- a/doc/developer-guide.txt
+++ b/doc/developer-guide.txt
@@ -503,13 +503,13 @@ The ``best_version`` function
 ,
 
 The ``best_version`` function returns the highest available version for
-a given package dep atom.
+a given package dependency specification.
 
 The ``has_version`` function
 
 
-The ``has_version`` function checks whether a given versioned package
-dep atom is installed.
+The ``has_version`` function checks whether a package matching a given
+dependency specification is installed.
 
 The ``get_repositories`` function
 ,

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: b391686b4d1fd434cb357c04ffe4026c335f70e1
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Jan 24 09:40:38 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Jan 24 09:40:38 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=b391686b

Update version to 1.4.12.

 ChangeLog| 3 +++
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 66b7e4e..d94fe63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2018-01-24  Ulrich Müller  
 
+   * configure.ac: Update version to 1.4.12.
+   * Tagged 1.4.12 release.
+
* modules/rc.eselect (show_script_status): Add /lib64/rc/bin
to PATH as well, workaround for bug 645240 until OpenRC is fixed.
 

diff --git a/configure.ac b/configure.ac
index 1cb4d06..062ef5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.11, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.12, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: fbd0035451b1095b8d3a4bd0f132c1d65ef95851
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Jan 24 09:39:02 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Jan 24 09:39:02 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=fbd00354

Update NEWS.

 NEWS | 4 
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index 28c7e20..c25a81a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.12:
+Bug fixes:
+- Workaround for bug #645240: OpenRC commands not in PATH in rc module.
+
 1.4.11:
 New features:
 - Show profile status in list, and allow setting an experimental profile

[gentoo-commits] proj/eselect:master commit in: /, modules/

[Ulrich Müller]

commit: 4651aedbef225455ee5679b1997573b14834dcfb
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Jan 24 09:34:02 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Jan 24 09:34:02 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=4651aedb

Workaround for OpenRC commands not in PATH in rc module.

* modules/rc.eselect (show_script_status): Add /lib64/rc/bin
to PATH as well, workaround for bug 645240 until OpenRC is fixed.

 ChangeLog  | 5 +
 modules/rc.eselect | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3846850..66b7e4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-24  Ulrich Müller  
+
+   * modules/rc.eselect (show_script_status): Add /lib64/rc/bin
+   to PATH as well, workaround for bug 645240 until OpenRC is fixed.
+
 2018-01-23  Ulrich Müller  
 
* libs/package-manager.bash.in (arch): Restore sparc64 which was

diff --git a/modules/rc.eselect b/modules/rc.eselect
index f364f8b..ff45d58 100644
--- a/modules/rc.eselect
+++ b/modules/rc.eselect
@@ -64,7 +64,7 @@ find_unused_scripts() {
 # output list entry for script $1 and show its status
 show_script_status() {
local script=$1 status=unknown x
-   local PATH=/lib/rc/bin:${PATH} # path to service_* commands
+   local PATH=/lib/rc/bin:/lib64/rc/bin:${PATH} # path to service_* 
commands
 
for x in stopping starting inactive started stopped; do
if service_${x} ${script}; then

[gentoo-commits] proj/eselect:master commit in: /, libs/

[Ulrich Müller]

commit: 95b7bee70378a6fcbf838301f2f98e8825544c22
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jan 23 12:43:39 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jan 23 12:51:42 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=95b7bee7

Update arch list in package-manager list.

* libs/package-manager.bash.in (arch): Restore sparc64 which was
lost in a previous update. Sync with arch.list in the gentoo repo.

 ChangeLog|  5 +
 libs/package-manager.bash.in | 34 +-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 398b23c..3846850 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-23  Ulrich Müller  
+
+   * libs/package-manager.bash.in (arch): Restore sparc64 which was
+   lost in a previous update. Sync with arch.list in the gentoo repo.
+
 2018-01-09  Ulrich Müller  
 
* configure.ac: Update version to 1.4.11.

diff --git a/libs/package-manager.bash.in b/libs/package-manager.bash.in
index baf49df..220e09c 100644
--- a/libs/package-manager.bash.in
+++ b/libs/package-manager.bash.in
@@ -70,23 +70,23 @@ arch() {
# Try to determine arch from HOSTTYPE and OSTYPE, which are
# derived from the GNU triplet (at build time of bash)
case ${HOSTTYPE} in
-   aarch64*)   ret=arm64   ;;
-   alpha*) ret=alpha   ;;
-   arm*)   ret=arm ;;
-   hppa*)  ret=hppa;;
-   i?86)   ret=x86 ;;
-   ia64*)  ret=ia64;;
-   m68k*)  ret=m68k;;
-   mips*)  ret=mips;;
-   nios2)  ret=nios2   ;;
-   or1k|or32*) ret=openrisc;;
-   powerpc64*) ret=ppc64   ;;
-   powerpc*)   ret=ppc ;;
-   riscv*) ret=riscv   ;;
-   s390*)  ret=s390;;
-   sh*)ret=sh  ;;
-   sparc*) ret=sparc   ;;
-   x86_64) ret=amd64   ;;
+   aarch64*)   ret=arm64   ;;
+   alpha*) ret=alpha   ;;
+   arm*)   ret=arm ;;
+   hppa*)  ret=hppa;;
+   i?86)   ret=x86 ;;
+   ia64*)  ret=ia64;;
+   m68k*)  ret=m68k;;
+   mips*)  ret=mips;;
+   nios2)  ret=nios2   ;;
+   powerpc64*) ret=ppc64   ;;
+   powerpc*)   ret=ppc ;;
+   riscv*) ret=riscv   ;;
+   s390*)  ret=s390;;
+   sh*)ret=sh  ;;
+   sparc64*)   ret=sparc64 ;;
+   sparc*) ret=sparc   ;;
+   x86_64) ret=amd64   ;;
*)
write_warning_msg \
"Unknown architecture \"${HOSTTYPE}\"." 
\

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 6844029a48c34acbf934a2002582509329a853b7
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jan  9 08:45:14 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jan  9 08:45:14 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=6844029a

Update version to 1.4.11.

 ChangeLog| 3 +++
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0be1bc4..398b23c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2018-01-09  Ulrich Müller  
 
+   * configure.ac: Update version to 1.4.11.
+   * Tagged 1.4.11 release.
+
* modules/profile.eselect (set_symlink): Require --force option
when selecting an experimental profile.
 

diff --git a/configure.ac b/configure.ac
index 19601ed..1cb4d06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(eselect, 1.4.10, esel...@gentoo.org, eselect)
+AC_INIT(eselect, 1.4.11, esel...@gentoo.org, eselect)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(bin/eselect.in)
 AC_CONFIG_AUX_DIR(config)

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 82bb7b48ecaeca1a1154d4cee7f52b428aa8c244
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jan  9 08:45:01 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jan  9 08:45:01 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=82bb7b48

Update NEWS.

 NEWS | 5 +
 1 file changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index 523c980..28c7e20 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.11:
+New features:
+- Show profile status in list, and allow setting an experimental profile
+  only with the --force option in profile module (bug #643864).
+
 1.4.10:
 Bug fixes:
 - Fixed bug #614008: Regex in profile module.

[gentoo-commits] proj/eselect:master commit in: modules/, /

[Ulrich Müller]

commit: 4bd139a86d73388dfdc6cbcf553f59b3ffa1138e
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jan  9 08:16:01 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jan  9 08:16:01 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=4bd139a8

Require --force option when selecting an experimental profile.

* modules/profile.eselect (set_symlink): Require --force option
when selecting an experimental profile.

 ChangeLog   | 5 +
 modules/profile.eselect | 7 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 57e768e..0be1bc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-09  Ulrich Müller  
+
+   * modules/profile.eselect (set_symlink): Require --force option
+   when selecting an experimental profile.
+
 2018-01-08  Ulrich Müller  
 
* modules/profile.eselect (find_targets): Add a fourth field for

diff --git a/modules/profile.eselect b/modules/profile.eselect
index de85f90..1e1dcff 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -75,7 +75,7 @@ remove_symlink() {
 
 # set the make.profile symlink
 set_symlink() {
-   local target=$1 force=$2 targets arch parch repo repopath
+   local target=$1 force=$2 targets arch parch repo repopath status
 
if is_number "${target}"; then
targets=( $(find_targets) )
@@ -86,7 +86,12 @@ set_symlink() {
target=${targets[target-1]}
repo=${target%%::*}; target=${target#*::}
repopath=${target%%::*}; target=${target#*::}
+   status=${target#*::}; status=${status%%::*}
target=${target%%::*}
+   if [[ ${status} == exp && -z ${force} ]]; then
+   write_error_msg "Profile ${target} is experimental"
+   die -q "Refusing to select ${status} profile without 
--force option"
+   fi
elif [[ -n ${target} ]]; then
# if the profile was explicitly specified (rather than a number)
# double check and make sure it's valid

[gentoo-commits] proj/eselect:master commit in: /, modules/

[Ulrich Müller]

commit: a25b292e4feaab4b3c073eeb1ed96166893e2d2b
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jan  8 23:29:45 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jan  8 23:29:45 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=a25b292e

Show the profiles' status in the profile module's list output.

* modules/profile.eselect (find_targets): Add a fourth field for
the profiles' status to the output.
(set_symlink): Account for the change in find_targets.
(do_list): Also show the profiles' status, but only in non-brief
output mode. Bug 643864.

 ChangeLog   |  8 
 modules/profile.eselect | 23 ++-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 97dd57f..57e768e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-01-08  Ulrich Müller  
+
+   * modules/profile.eselect (find_targets): Add a fourth field for
+   the profiles' status to the output.
+   (set_symlink): Account for the change in find_targets.
+   (do_list): Also show the profiles' status, but only in non-brief
+   output mode. Bug 643864.
+
 2017-12-25  Ulrich Müller  
 
* configure.ac: Update version to 1.4.10.

diff --git a/modules/profile.eselect b/modules/profile.eselect
index c9a1edc..de85f90 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -42,7 +42,7 @@ get_repo_path() {
 }
 
 # get a list of valid profiles
-# returns a line  for every profile
+# returns a line :: for every profile
 find_targets() {
local arch desc repos repo_paths i p
 
@@ -60,7 +60,8 @@ find_targets() {
[[ -r ${desc} ]] || continue
# parse profiles.desc and find profiles suitable for arch
for p in $(sed -n -e \
-   "s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" 
"${desc}")
+   
"s|^${arch}[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\).*$|\1::\2|p"
 \
+   "${desc}")
do
echo "${repos[i]}::${repo_paths[i]}::${p}"
done
@@ -85,6 +86,7 @@ set_symlink() {
target=${targets[target-1]}
repo=${target%%::*}; target=${target#*::}
repopath=${target%%::*}; target=${target#*::}
+   target=${target%%::*}
elif [[ -n ${target} ]]; then
# if the profile was explicitly specified (rather than a number)
# double check and make sure it's valid
@@ -174,7 +176,7 @@ describe_list() {
 }
 
 do_list() {
-   local targets active i target repo repopath
+   local targets active i target repo repopath status disp
 
targets=( $(find_targets) )
[[ ${#targets[@]} -eq 0 ]] \
@@ -187,13 +189,16 @@ do_list() {
target=${targets[i]}
repo=${target%%::*}; target=${target#*::}
repopath=${target%%::*}; target=${target#*::}
-   if [[ ${repo} == "${DEFAULT_REPO}" ]]; then
-   targets[i]=${target}
-   else
-   targets[i]=${repo}:${target}
+   status=${target#*::}; status=${status%%::*}
+   target=${target%%::*}
+   disp=${target}
+   [[ ${repo} != "${DEFAULT_REPO}" ]] && disp=${repo}:${disp}
+   if ! is_output_mode brief; then
+   disp+=" (${status})"
+   [[ $(canonicalise "${repopath}/profiles/${target}") \
+   == "${active}" ]] && disp=$(highlight_marker 
"${disp}")
fi
-   [[ $(canonicalise "${repopath}/profiles/${target}") == 
"${active}" ]] \
-   && targets[i]=$(highlight_marker "${targets[i]}")
+   targets[i]=${disp}
done
write_list_start "Available profile symlink targets:"
write_numbered_list "${targets[@]}"

[gentoo-commits] proj/eselect:master commit in: misc/, /, man/, bin/, modules/, libs/

[Ulrich Müller]

commit: 7b4a81e02cf6b98f12297c18a557a700fc991bd2
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jan  8 22:59:25 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jan  8 22:59:25 2018 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=7b4a81e0

Update copyright years.

 README | 2 +-
 bin/eselect.in | 4 ++--
 libs/config.bash.in| 2 +-
 libs/core.bash.in  | 2 +-
 libs/default.eselect.in| 2 +-
 libs/editor-variable.bash.in   | 2 +-
 libs/manip.bash.in | 2 +-
 libs/multilib.bash.in  | 2 +-
 libs/output.bash.in| 2 +-
 libs/package-manager.bash.in   | 2 +-
 libs/path-manipulation.bash.in | 2 +-
 libs/skel.bash.in  | 2 +-
 libs/tests.bash.in | 2 +-
 man/editor.eselect.5   | 2 +-
 man/env.eselect.5  | 2 +-
 man/eselect.1  | 2 +-
 man/kernel.eselect.5   | 2 +-
 man/news.eselect.5 | 2 +-
 man/pager.eselect.5| 2 +-
 man/profile.eselect.5  | 2 +-
 man/rc.eselect.5   | 2 +-
 man/visual.eselect.5   | 2 +-
 misc/eselect-mode.el   | 2 +-
 misc/eselect.bashcomp  | 2 +-
 modules/config.eselect | 2 +-
 modules/cow.eselect| 2 +-
 modules/editor.eselect | 2 +-
 modules/env.eselect| 2 +-
 modules/kernel.eselect | 2 +-
 modules/locale.eselect | 2 +-
 modules/modules.eselect| 2 +-
 modules/news.eselect   | 2 +-
 modules/pager.eselect  | 2 +-
 modules/profile.eselect| 2 +-
 modules/rc.eselect | 2 +-
 modules/visual.eselect | 2 +-
 36 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/README b/README
index a7ccd3a..57498d3 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ See ``doc/``. Use ``make html`` for HTML versions.
 Copyright
 -
 
-eselect is Copyright (c) 2005-2017 Gentoo Foundation. This code is
+eselect is Copyright (c) 2005-2018 Gentoo Foundation. This code is
 distributed under the terms of the `GNU General Public License,
 version 2 or later`__.
 

diff --git a/bin/eselect.in b/bin/eselect.in
index 7b1f019..432f4e8 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -1,6 +1,6 @@
 #!@BASH@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2017 Gentoo Foundation
+# Copyright (c) 2005-2018 Gentoo Foundation
 #
 # This file is part of the 'eselect' tools framework.
 #
@@ -98,7 +98,7 @@ es_do_help() {
 es_do_version() {
echo "eselect ${ESELECT_VERSION}"
echo
-   echo "Copyright (c) 2005-2017 Gentoo Foundation."
+   echo "Copyright (c) 2005-2018 Gentoo Foundation."
echo "Distributed under the terms of the GNU GPL version 2 or later."
 }
 

diff --git a/libs/config.bash.in b/libs/config.bash.in
index 96648eb..33a2695 100644
--- a/libs/config.bash.in
+++ b/libs/config.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2017 Gentoo Foundation
+# Copyright (c) 2005-2018 Gentoo Foundation
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/core.bash.in b/libs/core.bash.in
index 281dbde..6f77626 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2017 Gentoo Foundation
+# Copyright (c) 2005-2018 Gentoo Foundation
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/default.eselect.in b/libs/default.eselect.in
index 8eb2cd6..b889f95 100644
--- a/libs/default.eselect.in
+++ b/libs/default.eselect.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2017 Gentoo Foundation
+# Copyright (c) 2005-2018 Gentoo Foundation
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/editor-variable.bash.in b/libs/editor-variable.bash.in
index 23072a9..61bd981 100644
--- a/libs/editor-variable.bash.in
+++ b/libs/editor-variable.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2017 Gentoo Foundation
+# Copyright (c) 2005-2018 Gentoo Foundation
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/manip.bash.in b/libs/manip.bash.in
index f247c56..9e066f2 100644
--- a/libs/manip.bash.in
+++ b/libs/manip.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2017 Gentoo Foundation
+# Copyright (c) 2005-2018 Gentoo Foundation
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/multilib.bash.in b/libs/multilib.bash.in
index b483dd7..4225adb 100644
--- a/libs/multilib.bash.in
+++ b/libs/multilib.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2017 Gentoo Foundation
+# Copyright (c) 2005-2018 Gentoo Foundation
 #
 # This file is part of the 'eselect' tools framework.
 #

diff --git a/libs/output.bash.in b/libs/output.bash.in
index fa47820..23413d4 100644
--- 

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: dc4ab563af1a171e4cf04b4e9dc0e0af57f7a40f
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Dec 25 09:07:59 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Dec 25 09:07:59 2017 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=dc4ab563

Add reference to bug 640386 to ChangeLog.

 ChangeLog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 627fa10..a8d3693 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,8 @@
 2017-05-06  Ulrich Müller  
 
* modules/kernel.eselect (do_set): Don't remove the old symlink
-   before we know that we have a valid new target. Simplify.
+   before we know that we have a valid new target, bug 640386.
+   Simplify.
(set_symlink): Check if the new link target is valid, then remove
any old symlink, then set the new one.
(remove_symlink): Use rm -f.

[gentoo-commits] proj/eselect:master commit in: /

[Ulrich Müller]

commit: 4fcbb4a86078c3d98a555f6a260b1ca585daf2ce
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Dec 25 09:44:57 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Dec 25 09:44:57 2017 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=4fcbb4a8

Update NEWS.

 NEWS | 9 +
 1 file changed, 9 insertions(+)

diff --git a/NEWS b/NEWS
index 5300068..523c980 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,15 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+1.4.10:
+Bug fixes:
+- Fixed bug #614008: Regex in profile module.
+- Fixed bug #617572: Check range of number in kernel and profile modules.
+- Fixed bug #640386: Do not remove the old kernel symlink unless there is
+  a valid new target.
+- eval() will die rather than emit a warning.
+- Check for valid news item format.
+
 1.4.9:
 New features:
 - New architectures in package-manager lib.

[gentoo-commits] proj/eselect:master commit in: libs/, /

[Ulrich Müller]

commit: bc8d7b4d1cffbf60d31753aee798c65d554d0fa2
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Dec 25 09:11:29 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Dec 25 09:11:29 2017 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=bc8d7b4d

Make eval die.

* libs/core.bash.in (eval): Make it fatal again, after more than
one year of transition time.

 ChangeLog | 5 +
 libs/core.bash.in | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8d3693..648e874 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-25  Ulrich Müller  
+
+   * libs/core.bash.in (eval): Make it fatal again, after more than
+   one year of transition time.
+
 2017-10-14  Ulrich Müller  
 
* man/news.eselect.5: Update URI of GLEP 42.

diff --git a/libs/core.bash.in b/libs/core.bash.in
index 06f767e..281dbde 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -121,8 +121,7 @@ inherit() {
 
 # make eval not work, because it's evil
 eval() {
-   write_warning_msg "Don't use eval. Find another way."
-   builtin eval "$@"
+   die "Don't use eval. Find another way."
 }
 
 # GNU sed wrapper (sed or gsed, as determined by configure)