Don't let the build system compress the info files, as reported in bug 328471 by Tassilo Horn <tassilo AT members DOT fsf DOT org>

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 25 insertions, 19 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 3bfe8920bbb2..5fc62ca1ce8b 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.21 2010/06/25 17:46:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.22 2010/07/18 15:43:14 fauli Exp $
+
+  18 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
+  emacs-vcs-24.0.9999.ebuild:
+  Don't let the build system compress the info files, as reported in bug
+  328471 by Tassilo Horn <tassilo AT members DOT fsf DOT org>
 
   25 Jun 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
   emacs-vcs-24.0.9999.ebuild:
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index d1afae37f402..2a5ba60e34c8 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 EBUILD emacs-vcs-23.2.9999.ebuild 9850 RMD160 16e5a2f9cc4d308faf915a13bbced4ce00b3ae60 SHA1 d0b07d6315741151d7dde3e1e5b18c796ea30b03 SHA256 6ac70fba801be0ae346201e7a7f57e5770a2827bdb65681c086cd2ab4fdcb5c0
-EBUILD emacs-vcs-24.0.9999.ebuild 10146 RMD160 97eaeca6b092fb0064187b7a7ded29f090ab1b72 SHA1 364ae2368c0afcc44f7e4d264a1698674396a1e7 SHA256 3295528ed5118c9905a0c9c05507b5a80d01ffdc2c6a6a300cf335bc4b8a4b35
-MISC ChangeLog 52868 RMD160 818185b0c816ed33a62c22449a7a4e0556abd783 SHA1 d43ec18f379eaa5ef6d143911bc7ce367b2c9e27 SHA256 6b09541c20a535cbbc8b44808512be1266957c5f226ebf340857cc0d0a04ab41
+EBUILD emacs-vcs-24.0.9999.ebuild 9875 RMD160 9131b2bc695cd7a18379e1d024ba4a98f73dc06f SHA1 f06ef615d4067e567e9d26f3639ea08a384e048a SHA256 e34e9501ecd04bc6764ae060bc4ed4641e6c9128a47712c8996dc9cf2d206e0a
+MISC ChangeLog 53091 RMD160 de93ac4cae9dca0edddf85fd1f343d2e24089482 SHA1 b729c58672032680001afc0fdeac17160f813755 SHA256 00e1c831563a4e17945bc18888cbeba37c7df57ae3c9466d5a36e06a1be5bebe
 MISC metadata.xml 1622 RMD160 01a46ab0aebc8acab07a5a874736783791b75c4e SHA1 c2869923f6e835df175a9a6f0d803170bf98fd85 SHA256 7875ea72b5aa0e9dd526c88692c08a3e1598e563d8e2d27e336fd1d5d707cb5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwk6/MACgkQOeoy/oIi7uxNsACfYVBEDPnxFtNGmnQ0AZdR5mWu
-icQAoOj8A/xLmfIkdgG9OT/PANlXxeCo
-=bSKJ
+iEYEARECAAYFAkxDIZoACgkQNQqtfCuFneMpNwCeIJfy3j1FZK0INMqPXGTd3COU
+engAmgPnOby6TcKQeQcY4WvQwbs00K6T
+=SRHW
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
index f6ce622b6cf6..7acdef682ddb 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.7 2010/06/25 17:46:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.8 2010/07/18 15:43:14 fauli Exp $
 
 EAPI=2
 
@@ -102,20 +102,20 @@ src_prepare() {
 
 	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
 		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
+		"${S}"/src/s/freebsd.h || die
 
 	if ! use alsa; then
 		# ALSA is detected even if not requested by its USE flag.
 		# Suppress it by supplying pkg-config with a wrong library name.
 		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
+			|| die
 	fi
 	if ! use gzip-el; then
 		# Emacs' build system automatically detects the gzip binary and
 		# compresses el files. We don't want that so confuse it with a
 		# wrong binary name
 		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
+			|| die
 	fi
 
 	eautoreconf
@@ -199,37 +199,38 @@ src_configure() {
 		--program-suffix=-${EMACS_SUFFIX} \
 		--infodir=/usr/share/info/${EMACS_SUFFIX} \
 		--with-crt-dir=/usr/$(get_libdir) \
-		${myconf} || die "econf emacs failed"
+		--without-compress-info \
+		${myconf} || die
 }
 
 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
 	if [ "${PV##*.}" = "9999" ]; then
-		emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
+		emake CC="$(tc-getCC)" bootstrap || die
 		# cleanup, otherwise emacs will be dumped again in src_install
 		(cd src; emake versionclean)
 	fi
-	emake CC="$(tc-getCC)" || die "emake failed"
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install () {
 	local i m
 
-	emake install DESTDIR="${D}" || die "make install failed"
+	emake install DESTDIR="${D}" || die
 
 	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
+		|| die
 	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving Emacs executable failed"
+		|| die
 
 	# move info documentation to the correct place
 	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
-		mv "${i}" "${i}.info" || die "mv info failed"
+		mv "${i}" "${i}.info" || die
 	done
 
 	# move man pages to the correct place
 	for m in "${D}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
+		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die
 	done
 
 	# avoid collision between slots, see bug #169033 e.g.
@@ -267,7 +268,7 @@ src_install () {
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
-	dodoc README BUGS || die "dodoc failed"
+	dodoc README BUGS || die
 }
 
 emacs-infodir-rebuild() {