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

[Ulrich Müller]

commit: ac3052c13e3618eac170d036c5d39bf4db406028
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Jun  5 14:07:43 2024 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Jun  5 14:07:43 2024 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=ac3052c1

Update a comment

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

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

diff --git a/emacs-updater b/emacs-updater
index 2936b64..1926218 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -205,7 +205,7 @@ else
 BOLD=; NORMAL=; RED=; GREEN=; YELLOW=; BLUE=; MAGENTA=; CYAN=
 fi
 
-# Some type of output can be prettified and capsulated in functions
+# Some functions for output
 message() {
 local OUTPUT="$@"
 echo "${GREEN}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}"

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

[Ulrich Müller]

commit: ef43d23b34a5cc2e95c07a86d9161ced261d4c94
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu May  2 16:24:44 2024 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu May  2 16:24:44 2024 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=ef43d23b

Version 1.18 released

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

 ChangeLog | 2 ++
 emacs-updater | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 702a3de..372c88b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2024-05-02  Ulrich Müller  
 
+   * Version 1.18 released.
+
* emacs-updater (OPTIONS): Drop the -n, --nocolor, --nocolour
option, which is deprecated since version 1.11 released in 2013.
 

diff --git a/emacs-updater b/emacs-updater
index 4c4dc8a..2936b64 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -6,7 +6,7 @@
 # Christian Faulhammer 
 # Ulrich Müller 
 
-VERSION=1.17
+VERSION=1.18
 EMACS=/usr/bin/emacs
 GETOPT=/usr/bin/getopt
 SITELISP=/usr/share/emacs/site-lisp
@@ -71,7 +71,7 @@ usage() {
 version() {
 cat <<-EOF
Emacs updater version ${VERSION}
-   Copyright 2007-2023 Gentoo Authors
+   Copyright 2007-2024 Gentoo Authors
Distributed under the terms of the GNU GPL version 2 or later.
 
Gentoo Emacs project: 

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

[Ulrich Müller]

commit: 455a245dd327a8f18f77986662214206aa50d490
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu May  2 16:18:15 2024 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu May  2 16:18:15 2024 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=455a245d

Respect NO_COLOR

* emacs-updater (COLOUR): Respect the NO_COLOR environment
variable.

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

 ChangeLog | 5 +
 emacs-updater | 6 --
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2dc5440..6323e0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-05-02  Ulrich Müller  
+
+   * emacs-updater (COLOUR): Respect the NO_COLOR environment
+   variable.
+
 2024-05-01  Arsen Arsenović  
 
* emacs-updater (pm_portage): Pass --usepkg=n to Portage.

diff --git a/emacs-updater b/emacs-updater
index c1ac43e..34fd89b 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2007-2023 Gentoo Authors
+# Copyright 2007-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2 or later
 
 # Authors:
@@ -20,12 +20,14 @@ PM_EXTRAOPTS=( )
 
 # Other default variable settings
 BATCH=
-COLOUR=
 EXACT=
 MAJOR=
 ORPHANS=
 PRETEND=
 
+# Check for NO_COLOR environment variable: https://no-color.org/
+COLOUR=${NO_COLOR:+no}
+
 usage() {
 sed -e 's/^X//' <<-EOF
Usage: ${0##*/} [OPTION]...

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

[Ulrich Müller]

commit: 9d4c7c5b1bccd719decad755537fafc457fd4cfc
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu May  2 16:21:20 2024 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu May  2 16:21:20 2024 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=9d4c7c5b

Drop the -n, --nocolor, --nocolour option

* emacs-updater (OPTIONS): Drop the -n, --nocolor, --nocolour
option, which is deprecated since version 1.11 released in 2013.

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

 ChangeLog | 3 +++
 emacs-updater | 7 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6323e0c..702a3de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2024-05-02  Ulrich Müller  
 
+   * emacs-updater (OPTIONS): Drop the -n, --nocolor, --nocolour
+   option, which is deprecated since version 1.11 released in 2013.
+
* emacs-updater (COLOUR): Respect the NO_COLOR environment
variable.
 

diff --git a/emacs-updater b/emacs-updater
index 34fd89b..4c4dc8a 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -107,9 +107,9 @@ pm_auto() {
 }
 
 # Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C "${GETOPT}" -o a:behmnopP: \
---long action:,batch,color::,colour::,nocolor,nocolour,exact,help,major \
---long orphans,pretend,package-manager:,package-manager-command:,version \
+OPTIONS=$(LC_ALL=C "${GETOPT}" -o a:behmopP: \
+--long action:,batch,color::,colour::,exact,help,major,orphans \
+--long pretend,package-manager:,package-manager-command:,version \
 -n 'emacs-updater' -- "$@") \
 || usage $?
 
@@ -137,7 +137,6 @@ do
esac
shift 2
;;
-   -n|--nocolor|--nocolour) COLOUR="no"; shift ;; # legacy option
-a|--action)
ACTIONS=
for action in ${2/,/ }; do

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

[Ulrich Müller]

commit: 85014db5f84c2bc52d9314c7490b7277573204f6
Author: Arsen Arsenović  gentoo  org>
AuthorDate: Wed May  1 21:04:19 2024 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu May  2 16:12:33 2024 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=85014db5

Pass --usepkg=n to Portage

* emacs-updater (pm_portage): Pass --usepkg=n to Portage.
Fixes bug 931064.

Bug: https://bugs.gentoo.org/931064
Signed-off-by: Arsen Arsenović  gentoo.org>
Signed-off-by: Ulrich Müller  gentoo.org>

 ChangeLog | 5 +
 emacs-updater | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f4e8a2b..2dc5440 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-05-01  Arsen Arsenović  
+
+   * emacs-updater (pm_portage): Pass --usepkg=n to Portage.
+   Fixes bug 931064.
+
 2023-09-25  Ulrich Müller  
 
* Version 1.17 released.

diff --git a/emacs-updater b/emacs-updater
index 6d03c34..c1ac43e 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -79,7 +79,7 @@ version() {
 
 # Wrapper for package manager commands
 have_portage() { type -P emerge >/dev/null; }
-pm_portage() { emerge --oneshot "$@"; }
+pm_portage() { emerge --usepkg=n --oneshot "$@"; }
 
 have_pkgcore() { type -P pmerge >/dev/null; }
 pm_pkgcore() { pmerge --oneshot "$@"; }

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

[Ulrich Müller]

commit: 153f84cda8a0cc065c7c8bcedec5efd165d37cf9
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Sep 25 18:51:54 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Sep 25 18:51:54 2023 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=153f84cd

Version 1.17 released

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

 ChangeLog | 2 ++
 emacs-updater | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f21d36f..f4e8a2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2023-09-25  Ulrich Müller  
 
+   * Version 1.17 released.
+
* emacs-updater: The -e,--exact option of qfile no longer works in
portage-utils-0.80 or later. The "exact package" functionality is
now available with the -v,--verbose option (--verbose --quiet

diff --git a/emacs-updater b/emacs-updater
index 3cf85b0..6d03c34 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -6,7 +6,7 @@
 # Christian Faulhammer 
 # Ulrich Müller 
 
-VERSION=1.16
+VERSION=1.17
 EMACS=/usr/bin/emacs
 GETOPT=/usr/bin/getopt
 SITELISP=/usr/share/emacs/site-lisp
@@ -69,7 +69,7 @@ usage() {
 version() {
 cat <<-EOF
Emacs updater version ${VERSION}
-   Copyright 2007-2019 Gentoo Authors
+   Copyright 2007-2023 Gentoo Authors
Distributed under the terms of the GNU GPL version 2 or later.
 
Gentoo Emacs project: 

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

[Ulrich Müller]

commit: 58c7c3ee49dd1987c8542d709340e1315180df86
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Sep 25 18:45:47 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Sep 25 18:45:47 2023 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=58c7c3ee

qfile has lost its -e option

* emacs-updater: The -e,--exact option of qfile no longer works in
portage-utils-0.80 or later. The "exact package" functionality is
now available with the -v,--verbose option (--verbose --quiet
looks strange, but is not a contradiction here). Fixes bug 914479.

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

 ChangeLog | 7 +++
 emacs-updater | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5da7ab..f21d36f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-09-25  Ulrich Müller  
+
+   * emacs-updater: The -e,--exact option of qfile no longer works in
+   portage-utils-0.80 or later. The "exact package" functionality is
+   now available with the -v,--verbose option (--verbose --quiet
+   looks strange, but is not a contradiction here). Fixes bug 914479.
+
 2019-08-30  Ulrich Müller  
 
* Version 1.16 released.

diff --git a/emacs-updater b/emacs-updater
index ce308e5..3cf85b0 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2007-2019 Gentoo Authors
+# Copyright 2007-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2 or later
 
 # Authors:
@@ -292,7 +292,7 @@ message "Assigning ${NO_OF_FILES} file${s} to packages ..."
 if [[ ${ORPHANS} ]]; then
 xargs qfile -oCR <"${TMPFILE}" | sort -u >"${PKGFILE}"
 elif [[ ${EXACT} ]]; then
-xargs qfile -eqCR <"${TMPFILE}" | sort -u | sed 's/^/=/' >"${PKGFILE}"
+xargs qfile -vqCR <"${TMPFILE}" | sort -u | sed 's/^/=/' >"${PKGFILE}"
 else
 # Get package and slot number, requires >=portage-utils-0.3
 xargs qfile -SqCR <"${TMPFILE}" | sort -u >"${PKGFILE}"

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

[Ulrich Müller]

commit: f8aae8b612036972619dc5d6675843b887ab
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Aug 30 21:53:03 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Aug 30 21:53:03 2019 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=f8aae8b6

Version 1.16 released.

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

 ChangeLog | 2 ++
 emacs-updater | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25f549d..a5da7ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2019-08-30  Ulrich Müller  
 
+   * Version 1.16 released.
+
* emacs-updater (action_rebuild): Drop the last component,
i.e., the build number, from Emacs versions below 26 only.
Fixes bug 693140.

diff --git a/emacs-updater b/emacs-updater
index 0bca953..ce308e5 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,12 +1,12 @@
 #!/bin/bash
-# Copyright 2007-2016 Gentoo Authors
+# Copyright 2007-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2 or later
 
 # Authors:
 # Christian Faulhammer 
 # Ulrich Müller 
 
-VERSION=1.15
+VERSION=1.16
 EMACS=/usr/bin/emacs
 GETOPT=/usr/bin/getopt
 SITELISP=/usr/share/emacs/site-lisp
@@ -69,7 +69,7 @@ usage() {
 version() {
 cat <<-EOF
Emacs updater version ${VERSION}
-   Copyright 2007-2016 Gentoo Authors
+   Copyright 2007-2019 Gentoo Authors
Distributed under the terms of the GNU GPL version 2 or later.
 
Gentoo Emacs project: 

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

[Ulrich Müller]

commit: e67308394f12801aae8b004f2753a55c26f59635
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Aug 30 21:49:01 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Aug 30 21:49:01 2019 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=e6730839

Fix version comparison for Emacs 26.1 and later.

* emacs-updater (action_rebuild): Drop the last component,
i.e., the build number, from Emacs versions below 26 only.

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

 ChangeLog | 6 ++
 emacs-updater | 5 -
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 45a594e..25f549d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-08-30  Ulrich Müller  
+
+   * emacs-updater (action_rebuild): Drop the last component,
+   i.e., the build number, from Emacs versions below 26 only.
+   Fixes bug 693140.
+
 2016-06-08  Ulrich Müller  
 
* emacs-updater: Update URLs to use https.

diff --git a/emacs-updater b/emacs-updater
index 3133316..0bca953 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -237,6 +237,8 @@ action_rebuild() {
 ret=$?
 [[ ${ret} -eq 0 ]] || { failure "Error running Emacs"; exit ${ret}; }
 [[ ${active} ]] || { failure "Cannot determine Emacs version"; exit 1; }
+# Drop last component (build number) from versions below 26
+[[ ${active%%.*} -lt 26 ]] && active=${active%.*}
 message "Currently selected GNU Emacs version: ${active}"
 
 for elc in $(find "${ROOT}${SITELISP}" -name "*.elc")
@@ -245,8 +247,9 @@ action_rebuild() {
ret=$?
[[ ${ret} -eq 0 ]] || { failure "Error running sed"; exit ${ret}; }
version=${version:-unknown}
+   [[ ${version%%.*} -lt 26 ]] && version=${version%.*}
 
-   if [[ -z ${MAJOR} && ${version%.*} != "${active%.*}" ]] \
+   if [[ -z ${MAJOR} && ${version} != "${active}" ]] \
|| [[ ${version%%.*} != "${active%%.*}" ]] \
|| [[ $1 = all ]]
then

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

[Ulrich Müller]

commit: 5e8752b3f7f694668bdd9f1ce53ae7d122e7d956
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Dec  9 22:32:47 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Dec  9 22:32:47 2018 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=5e8752b3

Use simplified copyright notice for GLEP 76 compliance.

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

 Makefile| 2 +-
 emacs-updater   | 5 ++---
 emacs-updater.8 | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4b88716..ddaa32e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2008-2016 Christian Faulhammer and Ulrich Müller
+# Copyright 2008-2016 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2 or later
 
 PN = emacs-updater

diff --git a/emacs-updater b/emacs-updater
index 704d667..3133316 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,6 +1,5 @@
 #!/bin/bash
-# Copyright 2007-2010 Christian Faulhammer
-# Copyright 2007-2016 Ulrich Müller
+# Copyright 2007-2016 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2 or later
 
 # Authors:
@@ -70,7 +69,7 @@ usage() {
 version() {
 cat <<-EOF
Emacs updater version ${VERSION}
-   Copyright 2007-2016 Christian Faulhammer and Ulrich Müller
+   Copyright 2007-2016 Gentoo Authors
Distributed under the terms of the GNU GPL version 2 or later.
 
Gentoo Emacs project: 

diff --git a/emacs-updater.8 b/emacs-updater.8
index 22ecf5b..88777a7 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,5 +1,5 @@
 .\" -*- coding: utf-8 -*-
-.\" Copyright 2008-2016 Ulrich Müller
+.\" Copyright 2008-2016 Gentoo Authors
 .\" Distributed under the terms of the GNU General Public License v2 or later
 .\"
 .TH emacs-updater 8 "May 2014" "Gentoo Linux"

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

[Ulrich Müller]

commit: 4dd4b3fc65f8d90d4785d0007959edf35213b812
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Sep 16 14:45:03 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Sep 16 14:45:03 2018 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=4dd4b3fc

Update copyright notices to follow the new policy.

 ChangeLog   | 1 -
 Makefile| 2 +-
 emacs-updater   | 5 +++--
 emacs-updater.8 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c759036..45a594e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -362,5 +362,4 @@
 
* emacs-updater.sh: first version of Emacs updater
 
-Copyright 2007-2016 Gentoo Foundation
 Distributed under the terms of the GNU General Public License v2 or later

diff --git a/Makefile b/Makefile
index 63e02ca..4b88716 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2008-2016 Gentoo Foundation
+# Copyright 2008-2016 Christian Faulhammer and Ulrich Müller
 # Distributed under the terms of the GNU General Public License v2 or later
 
 PN = emacs-updater

diff --git a/emacs-updater b/emacs-updater
index 31cc448..704d667 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,6 @@
 #!/bin/bash
-# Copyright 2007-2016 Gentoo Foundation
+# Copyright 2007-2010 Christian Faulhammer
+# Copyright 2007-2016 Ulrich Müller
 # Distributed under the terms of the GNU General Public License v2 or later
 
 # Authors:
@@ -69,7 +70,7 @@ usage() {
 version() {
 cat <<-EOF
Emacs updater version ${VERSION}
-   Copyright 2007-2016 Gentoo Foundation.
+   Copyright 2007-2016 Christian Faulhammer and Ulrich Müller
Distributed under the terms of the GNU GPL version 2 or later.
 
Gentoo Emacs project: 

diff --git a/emacs-updater.8 b/emacs-updater.8
index 0e234b0..22ecf5b 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,5 +1,5 @@
 .\" -*- coding: utf-8 -*-
-.\" Copyright 2008-2016 Gentoo Foundation
+.\" Copyright 2008-2016 Ulrich Müller
 .\" Distributed under the terms of the GNU General Public License v2 or later
 .\"
 .TH emacs-updater 8 "May 2014" "Gentoo Linux"

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

[Ulrich Müller]

commit: 09086af284adac010b93c759b69b7b9994f4c6ad
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Jun  8 06:52:55 2016 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Jun  8 06:52:55 2016 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=09086af2

Update URLs.

* emacs-updater: Update URLs to use https.

 ChangeLog | 4 
 emacs-updater | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 57a87cd..c759036 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-08  Ulrich Müller  
+
+   * emacs-updater: Update URLs to use https.
+
 2016-06-07  Ulrich Müller  
 
* Version 1.15 released.

diff --git a/emacs-updater b/emacs-updater
index eb822bd..31cc448 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -72,7 +72,7 @@ version() {
Copyright 2007-2016 Gentoo Foundation.
Distributed under the terms of the GNU GPL version 2 or later.
 
-   Gentoo Emacs project: 
+   Gentoo Emacs project: 
EOF
 exit
 }
@@ -334,6 +334,6 @@ ${PM_COMMAND} "${PM_EXTRAOPTS[@]}" $(<"${PKGFILE}")
 ret=$?
 
 warning "If a package is being rebuilt over and over again,"
-warning "please report it on http://bugs.gentoo.org/;
+warning "please report it on https://bugs.gentoo.org/;
 
 exit ${ret}

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

[Ulrich Müller]

commit: 1244518533e2bf8aa4fdfd53cc41d56422085afc
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jun  7 16:51:13 2016 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jun  7 16:51:13 2016 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=12445185

Version 1.15 released.

 ChangeLog | 2 ++
 emacs-updater | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8954223..57a87cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2016-06-07  Ulrich Müller  
 
+   * Version 1.15 released.
+
* emacs-updater: Run qfile under xargs since portage-utils-0.61
has lost the -f option. Fixes bug 584984. Enable the pipefail
option in bash, in order to check qfile's exit status.

diff --git a/emacs-updater b/emacs-updater
index 936e97c..eb822bd 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -6,7 +6,7 @@
 # Christian Faulhammer 
 # Ulrich Müller 
 
-VERSION=1.14
+VERSION=1.15
 EMACS=/usr/bin/emacs
 GETOPT=/usr/bin/getopt
 SITELISP=/usr/share/emacs/site-lisp

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

[Ulrich Müller]

commit: f98d6c933ecdac4dd640085500914e8791292543
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jun  7 13:06:01 2016 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jun  7 13:06:01 2016 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=f98d6c93

More precise wording for error message.

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

diff --git a/emacs-updater b/emacs-updater
index 361817b..936e97c 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -296,7 +296,7 @@ else
 fi
 
 ret=$?
-[[ ${ret} -eq 0 ]] || { failure "Error running qfile"; exit ${ret}; }
+[[ ${ret} -eq 0 ]] || { failure "Error running qfile pipeline"; exit ${ret}; }
 
 NO_OF_PACKAGES=$(wc -l <"${PKGFILE}")
 [[ ${NO_OF_PACKAGES} -eq 1 ]] && s= || s=s

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

[Ulrich Müller]

commit: d172dd77add5e1328c26c49c86ce79696daeee39
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jun  7 12:24:34 2016 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jun  7 12:24:34 2016 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=d172dd77

Update copyright year.

 ChangeLog   | 2 +-
 Makefile| 2 +-
 emacs-updater   | 4 ++--
 emacs-updater.8 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3487baa..7f8124d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -350,5 +350,5 @@
 
* emacs-updater.sh: first version of Emacs updater
 
-Copyright 2007-2014 Gentoo Foundation
+Copyright 2007-2016 Gentoo Foundation
 Distributed under the terms of the GNU General Public License v2 or later

diff --git a/Makefile b/Makefile
index ee33910..63e02ca 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2008-2014 Gentoo Foundation
+# Copyright 2008-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2 or later
 
 PN = emacs-updater

diff --git a/emacs-updater b/emacs-updater
index a5a7c34..8d33bae 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2007-2014 Gentoo Foundation
+# Copyright 2007-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2 or later
 
 # Authors:
@@ -69,7 +69,7 @@ usage() {
 version() {
 cat <<-EOF
Emacs updater version ${VERSION}
-   Copyright 2007-2014 Gentoo Foundation.
+   Copyright 2007-2016 Gentoo Foundation.
Distributed under the terms of the GNU GPL version 2 or later.
 
Gentoo Emacs project: 

diff --git a/emacs-updater.8 b/emacs-updater.8
index 4c51281..0e234b0 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,5 +1,5 @@
 .\" -*- coding: utf-8 -*-
-.\" Copyright 2008-2014 Gentoo Foundation
+.\" Copyright 2008-2016 Gentoo Foundation
 .\" Distributed under the terms of the GNU General Public License v2 or later
 .\"
 .TH emacs-updater 8 "May 2014" "Gentoo Linux"

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

[Ulrich Müller]

commit: e58107167fffbe1d0e4c0560b8be5a9d28c5c55d
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jun  7 12:34:14 2016 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jun  7 12:34:14 2016 +
URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=e5810716

Run qfile under xargs since it has lost the -f option.

* emacs-updater: Run qfile under xargs since portage-utils-0.61
has lost the -f option. Fixes bug 584984. Enable the pipefail
option in bash, in order to check qfile's exit status.

 ChangeLog |  6 ++
 emacs-updater | 10 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f8124d..8954223 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-07  Ulrich Müller  
+
+   * emacs-updater: Run qfile under xargs since portage-utils-0.61
+   has lost the -f option. Fixes bug 584984. Enable the pipefail
+   option in bash, in order to check qfile's exit status.
+
 2014-06-05  Ulrich Müller  
 
* Version 1.14 released.

diff --git a/emacs-updater b/emacs-updater
index 8d33bae..361817b 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -268,6 +268,7 @@ cleanup() {
 }
 
 trap cleanup EXIT
+set -o pipefail
 
 TMPFILE="$(mktemp ${TMPDIR:-/tmp}/emacs-updater.files.XX)"
 PKGFILE="$(mktemp ${TMPDIR:-/tmp}/emacs-updater.pkgs.XX)"
@@ -286,14 +287,17 @@ NO_OF_FILES=$(wc -l <"${TMPFILE}")
 message "Assigning ${NO_OF_FILES} file${s} to packages ..."
 
 if [[ ${ORPHANS} ]]; then
-qfile -oCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
+xargs qfile -oCR <"${TMPFILE}" | sort -u >"${PKGFILE}"
 elif [[ ${EXACT} ]]; then
-qfile -eqCR -f "${TMPFILE}" | sort -u | sed 's/^/=/' > "${PKGFILE}"
+xargs qfile -eqCR <"${TMPFILE}" | sort -u | sed 's/^/=/' >"${PKGFILE}"
 else
 # Get package and slot number, requires >=portage-utils-0.3
-qfile -SqCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
+xargs qfile -SqCR <"${TMPFILE}" | sort -u >"${PKGFILE}"
 fi
 
+ret=$?
+[[ ${ret} -eq 0 ]] || { failure "Error running qfile"; exit ${ret}; }
+
 NO_OF_PACKAGES=$(wc -l <"${PKGFILE}")
 [[ ${NO_OF_PACKAGES} -eq 1 ]] && s= || s=s
 if [[ ${ORPHANS} ]]; then

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

[Ulrich Müller]

commit: 90485bb12fd5ff2b0a01baaedd371e794b778535
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Thu Jun  5 16:43:04 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Thu Jun  5 16:43:04 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=90485bb1

New variable for path of getopt.

* emacs-updater (GETOPT): New variable, path of getopt executable.

---
 ChangeLog | 4 
 emacs-updater | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 86d9d16..642741f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-05  Ulrich Müller  u...@gentoo.org
+
+   * emacs-updater (GETOPT): New variable, path of getopt executable.
+
 2014-05-19  Ulrich Müller  u...@gentoo.org
 
* emacs-updater: Remove the sitedir action; site-init files are

diff --git a/emacs-updater b/emacs-updater
index 7b8a965..38c6390 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -8,6 +8,7 @@
 
 VERSION=1.13
 EMACS=/usr/bin/emacs
+GETOPT=/usr/bin/getopt
 SITELISP=/usr/share/emacs/site-lisp
 
 # Default actions
@@ -104,7 +105,7 @@ pm_auto() {
 }
 
 # Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C getopt -o a:behmnopP: \
+OPTIONS=$(LC_ALL=C ${GETOPT} -o a:behmnopP: \
 --long action:,batch,color::,colour::,nocolor,nocolour,exact,help,major \
 --long orphans,pretend,package-manager:,package-manager-command:,version \
 -n 'emacs-updater' -- $@) \

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

[Ulrich Müller]

commit: bccab10154e8472554b65d821b60ea4cc2c405dc
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Thu Jun  5 17:02:46 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Thu Jun  5 17:02:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=bccab101

Version 1.14 released.

---
 ChangeLog | 2 ++
 emacs-updater | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 642741f..3487baa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-06-05  Ulrich Müller  u...@gentoo.org
 
+   * Version 1.14 released.
+
* emacs-updater (GETOPT): New variable, path of getopt executable.
 
 2014-05-19  Ulrich Müller  u...@gentoo.org

diff --git a/emacs-updater b/emacs-updater
index 38c6390..a5a7c34 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -6,7 +6,7 @@
 # Christian Faulhammer fa...@gentoo.org
 # Ulrich Müller u...@gentoo.org
 
-VERSION=1.13
+VERSION=1.14
 EMACS=/usr/bin/emacs
 GETOPT=/usr/bin/getopt
 SITELISP=/usr/share/emacs/site-lisp

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

[Ulrich Müller]

commit: 56d49cfa2a76d59cac6a4925e10506bafa627695
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Tue May 20 06:49:12 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Tue May 20 06:49:12 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=56d49cfa

Do not mention wrong location in description.

---
 emacs-updater   | 4 ++--
 emacs-updater.8 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/emacs-updater b/emacs-updater
index 3971de0..7b8a965 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -28,8 +28,8 @@ PRETEND=
 usage() {
 sed -e 's/^X//' -EOF
Usage: ${0##*/} [OPTION]...
-   Rebuild Emacs packages that were compiled by another Emacs version,
-   or that are installed in the wrong location.
+   Rebuild Emacs packages that were compiled by a different GNU Emacs
+   version, or all Emacs packages.
X
X  -a, --action=ACTION[,ACTION]...
Xspecify actions, comma-separated list of:

diff --git a/emacs-updater.8 b/emacs-updater.8
index f6a5ae3..4c51281 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -9,8 +9,8 @@ emacs-updater \- rebuild Emacs packages
 .B emacs-updater
 .I [OPTION]...
 .SH DESCRIPTION
-Find packages that are installed in the wrong location or rebuild all
-GNU Emacs packages.
+Rebuild Emacs packages that were compiled by a different GNU Emacs
+version, or all Emacs packages.
 .SH OPTIONS
 .TP
 .BI -a, --action= ACTION[,ACTION]...

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

[Ulrich Müller]

commit: f5faae2c922771cc79b1dc3ce3535d3314a49c7e
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Mon May 19 17:43:06 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Mon May 19 17:43:06 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f5faae2c

Update copyright year.

---
 ChangeLog   | 2 +-
 Makefile| 2 +-
 emacs-updater   | 4 ++--
 emacs-updater.8 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d5aa0d0..a00d5a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -336,5 +336,5 @@
 
* emacs-updater.sh: first version of Emacs updater
 
-Copyright 2007-2013 Gentoo Foundation
+Copyright 2007-2014 Gentoo Foundation
 Distributed under the terms of the GNU General Public License v2 or later

diff --git a/Makefile b/Makefile
index 0f8172c..ee33910 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2008-2013 Gentoo Foundation
+# Copyright 2008-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2 or later
 
 PN = emacs-updater

diff --git a/emacs-updater b/emacs-updater
index c2493bd..4eb9c85 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2007-2013 Gentoo Foundation
+# Copyright 2007-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2 or later
 
 # Authors:
@@ -70,7 +70,7 @@ usage() {
 version() {
 cat -EOF
Emacs updater version ${VERSION}
-   Copyright 2007-2013 Gentoo Foundation.
+   Copyright 2007-2014 Gentoo Foundation.
Distributed under the terms of the GNU GPL version 2 or later.
 
Gentoo Emacs project: http://wiki.gentoo.org/wiki/Project:Emacs

diff --git a/emacs-updater.8 b/emacs-updater.8
index a5dc998..e2ed0e2 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -1,8 +1,8 @@
 .\ -*- coding: utf-8 -*-
-.\ Copyright 2008-2013 Gentoo Foundation
+.\ Copyright 2008-2014 Gentoo Foundation
 .\ Distributed under the terms of the GNU General Public License v2 or later
 .\
-.TH emacs-updater 8 March 2013 Gentoo Linux
+.TH emacs-updater 8 May 2014 Gentoo Linux
 .SH NAME
 emacs-updater \- rebuild Emacs packages
 .SH SYNOPSIS

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

[Ulrich Müller]

commit: 618c887cc72189c67ec4ac72873c5a8de46bdba2
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Mon May 19 18:14:01 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Mon May 19 18:14:01 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=618c887c

Remove the sitedir action.

* emacs-updater: Remove the sitedir action; site-init files are
installed in the new location since 2007.
(action_sitedir): Function removed.
(usage): Update help text accordingly.
* emacs-updater.8: Update.

---
 ChangeLog   |  8 
 emacs-updater   | 30 ++
 emacs-updater.8 |  4 
 3 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a00d5a4..86d9d16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-05-19  Ulrich Müller  u...@gentoo.org
+
+   * emacs-updater: Remove the sitedir action; site-init files are
+   installed in the new location since 2007.
+   (action_sitedir): Function removed.
+   (usage): Update help text accordingly.
+   * emacs-updater.8: Update.
+
 2013-08-09  Ulrich Müller  u...@gentoo.org
 
* emacs-updater (version): Update URI of Emacs project page.

diff --git a/emacs-updater b/emacs-updater
index 4eb9c85..3971de0 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -11,7 +11,7 @@ EMACS=/usr/bin/emacs
 SITELISP=/usr/share/emacs/site-lisp
 
 # Default actions
-ACTIONS=sitedir rebuild
+ACTIONS=rebuild
 
 # Default package manager
 PM_COMMAND=pm_auto
@@ -33,13 +33,11 @@ usage() {
X
X  -a, --action=ACTION[,ACTION]...
Xspecify actions, comma-separated list of:
-   Xsitedir: find site-init files not in the
-   X  new-style location
Xrebuild: rebuild packages with elisp files
X  byte-compiled by a different Emacs version
Xall: rebuild all packages that have
X  byte-compiled elisp files
-   X(default: sitedir,rebuild)
+   X(default: rebuild)
X  -b, --batch   batch mode, don't ask any questions
X  --color[=MODE], --colour[=MODE]
Xcontrol colour output. MODE is yes, no,
@@ -141,9 +139,12 @@ do
ACTIONS=
for action in ${2/,/ }; do
case ${action} in
-   sitedir|rebuild|all)
+   rebuild|all)
ACTIONS=${ACTIONS}${ACTIONS:+ }${action}
;;
+   sitedir)
+   echo Obsolete action '$action' ignored.
+   ;;
*)
echo Invalid action '$action' given!
usage 1
@@ -227,25 +228,6 @@ bytecomp_version() {
 sed -n '/^[^;]/q;s/\.$//;s/.*[Ee]macs version \([0-9].*\)/\1/p' $1
 }
 
-action_sitedir() {
-local sf
-
-message Searching for site-init files in obsolete location ...
-
-# Set nullglob option since there may be no matching files
-local old_shopts=$(shopt -p nullglob)
-shopt -s nullglob
-
-for sf in ${ROOT}${SITELISP}/[0-9][0-9]*-gentoo.el
-do
-   echo Found ${sf##*/}
-   echo ${sf}  ${TMPFILE}
-done
-
-eval ${old_shopts}
-echo
-}
-
 action_rebuild() {
 local active version elc ret
 

diff --git a/emacs-updater.8 b/emacs-updater.8
index e2ed0e2..f6a5ae3 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -16,9 +16,6 @@ GNU Emacs packages.
 .BI -a, --action= ACTION[,ACTION]...
 Specify actions, comma-separated list of:
 
-.BR sitedir :
-Find site-init files not in the new-style location.
-
 .BR rebuild :
 Rebuild packages with Elisp files byte-compiled by a different Emacs
 version.
@@ -27,7 +24,6 @@ version.
 Rebuild all packages that have byte-compiled Elisp files.
 
 (default:
-.BR sitedir ,
 .BR rebuild )
 .TP
 .B -b, --batch