From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-458956-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1SR4AF-0006S6-Cd
for garchives@archives.gentoo.org; Sun, 06 May 2012 16:18:27 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F2683E09CF;
Sun, 6 May 2012 16:09:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id E3164E09CC
for <gentoo-commits@lists.gentoo.org>; Sun, 6 May 2012 16:07:07 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2F5151B405C
for <gentoo-commits@lists.gentoo.org>; Sun, 6 May 2012 16:07:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id E0984E5430
for <gentoo-commits@lists.gentoo.org>; Sun, 6 May 2012 16:07:04 +0000 (UTC)
From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" <sping@gentoo.org>
Message-ID: <1174987606.b9853755f535669f7f007dcc285580eef47ba1e1.sping@gentoo>
Subject: [gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /
X-VCS-Repository: proj/emacs-tools
X-VCS-Files: ChangeLog README.icons emacs.eselect
X-VCS-Directories: /
X-VCS-Committer: sping
X-VCS-Committer-Name: Sebastian Pipping
X-VCS-Revision: b9853755f535669f7f007dcc285580eef47ba1e1
X-VCS-Branch: backups/emacs-common-gentoo@1030
Date: Sun, 6 May 2012 16:07:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 2111e0e5-4615-40af-8b36-649a8433f4b3
X-Archives-Hash: 48b3279d985d05c271573762c157846e
Message-ID: <20120506160704.84W2NqJjYD_ZqTuLS7aDqR0-JHNS1_yxU9aLkuStaK8@z>
commit: b9853755f535669f7f007dcc285580eef47ba1e1
Author: Ulrich M=C3=BCller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 09:26:46 2007 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 09:26:46 2007 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/emacs-tools.g=
it;a=3Dcommit;h=3Db9853755
Call env.eselect to update the environment from env.d files.
svn path=3D/emacs-extra/eselect-emacs/; revision=3D178
---
ChangeLog | 2 ++
README.icons | 6 +++---
emacs.eselect | 31 ++++++++++++++++---------------
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2ba855b..2b17af6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,3 +47,5 @@ Version 0.4 (22 Mar 2007)
Desktop file for emacsclient.
Version 0.5 (24 Mar 2007)
Removed -n option in emacsclient.desktop.
+ 27 Mar 2007
+ Call env.eselect to update the environment from env.d files.
diff --git a/README.icons b/README.icons
index 8439829..9d5dbbb 100644
--- a/README.icons
+++ b/README.icons
@@ -4,17 +4,17 @@ File: emacs.png
Taken from GNOME (gnome-emacs.png)
Authors: Garrett LeSage <garrett@linux.com>
Tuomas Kuosmanen <tigert@gimp.org>
- License: GNU General Public License version 2 or later (see COPYING)
+ License: GNU General Public License version 2 or later
=20
Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png
Taken from Emacs 22
Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
- License: GNU General Public License version 2 or later (see COPYING)
+ License: GNU General Public License version 2 or later
=20
File: gnured_48.png
Based on splash.xpm from Emacs 22
Author: Luis Fernandes <elf@ee.ryerson.ca>
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
- License: GNU General Public License version 2 or later (see COPYING)
+ License: GNU General Public License version 2 or later
diff --git a/emacs.eselect b/emacs.eselect
index 4a97796..6ff6fd9 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -85,7 +85,7 @@ set_man_symlinks() {
done
}
=20
-# Set symlinks to binaries and man pages
+# Set symlinks to binaries and man pages, update info path
set_symlinks() {
local target=3D"${1}" targets
# target may be specified by its name or its index
@@ -96,21 +96,22 @@ set_symlinks() {
fi
=20
# is the target valid, i.e. does an Emacs binary with this name exist?
- if [[ -f "${ROOT}/usr/bin/${target}" ]]; then
- remove_symlinks
- # the main /usr/bin/emacs symlink is only set for Emacs binaries
- # (but not for other providers of auxiliary programs, e.g., XEmacs)
- if [[ ${target} =3D=3D emacs-* ]]; then
- ln -s "${target}" "${ROOT}/usr/bin/emacs" ||
- die "Couldn't set ${target} /usr/bin/emacs symlink"
- fi
- set_bin_symlinks "${target}"
- set_man_symlinks "${target}"
- set_infopath "${target}"
- return 0
- else
- die -q "Target \"${1}\" doesn't appear to be valid!"
+ [[ -f "${ROOT}/usr/bin/${target}" ]] \
+ || die -q "Target \"${1}\" doesn't appear to be valid!"
+
+ remove_symlinks
+ # the main /usr/bin/emacs symlink is only set for Emacs binaries
+ # (but not for other providers of auxiliary programs, e.g., XEmacs)
+ if [[ ${target} =3D=3D emacs-* ]]; then
+ ln -s "${target}" "${ROOT}/usr/bin/emacs" \
+ || die "Couldn't set ${target} /usr/bin/emacs symlink"
fi
+ set_bin_symlinks "${target}"
+ set_man_symlinks "${target}"
+ set_infopath "${target}"
+ # call env.eselect to update the environment from env.d files
+ do_action env update >/dev/null
+ return 0
}
=20
### show action ###