added flags for PPC64, fixes bug 152006, reported by corsair, solution found by Andrew John Hughes <gnu_andrew@member.fsf.org>; removed stale version as it is in prefix overlay for ppc-macos

Package-Manager: portage-2.1.2-r9

7 files changed, 47 insertions, 235 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index dd373c3f40d8..670c9969cf2a 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.120 2007/02/20 22:15:16 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.121 2007/03/02 18:38:54 opfer Exp $
+
+  02 Mar 2007; Christian Faulhammer <opfer@gentoo.org> emacs-21.4-r4.ebuild,
+  emacs-21.4-r6.ebuild, emacs-21.4-r7.ebuild,
+  -emacs-22.0.50_pre20050225.ebuild:
+  added flags for PPC64, fixes bug 152006, reported by corsair, solution found
+  by Andrew John Hughes <gnu_andrew@member.fsf.org>; removed stale version as
+  it is in prefix overlay for ppc-macos
 
 *emacs-21.4-r7 (20 Feb 2007)
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 0815fceb2f7a..ff1c1f0335ae 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 40aspell-gentoo.el 80 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 SHA1 90ab33e0d4a61dbc8feaabdc3dd08ec059941179 SHA256 b4d23344039e6d48efc893597295b3cacdad684c188a7fb2fada777e925f36b4
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 files/40aspell-gentoo.el 80
@@ -70,37 +73,30 @@ AUX emacs-subdirs-el-gentoo.diff 1369 RMD160 142e80ab7dc4620275ec9623f646e0b2c4a
 MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
 RMD160 142e80ab7dc4620275ec9623f646e0b2c4a1c6bf files/emacs-subdirs-el-gentoo.diff 1369
 SHA256 c407b31c785b275f12337e41e58ff8386219b1c94a1c98b69eee82a10eb54074 files/emacs-subdirs-el-gentoo.diff 1369
-DIST emacs--multi-tty--0--patch-301.2005-02-25.patch.gz 150653 RMD160 4bfcd54884fb0bbb7b3bdafa86eebfab33d60c2f SHA1 cf445a31ea1878ec1e71cea1e45dddbc12d65162 SHA256 e8688a6c2fc4d86b8af91e76cabd01022b6ea0c5271667dd1a55a00afe6fee09
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
-DIST emacs-22.0.50-20050225.tar.gz 33383930 RMD160 cf882d823cc2ac75b3bcacd83f73654fc05ccb0b SHA1 d258a6d3849d5f0010ad476ae6400ce9e4c7ebaa SHA256 e132ac3975a04f42e810e762283953bfe48eeb7ecafcc56f78ad32b777dbee7f
-DIST inline_patch-20041229.tar.gz 7047 RMD160 38e456bdd11a4edcaf952181159a9b98aaf11573 SHA1 c0bdb4d77c986bb8931ed60b89e0becdb78dd402 SHA256 7999d75451e0dbd0e9ea078f0899ba31e475c2d5d28c32e580243eedf5aea09b
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r1.ebuild 2934 RMD160 c58003f359b970f445fbcd35a43fa1f29504881c SHA1 272c69cd9c9afa1f25d8a875cb88334071b027e3 SHA256 9f152b4d0937a39a07e70847d512475a5fff16a194a06f72fdacab888308664c
 MD5 34ef95f0991baebedde795e1c642ec44 emacs-18.59-r1.ebuild 2934
 RMD160 c58003f359b970f445fbcd35a43fa1f29504881c emacs-18.59-r1.ebuild 2934
 SHA256 9f152b4d0937a39a07e70847d512475a5fff16a194a06f72fdacab888308664c emacs-18.59-r1.ebuild 2934
-EBUILD emacs-21.4-r4.ebuild 4492 RMD160 571f7409b0f65bad0715aecc91d176af1edd3443 SHA1 fbcb530b08adec024137267b802ea9497e8f7204 SHA256 3914a526e5560e54fd0d670f190b4032f701aa46200570279f100a38841fcb4e
-MD5 317bcb60bc1061bf3794a1a993730405 emacs-21.4-r4.ebuild 4492
-RMD160 571f7409b0f65bad0715aecc91d176af1edd3443 emacs-21.4-r4.ebuild 4492
-SHA256 3914a526e5560e54fd0d670f190b4032f701aa46200570279f100a38841fcb4e emacs-21.4-r4.ebuild 4492
-EBUILD emacs-21.4-r6.ebuild 5439 RMD160 4f3b1fb1a676ade42008069b06370e24b93c5cde SHA1 92122afed912b2ed7410c54e36be7149a4da64c0 SHA256 4228b2f70cf3eb38d0f77ed61f55df98543b3e092509bd1cf1a3f5102d58265f
-MD5 a6603cf7b282b197e9267c5432e2dcae emacs-21.4-r6.ebuild 5439
-RMD160 4f3b1fb1a676ade42008069b06370e24b93c5cde emacs-21.4-r6.ebuild 5439
-SHA256 4228b2f70cf3eb38d0f77ed61f55df98543b3e092509bd1cf1a3f5102d58265f emacs-21.4-r6.ebuild 5439
-EBUILD emacs-21.4-r7.ebuild 5656 RMD160 d178435fa1a7910ef3b57bbc6c2f6160a64ba210 SHA1 0aca9f009a4e4b4270c50c2d75caa4c14acf60c3 SHA256 2b581f003f11530a84e758136cb4e58bfd5c1ecb4f9d882f2c2bff5e0d003573
-MD5 58d63df6f79d17a13a01ed083679623b emacs-21.4-r7.ebuild 5656
-RMD160 d178435fa1a7910ef3b57bbc6c2f6160a64ba210 emacs-21.4-r7.ebuild 5656
-SHA256 2b581f003f11530a84e758136cb4e58bfd5c1ecb4f9d882f2c2bff5e0d003573 emacs-21.4-r7.ebuild 5656
-EBUILD emacs-22.0.50_pre20050225.ebuild 5545 RMD160 687740f84ed5ff69ea7e3c93330c67d69867dee2 SHA1 8d74fc27ca2ed8a69cb9152845cfffdf2f894cbe SHA256 097ea5af254a835358dc30f6b07a1462b627ed7084ae766e45f4120b73d12f68
-MD5 d98a4527c89aa4053de22a6d75e230e3 emacs-22.0.50_pre20050225.ebuild 5545
-RMD160 687740f84ed5ff69ea7e3c93330c67d69867dee2 emacs-22.0.50_pre20050225.ebuild 5545
-SHA256 097ea5af254a835358dc30f6b07a1462b627ed7084ae766e45f4120b73d12f68 emacs-22.0.50_pre20050225.ebuild 5545
-MISC ChangeLog 18125 RMD160 da66390ae6dc6b427bdb812665b058df7724f5f9 SHA1 eb6efdea62f1d40291faccec07594b9f7d240c1e SHA256 d31203895a42eaef8e4319a74aae36229c1e6127c66653e4e827b5c7f6cb8ee3
-MD5 879a689230bf3da36277445b8e2006d9 ChangeLog 18125
-RMD160 da66390ae6dc6b427bdb812665b058df7724f5f9 ChangeLog 18125
-SHA256 d31203895a42eaef8e4319a74aae36229c1e6127c66653e4e827b5c7f6cb8ee3 ChangeLog 18125
+EBUILD emacs-21.4-r4.ebuild 4576 RMD160 9d13437e4792cb077f3c0f58ac21b5f23367ba09 SHA1 ac279cb763925caf5e5e39cfaa15670228896b39 SHA256 69a9266c3e94c3b1f90f23d6036a5fda18447a84836814308a6394e1326c4f12
+MD5 d587ed63604257a78b4ef1c44573a601 emacs-21.4-r4.ebuild 4576
+RMD160 9d13437e4792cb077f3c0f58ac21b5f23367ba09 emacs-21.4-r4.ebuild 4576
+SHA256 69a9266c3e94c3b1f90f23d6036a5fda18447a84836814308a6394e1326c4f12 emacs-21.4-r4.ebuild 4576
+EBUILD emacs-21.4-r6.ebuild 5523 RMD160 8481fa97a452a6ff3176bdc8b510153b366cab8f SHA1 e1ada4544e5b482220721630a21d4d0775c3d5d1 SHA256 262921203e82419f5ad1aef52f9cbdc61d13c60b6eac6b8cec5095770c557e0d
+MD5 bbb541073e4c64743c16b84356728160 emacs-21.4-r6.ebuild 5523
+RMD160 8481fa97a452a6ff3176bdc8b510153b366cab8f emacs-21.4-r6.ebuild 5523
+SHA256 262921203e82419f5ad1aef52f9cbdc61d13c60b6eac6b8cec5095770c557e0d emacs-21.4-r6.ebuild 5523
+EBUILD emacs-21.4-r7.ebuild 5740 RMD160 8b3e7d5c5131578a747a557698e20fa1f1bc0afd SHA1 b8772bfd58739c224fe935c455d55d704b9bae1f SHA256 92c536b96b10a34b1e3a378d796acb920b6aa4d2370180c05121201e6ba3cd42
+MD5 44ab97cff17e355d80cfab6659205aa2 emacs-21.4-r7.ebuild 5740
+RMD160 8b3e7d5c5131578a747a557698e20fa1f1bc0afd emacs-21.4-r7.ebuild 5740
+SHA256 92c536b96b10a34b1e3a378d796acb920b6aa4d2370180c05121201e6ba3cd42 emacs-21.4-r7.ebuild 5740
+MISC ChangeLog 18483 RMD160 848c994e02423ddce38f1b735894ca4055df2c28 SHA1 e6645bc1d6bb2a94f4de2d0d9db52c536853d969 SHA256 8421192334bbc81c8e60e62d3faf3c0be10c52eca5165b737f2f8c9bac0caba6
+MD5 2babf1392d9d6e27bd9dfc1ee99f3d35 ChangeLog 18483
+RMD160 848c994e02423ddce38f1b735894ca4055df2c28 ChangeLog 18483
+SHA256 8421192334bbc81c8e60e62d3faf3c0be10c52eca5165b737f2f8c9bac0caba6 ChangeLog 18483
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -117,6 +113,10 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di
 MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r7 473
 RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r7 473
 SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r7 473
-MD5 2df1eb628db6afebd06600c89c6b5632 files/digest-emacs-22.0.50_pre20050225 864
-RMD160 6ca2f9e46acf2ab0ef441365fc4943c399c84070 files/digest-emacs-22.0.50_pre20050225 864
-SHA256 101b72de2e3aabbc053bba0963fa2aac03ece43a8654250914eb700f5dea5c19 files/digest-emacs-22.0.50_pre20050225 864
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFF6G8hNQqtfCuFneMRAoQYAJ9gKwy1tBF8eiqVWPBW077dh4FgiQCfR9mI
+4z1ODK3hcuQwF1Lm4Um+CTA=
+=4W0V
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r4.ebuild b/app-editors/emacs/emacs-21.4-r4.ebuild
index 14b1262bada4..8f96cfcea6cd 100644
--- a/app-editors/emacs/emacs-21.4-r4.ebuild
+++ b/app-editors/emacs/emacs-21.4-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r4.ebuild,v 1.11 2006/10/31 17:33:55 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r4.ebuild,v 1.12 2007/03/02 18:38:54 opfer Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -80,6 +80,9 @@ src_compile() {
 	# ever since GCC 3.2
 	replace-flags -O[3-9] -O2
 
+	# this fixes bug 152006
+	use ppc64 && append-flags -mno-fp-in-toc -mno-sum-in-toc
+
 	# -march is known to cause signal 6 on some environment
 	filter-flags "-march=*"
 
diff --git a/app-editors/emacs/emacs-21.4-r6.ebuild b/app-editors/emacs/emacs-21.4-r6.ebuild
index 38a475557e14..acc03bb3c841 100644
--- a/app-editors/emacs/emacs-21.4-r6.ebuild
+++ b/app-editors/emacs/emacs-21.4-r6.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/emacs-21.4-r6.ebuild,v 1.6 2007/02/06 06:09:41 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r6.ebuild,v 1.7 2007/03/02 18:38:54 opfer Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -80,6 +80,9 @@ src_compile() {
 	# ever since GCC 3.2
 	replace-flags -O[3-9] -O2
 
+	# this fixes bug 152006
+	use ppc64 && append-flags -mno-fp-in-toc -mno-sum-in-toc
+
 	# -march is known to cause signal 6 on some environment
 	filter-flags "-march=*"
 
diff --git a/app-editors/emacs/emacs-21.4-r7.ebuild b/app-editors/emacs/emacs-21.4-r7.ebuild
index c5ab35a3e87d..67a55abf103b 100644
--- a/app-editors/emacs/emacs-21.4-r7.ebuild
+++ b/app-editors/emacs/emacs-21.4-r7.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/emacs-21.4-r7.ebuild,v 1.1 2007/02/20 22:15:16 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r7.ebuild,v 1.2 2007/03/02 18:38:54 opfer Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -82,6 +82,9 @@ src_compile() {
 	# ever since GCC 3.2
 	replace-flags -O[3-9] -O2
 
+	# this fixes bug 152006
+	use ppc64 && append-flags -mno-fp-in-toc -mno-sum-in-toc
+
 	# -march is known to cause signal 6 on some environment
 	filter-flags "-march=*"
 
diff --git a/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild b/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild
deleted file mode 100644
index 7bd0db9fd3a7..000000000000
--- a/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild,v 1.7 2007/02/28 21:55:12 genstef Exp $
-
-inherit elisp-common alternatives flag-o-matic eutils
-
-IUSE="X Xaw3d aqua cjk gif gnome gtk jpeg multi-tty nls png spell tiff"
-
-INLINE="inline_patch-20041229"
-MULTI_TTY="emacs--multi-tty--0--patch-301.2005-02-25"
-
-DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
-HOMEPAGE="http://www.gnu.org/software/emacs/
-	http://macemacsjp.sourceforge.jp/
-	http://lorentey.hu/project/emacs.html.en"
-SRC_URI="mirror://gentoo/${P/_pre/-}.tar.gz
-	cjk? ( mirror://sourceforge.jp/macemacsjp/12817/${INLINE}.tar.gz )
-	multi-tty? ( http://lorentey.hu/downloads/emacs/multi-tty/${MULTI_TTY}.patch.gz )"
-
-RESTRICT="$RESTRICT nostrip"
-
-DEPEND=">=sys-apps/portage-2.0.51
-	>=sys-libs/ncurses-5.3
-	sys-libs/gdbm
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( || ( ( x11-libs/libXext
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libXmu
-				x11-libs/libXpm
-				x11-misc/xbitmaps
-				|| ( media-fonts/font-adobe-100dpi
-					media-fonts/font-adobe-75dpi )
-			)
-			virtual/x11
-		)
-		gif? ( >=media-libs/giflib-4.1.0.1b )
-		jpeg? ( >=media-libs/jpeg-6b )
-		tiff? ( >=media-libs/tiff-3.5.7 )
-		png? ( >=media-libs/libpng-1.2.5 )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		gnome? ( gnome-base/gnome-desktop ) )
-	nls? ( >=sys-devel/gettext-0.11.5 )
-	!=app-editors/emacs-cvs-21.3.50*
-	!=app-editors/emacs-cvs-22.0.50*"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="22.0.50"
-LICENSE="GPL-2"
-# should run on other arches, but the ebuild is intended for ppc-macos
-KEYWORDS="-*"
-
-DFILE=emacs-${SLOT}.desktop
-
-S=${WORKDIR}/${P%_*}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-	if use ppc-macos ; then
-		use cjk && epatch ${WORKDIR}/${INLINE}/emacs-inline.patch
-		epatch ${FILESDIR}/emacs-nofink-gentoo.diff
-	fi
-	if use multi-tty ; then
-		if use aqua ; then
-			ewarn "Carbon Emacs will not compile with multi-tty patch; disabling multi-tty."
-			ewarn "If you want to use multi-tty, please trun off aqua USE flag."
-			epause; ebeep; epause
-		else
-			epatch ../${MULTI_TTY}.patch
-		fi
-	fi
-
-	# This will need to be updated for X-Compilation
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		   ${S}/src/s/gnu-linux.h
-
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile.in || die
-}
-
-src_compile() {
-	SANDBOX_ON=0
-
-	strip-flags
-
-	local myconf
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} --with-xpm --with-toolkit-scroll-bars"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		if use gtk; then
-			einfo "Configuring to build with GTK support"
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d support"
-			myconf="${myconf} --with-x-toolkit=athena"
-		else
-			einfo "Configuring to build with lucid toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=lucid"
-		fi
-	fi
-
-	if use aqua ; then
-		einfo "Configuring to build with Carbon Emacs"
-		econf --enable-debug \
-			--enable-carbon-app=/Applications/Gentoo \
-			--without-x \
-			$(use_with jpeg) $(use_with tiff) \
-			$(use_with gif) $(use_with png) \
-			|| die "econf carbon emacs failed"
-		emake -j1 || die "make carbon emacs bootstrap failed"
-	fi
-
-	econf --enable-debug \
-		--program-suffix=.emacs-${SLOT} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake -j1 CC="$(tc-getCC)" || die "make emacs bootstrap failed"
-}
-
-src_install () {
-	einstall || die
-	rm ${D}/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed"
-	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die
-
-	if use aqua ; then
-		einfo "Installing Carbon Emacs..."
-		dodir /Applications/Gentoo/Emacs.app
-		pushd mac/Emacs.app
-		tar -chf - . | ( cd ${D}/Applications/Gentoo/Emacs.app; tar -xf -)
-		popd
-	fi
-
-	# fix info documentation
-	einfo "Fixing info documentation..."
-	dodir /usr/share/info/emacs-${SLOT}
-	mv ${D}/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
-	for i in ${D}/usr/share/info/*
-	do
-		if [ "${i##*/}" != emacs-${SLOT} ] ; then
-			mv ${i} ${i/info/info/emacs-${SLOT}}.info
-			gzip -9 ${i/info/info/emacs-${SLOT}}.info
-		fi
-	done
-
-	if has_version 'app-text/aspell' ; then
-		# defaults to aspell if installed
-		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
-	fi
-	newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${SLOT}
-
-	einfo "Fixing manpages..."
-	for m in  ${D}/usr/share/man/man1/* ; do
-		mv ${m} ${m/.1/-${SLOT}.1} || die "mv man failed"
-	done
-
-	dodoc BUGS ChangeLog README*
-
-	if use gnome; then
-		insinto /usr/share/applications
-		doins ${FILESDIR}/${DFILE} || die "install desktop file faild"
-	fi
-}
-
-update-alternatives() {
-	for i in emacs emacsclient etags ctags b2m ebrowse \
-		rcs-checkin grep-changelog ; do
-		alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/$i.emacs-*"
-	done
-}
-
-pkg_postinst() {
-	use ppc-macos || update-alternatives
-	if use aqua && use cjk ; then
-		einfo
-		einfo "If you are going to use Japanese input method on Carbon Emacs,"
-		einfo "put the following lines to your ~/.emacs.el"
-		einfo "(if (eq window-system 'mac)"
-		einfo "	(set-keyboard-coding-system 'sjis)"
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	use ppc-macos || update-alternatives
-}
diff --git a/app-editors/emacs/files/digest-emacs-22.0.50_pre20050225 b/app-editors/emacs/files/digest-emacs-22.0.50_pre20050225
deleted file mode 100644
index 9956386abf6b..000000000000
--- a/app-editors/emacs/files/digest-emacs-22.0.50_pre20050225
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 9ebc373bbef7ee62e63b15dcca9570fe emacs--multi-tty--0--patch-301.2005-02-25.patch.gz 150653
-RMD160 4bfcd54884fb0bbb7b3bdafa86eebfab33d60c2f emacs--multi-tty--0--patch-301.2005-02-25.patch.gz 150653
-SHA256 e8688a6c2fc4d86b8af91e76cabd01022b6ea0c5271667dd1a55a00afe6fee09 emacs--multi-tty--0--patch-301.2005-02-25.patch.gz 150653
-MD5 be496a1379f0a99af537f02f423c0291 emacs-22.0.50-20050225.tar.gz 33383930
-RMD160 cf882d823cc2ac75b3bcacd83f73654fc05ccb0b emacs-22.0.50-20050225.tar.gz 33383930
-SHA256 e132ac3975a04f42e810e762283953bfe48eeb7ecafcc56f78ad32b777dbee7f emacs-22.0.50-20050225.tar.gz 33383930
-MD5 ca71ae2407325987ea3eacb7665023fe inline_patch-20041229.tar.gz 7047
-RMD160 38e456bdd11a4edcaf952181159a9b98aaf11573 inline_patch-20041229.tar.gz 7047
-SHA256 7999d75451e0dbd0e9ea078f0899ba31e475c2d5d28c32e580243eedf5aea09b inline_patch-20041229.tar.gz 7047