made the definition of suffix variable more elegant (thanks to Ulrich Müller <ulm@kph.uni-mainz.de>; removed emacsclient from man page symlinking; added gfdl at the same place

Package-Manager: portage-2.1.1-r2

3 files changed, 20 insertions, 18 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 7d7ba6d5ac92..f038c925347f 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.117 2007/02/04 14:54:31 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.118 2007/02/06 06:09:41 opfer Exp $
+
+  06 Feb 2007; Christian Faulhammer <opfer@gentoo.org> emacs-21.4-r6.ebuild:
+  made the definition of suffix variable more elegant (thanks to Ulrich
+  Müller <ulm@kph.uni-mainz.de>; removed emacsclient from man page
+  symlinking; added gfdl at the same place
 
   04 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
   -emacs-21.4-r5.ebuild, emacs-21.4-r6.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 8fd52551ce16..41e25e5e4c82 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -62,18 +62,18 @@ EBUILD emacs-21.4-r4.ebuild 4492 RMD160 571f7409b0f65bad0715aecc91d176af1edd3443
 MD5 317bcb60bc1061bf3794a1a993730405 emacs-21.4-r4.ebuild 4492
 RMD160 571f7409b0f65bad0715aecc91d176af1edd3443 emacs-21.4-r4.ebuild 4492
 SHA256 3914a526e5560e54fd0d670f190b4032f701aa46200570279f100a38841fcb4e emacs-21.4-r4.ebuild 4492
-EBUILD emacs-21.4-r6.ebuild 5495 RMD160 57dc85f2770d8037871bec3e489f5ef72bdf0486 SHA1 fc8aa565c835d176f38ccb1c969ef5cbe8ede4db SHA256 4fb00acca0160bf3d32021614d6b0627a5a8130f41e84da40dbea838fcb6fe8e
-MD5 b04d43927c490b1be05fec0508f1650a emacs-21.4-r6.ebuild 5495
-RMD160 57dc85f2770d8037871bec3e489f5ef72bdf0486 emacs-21.4-r6.ebuild 5495
-SHA256 4fb00acca0160bf3d32021614d6b0627a5a8130f41e84da40dbea838fcb6fe8e emacs-21.4-r6.ebuild 5495
+EBUILD emacs-21.4-r6.ebuild 5439 RMD160 4f3b1fb1a676ade42008069b06370e24b93c5cde SHA1 92122afed912b2ed7410c54e36be7149a4da64c0 SHA256 4228b2f70cf3eb38d0f77ed61f55df98543b3e092509bd1cf1a3f5102d58265f
+MD5 a6603cf7b282b197e9267c5432e2dcae emacs-21.4-r6.ebuild 5439
+RMD160 4f3b1fb1a676ade42008069b06370e24b93c5cde emacs-21.4-r6.ebuild 5439
+SHA256 4228b2f70cf3eb38d0f77ed61f55df98543b3e092509bd1cf1a3f5102d58265f emacs-21.4-r6.ebuild 5439
 EBUILD emacs-22.0.50_pre20050225.ebuild 5557 RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed SHA1 296bba1410b3575fd1ccf54bbcef7756adc5038a SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39
 MD5 7e17815f1e5c1a8a92e12ce8a4a20951 emacs-22.0.50_pre20050225.ebuild 5557
 RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed emacs-22.0.50_pre20050225.ebuild 5557
 SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39 emacs-22.0.50_pre20050225.ebuild 5557
-MISC ChangeLog 16953 RMD160 a6402fb6788c28942087e23d638289dd2b375c75 SHA1 35289dcfd35c21b2fe738a0e5a0cb94c82db2e42 SHA256 318bfcc0cbe85a43b0e5ff61439df3b6e0e5e261aa3cf92fdfb1fa8fbc92e1f8
-MD5 7378751d1c787c4f15ecec2adee9d1b8 ChangeLog 16953
-RMD160 a6402fb6788c28942087e23d638289dd2b375c75 ChangeLog 16953
-SHA256 318bfcc0cbe85a43b0e5ff61439df3b6e0e5e261aa3cf92fdfb1fa8fbc92e1f8 ChangeLog 16953
+MISC ChangeLog 17214 RMD160 ab79c4d9d10434a8412a1b305841ab8cb83b1d37 SHA1 9403511578db4f1c3da60bff455ef147ee289e97 SHA256 457199c3be9730899ec79b89402bf770fa209cca30a07e344e6d086013b1c116
+MD5 911248848f7d6c177d4bcc68de1dd531 ChangeLog 17214
+RMD160 ab79c4d9d10434a8412a1b305841ab8cb83b1d37 ChangeLog 17214
+SHA256 457199c3be9730899ec79b89402bf770fa209cca30a07e344e6d086013b1c116 ChangeLog 17214
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -90,7 +90,7 @@ SHA256 263c0f93c22b5467286e5ff0054a83697b60e25ea6e3c44f38ce61fa181d97b6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFxfN9NQqtfCuFneMRAtfPAJ0RxtLwfjQMoB2PXNwW6EuCtE+SbQCfeYHH
-nTznDrvRh50nsYnuZzo+aWs=
-=grDt
+iD8DBQFFyBueNQqtfCuFneMRAvLrAJwOpmNyNIo49pZaUYxmhrnusR325wCcDU3D
+RUC0Fd8wHVmKhVzBXvg8CJ8=
+=wfPE
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r6.ebuild b/app-editors/emacs/emacs-21.4-r6.ebuild
index 2e3e5b532332..38a475557e14 100644
--- a/app-editors/emacs/emacs-21.4-r6.ebuild
+++ b/app-editors/emacs/emacs-21.4-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r6.ebuild,v 1.5 2007/02/04 14:54:31 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r6.ebuild,v 1.6 2007/02/06 06:09:41 opfer Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -160,10 +160,7 @@ src_install() {
 
 update-alternatives() {
 	# extract the suffix of the manpages to determine the correct compression program
-	local suffix=".`ls /usr/share/man/man1/emacs.emacs-* |sed s/".*\."//g|tail -n 1`"
-	if [ suffix = 1 ]; then
-		suffix=""
-	fi
+	local suffix=$(echo /usr/share/man/man1/emacs.emacs-*.1*|sed 's/.*\.1//')
 
 	# this creates symlinks for binaries and man pages, so the correct ones in a slotted
 	# environment can be accessed
@@ -172,7 +169,7 @@ update-alternatives() {
 		alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/${i}.emacs-*"
 	done
 
-	for j in emacs emacsclient etags ctags
+	for j in emacs etags ctags gfdl
 	do
 		alternatives_auto_makesym "/usr/share/man/man1/$j.1${suffix}" "/usr/share/man/man1/$j.emacs-*"
 	done