Don't compress GNU Info dir. Update ebuilds to EAPI 4.

svn path=/emacs-overlay/; revision=1552

5 files changed, 41 insertions, 22 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index fcdb015..49f6da5 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*emacs-23.2-r3 (31 Dec 2010)
+*emacs-22.3-r7 (31 Dec 2010)
+*emacs-21.4-r23 (31 Dec 2010)
+
+  31 Dec 2010; Ulrich Mueller <ulm@gentoo.org> -emacs-21.4-r22.ebuild,
+  +emacs-21.4-r23.ebuild, -emacs-22.3-r6.ebuild, +emacs-22.3-r7.ebuild,
+  -emacs-23.2-r2.ebuild, +emacs-23.2-r3.ebuild:
+  Don't compress GNU Info dir. Update ebuilds to EAPI 4.
+
 *emacs-23.2-r2 (31 Dec 2010)
 *emacs-22.3-r6 (31 Dec 2010)
 *emacs-21.4-r22 (31 Dec 2010)
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 0fd6621..a7d124d 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -5,8 +5,8 @@ DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
 DIST emacs-23.2-patches-2.tar.bz2 2248 RMD160 e8e6d8ac11b9d9f61edca4046381f93deec24d17 SHA1 261f32cde33890d77efde5448c6aedf72377f1f1 SHA256 5a5c257847ec952d4ca8e9c1c296ae906043b9fb989c40042d25cdb27a81768c
 DIST emacs-23.2.tar.bz2 38376047 RMD160 b7441be0a32e78e02f108dcb3b09b531c6849d95 SHA1 b46e6b33e1f5e24ede0ecd0d8703b64847c83946 SHA256 ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-21.4-r22.ebuild 5176 RMD160 1fa570948a1de7c16e24fd97bf98062d08c76786 SHA1 f398f96f53735b83b0f7ef0333573da2b094c0a6 SHA256 f2b61e2616727544f5f4e14f45567014d24162986bd10e411aaa904ace6d65fd
-EBUILD emacs-22.3-r6.ebuild 8052 RMD160 444100251b38e4c011889290c70e1e1d0a29416c SHA1 cd5d8ab44f1a1244e6790aef831140dc42604216 SHA256 b7af827b7bae26adffb6e0df84fd12a9f60fcf0238a24f3b307b93a9d591a17d
-EBUILD emacs-23.2-r2.ebuild 10008 RMD160 47d6ab99e7483fe18a7fece0a31f1f0ad19fdfef SHA1 57367184d44c8e170f3186cf84c007a4d9be7fd3 SHA256 44fd93a28deb705d0cdbf741bb3ce65ae0c6bdc1b06d147b76abf085cd1cc4f9
-MISC ChangeLog 370 RMD160 d7056456a7b8f745b5a5b143435ad782c9aecba8 SHA1 9379293a9f23faeff296475b29ac60830f0b430b SHA256 f4b22afe44376f93751ae03a8f2cb554fe1782cec8b312ef6afd94d43fe84c35
+EBUILD emacs-21.4-r23.ebuild 5218 RMD160 9b1d051a2dec0ac5440c4ba8d4b3edf40895d0fb SHA1 46af2836fc9204a25857df847a069b4502f8da25 SHA256 e308d2d4330dfffaa86f777e9ef08dd895e7796d491e81f0f4be8bf56f37b333
+EBUILD emacs-22.3-r7.ebuild 8093 RMD160 5924d01fbd8eb58e977ce0018a9f97c9f77916e2 SHA1 acb3278c739cd5cfacefc01e6f8ed315013c6ee9 SHA256 09a734625630b1a79a8f849924cccb955f0d26ad37b86f11db6c232558d31242
+EBUILD emacs-23.2-r3.ebuild 10049 RMD160 1314f8bb3b79fd2693ccae8901ee4afb7881255a SHA1 42f6c00bbc83d582d661460d2821287b853e2017 SHA256 0872f3659dbdff4218b7db7a32b5ad75de25cba00575b466544bef1a0cd32a79
+MISC ChangeLog 708 RMD160 15d3b3ce11f85efa1b8e4e73384d2fad1006ee4c SHA1 db0591798de9ffdcddb2359074a04ddb81c09f5f SHA256 a8230d6f718c8a47d5a44def9182e1394086829ec37f7045d36576dcdd8eb6b4
 MISC metadata.xml 1745 RMD160 c60885ffe070e2e88f9a5b8def28fd20d05e5de3 SHA1 c4480fbafe47b334f878d9e87328e37c20cba56b SHA256 86f6e3328b4abfbf278876ab4ab7c546c5164713e736b14ad7cab4c68825d010
diff --git a/app-editors/emacs/emacs-21.4-r22.ebuild b/app-editors/emacs/emacs-21.4-r23.ebuild
index 7984fcb..4c35fc3 100644
--- a/app-editors/emacs/emacs-21.4-r22.ebuild
+++ b/app-editors/emacs/emacs-21.4-r23.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r22.ebuild,v 1.11 2010/11/14 16:22:09 armin76 Exp $
 
-EAPI=2
+EAPI=4
 
 inherit flag-o-matic eutils toolchain-funcs autotools
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
 
 LICENSE="GPL-2 FDL-1.1 BSD as-is MIT"
 SLOT="21"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="X Xaw3d leim motif sendmail"
 
 DEPEND="sys-libs/ncurses
@@ -95,6 +95,10 @@ src_configure() {
 	else
 		myconf="${myconf} --without-x"
 	fi
+
+	# EAPI 4 failure :(
+	einfo "Please ignore the warning about --disable-dependency-tracking"
+
 	econf ${myconf} || die "econf failed"
 }
 
@@ -129,6 +133,7 @@ src_install() {
 	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} \
 		|| die "moving info dir failed"
 	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
+	docompress -x /usr/share/info/emacs-${SLOT}/dir.orig
 
 	# avoid collision between slots
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
@@ -143,14 +148,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	# Depending on Portage version and user's settings, the Info dir file
-	# may have been compressed or removed. We rebuild it in both cases.
+	# move Info dir file to correct name
 	local infodir=/usr/share/info/emacs-${SLOT} f
 	if [ -f "${D}"${infodir}/dir.orig ]; then
-		# prefer existing file if it has survived to here
 		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
 	else
-		einfo "Regenerating Info directory index in ${infodir} ..."
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
 		rm -f "${D}"${infodir}/dir{,.*}
 		for f in "${D}"${infodir}/*; do
 			if [[ ${f##*/} != *[0-9].info* && -e ${f} ]]; then
diff --git a/app-editors/emacs/emacs-22.3-r6.ebuild b/app-editors/emacs/emacs-22.3-r7.ebuild
index 89414da..9ad23a1 100644
--- a/app-editors/emacs/emacs-22.3-r6.ebuild
+++ b/app-editors/emacs/emacs-22.3-r7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r6.ebuild,v 1.12 2010/12/29 13:09:01 ulm Exp $
 
-EAPI=2
+EAPI=4
 
 inherit autotools elisp-common eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.gz
 
 LICENSE="GPL-3 FDL-1.2 BSD as-is MIT"
 SLOT="22"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png sound source tiff toolkit-scroll-bars X Xaw3d +xpm"
 RESTRICT="strip"
 
@@ -139,6 +139,9 @@ src_configure() {
 	myconf="${myconf} $(use_with hesiod)"
 	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
 
+	# EAPI 4 failure :(
+	einfo "Please ignore the warning about --disable-dependency-tracking"
+
 	econf \
 		--program-suffix=-${EMACS_SUFFIX} \
 		--infodir=/usr/share/info/${EMACS_SUFFIX} \
@@ -171,6 +174,7 @@ src_install () {
 	mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
 		|| die "moving info dir failed"
 	touch "${D}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/emacs-${SLOT}/dir.orig
 
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
@@ -210,14 +214,13 @@ src_install () {
 }
 
 pkg_preinst() {
-	# Depending on Portage version and user's settings, the Info dir file
-	# may have been compressed or removed. We rebuild it in both cases.
+	# move Info dir file to correct name
 	local infodir=/usr/share/info/${EMACS_SUFFIX} f
 	if [ -f "${D}"${infodir}/dir.orig ]; then
-		# prefer existing file if it has survived to here
 		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
 	else
-		einfo "Regenerating Info directory index in ${infodir} ..."
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
 		rm -f "${D}"${infodir}/dir{,.*}
 		for f in "${D}"${infodir}/*; do
 			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
diff --git a/app-editors/emacs/emacs-23.2-r2.ebuild b/app-editors/emacs/emacs-23.2-r3.ebuild
index 4a3a869..9191996 100644
--- a/app-editors/emacs/emacs-23.2-r2.ebuild
+++ b/app-editors/emacs/emacs-23.2-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v 1.12 2010/12/29 13:09:01 ulm Exp $
 
-EAPI=2
+EAPI=4
 
 inherit autotools elisp-common eutils flag-o-matic multilib
 
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode"
 SLOT="23"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="alsa dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 RESTRICT="strip"
 
@@ -189,6 +189,9 @@ src_configure() {
 	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
 	myconf="${myconf} $(use_with gpm) $(use_with dbus)"
 
+	# EAPI 4 failure :(
+	einfo "Please ignore the warning about --disable-dependency-tracking"
+
 	econf \
 		--program-suffix=-${EMACS_SUFFIX} \
 		--infodir=/usr/share/info/${EMACS_SUFFIX} \
@@ -226,6 +229,7 @@ src_install () {
 	mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
 		|| die "moving info dir failed"
 	touch "${D}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/emacs-${SLOT}/dir.orig
 
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
@@ -266,14 +270,13 @@ src_install () {
 }
 
 pkg_preinst() {
-	# Depending on Portage version and user's settings, the Info dir file
-	# may have been compressed or removed. We rebuild it in both cases.
+	# move Info dir file to correct name
 	local infodir=/usr/share/info/${EMACS_SUFFIX} f
 	if [ -f "${D}"${infodir}/dir.orig ]; then
-		# prefer existing file if it has survived to here
 		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
 	else
-		einfo "Regenerating Info directory index in ${infodir} ..."
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
 		rm -f "${D}"${infodir}/dir{,.*}
 		for f in "${D}"${infodir}/*; do
 			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then