Updated CVS snapshot for ppc-macos. Removed ebuilds vulnerable to GLSA 200502-20.

Package-Manager: portage-2.0.51.16

13 files changed, 58 insertions, 399 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 5daeafbfaebd..8dce5cd46041 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.57 2005/02/21 17:36:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.58 2005/02/26 04:20:48 usata Exp $
+
+*emacs-22.0.50_pre20050225 (26 Feb 2005)
+
+  26 Feb 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/60emacs-22.0.50.envd, +files/emacs-22.0.50.desktop,
+  -emacs-21.3-r2.ebuild, -emacs-21.3-r3.ebuild, -emacs-21.3-r5.ebuild,
+  -emacs-21.3.50_pre20041027.ebuild, +emacs-22.0.50_pre20050225.ebuild:
+  Updated CVS snapshot for ppc-macos.
+  Removed ebuilds vulnerable to GLSA 200502-20.
 
   20 Feb 2005; Aron Griffis <agriffis@gentoo.org> emacs-21.4.ebuild:
   stable on ia64 #79686
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 21c2089079e7..c70351136dcb 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,23 +1,29 @@
-MD5 889ab987863a4683ee3384ca90863328 emacs-21.3-r3.ebuild 2608
-MD5 f2a41058885dba9b4611b3667f2b42f5 emacs-21.3-r5.ebuild 4004
-MD5 12938feba91966dbaeab37e85d0203a3 emacs-21.4.ebuild 4077
-MD5 0a7a86b12e580fd854e57a7744859af1 emacs-21.3-r2.ebuild 2195
-MD5 767c6035b2be8309041a7c2e81bfd7a0 emacs-18.59.ebuild 2007
-MD5 0ff66bc9468f2ac20294894769b3202b emacs-21.3.50_pre20041027.ebuild 5240
-MD5 234bcc02abb5190529e6030099fc5eb4 ChangeLog 8540
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2f8cad126b529ba2b927494e16060732 ChangeLog 8919
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-nofink-gentoo.diff 1520
-MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
+MD5 767c6035b2be8309041a7c2e81bfd7a0 emacs-18.59.ebuild 2007
+MD5 12938feba91966dbaeab37e85d0203a3 emacs-21.4.ebuild 4077
+MD5 0956120e282fdb09d44339831db10e7d emacs-22.0.50_pre20050225.ebuild 5346
+MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216
+MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
+MD5 56a239d1965c2bac249e787b1ef6a1f5 files/digest-emacs-21.4 126
 MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
-MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r2 126
-MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r3 126
-MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r5 126
-MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
-MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394
+MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
 MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
-MD5 6ad048aba58fdae6c516ed18ad728d95 files/digest-emacs-21.3.50_pre20041027 242
-MD5 56a239d1965c2bac249e787b1ef6a1f5 files/digest-emacs-21.4 126
-MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
-MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216
+MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
+MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394
 MD5 6aafc439ab1c05f97db2bfefc707bdcc files/emacs-21.desktop 196
-MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
+MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-nofink-gentoo.diff 1520
+MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
+MD5 8e50e760415e106cd168d8709d31b7dc files/emacs-22.0.50.desktop 206
+MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/60emacs-22.0.50.envd 39
+MD5 f6a4a0f9d36297f686ca56fae7bcef68 files/digest-emacs-22.0.50_pre20050225 242
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (Darwin)
+
+iD8DBQFCH/kqVWNWqTUmv+0RAg4NAKCuMZoLVt3vKievSNqcHpA//tI7+QCfVd7H
+MkcbuJotOIGY+JiBcUH2PAk=
+=+cMK
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.3-r2.ebuild b/app-editors/emacs/emacs-21.3-r2.ebuild
deleted file mode 100644
index 5287d55ade81..000000000000
--- a/app-editors/emacs/emacs-21.3-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r2.ebuild,v 1.18 2005/01/01 13:24:23 eradicator Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="An incredibly powerful, extensible text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="21"
-KEYWORDS="x86 ppc sparc alpha amd64 hppa ia64 s390"
-IUSE="X nls motif leim gnome Xaw3d"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/gdbm
-	X? ( virtual/x11
-		>=media-libs/libungif-4.1.0.1b
-		>=media-libs/jpeg-6b-r2
-		>=media-libs/tiff-3.5.5-r3
-		>=media-libs/libpng-1.2.1
-		Xaw3d? ( x11-libs/Xaw3d )
-		motif? ( >=x11-libs/openmotif-2.1.30 )
-		gnome? ( gnome-base/gnome-desktop )
-	)
-	nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-PROVIDE="virtual/emacs virtual/editor"
-SANDBOX_DISABLED="1"
-
-DFILE=emacs.desktop
-
-src_compile() {
-
-	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
-	filter-flags -fstack-protector
-
-	epatch ${FILESDIR}/${P}-amd64.patch
-	epatch ${FILESDIR}/${P}-hppa.patch
-
-	export WANT_AUTOCONF=2.1
-	autoconf
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	if use X ; then
-		myconf="${myconf}
-			--with-x
-			--with-xpm
-			--with-jpeg
-			--with-tiff
-			--with-gif
-			--with-png"
-		if use Xaw3d ; then
-			myconf="${myconf} --with-x-toolkit=athena"
-		elif use motif ; then
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			# do not build emacs with any toolkit, bug 35300
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	einfo "Fixing info documentation..."
-	rm -f ${D}/usr/share/info/dir
-	for i in ${D}/usr/share/info/*
-	do
-		mv ${i%.info} $i.info
-	done
-
-	einfo "Fixing permissions..."
-	find ${D} -perm 664 |xargs chmod 644
-	find ${D} -type d |xargs chmod 755
-
-	dodoc BUGS ChangeLog README
-
-	keepdir /usr/share/emacs/${PV}/leim
-
-	if use gnome ; then
-		insinto /usr/share/gnome/apps/Application
-		doins ${FILESDIR}/${DFILE}
-	fi
-}
diff --git a/app-editors/emacs/emacs-21.3-r3.ebuild b/app-editors/emacs/emacs-21.3-r3.ebuild
deleted file mode 100644
index 22ded1c69194..000000000000
--- a/app-editors/emacs/emacs-21.3-r3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r3.ebuild,v 1.14 2005/01/01 13:24:23 eradicator Exp $
-
-inherit flag-o-matic eutils gcc
-
-DESCRIPTION="An incredibly powerful, extensible text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="21"
-KEYWORDS="x86 ppc sparc -alpha arm hppa amd64 -ia64 ~s390"
-IUSE="X nls motif leim gnome Xaw3d lesstif"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/gdbm
-	X? ( virtual/x11
-		>=media-libs/libungif-4.1.0.1b
-		>=media-libs/jpeg-6b-r2
-		>=media-libs/tiff-3.5.5-r3
-		>=media-libs/libpng-1.2.1
-		!arm? (
-		Xaw3d? ( x11-libs/Xaw3d )
-		motif? (
-			lesstif? ( x11-libs/lesstif )
-			!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
-		gnome? ( gnome-base/gnome-desktop )
-		)
-	)
-	nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-PROVIDE="virtual/emacs virtual/editor"
-SANDBOX_DISABLED="1"
-
-DFILE=emacs.desktop
-
-src_compile() {
-
-	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
-	filter-flags -fstack-protector
-
-	# gcc 3.4 with -O3 or stronger flag spoils emacs
-	if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then
-		replace-flags -O[3-9] -O2
-	fi
-
-	epatch ${FILESDIR}/${P}-amd64.patch
-	epatch ${FILESDIR}/${P}-hppa.patch
-
-	export WANT_AUTOCONF=2.1
-	autoconf
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	if use X ; then
-		if use motif && use lesstif; then
-			append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
-			export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
-		fi
-		myconf="${myconf}
-			--with-x
-			--with-xpm
-			--with-jpeg
-			--with-tiff
-			--with-gif
-			--with-png"
-		if use Xaw3d ; then
-			myconf="${myconf} --with-x-toolkit=athena"
-		elif use motif ; then
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			# do not build emacs with any toolkit, bug 35300
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	einfo "Fixing info documentation..."
-	rm -f ${D}/usr/share/info/dir
-	for i in ${D}/usr/share/info/*
-	do
-		mv ${i%.info} $i.info
-	done
-
-	einfo "Fixing permissions..."
-	find ${D} -perm 664 |xargs chmod 644
-	find ${D} -type d |xargs chmod 755
-
-	dodoc BUGS ChangeLog README
-
-	keepdir /usr/share/emacs/${PV}/leim
-
-	if use gnome ; then
-		insinto /usr/share/gnome/apps/Application
-		doins ${FILESDIR}/${DFILE}
-	fi
-}
diff --git a/app-editors/emacs/emacs-21.3-r5.ebuild b/app-editors/emacs/emacs-21.3-r5.ebuild
deleted file mode 100644
index b71fad3eb6fa..000000000000
--- a/app-editors/emacs/emacs-21.3-r5.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r5.ebuild,v 1.4 2005/01/01 13:24:23 eradicator Exp $
-
-inherit flag-o-matic eutils alternatives toolchain-funcs
-
-DESCRIPTION="An incredibly powerful, extensible text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="21"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm hppa ~amd64 -ia64 ~s390 ~ppc64"
-IUSE="X Xaw3d gnome leim lesstif motif nls nosendmail"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/gdbm
-	X? ( virtual/x11
-		>=media-libs/libungif-4.1.0.1b
-		>=media-libs/jpeg-6b-r2
-		>=media-libs/tiff-3.5.5-r3
-		>=media-libs/libpng-1.2.1
-		!arm? (
-		Xaw3d? ( x11-libs/Xaw3d )
-		motif? (
-			lesstif? ( x11-libs/lesstif )
-			!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
-		gnome? ( gnome-base/gnome-desktop )
-		)
-	)
-	nls? ( sys-devel/gettext )
-	!nosendmail? ( virtual/mta )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-PROVIDE="virtual/emacs virtual/editor"
-SANDBOX_DISABLED="1"
-
-DFILE=emacs-${SLOT}.desktop
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-xorg.patch
-	epatch ${FILESDIR}/${P}-amd64.patch
-	epatch ${FILESDIR}/${P}-hppa.patch
-	use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch
-
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-
-	# 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
-}
-
-src_compile() {
-
-	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
-	filter-flags -fstack-protector
-
-	# gcc 3.4 with -O3 or stronger flag spoils emacs
-	if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then
-		replace-flags -O[3-9] -O2
-	fi
-
-	export WANT_AUTOCONF=2.1
-	autoconf
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	if use X ; then
-		if use motif && use lesstif; then
-			append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
-			export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
-		fi
-		myconf="${myconf}
-			--with-x
-			--with-xpm
-			--with-jpeg
-			--with-tiff
-			--with-gif
-			--with-png"
-		if use Xaw3d ; then
-			myconf="${myconf} --with-x-toolkit=athena"
-		elif use motif ; then
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			# do not build emacs with any toolkit, bug 35300
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	for i in ${D}/usr/bin/* ; do
-		mv ${i} ${i}.emacs-${SLOT} || die "mv ${i} failed"
-	done
-	mv ${D}/usr/bin/emacs{-${PV},}.emacs-${SLOT} || die "mv emacs failed"
-
-	einfo "Fixing info documentation..."
-	mkdir ${T}/emacs-${SLOT}
-	mv ${D}/usr/share/info/dir ${T}
-	for i in ${D}/usr/share/info/*
-	do
-		mv ${i} ${T}/emacs-${SLOT}/${i##*/}.info
-		gzip -9 ${T}/emacs-${SLOT}/${i##*/}.info
-	done
-	mv ${T}/emacs-${SLOT} ${D}/usr/share/info
-	mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT}
-
-	newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${SLOT}
-
-	einfo "Fixing manpages..."
-	for m in ${D}/usr/share/man/man1/* ; do
-		mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv ${m} failed"
-	done
-
-	einfo "Fixing permissions..."
-	find ${D} -perm 664 |xargs chmod 644
-	find ${D} -type d |xargs chmod 755
-
-	keepdir /usr/share/emacs/${PV}/leim
-
-	dodoc BUGS ChangeLog README
-
-	if use gnome ; then
-		insinto /usr/share/gnome/apps/Application
-		doins ${FILESDIR}/${DFILE}
-	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() {
-	update-alternatives
-	if use nosendmail ; then
-	ewarn
-	ewarn "You disabled sendmail support for Emacs. If you will install any MTA"
-	ewarn "you need to recompile Emacs after that. See bug #11104."
-	ewarn
-	fi
-}
-
-pkg_postrm() {
-	update-alternatives
-}
diff --git a/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild b/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild
index 130cdd653166..06dce1b3bf27 100644
--- a/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild
+++ b/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild,v 1.3 2005/01/01 13:24:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild,v 1.1 2005/02/26 04:20:48 usata 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-20041015"
-MULTI_TTY="emacs--multi-tty--0--patch-261.2004-10-19"
+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/11918/${INLINE}.tar.gz )
+	cjk? ( mirror://sourceforge.jp/macemacsjp/12817/${INLINE}.tar.gz )
 	multi-tty? ( http://lorentey.hu/downloads/emacs/multi-tty/${MULTI_TTY}.patch.gz )"
 
 # Never use the sandbox, it causes Emacs to segfault on startup
@@ -34,11 +34,12 @@ DEPEND=">=sys-apps/portage-2.0.51
 		!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-21.3.50*
+	!=app-editors/emacs-cvs-22.0.50*"
 
 PROVIDE="virtual/emacs virtual/editor"
 
-SLOT="21.3.50"
+SLOT="22.0.50"
 LICENSE="GPL-2"
 # should run on other arches, but the ebuild is intended for ppc-macos
 KEYWORDS="-* ~ppc-macos"
@@ -109,7 +110,7 @@ src_compile() {
 	fi
 
 	econf --enable-debug \
-		--program-suffix=-${SLOT} \
+		--program-suffix=.emacs-${SLOT} \
 		--without-carbon \
 		${myconf} || die "econf emacs failed"
 
@@ -118,7 +119,8 @@ src_compile() {
 
 src_install () {
 	einstall || die
-	rm ${D}/usr/bin/emacs-${SLOT}-${SLOT}
+	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..."
@@ -144,8 +146,7 @@ src_install () {
 		# defaults to aspell if installed
 		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
 	fi
-	newenvd ${FILESDIR}/50emacs-${SLOT}.envd 50emacs-${SLOT}
-	dosed "s:%%SLOT%%:${SLOT}:g" /etc/env.d/50emacs-${SLOT}
+	newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${SLOT}
 
 	einfo "Fixing manpages..."
 	for m in  ${D}/usr/share/man/man1/* ; do
@@ -163,7 +164,7 @@ src_install () {
 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-21.*"
+		alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/$i.emacs-*"
 	done
 }
 
diff --git a/app-editors/emacs/files/60emacs-22.0.50.envd b/app-editors/emacs/files/60emacs-22.0.50.envd
new file mode 100644
index 000000000000..dfe7c9bcada1
--- /dev/null
+++ b/app-editors/emacs/files/60emacs-22.0.50.envd
@@ -0,0 +1 @@
+INFOPATH=/usr/share/info/emacs-22.0.50
diff --git a/app-editors/emacs/files/digest-emacs-21.3-r2 b/app-editors/emacs/files/digest-emacs-21.3-r2
deleted file mode 100644
index 7aafc8e2fda1..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.3-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a0bab457cbf5b4f8eb99d1d0a3ada420 emacs-21.3.tar.gz 20399831
-MD5 1c968c37e22be0f0d8f8cd57cebe5a5e leim-21.3.tar.gz 3291224
diff --git a/app-editors/emacs/files/digest-emacs-21.3-r3 b/app-editors/emacs/files/digest-emacs-21.3-r3
deleted file mode 100644
index 7aafc8e2fda1..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.3-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a0bab457cbf5b4f8eb99d1d0a3ada420 emacs-21.3.tar.gz 20399831
-MD5 1c968c37e22be0f0d8f8cd57cebe5a5e leim-21.3.tar.gz 3291224
diff --git a/app-editors/emacs/files/digest-emacs-21.3-r5 b/app-editors/emacs/files/digest-emacs-21.3-r5
deleted file mode 100644
index 7aafc8e2fda1..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.3-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a0bab457cbf5b4f8eb99d1d0a3ada420 emacs-21.3.tar.gz 20399831
-MD5 1c968c37e22be0f0d8f8cd57cebe5a5e leim-21.3.tar.gz 3291224
diff --git a/app-editors/emacs/files/digest-emacs-21.3.50_pre20041027 b/app-editors/emacs/files/digest-emacs-21.3.50_pre20041027
deleted file mode 100644
index a9a0fb47be4f..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.3.50_pre20041027
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c11d878942c3a91052b915e7f267ab91 emacs-21.3.50-20041027.tar.gz 32678279
-MD5 5f82ee1b33a1915e917192fee5c8b59c inline_patch-20041015.tar.gz 6077
-MD5 97888226c80f142143bf108a1290c53f emacs--multi-tty--0--patch-261.2004-10-19.patch.gz 148316
diff --git a/app-editors/emacs/files/digest-emacs-22.0.50_pre20050225 b/app-editors/emacs/files/digest-emacs-22.0.50_pre20050225
new file mode 100644
index 000000000000..474713349e02
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-22.0.50_pre20050225
@@ -0,0 +1,3 @@
+MD5 be496a1379f0a99af537f02f423c0291 emacs-22.0.50-20050225.tar.gz 33383930
+MD5 ca71ae2407325987ea3eacb7665023fe inline_patch-20041229.tar.gz 7047
+MD5 9ebc373bbef7ee62e63b15dcca9570fe emacs--multi-tty--0--patch-301.2005-02-25.patch.gz 150653
diff --git a/app-editors/emacs/files/emacs-22.0.50.desktop b/app-editors/emacs/files/emacs-22.0.50.desktop
new file mode 100644
index 000000000000..9450a26f6e95
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.0.50.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=GNU Emacs 22.0.50
+Comment=Emacs is the extensible, customizable, self-documenting real-time display editor.
+Icon=gnome-emacs.png
+Terminal=0
+Type=Application
+Exec=/usr/bin/emacs-22.0.50