fix (hack, we wait for the proper solution) for the compression of dir file, see bug #162675, reported by Tassilo Horn <tassilo@member.fsf.org>

Package-Manager: portage-2.1.1-r2

4 files changed, 50 insertions, 28 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 82e27e85272b..1ca21ba9c755 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.69 2007/01/30 08:29:56 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.70 2007/01/31 08:36:55 opfer Exp $
+
+  31 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.93-r1.ebuild, emacs-cvs-22.0.9999-r1.ebuild:
+  fix (hack, we wait for the proper solution) for the compression of dir file,
+  see bug #162675, reported by Tassilo Horn <tassilo@member.fsf.org>
 
   30 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
   emacs-cvs-22.0.9999-r1.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index f63c9040b1f2..8e03e48cbaf5 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -38,18 +38,18 @@ EBUILD emacs-cvs-22.0.92-r1.ebuild 5605 RMD160 a3286092a450dd9adb3ca4bde91f525db
 MD5 949994306cffdef1a318c2d64c53e744 emacs-cvs-22.0.92-r1.ebuild 5605
 RMD160 a3286092a450dd9adb3ca4bde91f525db14b54d9 emacs-cvs-22.0.92-r1.ebuild 5605
 SHA256 3f4bfe42626b2268a5116aa46267853e10ce1e485b37c4643705b1f880222f89 emacs-cvs-22.0.92-r1.ebuild 5605
-EBUILD emacs-cvs-22.0.93-r1.ebuild 6069 RMD160 bfd00da5e95ff3944a5a339211b2901ed2e688e1 SHA1 8fb8088c3b18535e8e3e0df79b2380faccb58f9e SHA256 0158bf290cdd77ecd15c770bd69658ee9f762cc00415a83bb04ba32fd9884a73
-MD5 4a11f08b75497f4e5597aece8940bccf emacs-cvs-22.0.93-r1.ebuild 6069
-RMD160 bfd00da5e95ff3944a5a339211b2901ed2e688e1 emacs-cvs-22.0.93-r1.ebuild 6069
-SHA256 0158bf290cdd77ecd15c770bd69658ee9f762cc00415a83bb04ba32fd9884a73 emacs-cvs-22.0.93-r1.ebuild 6069
+EBUILD emacs-cvs-22.0.93-r1.ebuild 6328 RMD160 a00a951bea35a89066d0e48cde6002be3fa8f849 SHA1 3e7cd74c35634e1eac1a26b85b7f5f83298aa021 SHA256 4baa601ac9b71bf7c4e02b1ca9469a732941cbe474b8555ccc852260ad491da7
+MD5 4dc0e5f425e33d3bd0e1294d82a83fda emacs-cvs-22.0.93-r1.ebuild 6328
+RMD160 a00a951bea35a89066d0e48cde6002be3fa8f849 emacs-cvs-22.0.93-r1.ebuild 6328
+SHA256 4baa601ac9b71bf7c4e02b1ca9469a732941cbe474b8555ccc852260ad491da7 emacs-cvs-22.0.93-r1.ebuild 6328
 EBUILD emacs-cvs-22.0.93.ebuild 5593 RMD160 0edd860587977d72228aa39762fc9a32a8d86097 SHA1 139b369d5f95bb4862819f3528413c28f28962b3 SHA256 ed97a34250589fdc14a17cc5ed9399ecbe1b94cbcd9adae6e037130e759db8f4
 MD5 4c68e3c4622262c13e1cc6c36b45aaba emacs-cvs-22.0.93.ebuild 5593
 RMD160 0edd860587977d72228aa39762fc9a32a8d86097 emacs-cvs-22.0.93.ebuild 5593
 SHA256 ed97a34250589fdc14a17cc5ed9399ecbe1b94cbcd9adae6e037130e759db8f4 emacs-cvs-22.0.93.ebuild 5593
-EBUILD emacs-cvs-22.0.9999-r1.ebuild 6126 RMD160 46b23d27e33b5ed75d6a7c0114b4f2016d1f6616 SHA1 1ef6c82941583dc1c1e449f782c999983e19ab22 SHA256 41d0925bea64e1e7f31623f30fe0d6f7bc275ba47339e9ef425fffff0d12d381
-MD5 779169a684bcd77c9c2c02beddd4ac68 emacs-cvs-22.0.9999-r1.ebuild 6126
-RMD160 46b23d27e33b5ed75d6a7c0114b4f2016d1f6616 emacs-cvs-22.0.9999-r1.ebuild 6126
-SHA256 41d0925bea64e1e7f31623f30fe0d6f7bc275ba47339e9ef425fffff0d12d381 emacs-cvs-22.0.9999-r1.ebuild 6126
+EBUILD emacs-cvs-22.0.9999-r1.ebuild 6384 RMD160 1908d349c9b53d8c3a31b19f696b31cd8c67fd2c SHA1 7c360cd5ea880756dd8d563e8c7d1743ace2d0ff SHA256 5ab2d8c49a4869bdd01aec3022bbec1c5ad67cd7a46b66e9fed2ef5be27e617c
+MD5 75cffcca5fba98751bf9d99ee656ed46 emacs-cvs-22.0.9999-r1.ebuild 6384
+RMD160 1908d349c9b53d8c3a31b19f696b31cd8c67fd2c emacs-cvs-22.0.9999-r1.ebuild 6384
+SHA256 5ab2d8c49a4869bdd01aec3022bbec1c5ad67cd7a46b66e9fed2ef5be27e617c emacs-cvs-22.0.9999-r1.ebuild 6384
 EBUILD emacs-cvs-22.0.9999.ebuild 5578 RMD160 81009f7095f655f12c1654f98f8957ea4dffd57c SHA1 fbae0173d427ad2eb2ab0bae4c1f1d543817db75 SHA256 506cbcd64e0b4dc9b20fa2041fef7a4b29a861c37e89d641722f2ed47ea7f4ec
 MD5 3882bdaa56e46e0a890aad6c5a22ec8a emacs-cvs-22.0.9999.ebuild 5578
 RMD160 81009f7095f655f12c1654f98f8957ea4dffd57c emacs-cvs-22.0.9999.ebuild 5578
@@ -58,10 +58,10 @@ EBUILD emacs-cvs-23.0.0-r1.ebuild 5904 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e2
 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 12751 RMD160 e5f7d3f9e5e2624d46a8491ddd413147c9a4991e SHA1 b7b481f593bd817ec1fe384fef70350a605fd883 SHA256 7a45a55e26c3e407359419e42d9742018b8c31491935e69c399e2cf79a8bdc34
-MD5 8c26dd9d5fd729e5ab31136f034c1b5b ChangeLog 12751
-RMD160 e5f7d3f9e5e2624d46a8491ddd413147c9a4991e ChangeLog 12751
-SHA256 7a45a55e26c3e407359419e42d9742018b8c31491935e69c399e2cf79a8bdc34 ChangeLog 12751
+MISC ChangeLog 13017 RMD160 a593ce8349ad72680fed94141f6341bc7623cf3d SHA1 8d4b3ed73d33f9188c1034e20f05d5e6ee81c1b8 SHA256 ff7ea4e2e6467f6acd91286ee5fa1aee18ffe4a69fb726e3f1cf79edd55c1d52
+MD5 f193e6aff786c19b5af13b1fe5751430 ChangeLog 13017
+RMD160 a593ce8349ad72680fed94141f6341bc7623cf3d ChangeLog 13017
+SHA256 ff7ea4e2e6467f6acd91286ee5fa1aee18ffe4a69fb726e3f1cf79edd55c1d52 ChangeLog 13017
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -87,7 +87,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFvwHvNQqtfCuFneMRAt7wAJ0Qu2OKh+3fFLFltIoy3ydDRFu6AwCfa3oj
-4G4BgB4MlA/z0sP9TJHGlQo=
-=hdqW
+iD8DBQFFwFUHNQqtfCuFneMRAunfAJ4mieRyLKOAHvZD/IoBZ6z2zdMCUwCgjPK3
+V8QBAAWsNLXQIjVk/TNfrtw=
+=WTRL
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.93-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.93-r1.ebuild
index 55577118de1b..db84d0c108c1 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.93-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.93-r1.ebuild
@@ -1,16 +1,16 @@
 # 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-r1.ebuild,v 1.1 2007/01/30 06:18:40 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.93-r1.ebuild,v 1.2 2007/01/31 08:36:55 opfer Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit alternatives autotools elisp-common  eutils flag-o-matic
+inherit alternatives autotools elisp-common	 eutils flag-o-matic
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 SRC_URI="ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa aqua gif gnome gtk gzip-el jpeg lesstif motif nls png spell  source tiff  toolkit-scroll-bars X Xaw3d "
+IUSE="alsa aqua gif gnome gtk gzip-el jpeg lesstif motif nls png spell	source tiff	 toolkit-scroll-bars X Xaw3d "
 
 RESTRICT="$RESTRICT nostrip"
 
@@ -29,7 +29,7 @@ DEPEND="sys-libs/ncurses
 		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
 		!motif? ( lesstif? ( x11-libs/lesstif ) )
 		gnome? ( gnome-base/gnome-desktop ) )
-	alsa? ( media-sound/alsa-headers )	
+	alsa? ( media-sound/alsa-headers )
 	gzip-el? ( app-arch/gzip  )
 	nls? ( sys-devel/gettext )"
 
@@ -164,7 +164,7 @@ EOF
 	fi
 	dodoc BUGS ChangeLog README
 
-	make_desktop_entry /usr/bin/emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png  editors
+	make_desktop_entry /usr/bin/emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png	editors
 }
 
 update-alternatives() {
@@ -178,8 +178,17 @@ update-alternatives() {
 pkg_postinst() {
 	use ppc-macos || update-alternatives
 	elisp-site-regen
+
+	# ecompress from Portage 2.2.* does auto-compression
+	# which is not desired for the dir file
+	# temporary fix until we know how to fix it properly
+	if [ -f /usr/share/info/emacs-${SLOT}/dir.bz2 ]; then
+		bunzip2 -q /usr/share/info/emacs-${SLOT}/dir.bz2
+	fi
+
+
 	if use X; then
-		elog "You need to install some fonts for Emacs.  Under monolithic"
+		elog "You need to install some fonts for Emacs.	 Under monolithic"
 		elog "XFree86/Xorg you typically had such fonts installed by default."
 		elog "With modular Xorg, you will have to perform this step yourself."
 		elog "Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic"
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r1.ebuild
index 4dd4b8a6b890..8df675b3cb77 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r1.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-r1.ebuild,v 1.3 2007/01/30 08:29:56 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r1.ebuild,v 1.4 2007/01/31 08:36:55 opfer Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -10,12 +10,12 @@ ECVS_BRANCH="HEAD"
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit alternatives autotools cvs elisp-common  eutils flag-o-matic
+inherit alternatives autotools cvs elisp-common	 eutils flag-o-matic
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 SRC_URI=""
 HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa aqua gif gnome gtk gzip-el jpeg lesstif motif nls png spell  source tiff  toolkit-scroll-bars X Xaw3d "
+IUSE="alsa aqua gif gnome gtk gzip-el jpeg lesstif motif nls png spell	source tiff	 toolkit-scroll-bars X Xaw3d "
 
 RESTRICT="$RESTRICT nostrip"
 
@@ -34,7 +34,7 @@ DEPEND="sys-libs/ncurses
 		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
 		!motif? ( lesstif? ( x11-libs/lesstif ) )
 		gnome? ( gnome-base/gnome-desktop ) )
-	alsa? ( media-sound/alsa-headers )	
+	alsa? ( media-sound/alsa-headers )
 	gzip-el? ( app-arch/gzip  )
 	nls? ( sys-devel/gettext )"
 
@@ -169,7 +169,7 @@ EOF
 	fi
 	dodoc BUGS ChangeLog README
 
-	make_desktop_entry /usr/bin/emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png  editors
+	make_desktop_entry /usr/bin/emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png	editors
 }
 
 update-alternatives() {
@@ -183,8 +183,16 @@ update-alternatives() {
 pkg_postinst() {
 	use ppc-macos || update-alternatives
 	elisp-site-regen
+
+	# ecompress from Portage 2.2.* does auto-compression
+	# which is not desired for the dir file
+	# temporary fix until we know how to fix it properly
+	if [ -f /usr/share/info/emacs-${SLOT}/dir.bz2 ]; then
+		bunzip2 -q /usr/share/info/emacs-${SLOT}/dir.bz2
+	fi
+
 	if use X; then
-		elog "You need to install some fonts for Emacs.  Under monolithic"
+		elog "You need to install some fonts for Emacs.	 Under monolithic"
 		elog "XFree86/Xorg you typically had such fonts installed by default."
 		elog "With modular Xorg, you will have to perform this step yourself."
 		elog "Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic"