made the definition of suffix variable more elegant (thanks to Ulrich Müller <ulm@kph.uni-mainz.de>

Package-Manager: portage-2.1.1-r2

4 files changed, 25 insertions, 26 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 0901704b81e2..a8a51976b10b 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.79 2007/02/04 14:57:58 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.80 2007/02/06 06:02:41 opfer Exp $
+
+  06 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.93-r2.ebuild, emacs-cvs-22.0.9999-r2.ebuild:
+  made the definition of suffix variable more elegant (thanks to Ulrich
+  Müller <ulm@kph.uni-mainz.de>
 
   04 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
   -emacs-cvs-22.0.93-r1.ebuild, emacs-cvs-22.0.93-r2.ebuild,
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 272de60932ee..00647247d7a2 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -34,22 +34,22 @@ MD5 97a1860f95596f13a074a96456ffeac4 files/emacs.desktop.in 236
 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 files/emacs.desktop.in 236
 SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/emacs.desktop.in 236
 DIST emacs-22.0.93.tar.gz 37118034 RMD160 c70a745662495c68470f2b483f61d68d09e8ed73 SHA1 1c226f1c03e33fef66b759e6afd6eb580adc948b SHA256 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e
-EBUILD emacs-cvs-22.0.93-r2.ebuild 6723 RMD160 4e1a53af1bed8ca52462470fa12ff8caf77c8df8 SHA1 cec0bb3f1f7729477d4dc9bb2b970149afd39c3c SHA256 52a5a9867f24a8c8fcd2134245b42025555fcae0a643c297ecf674c02e3f17c1
-MD5 2ceb639f3d5e04268ae56ba13cd6a0db emacs-cvs-22.0.93-r2.ebuild 6723
-RMD160 4e1a53af1bed8ca52462470fa12ff8caf77c8df8 emacs-cvs-22.0.93-r2.ebuild 6723
-SHA256 52a5a9867f24a8c8fcd2134245b42025555fcae0a643c297ecf674c02e3f17c1 emacs-cvs-22.0.93-r2.ebuild 6723
-EBUILD emacs-cvs-22.0.9999-r2.ebuild 6780 RMD160 b8136e4ef9f26856824a9e02805005793a7b83fd SHA1 0b83092fcde1e5def0577a81df02a1a45fdfcc5d SHA256 68900827faa9b4e59fbbd52f4061baec582aa69bfe0fb44f74fe5ca0aa68913f
-MD5 dc19fee635a6539a61039da3bd149643 emacs-cvs-22.0.9999-r2.ebuild 6780
-RMD160 b8136e4ef9f26856824a9e02805005793a7b83fd emacs-cvs-22.0.9999-r2.ebuild 6780
-SHA256 68900827faa9b4e59fbbd52f4061baec582aa69bfe0fb44f74fe5ca0aa68913f emacs-cvs-22.0.9999-r2.ebuild 6780
+EBUILD emacs-cvs-22.0.93-r2.ebuild 6677 RMD160 8d0cb8add21f9635eace25420f2bb146e21780df SHA1 c87fc7c514441b57c59b5fa8747753496ec3df1a SHA256 3fdfc7395b1976e1904f3f9419e208f942e875a6ed9ad12d84d0e522e739347a
+MD5 a99812ff7441eddd8763762bb0c142c3 emacs-cvs-22.0.93-r2.ebuild 6677
+RMD160 8d0cb8add21f9635eace25420f2bb146e21780df emacs-cvs-22.0.93-r2.ebuild 6677
+SHA256 3fdfc7395b1976e1904f3f9419e208f942e875a6ed9ad12d84d0e522e739347a emacs-cvs-22.0.93-r2.ebuild 6677
+EBUILD emacs-cvs-22.0.9999-r2.ebuild 6734 RMD160 6beb0824ec4cdc1fd4e2671d64b2a259f7ec94e8 SHA1 35727b7ef26b7bae493313a005c0e5d309ad9fa7 SHA256 4c2284b98628c905ac6fe41eb999588020019354f2398ca2ad1d91e5c94a4607
+MD5 dea8b8ccf54925e215b7be7d5b7aa63e emacs-cvs-22.0.9999-r2.ebuild 6734
+RMD160 6beb0824ec4cdc1fd4e2671d64b2a259f7ec94e8 emacs-cvs-22.0.9999-r2.ebuild 6734
+SHA256 4c2284b98628c905ac6fe41eb999588020019354f2398ca2ad1d91e5c94a4607 emacs-cvs-22.0.9999-r2.ebuild 6734
 EBUILD emacs-cvs-23.0.0-r1.ebuild 5904 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e21f4764 SHA1 b816af746a3646a3ff5767db41f85cfc4a4b0117 SHA256 9a20533595e3949519d4e75e3857c1c729dfaf124e891253e63631ff962a8b9b
 MD5 61bac54173aa6dc34e29d7f75935ff36 emacs-cvs-23.0.0-r1.ebuild 5904
 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e21f4764 emacs-cvs-23.0.0-r1.ebuild 5904
 SHA256 9a20533595e3949519d4e75e3857c1c729dfaf124e891253e63631ff962a8b9b emacs-cvs-23.0.0-r1.ebuild 5904
-MISC ChangeLog 14781 RMD160 89e06c8ea5ac46188b441bb6de7ff4e6ada5c9dc SHA1 1b4590a0fc71a5751ddcb68ef911601de26f2e3c SHA256 193f2c92f9a029eb32bf883cafa57d8a104f055f70becdfeb31e03b5c5fc9c30
-MD5 02c4aa8083f3b7faee395c1315132806 ChangeLog 14781
-RMD160 89e06c8ea5ac46188b441bb6de7ff4e6ada5c9dc ChangeLog 14781
-SHA256 193f2c92f9a029eb32bf883cafa57d8a104f055f70becdfeb31e03b5c5fc9c30 ChangeLog 14781
+MISC ChangeLog 15004 RMD160 3a11747818fe7409f34c014a084a4b0ab42952dc SHA1 156ced78b5064ac0216c89f302c83d5a28823f0f SHA256 e324e5baa5e75532243bf08b101699dc8dc764a6cfbcc2286ff3dad51f40ad9b
+MD5 953b6877ca0657267479efde2f983e12 ChangeLog 15004
+RMD160 3a11747818fe7409f34c014a084a4b0ab42952dc ChangeLog 15004
+SHA256 e324e5baa5e75532243bf08b101699dc8dc764a6cfbcc2286ff3dad51f40ad9b ChangeLog 15004
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -66,7 +66,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFxfRQNQqtfCuFneMRAuflAJ0XeKJI7DYCWVygZvB+ylxTuAfMzQCghlar
-pgt9NowOs5lDiyraVaHwUBc=
-=mwBJ
+iD8DBQFFyBn+NQqtfCuFneMRAgR+AJ0VXUmwq+6qzCtpG2swablCYOk6MACfX1GJ
+PQQABV1Tj+X17T5ErP+OJNk=
+=zHcU
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild
index 332fadd1b0da..cb12c595914c 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.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-cvs/emacs-cvs-22.0.93-r2.ebuild,v 1.5 2007/02/04 14:57:58 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild,v 1.6 2007/02/06 06:02:41 opfer Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -168,10 +168,7 @@ EOF
 
 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
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r2.ebuild
index 3a8bbe822d1f..996e1c7a12a4 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r2.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r2.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-cvs/emacs-cvs-22.0.9999-r2.ebuild,v 1.5 2007/02/04 14:57:58 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r2.ebuild,v 1.6 2007/02/06 06:02:41 opfer Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -173,10 +173,7 @@ EOF
 
 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