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

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

[Sebastian Pipping]

commit:     29fe57603e62928b324deabf72799124202ee966
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  8 23:20:19 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Jan  8 23:20:19 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=29fe5760

New variable for path of Emacs executable.

svn path=/emacs-updater/; revision=1219

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

diff --git a/ChangeLog b/ChangeLog
index 1a6ca24..94775d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-09  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater (EMACS): New variable, path of Emacs executable.
+	(emacs-version): Use it.
+
 2008-12-30  Ulrich Mueller  <ulm@gentoo.org>
 
 	* Version 1.2 released.
@@ -175,5 +180,5 @@
 
 	* emacs-updater.sh: first version of Emacs updater
 
-Copyright 2007-2008 Gentoo Foundation
+Copyright 2007-2009 Gentoo Foundation
 Distributed under the terms of the GNU General Public License v2

diff --git a/emacs-updater b/emacs-updater
index 7bbc307..b1cc03b 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -1,6 +1,5 @@
 #!/bin/bash
-
-# Copyright 2007-2008 Gentoo Foundation
+# Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,6 +8,7 @@
 # Ulrich Mueller <ulm@gentoo.org>
 
 VERSION=1.2
+EMACS=/usr/bin/emacs
 SITELISP=/usr/share/emacs/site-lisp
 
 # Default actions
@@ -133,7 +133,7 @@ failure() {
 }
 
 emacs-version() {
-    /usr/bin/emacs -batch -q --no-site-file --eval "(princ emacs-version)" \
+    "${EMACS}" -batch -q --no-site-file --eval "(princ emacs-version)" \
 	|| { failure "Cannot run Emacs"; exit 5; }
 }
 

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

[Sebastian Pipping]

commit:     7ab30e19f116aaa686cdb4fb00447072211653dd
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 18 11:25:44 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jan 18 11:25:44 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=7ab30e19

Version 1.3 released.

svn path=/emacs-updater/; revision=1221

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

diff --git a/ChangeLog b/ChangeLog
index 94775d3..b3cca7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-18  Ulrich Mueller  <ulm@gentoo.org>
+
+	* Version 1.3 released.
+
 2009-01-09  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater (EMACS): New variable, path of Emacs executable.

diff --git a/emacs-updater b/emacs-updater
index b1cc03b..364481f 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -7,7 +7,7 @@
 # Christian Faulhammer <fauli@gentoo.org>
 # Ulrich Mueller <ulm@gentoo.org>
 
-VERSION=1.2
+VERSION=1.3
 EMACS=/usr/bin/emacs
 SITELISP=/usr/share/emacs/site-lisp
 

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

[Sebastian Pipping]

commit:     2998c9e84e637322948c3a6f2e1a2dfb3b4b07e4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 11:31:41 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 11:31:41 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=2998c9e8

Per default, determine package manager automatically.

svn path=/emacs-updater/; revision=1244

---
 ChangeLog       |    8 ++++++++
 emacs-updater   |   51 +++++++++++++++++++++++++++++++++------------------
 emacs-updater.8 |    9 ++++++---
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e8cdb99..0a4500f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-11  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater (have_portage, have_pkgcore, have_paludis):
+	New functions, return true if respective package manager exists.
+	(pm_auto, have_auto): New function, find a package manager.
+	(PM_COMMAND): Default to pm_auto.
+	Test if package manager selected by -P option actually exists.
+
 2009-03-22  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater (action_sitedir): 00site-gentoo.el should not

diff --git a/emacs-updater b/emacs-updater
index f6c002e..2ea542b 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -7,7 +7,7 @@
 # Christian Faulhammer <fauli@gentoo.org>
 # Ulrich Mueller <ulm@gentoo.org>
 
-VERSION=1.3
+VERSION=1.4_pre
 EMACS=/usr/bin/emacs
 SITELISP=/usr/share/emacs/site-lisp
 
@@ -15,7 +15,7 @@ SITELISP=/usr/share/emacs/site-lisp
 ACTIONS="sitedir rebuild"
 
 # Default package manager
-PM_COMMAND=pm_portage
+PM_COMMAND=pm_auto
 
 # Other default variable settings
 EXACT=
@@ -48,12 +48,35 @@ usage() {
 	X  -p, --pretend          don't actually emerge packages
 	X  -P, --package-manager <arg>
 	X                         select a package manager. arg is one out of
-	X                         'portage' (default), 'pkgcore', or 'paludis'
+	X                         'portage', 'pkgcore', or 'paludis'
+	X                         (default: automatically determined)
 	X  -h, --help             display this help and exit
 	EOF
     exit ${1}
 }
 
+# Wrapper for package manager commands
+have_portage() { type -P emerge >/dev/null; }
+pm_portage() { emerge --oneshot --ask --verbose "$@"; }
+
+have_pkgcore() { type -P pmerge >/dev/null; }
+pm_pkgcore() { pmerge --oneshot --ask "$@"; }
+
+have_paludis() { type -P paludis >/dev/null; }
+pm_paludis() { paludis --install --preserve-world "$@"; }
+
+pm_auto() {
+    local pm
+    for pm in portage pkgcore paludis; do
+	if have_${pm}; then
+	    pm_${pm} "$@"
+	    return
+	fi
+    done
+    failure "No package manager found"
+    return 1
+}
+
 # Read in all command-line options and force English output
 OPTIONS=$(LC_ALL=C getopt -o a:ehnpP: \
     --long action:,exact,help,nocolour,pretend,package-manager: \
@@ -78,7 +101,7 @@ do
 			;;
 		    *)
 			echo "Invalid action '$action' given!"
-			exit 20
+			usage 20
 			;;
 		esac
 	    done
@@ -86,12 +109,17 @@ do
 	    ;;
 	-P|--package-manager)
 	    case "${2}" in
+		auto|automatic) PM_COMMAND=pm_auto ;;
 		portage|pkgcore|paludis)
+		    if ! "have_${2}"; then
+			echo "Package manager '${2}' not found!"
+			exit 22
+		    fi
 		    PM_COMMAND=pm_${2}
 		    ;;
 		*)
 		    echo "Package manager '${2}' not known!"
-		    exit 21
+		    usage 21
 		    ;;
 	    esac
 	    shift 2
@@ -188,19 +216,6 @@ action_all() {
     action_rebuild all
 }
 
-# Wrapper for package manager commands
-pm_portage() {
-    emerge --oneshot --ask --verbose "$@"
-}
-
-pm_pkgcore() {
-    pmerge --oneshot --ask "$@"
-}
-
-pm_paludis() {
-    paludis --install --preserve-world "$@"
-}
-
 cleanup() {
     rm -f "${TMPFILE}" "${PKGFILE}"
 }

diff --git a/emacs-updater.8 b/emacs-updater.8
index 330ea69..a280a32 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -43,11 +43,14 @@ Don't actually emerge packages
 Select a package manager.
 .I PM
 is one out of
-.B portage
-(default),
+.BR portage ,
 .BR pkgcore ,
 or
-.B paludis
+.BR paludis .
+If the argument
+.B auto
+is given, then the package manager is automatically determined.
+This is the default.
 .TP
 .B -h, --help
 Display help and exit

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

[Sebastian Pipping]

commit:     fac58f4f78253805310e788222b84a44207d2922
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 11:33:40 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 11:33:40 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=fac58f4f

Remove unnecessary quotes.

svn path=/emacs-updater/; revision=1245

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

diff --git a/emacs-updater b/emacs-updater
index 2ea542b..8da8243 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -111,7 +111,7 @@ do
 	    case "${2}" in
 		auto|automatic) PM_COMMAND=pm_auto ;;
 		portage|pkgcore|paludis)
-		    if ! "have_${2}"; then
+		    if ! have_${2}; then
 			echo "Package manager '${2}' not found!"
 			exit 22
 		    fi

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

[Sebastian Pipping]

commit:     a700c73edec63d8d12cb4e2ed1e82654767a33dc
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 19:50:37 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 19:50:37 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=a700c73e

00site-gentoo.el should not exist anymore. Treat it like a normal file.

svn path=/emacs-updater/; revision=1241

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

diff --git a/ChangeLog b/ChangeLog
index b3cca7d..e8cdb99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-22  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater (action_sitedir): 00site-gentoo.el should not
+	exist anymore. Treat it like a normal file.
+
 2009-01-18  Ulrich Mueller  <ulm@gentoo.org>
 
 	* Version 1.3 released.

diff --git a/emacs-updater b/emacs-updater
index 364481f..f6c002e 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -153,7 +153,6 @@ action_sitedir() {
 
     for sf in "${ROOT}${SITELISP}"/[0-9][0-9]*-gentoo.el
     do
-	[ "${sf##*/}" = 00site-gentoo.el ] && continue
 	echo "Found ${sf##*/}"
 	echo "${sf}" >> "${TMPFILE}"
     done

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

[Sebastian Pipping]

commit:     9e5cbf67c8bd8c312718eb0b9793387808c434ef
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 08:07:49 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 08:07:49 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=9e5cbf67

Assign PM_COMMAND in pm_auto.

svn path=/emacs-updater/; revision=1249

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

diff --git a/emacs-updater b/emacs-updater
index 8da8243..c7c5510 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -69,7 +69,8 @@ pm_auto() {
     local pm
     for pm in portage pkgcore paludis; do
 	if have_${pm}; then
-	    pm_${pm} "$@"
+	    PM_COMMAND=pm_${pm}
+	    ${PM_COMMAND} "$@"
 	    return
 	fi
     done

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

[Sebastian Pipping]

commit:     f6535c4664d4c47025537c6151f62ed605fbd52c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 08:07:42 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 08:07:42 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f6535c46

Update date.

svn path=/emacs-updater/; revision=1253

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

diff --git a/emacs-updater.8 b/emacs-updater.8
index a280a32..71866ca 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -2,7 +2,7 @@
 .\" Distributed under the terms of the GNU General Public License v2
 .\" $Id$
 .\"
-.TH emacs-updater 8 "December 2008" "Gentoo Linux"
+.TH emacs-updater 8 "April 2009" "Gentoo Linux"
 .SH NAME
 emacs-updater \- rebuild Emacs packages
 .SH SYNOPSIS

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

[Sebastian Pipping]

commit:     3d54424fcc10b49b454e3c7cf47a88b831dbeb4a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 19:28:37 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 19:28:37 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=3d54424f

Change initialisation of colours, since POSIX tput has no -S option.

svn path=/emacs-updater/; revision=1250

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

diff --git a/ChangeLog b/ChangeLog
index 0a4500f..867305a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-13  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater (RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN):
+	Change initialisation, since POSIX tput has no -S option.
+
 2009-04-11  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater (have_portage, have_pkgcore, have_paludis):

diff --git a/emacs-updater b/emacs-updater
index c7c5510..d54809d 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -80,7 +80,7 @@ pm_auto() {
 
 # Read in all command-line options and force English output
 OPTIONS=$(LC_ALL=C getopt -o a:ehnpP: \
-    --long action:,exact,help,nocolour,pretend,package-manager: \
+    --long action:,exact,help,nocolour,nocolor,pretend,package-manager: \
     -n 'emacs-updater' -- "$@")
 [ $? -eq 0 ] || usage 1
 
@@ -92,7 +92,7 @@ do
 	-h|--help)      usage 0 ;;
 	-e|--exact)     EXACT="true"; shift 1 ;;
 	-p|--pretend)   PRETEND="true"; shift 1 ;;
-	-n|--nocolour)  NOCOLOUR="true"; shift 1 ;;
+	-n|--nocolour|--nocolor) NOCOLOUR="true"; shift 1 ;;
 	-a|--action)
 	    ACTIONS=
 	    for action in ${2/,/ }; do
@@ -133,16 +133,16 @@ done
 # Only set colours if output is not redirected or the --no-colour
 # option is not set
 if [ -t 1 ] && [ -z "${NOCOLOUR}" ] ; then
-    RED=$(tput -S <<<$'setaf 1\nbold')
-    GREEN=$(tput -S <<<$'setaf 2\nbold')
-    YELLOW=$(tput -S <<<$'setaf 3\nbold')
-    BLUE=$(tput -S <<<$'setaf 4\nbold')
-    MAGENTA=$(tput -S <<<$'setaf 5\nbold')
-    CYAN=$(tput -S <<<$'setaf 6\nbold')
     BOLD=$(tput bold)
     NORMAL=$(tput sgr0)
+    RED=$(tput setaf 1)${BOLD}
+    GREEN=$(tput setaf 2)${BOLD}
+    YELLOW=$(tput setaf 3)${BOLD}
+    BLUE=$(tput setaf 4)${BOLD}
+    MAGENTA=$(tput setaf 5)${BOLD}
+    CYAN=$(tput setaf 6)${BOLD}
 else
-    RED=; GREEN=; YELLOW=; BLUE=; MAGENTA=; CYAN=; BOLD=; NORMAL=
+    BOLD=; NORMAL=; RED=; GREEN=; YELLOW=; BLUE=; MAGENTA=; CYAN=
 fi
 
 # Some type of output can be prettified and capsulated in functions

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

[Sebastian Pipping]

commit:     f6f536ef942b8965e4980b4c42acae7c8118f901
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 09:33:03 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 09:33:03 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f6f536ef

Version 1.4.

svn path=/emacs-updater/; revision=1254

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

diff --git a/ChangeLog b/ChangeLog
index 13315d5..8ad0d4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-14  Ulrich Mueller  <ulm@gentoo.org>
+
+	* Version 1.4 released.
+
+	* emacs-updater (usage): American English spelling for --nocolor
+	option is also accepted.
+	* emacs-updater.8: Update.
+
 2009-04-13  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater (RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN):

diff --git a/emacs-updater b/emacs-updater
index e024af2..90571ed 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -7,7 +7,7 @@
 # Christian Faulhammer <fauli@gentoo.org>
 # Ulrich Mueller <ulm@gentoo.org>
 
-VERSION=1.4_pre
+VERSION=1.4
 EMACS=/usr/bin/emacs
 SITELISP=/usr/share/emacs/site-lisp
 
@@ -44,7 +44,8 @@ usage() {
 	X                           byte-compiled Elisp files
 	X                         (default: sitedir,rebuild)
 	X  -e, --exact            match exact versions when remerging packages
-	X  -n, --nocolour         disable colour in output
+	X  -n, --nocolour, --nocolor
+	X                         disable colour in output
 	X  -p, --pretend          don't actually emerge packages
 	X  -P, --package-manager <arg>
 	X                         select a package manager. arg is one out of

diff --git a/emacs-updater.8 b/emacs-updater.8
index 71866ca..4a65cad 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -33,7 +33,7 @@ Rebuild all packages that have byte-compiled Elisp files
 .B -e, --exact
 Match exact versions when remerging packages
 .TP
-.B -n, --nocolour
+.B -n, --nocolour, --nocolor
 Disable colour in output
 .TP
 .B -p, --pretend

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

[Sebastian Pipping]

commit:     0850c2c9e4106f0030401825019423e1b7c2820a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 19:38:18 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 19:38:18 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=0850c2c9

Fix typo.

svn path=/emacs-updater/; revision=1251

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

diff --git a/emacs-updater b/emacs-updater
index d54809d..ea87a8c 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -130,7 +130,7 @@ do
     esac
 done
 
-# Only set colours if output is not redirected or the --no-colour
+# Only set colours if output is not redirected or the --nocolour
 # option is not set
 if [ -t 1 ] && [ -z "${NOCOLOUR}" ] ; then
     BOLD=$(tput bold)

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

[Sebastian Pipping]

commit:     2da9e3a22dde2c715c1b06e37e630a63cedb3d31
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 01:12:11 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 01:12:11 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=2da9e3a2

Use POSIX syntax in sed expression.

svn path=/emacs-updater/; revision=1252

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

diff --git a/ChangeLog b/ChangeLog
index 867305a..13315d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* emacs-updater (RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN):
 	Change initialisation, since POSIX tput has no -S option.
+	(bytecomp-version): Use POSIX syntax in sed expression.
 
 2009-04-11  Ulrich Mueller  <ulm@gentoo.org>
 

diff --git a/emacs-updater b/emacs-updater
index ea87a8c..e024af2 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -168,7 +168,7 @@ emacs-version() {
 
 # Get Emacs version from byte-compiled file
 bytecomp-version() {
-    sed -n '/^[^;]/q;s/\.$//;s/.*emacs version \([0-9].*\)/\1/Ip' "${1}"
+    sed -n '/^[^;]/q;s/\.$//;s/.*[Ee]macs version \([0-9].*\)/\1/p' "${1}"
 }
 
 action_sitedir() {

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

[Sebastian Pipping]

commit:     7b6fe72e31a9f846d46d73fc2a6dc1306661bede
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 19:29:01 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 19:29:01 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=7b6fe72e

New option --package-manager-command.

svn path=/emacs-updater/; revision=1341

---
 ChangeLog       |    6 ++++++
 emacs-updater   |   15 ++++++++++-----
 emacs-updater.8 |    7 ++++++-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 48120a4..2189a14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-09  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater (OPTIONS): New option --package-manager-command.
+	(usage): Update help text.
+	* emacs-updater.8: Update.
+
 2009-06-04  Ulrich Mueller  <ulm@gentoo.org>
 
 	* Version 1.5 released.

diff --git a/emacs-updater b/emacs-updater
index 3fb7865..0b30552 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -34,7 +34,7 @@ EOF
 usage() {
     sed -e 's/^X//' <<-EOF
 	Usage: ${0##*/} [OPTION]...
-	X  -a, --action <arg>[,<arg>]...
+	X  -a, --action ACTION[,ACTION]...
 	X                         specify actions, comma-separated list of:
 	X                         'sitedir': find site-init files not in the
 	X                           new-style location
@@ -47,10 +47,14 @@ usage() {
 	X  -n, --nocolour, --nocolor
 	X                         disable colour in output
 	X  -p, --pretend          don't actually emerge packages
-	X  -P, --package-manager <arg>
-	X                         select a package manager. arg is one out of
+	X  -P, --package-manager PM
+	X                         select a package manager. PM is one out of
 	X                         'portage', 'pkgcore', or 'paludis'
 	X                         (default: automatically determined)
+	X      --package-manager-command CMD
+	X                         call CMD instead of the default package
+	X                         manager command. If CMD includes options
+	X                         the whole command string must be quoted
 	X  -h, --help             display this help and exit
 	EOF
     exit ${1}
@@ -85,7 +89,8 @@ pm_auto() {
 
 # Read in all command-line options and force English output
 OPTIONS=$(LC_ALL=C getopt -o a:ehnpP: \
-    --long action:,exact,help,nocolour,nocolor,pretend,package-manager: \
+    --long action:,exact,help,nocolour,nocolor,pretend \
+    --long package-manager:,package-manager-command: \
     -n 'emacs-updater' -- "$@")
 [ $? -eq 0 ] || usage 1
 
@@ -130,7 +135,7 @@ do
 	    esac
 	    shift 2
 	    ;;
-
+	--package-manager-command) PM_COMMAND=${2}; shift 2 ;;
 	--) shift; break ;;
     esac
 done

diff --git a/emacs-updater.8 b/emacs-updater.8
index 818c130..e10f4b5 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -2,7 +2,7 @@
 .\" Distributed under the terms of the GNU General Public License v2
 .\" $Id$
 .\"
-.TH emacs-updater 8 "June 2009" "Gentoo Linux"
+.TH emacs-updater 8 "August 2009" "Gentoo Linux"
 .SH NAME
 emacs-updater \- rebuild Emacs packages
 .SH SYNOPSIS
@@ -52,6 +52,11 @@ If the argument
 is given, then the package manager is automatically determined.
 This is the default.
 .TP
+.BI --package-manager-command " CMD"
+Call CMD instead of the default package manager command.
+CMD may include options in which case the whole command string must be
+passed as a single argument (i.e. included in quotes).
+.TP
 .B -h, --help
 Display help and exit
 .SH ENVIRONMENT

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

[Sebastian Pipping]

commit:     0e0da7e2067c4d4ec5f2d61feab7e7281c0c8a7b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 08:51:34 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun May 24 08:51:34 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=0e0da7e2

Avoid hyphens in function identifiers.

svn path=/emacs-updater/; revision=1277

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

diff --git a/ChangeLog b/ChangeLog
index 8ad0d4f..dc6e7c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-24  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater (emacs_version, bytecomp_version): Rename, in
+	order to avoid hyphens in function identifiers.
+
 2009-04-14  Ulrich Mueller  <ulm@gentoo.org>
 
 	* Version 1.4 released.

diff --git a/emacs-updater b/emacs-updater
index 90571ed..2b30616 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -162,13 +162,13 @@ failure() {
     echo "${RED}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}"
 }
 
-emacs-version() {
+emacs_version() {
     "${EMACS}" -batch -q --no-site-file --eval "(princ emacs-version)" \
 	|| { failure "Cannot run Emacs"; exit 5; }
 }
 
 # Get Emacs version from byte-compiled file
-bytecomp-version() {
+bytecomp_version() {
     sed -n '/^[^;]/q;s/\.$//;s/.*[Ee]macs version \([0-9].*\)/\1/p' "${1}"
 }
 
@@ -195,13 +195,13 @@ action_rebuild() {
     local active version elc
 
     message "Searching for byte-compiled elisp files ..."
-    active=$(emacs-version)
+    active=$(emacs_version)
     [ -n "${active}" ] || { failure "Cannot determine Emacs version"; exit 6; }
     message "Currently selected GNU Emacs version: ${active}"
 
     for elc in $(find "${ROOT}${SITELISP}" -name "*.elc")
     do
-	version=$(bytecomp-version "${elc}")
+	version=$(bytecomp_version "${elc}")
 	version=${version:-unknown}
 
 	if [ "${version}" != "${active}" ] || [ "${1}" = all ]; then

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

[Sebastian Pipping]

commit:     e253d5148ea3196ec46fac1e9107057d264b6cd2
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  5 20:53:57 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  5 20:53:57 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=e253d514

Fix spelling.

svn path=/emacs-updater/; revision=1299

---
 ChangeLog |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65ca57a..48120a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,7 +36,7 @@
 2009-03-22  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater (action_sitedir): 00site-gentoo.el should not
-	exist anymore. Treat it like a normal file.
+	exist any more. Treat it like a normal file.
 
 2009-01-18  Ulrich Mueller  <ulm@gentoo.org>
 

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

[Sebastian Pipping]

commit:     4aad3003c01e55b023a272bd19272ccfab672bd0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  5 05:09:16 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 05:09:16 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=4aad3003

Version 1.5 released.

svn path=/emacs-updater/; revision=1282

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

diff --git a/ChangeLog b/ChangeLog
index 1e0661d..65ca57a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-06-04  Ulrich Mueller  <ulm@gentoo.org>
 
+	* Version 1.5 released.
+
 	* emacs-updater (pm_auto): Try to determine the package manager
 	from the PACKAGE_MANAGER environment variable first.
 	* emacs-updater.8: Document it.

diff --git a/emacs-updater b/emacs-updater
index 8d13b39..3fb7865 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -7,7 +7,7 @@
 # Christian Faulhammer <fauli@gentoo.org>
 # Ulrich Mueller <ulm@gentoo.org>
 
-VERSION=1.4
+VERSION=1.5
 EMACS=/usr/bin/emacs
 SITELISP=/usr/share/emacs/site-lisp
 

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

[Sebastian Pipping]

commit:     1edc608be5cb86ae31eddecb2f6753b0b98db431
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 12:48:59 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 12:48:59 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1edc608b

New --orphans option (and commit forgotten ChangeLog entry for --version).

svn path=/emacs-updater/; revision=1364

---
 ChangeLog       |    8 ++++++++
 emacs-updater   |   11 ++++++++---
 emacs-updater.8 |    3 +++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2189a14..358e64b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-25  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater (OPTIONS): New options --orphans|-o and --version.
+	(ORPHANS): New variable.
+	(version): New function.
+	(usage): Update help text.
+	* emacs-updater.8: Describe new options.
+
 2009-08-09  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater (OPTIONS): New option --package-manager-command.

diff --git a/emacs-updater b/emacs-updater
index b81ce90..f6d0c5a 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -20,6 +20,7 @@ PM_COMMAND=pm_auto
 # Other default variable settings
 EXACT=
 NOCOLOUR=
+ORPHANS=
 PRETEND=
 
 usage() {
@@ -40,6 +41,7 @@ usage() {
 	X  -e, --exact            match exact versions when remerging packages
 	X  -n, --nocolour, --nocolor
 	X                         disable colour in output
+	X  -o, --orphans          list orphan files
 	X  -p, --pretend          don't actually emerge packages
 	X  -P, --package-manager PM
 	X                         select a package manager. PM is one out of
@@ -94,8 +96,8 @@ pm_auto() {
 }
 
 # Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C getopt -o a:ehnpP: \
-    --long action:,exact,help,nocolour,nocolor,pretend \
+OPTIONS=$(LC_ALL=C getopt -o a:ehnopP: \
+    --long action:,exact,help,nocolour,nocolor,orphans,pretend \
     --long package-manager:,package-manager-command:,version \
     -n 'emacs-updater' -- "$@")
 [ $? -eq 0 ] || usage 1
@@ -108,6 +110,7 @@ do
 	-h|--help)      usage 0 ;;
 	--version)      version ;;
 	-e|--exact)     EXACT="true"; shift 1 ;;
+	-o|--orphans)   ORPHANS="true"; shift 1 ;;
 	-p|--pretend)   PRETEND="true"; shift 1 ;;
 	-n|--nocolour|--nocolor) NOCOLOUR="true"; shift 1 ;;
 	-a|--action)
@@ -256,7 +259,9 @@ NO_OF_FILES=$(sed -n '$=' "${TMPFILE}")
 [ ${NO_OF_FILES} -eq 1 ] && s= || s=s
 message "Assigning ${NO_OF_FILES} file${s} to packages ..."
 
-if [ "${EXACT}" ]; then
+if [ "${ORPHANS}" ]; then
+    qfile -oCR -f "${TMPFILE}" | sort -u
+elif [ "${EXACT}" ]; then
     qfile -eqCR -f "${TMPFILE}" | sort -u | sed 's/^/=/' > "${PKGFILE}"
 else
     qfile -qCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"

diff --git a/emacs-updater.8 b/emacs-updater.8
index 2d8e157..3789882 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -36,6 +36,9 @@ Match exact versions when remerging packages
 .B -n, --nocolour, --nocolor
 Disable colour in output
 .TP
+.B -o, --orphans
+List orphan files, i.e. files that are not owned by any package.
+.TP
 .B -p, --pretend
 Don't actually emerge packages
 .TP

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

[Sebastian Pipping]

commit:     21b7b6eb0946a5459eb277d4f61b236d4db84a35
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 06:44:37 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 06:44:37 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=21b7b6eb

Be more verbose in orphan mode.

svn path=/emacs-updater/; revision=1384

---
 emacs-updater |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/emacs-updater b/emacs-updater
index f6d0c5a..8832fed 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -260,7 +260,7 @@ NO_OF_FILES=$(sed -n '$=' "${TMPFILE}")
 message "Assigning ${NO_OF_FILES} file${s} to packages ..."
 
 if [ "${ORPHANS}" ]; then
-    qfile -oCR -f "${TMPFILE}" | sort -u
+    qfile -oCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
 elif [ "${EXACT}" ]; then
     qfile -eqCR -f "${TMPFILE}" | sort -u | sed 's/^/=/' > "${PKGFILE}"
 else
@@ -276,11 +276,15 @@ fi
 
 NO_OF_PACKAGES=$(sed -n '$=' "${PKGFILE}")
 [ ${NO_OF_PACKAGES} -eq 1 ] && s= || s=s
-message "${NO_OF_PACKAGES} package${s} to remerge:"
+if [ "${ORPHANS}" ]; then
+    message "${NO_OF_PACKAGES} orphan file${s} found:"
+else
+    message "${NO_OF_PACKAGES} package${s} to remerge:"
+fi
 
 cat "${PKGFILE}"
 
-if [ "${PRETEND}" ]; then
+if [ "${PRETEND}" -o "${ORPHANS}" ]; then
     exit 4
 fi
 

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

[Sebastian Pipping]

commit:     f660dd132fdb09702ac56d79d0a3b06805dc609c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 18:50:58 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 18:50:58 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f660dd13

New --major option.

svn path=/emacs-updater/; revision=1390

---
 ChangeLog       |    5 +++--
 emacs-updater   |   17 ++++++++++++++---
 emacs-updater.8 |    3 +++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 358e64b..7b18317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2009-08-25  Ulrich Mueller  <ulm@gentoo.org>
 
-	* emacs-updater (OPTIONS): New options --orphans|-o and --version.
-	(ORPHANS): New variable.
+	* emacs-updater (OPTIONS): New options --major|-m, --orphans|-o,
+	and --version.
+	(MAJOR, ORPHANS): New variables.
 	(version): New function.
 	(usage): Update help text.
 	* emacs-updater.8: Describe new options.

diff --git a/emacs-updater b/emacs-updater
index 8832fed..8027f27 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -19,6 +19,7 @@ PM_COMMAND=pm_auto
 
 # Other default variable settings
 EXACT=
+MAJOR=
 NOCOLOUR=
 ORPHANS=
 PRETEND=
@@ -39,6 +40,8 @@ usage() {
 	X                           byte-compiled Elisp files
 	X                         (default: sitedir,rebuild)
 	X  -e, --exact            match exact versions when remerging packages
+	X  -m, --major            use only the major version when comparing
+	X                         Emacs version numbers
 	X  -n, --nocolour, --nocolor
 	X                         disable colour in output
 	X  -o, --orphans          list orphan files
@@ -96,8 +99,8 @@ pm_auto() {
 }
 
 # Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C getopt -o a:ehnopP: \
-    --long action:,exact,help,nocolour,nocolor,orphans,pretend \
+OPTIONS=$(LC_ALL=C getopt -o a:ehmnopP: \
+    --long action:,exact,help,major,nocolour,nocolor,orphans,pretend \
     --long package-manager:,package-manager-command:,version \
     -n 'emacs-updater' -- "$@")
 [ $? -eq 0 ] || usage 1
@@ -110,6 +113,7 @@ do
 	-h|--help)      usage 0 ;;
 	--version)      version ;;
 	-e|--exact)     EXACT="true"; shift 1 ;;
+	-m|--major)     MAJOR="true"; shift 1 ;;
 	-o|--orphans)   ORPHANS="true"; shift 1 ;;
 	-p|--pretend)   PRETEND="true"; shift 1 ;;
 	-n|--nocolour|--nocolor) NOCOLOUR="true"; shift 1 ;;
@@ -147,6 +151,11 @@ do
 	    ;;
 	--package-manager-command) PM_COMMAND=${2}; shift 2 ;;
 	--) shift; break ;;
+	*)
+	    # this should not happen; getopt should return bad status
+	    echo "Invalid option '${1}' given!"
+	    usage 22
+	    ;;
     esac
 done
 
@@ -223,7 +232,9 @@ action_rebuild() {
 	version=$(bytecomp_version "${elc}")
 	version=${version:-unknown}
 
-	if [ "${version}" != "${active}" ] || [ "${1}" = all ]; then
+	if [ -z "${MAJOR}" -a "${version}" != "${active}" ] \
+	    || [ "${version%%.*}" != "${active%%.*}" ] \
+	    || [ "${1}" = all ]; then
 	    echo "Found ${elc##*/} (compiled by Emacs version ${version})"
 	    echo "${elc}" >> "${TMPFILE}"
 	else

diff --git a/emacs-updater.8 b/emacs-updater.8
index 3789882..b05fcae 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -33,6 +33,9 @@ Rebuild all packages that have byte-compiled Elisp files
 .B -e, --exact
 Match exact versions when remerging packages
 .TP
+.B -m, --major
+Use only the major version when comparing Emacs version numbers
+.TP
 .B -n, --nocolour, --nocolor
 Disable colour in output
 .TP

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

[Sebastian Pipping]

commit:     b5d88276f12ce4d1bca6ab03163c395ed8767051
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 19:32:01 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 19:32:01 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=b5d88276

Use italics in man page.

svn path=/emacs-updater/; revision=1342

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

diff --git a/emacs-updater.8 b/emacs-updater.8
index e10f4b5..dedab9d 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -53,8 +53,11 @@ is given, then the package manager is automatically determined.
 This is the default.
 .TP
 .BI --package-manager-command " CMD"
-Call CMD instead of the default package manager command.
-CMD may include options in which case the whole command string must be
+Call
+.I CMD
+instead of the default package manager command.
+.I CMD
+may include options in which case the whole command string must be
 passed as a single argument (i.e. included in quotes).
 .TP
 .B -h, --help

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

[Sebastian Pipping]

commit:     cae11912aa8a0eb2e9d098babb7999344a0512ad
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 19:06:40 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 19:06:40 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=cae11912

End sentences with a full stop.

svn path=/emacs-updater/; revision=1391

---
 emacs-updater.8 |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/emacs-updater.8 b/emacs-updater.8
index b05fcae..9b32365 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -17,33 +17,33 @@ GNU Emacs packages.
 Specify actions, comma-separated list of:
 
 .BR sitedir :
-Find site-init files not in the new-style location
+Find site-init files not in the new-style location.
 
 .BR rebuild :
 Rebuild packages with Elisp files byte-compiled by a different Emacs
-version
+version.
 
 .BR all :
-Rebuild all packages that have byte-compiled Elisp files
+Rebuild all packages that have byte-compiled Elisp files.
 
 (default:
 .BR sitedir ,
 .BR rebuild )
 .TP
 .B -e, --exact
-Match exact versions when remerging packages
+Match exact versions when remerging packages.
 .TP
 .B -m, --major
-Use only the major version when comparing Emacs version numbers
+Use only the major version when comparing Emacs version numbers.
 .TP
 .B -n, --nocolour, --nocolor
-Disable colour in output
+Disable colour in output.
 .TP
 .B -o, --orphans
 List orphan files, i.e. files that are not owned by any package.
 .TP
 .B -p, --pretend
-Don't actually emerge packages
+Don't actually emerge packages.
 .TP
 .BI "-P, --package-manager" " PM"
 Select a package manager.
@@ -67,10 +67,10 @@ may include options in which case the whole command string must be
 passed as a single argument (i.e. included in quotes).
 .TP
 .B -h, --help
-Display help and exit
+Display help and exit.
 .TP
 .B --version
-Output version information and exit
+Output version information and exit.
 .SH ENVIRONMENT
 .TP
 .B PACKAGE_MANAGER

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

[Sebastian Pipping]

commit:     a4a7c24d0f2f6e85554f463cf9abeacf02a5e71f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 05:08:39 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 05:08:39 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=a4a7c24d

Version 1.6 released.

svn path=/emacs-updater/; revision=1392

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

diff --git a/ChangeLog b/ChangeLog
index 7b18317..37b0c4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-27  Ulrich Mueller  <ulm@gentoo.org>
+
+	* Version 1.6 released.
+
 2009-08-25  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater (OPTIONS): New options --major|-m, --orphans|-o,

diff --git a/emacs-updater b/emacs-updater
index 8027f27..37d1e38 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -7,7 +7,7 @@
 # Christian Faulhammer <fauli@gentoo.org>
 # Ulrich Mueller <ulm@gentoo.org>
 
-VERSION=1.5
+VERSION=1.6
 EMACS=/usr/bin/emacs
 SITELISP=/usr/share/emacs/site-lisp