Option --without-compress-info is no longer available in upstream configure. Therefore, we suppress all compression with --without-compress-install; in case of USE=gzip-el we compress the .el files ourselves. This also allows removing of the long-standing gzip detection hack in configure.ac.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 29 insertions, 25 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index a0f163a20a0f..c9436e15f5fd 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.141 2013/08/31 22:13:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.142 2013/12/16 23:59:27 ulm Exp $
+
+  17 Dec 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+  Option --without-compress-info is no longer available in upstream configure.
+  Therefore, we suppress all compression with --without-compress-install; in
+  case of USE=gzip-el we compress the .el files ourselves. This also allows
+  removing of the long-standing gzip detection hack in configure.ac.
 
   31 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
   Account for new --with-sound configure option argument, upstream bug #15067.
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index bd23dacb0fac..476c6ee0671d 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD emacs-vcs-24.3.9999.ebuild 11154 SHA256 81ec9bdc1ef19e276b474a43ea78fe1fc7a61c6234ad3ac671ddbd911e865c1a SHA512 c2034b6106f5201635ecd8736e53e7bafc2225ffbe0b5881729f93aaf0ed7b35b2bc4bfaa6f3005abcc9002ef90f67ee48b5fb8d339853ed39408b9dbafb7516 WHIRLPOOL 3426b290a61474e486a2333b4db14f8df8e50d42de590623e6d48112441cfe6b99b151f5deb9e5045dc8efb31e423ecdf81cfd1b9aa69bcb3b7e84117791fa89
-MISC ChangeLog 73817 SHA256 657e8607942b0d62ed74f02b3d5a81e8bee585d7fdd6378036074b7cea51b114 SHA512 e0f49c32fc059e4491564d025b9e1d855601040c162cd95e2f05949122ae09e9b8b30667f8148cd57a26adccc8e4e181b37294732adc4c4ad2db42b4b6c2ade9 WHIRLPOOL 8d46c3cfd2431303a01f03833d3f09a77ae5d410580edc82681cc82452176a7166389b2e10e7da0f82e7834fcc08b50c7f79c13b8a8bb5637a447ed3add1a163
+EBUILD emacs-vcs-24.3.9999.ebuild 11100 SHA256 86575fcf9529477dcb13fed50007b6792c8c44d69e3bba266d8ec503a20a10a7 SHA512 bce4b083a34ee2f36037e211726dc46582bfd5e33aea3ac529b8bc79ccd28964a95ad20af2c6c0d26522bc35858d1dc7bd28726cc93a215abdca225651a4a999 WHIRLPOOL 8b661fc07c2c2a046fa80c2d8e89b2be005ad22dd065bccde38e1f420627d7031283cd25588fd45e429bcbf6bb5c59a9b1198f5725d733a7508b6b7bfbe6d504
+MISC ChangeLog 74194 SHA256 eea11aed93c6d9dfb6d30d82d436e5c11f8bfff5c07917cd3c0bba68479ffaa6 SHA512 71b5d7bcb0b807aae206c076d88a3d77b39af7c561000da3adf6672542ecbc7def24571694e0db7d83a47930b4551df64d1dd25c176e7aba12fcecdb28b9705c WHIRLPOOL ba4ae666076aa2bafad1cf92db509b181f8d6a87894c45b636b58ba0acf401fedda441ff7118b49d207c5aaec34edf8de6d034568d5cff6937d5a5ef5ed1c8ee
 MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJSImq5AAoJEJQzkH1pP7W4mMYL/RNIR08H1BZiPZCZIHmI7L80
-4FHKE2OF86uWlKyrXsXYbrt8NHh1TDHcV6uRl9mDnmIF9Sqr6iON/zxiB+HVKsbl
-KIGwsQFb6U6XYm289+DlPwRseW6kc8PWvnPHICAhlPiIWTCCQBG+olGBNlfUrFBE
-xWDWQTJ06kb9uFbC3AJ9W8H4m7/brjNYOU1SvuwF94FIoeZUZoCGLP3thJ+W40sW
-AgCNID7hK6VHcZnZazMNHzmljRf6mJW83E+YSTGowqhKwUOUKdz+Fk8aOJ5RoQcx
-MJt3lVY0ijSSHMosqjmO6qa1IHR10oIanLZMWem1otnTOHWsebcyQCAOBWRSetiM
-8zHz4sPPq5aCScB8yzdRM+z7BV2apFG9543mn3yQMQUT7fj2sRNPUVU/7Xeo90cB
-gSeU4XZwr539/tvQaWGvnzzPILA7QWzsBoYaejJX5qaNAactwTEBHyghVq6gQx12
-L8Y2xt4J6W0FgAA8js3vKS9+cR8UFkeFGQCqJyG0GQ==
-=3ME2
+iQGcBAEBCAAGBQJSr5S6AAoJEJQzkH1pP7W41IUL/jshVYj7GquFkOiH3PGi0FU2
+ut4O6Nh5KKBsW7eBPW9PeHQKYOAVeGgHKKBmjUDT7em99XPM3QsdnsuNp8U5XPgd
+DRm4Bs4mevNXQ7B0NlVAwKSyXVA94wQxP8ZL9XpAJaNKrBq3dwR7jW/lAcKPdz8t
+Z1N3Lq+tARQVA2MPyoWjPpg9mnJeWAzVHXjGmoZNKGJEGuNzEEIyn6HX023MSfSC
+XwIbcJiT+7RcMPzKUviB2dpftKKDgAJpRiNyWbWHCxpf5p6TXZl3Fg5Tq6A+PCMO
+F89KZ47vLZFfVGCHrqUFewnXVATtSHzggV3AYZCwNHCF0N7CWfpIcK73Trrt9alz
++F2PMUKyEGgWx8Gl78NBtkWuoGkUFe9zkMrqOFicGm4A0O53idyk2gj6/W14S5HH
+dep4+VA2XH9rT95hYy1vFgCiihZPcJTcVmkurqmg8sLcke4tbxJQsia3kvvAF6g5
+vpt/jUcYsrDssYHH3qGwgMrPY3Aw48XP4heXmNLzTw==
+=+ky8
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index c3cdcc0e9715..2d3a558417ea 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.3.9999.ebuild,v 1.20 2013/08/31 22:13:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.21 2013/12/16 23:59:27 ulm Exp $
 
 EAPI=5
 
@@ -116,15 +116,6 @@ src_prepare() {
 	fi
 
 	epatch_user
-
-	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 "/AC_PATH_PROG/s/gzip/PrEvEnTcOmPrEsSiOn/" configure.ac \
-			|| die "unable to sed configure.ac"
-	fi
-
 	AT_M4DIR=m4 eautoreconf
 }
 
@@ -215,7 +206,7 @@ src_configure() {
 		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
 		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
 		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-info \
+		--without-compress-install \
 		--with-file-notification=$(usev gfile || usev inotify || echo no) \
 		$(use_enable acl) \
 		$(use_with dbus) \
@@ -255,6 +246,13 @@ src_install () {
 	# remove unused <version>/site-lisp dir
 	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
 
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
 	local cdir
 	if use source; then
 		cdir="/usr/share/emacs/${FULL_VERSION}/src"