revision bump:

more USE flags: alsa gnome
better calling of configure options
slightly modified some output
added a lot of quotes to prevent directory names with spaces from breaking the emerge process
.93-r1 does not checkout a live CVS tag, but downloads a prepared snapshot
based on the ideas of ArYiX <aryixb@gmail.com> in bug #164164
Package-Manager: portage-2.1.1-r2

6 files changed, 430 insertions, 8 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index a14e011d93af..60705b0604b4 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.66 2007/01/29 14:54:05 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.67 2007/01/30 06:18:40 opfer Exp $
+
+*emacs-cvs-22.0.9999-r1 (30 Jan 2007)
+*emacs-cvs-22.0.93-r1 (30 Jan 2007)
+
+  30 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+  +emacs-cvs-22.0.93-r1.ebuild, +emacs-cvs-22.0.9999-r1.ebuild:
+  revision bump: more USE flags: alsa gnome better calling of configure
+  options slightly modified some output added a lot of quotes to prevent
+  directory names with spaces from breaking the emerge process .93-r1 does not
+  checkout a live CVS tag, but downloads a prepared snapshot based on the
+  ideas of ArYiX <aryixb@gmail.com> in bug #164164
 
   29 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
   -emacs-cvs-22.0.91.ebuild, -emacs-cvs-22.0.92.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 0fe72dfe6b42..b0b592fd18be 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -33,14 +33,23 @@ AUX emacs.desktop.in 236 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 SHA1 0e
 MD5 97a1860f95596f13a074a96456ffeac4 files/emacs.desktop.in 236
 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 files/emacs.desktop.in 236
 SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/emacs.desktop.in 236
+DIST emacs-22.0.93.tar.gz 37118034 RMD160 c70a745662495c68470f2b483f61d68d09e8ed73 SHA1 1c226f1c03e33fef66b759e6afd6eb580adc948b SHA256 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e
 EBUILD emacs-cvs-22.0.92-r1.ebuild 5605 RMD160 a3286092a450dd9adb3ca4bde91f525db14b54d9 SHA1 a4094d2220304933903f578ebbcd3def58ba88ca SHA256 3f4bfe42626b2268a5116aa46267853e10ce1e485b37c4643705b1f880222f89
 MD5 949994306cffdef1a318c2d64c53e744 emacs-cvs-22.0.92-r1.ebuild 5605
 RMD160 a3286092a450dd9adb3ca4bde91f525db14b54d9 emacs-cvs-22.0.92-r1.ebuild 5605
 SHA256 3f4bfe42626b2268a5116aa46267853e10ce1e485b37c4643705b1f880222f89 emacs-cvs-22.0.92-r1.ebuild 5605
+EBUILD emacs-cvs-22.0.93-r1.ebuild 6069 RMD160 bfd00da5e95ff3944a5a339211b2901ed2e688e1 SHA1 8fb8088c3b18535e8e3e0df79b2380faccb58f9e SHA256 0158bf290cdd77ecd15c770bd69658ee9f762cc00415a83bb04ba32fd9884a73
+MD5 4a11f08b75497f4e5597aece8940bccf emacs-cvs-22.0.93-r1.ebuild 6069
+RMD160 bfd00da5e95ff3944a5a339211b2901ed2e688e1 emacs-cvs-22.0.93-r1.ebuild 6069
+SHA256 0158bf290cdd77ecd15c770bd69658ee9f762cc00415a83bb04ba32fd9884a73 emacs-cvs-22.0.93-r1.ebuild 6069
 EBUILD emacs-cvs-22.0.93.ebuild 5593 RMD160 0edd860587977d72228aa39762fc9a32a8d86097 SHA1 139b369d5f95bb4862819f3528413c28f28962b3 SHA256 ed97a34250589fdc14a17cc5ed9399ecbe1b94cbcd9adae6e037130e759db8f4
 MD5 4c68e3c4622262c13e1cc6c36b45aaba emacs-cvs-22.0.93.ebuild 5593
 RMD160 0edd860587977d72228aa39762fc9a32a8d86097 emacs-cvs-22.0.93.ebuild 5593
 SHA256 ed97a34250589fdc14a17cc5ed9399ecbe1b94cbcd9adae6e037130e759db8f4 emacs-cvs-22.0.93.ebuild 5593
+EBUILD emacs-cvs-22.0.9999-r1.ebuild 6182 RMD160 a3ba05f02f2f5635ec01309001fd70c3d70f1074 SHA1 efb369f35ad44ce1441b05c4e0ef7fc4e15a4bb8 SHA256 6c5323a1ee4310b3c2b430f4a656c86a39e1dde09b97af94844269446828706f
+MD5 7ff4e8da4dec634000de3af6dce13858 emacs-cvs-22.0.9999-r1.ebuild 6182
+RMD160 a3ba05f02f2f5635ec01309001fd70c3d70f1074 emacs-cvs-22.0.9999-r1.ebuild 6182
+SHA256 6c5323a1ee4310b3c2b430f4a656c86a39e1dde09b97af94844269446828706f emacs-cvs-22.0.9999-r1.ebuild 6182
 EBUILD emacs-cvs-22.0.9999.ebuild 5578 RMD160 81009f7095f655f12c1654f98f8957ea4dffd57c SHA1 fbae0173d427ad2eb2ab0bae4c1f1d543817db75 SHA256 506cbcd64e0b4dc9b20fa2041fef7a4b29a861c37e89d641722f2ed47ea7f4ec
 MD5 3882bdaa56e46e0a890aad6c5a22ec8a emacs-cvs-22.0.9999.ebuild 5578
 RMD160 81009f7095f655f12c1654f98f8957ea4dffd57c emacs-cvs-22.0.9999.ebuild 5578
@@ -49,10 +58,10 @@ EBUILD emacs-cvs-23.0.0-r1.ebuild 5904 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e2
 MD5 61bac54173aa6dc34e29d7f75935ff36 emacs-cvs-23.0.0-r1.ebuild 5904
 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e21f4764 emacs-cvs-23.0.0-r1.ebuild 5904
 SHA256 9a20533595e3949519d4e75e3857c1c729dfaf124e891253e63631ff962a8b9b emacs-cvs-23.0.0-r1.ebuild 5904
-MISC ChangeLog 11964 RMD160 38530eb990a518d61702eb32c6728d99e19cad90 SHA1 efc303d2cb20e44871c9c7f2b8fd66ac91e0b012 SHA256 1c18895e5b30868cb911da08491e388a7ec59b745a573c91b7513ea926e7b38a
-MD5 e38a57543c67e80b43da2ce95be6f902 ChangeLog 11964
-RMD160 38530eb990a518d61702eb32c6728d99e19cad90 ChangeLog 11964
-SHA256 1c18895e5b30868cb911da08491e388a7ec59b745a573c91b7513ea926e7b38a ChangeLog 11964
+MISC ChangeLog 12508 RMD160 b4a975cb6f7c1c541e521474f2eeeb82476ac2d9 SHA1 c7f7bf65889737afa99eb83a05af8218ed1926ec SHA256 c2725a6b23f98d8bd677a31dd4990eebfe5e0f9409fa99a98975db2fd2d3c155
+MD5 2b685dadda65457fa3eb5b3057f600ca ChangeLog 12508
+RMD160 b4a975cb6f7c1c541e521474f2eeeb82476ac2d9 ChangeLog 12508
+SHA256 c2725a6b23f98d8bd677a31dd4990eebfe5e0f9409fa99a98975db2fd2d3c155 ChangeLog 12508
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -63,16 +72,22 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.93 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.93 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.93 1
+MD5 6be53866d89e1729a1b8e95197a92e12 files/digest-emacs-cvs-22.0.93-r1 247
+RMD160 950a3ffa592585b775efb646394050c72c7020a7 files/digest-emacs-cvs-22.0.93-r1 247
+SHA256 96f31c2909fddc7c78c9ab53a2d31af907624424c22698aee57a8c160c9c93fa files/digest-emacs-cvs-22.0.93-r1 247
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.9999 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.9999 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.9999 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.9999-r1 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.9999-r1 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.9999-r1 1
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-23.0.0-r1 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-23.0.0-r1 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-23.0.0-r1 1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFvgqONQqtfCuFneMRAhovAJ9RUuKi1kHGjgInDiHsn7zh+azEBQCgkchk
-Wdx1cpCmS0TcamKf3NMhKMw=
-=+Qj4
+iD8DBQFFvuMkNQqtfCuFneMRAgggAKCb7pOQRCKcUeeif6KWD1NNlotJ4wCdHbuj
+K3pxXcnLD2GRnqvA1xKM3pU=
+=Siy6
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.93-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.93-r1.ebuild
new file mode 100644
index 000000000000..55577118de1b
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.93-r1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.93-r1.ebuild,v 1.1 2007/01/30 06:18:40 opfer Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit alternatives autotools elisp-common  eutils flag-o-matic
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+SRC_URI="ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+IUSE="alsa aqua gif gnome gtk gzip-el jpeg lesstif motif nls png spell  source tiff  toolkit-scroll-bars X Xaw3d "
+
+RESTRICT="$RESTRICT nostrip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-misc/xbitmaps || ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi )"
+
+DEPEND="sys-libs/ncurses
+	sys-libs/zlib
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
+	X? ( gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		tiff? ( media-libs/tiff )
+		png? ( media-libs/libpng )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
+		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		!motif? ( lesstif? ( x11-libs/lesstif ) )
+		gnome? ( gnome-base/gnome-desktop ) )
+	alsa? ( media-sound/alsa-headers )	
+	gzip-el? ( app-arch/gzip  )
+	nls? ( sys-devel/gettext )"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="22.0.93"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+S="${WORKDIR}/emacs-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff"
+	use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
+	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"
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+	eautoreconf
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	ALLOWED_FLAGS=""
+	strip-flags
+	unset LDFLAGS
+	replace-flags -O[3-9] -O2
+	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
+	local myconf
+
+	if use X; then
+		myconf="${myconf} --with-x"
+		myconf="${myconf} --with-xpm"
+		myconf="${myconf} $(use_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"
+			myconf="${myconf} --with-x-toolkit=athena"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d(athena) support"
+
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=lucid"
+		elif use motif; then
+			einfo "Configuring to build with motif toolkit support"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=motif"
+		else use lesstif;
+			einfo "Configuring to build with lesstif toolkit support"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=motif"
+		fi
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	if use aqua; then
+		einfo "Configuring to build with Carbon Emacs"
+		econf \
+			--enable-carbon-app=/Applications/Gentoo \
+			--without-x \
+			$(use_with jpeg) $(use_with tiff) \
+			$(use_with gif) $(use_with png) \
+			 || die "econf carbon emacs failed"
+	else
+		econf \
+			--program-suffix=.emacs-${SLOT} \
+			--without-carbon \
+			${myconf} || die "econf emacs failed"
+	fi
+
+	emake CC="$(tc-getCC) " bootstrap \
+		|| die "make bootstrap failed."
+}
+
+src_install () {
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	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
+		fi
+	done
+
+	if has_version 'app-text/aspell' ; then
+		# defaults to aspell if installed
+		elisp-site-file-install "${FILESDIR}/40aspell-gentoo.el"
+	fi
+	insinto /etc/env.d
+	cat >"${D}"/etc/env.d/50emacs-cvs-${SLOT} <<EOF
+INFOPATH=/usr/share/info/emacs-${SLOT}
+EOF
+	einfo "Fixing manpages..."
+	for m in  "${D}"/usr/share/man/man1/* ; do
+		mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
+	done
+
+	if use source; then
+		insinto /usr/share/emacs/${SLOT}/src
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.[ch]
+		cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+(when (substring emacs-version 0 (length "${SLOT}"))
+  (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src"))
+EOF
+		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+	fi
+
+	if ! use gzip-el; then
+		find ${D} -type f -name \*.el.gz -print0 |xargs -0 gunzip
+	fi
+	dodoc BUGS ChangeLog README
+
+	make_desktop_entry /usr/bin/emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png  editors
+}
+
+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
+	elisp-site-regen
+	if use X; then
+		elog "You need to install some fonts for Emacs.  Under monolithic"
+		elog "XFree86/Xorg you typically had such fonts installed by default."
+		elog "With modular Xorg, you will have to perform this step yourself."
+		elog "Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic"
+		elog "Emacs requirements under X11."
+	fi
+}
+
+pkg_postrm() {
+	use ppc-macos || update-alternatives
+	elisp-site-regen
+}
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r1.ebuild
new file mode 100644
index 000000000000..cd3bb48fa403
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r1.ebuild,v 1.1 2007/01/30 06:18:40 opfer Exp $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_BRANCH="HEAD"
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit alternatives autotools cvs elisp-common  eutils flag-o-matic
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+SRC_URI=""
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+IUSE="alsa aqua gif gnome gtk gzip-el jpeg lesstif motif nls png spell  source tiff  toolkit-scroll-bars X Xaw3d "
+
+RESTRICT="$RESTRICT nostrip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-misc/xbitmaps || ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi )"
+
+DEPEND="sys-libs/ncurses
+	sys-libs/zlib
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
+	X? ( gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		tiff? ( media-libs/tiff )
+		png? ( media-libs/libpng )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
+		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		!motif? ( lesstif? ( x11-libs/lesstif ) )
+		gnome? ( gnome-base/gnome-desktop ) )
+	alsa? ( media-sound/alsa-headers )	
+	gzip-el? ( app-arch/gzip  )
+	nls? ( sys-devel/gettext )"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="22.0.93"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+S="${WORKDIR}/emacs-${PV}"
+
+src_unpack() {
+	cvs_src_unpack
+	cd ${S}
+	epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff"
+	use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
+	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"
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+	eautoreconf
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	ALLOWED_FLAGS=""
+	strip-flags
+	unset LDFLAGS
+	replace-flags -O[3-9] -O2
+	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
+	local myconf
+
+	myconf="${myconf} $(use_enable mudflap multilib)"
+	if use X; then
+		myconf="${myconf} --with-x"
+		myconf="${myconf} --with-xpm"
+		myconf="${myconf} $(use_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"
+			myconf="${myconf} --with-x-toolkit=athena"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d(athena) support"
+
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=lucid"
+		elif use motif; then
+			einfo "Configuring to build with motif toolkit support"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=motif"
+		else use lesstif;
+			einfo "Configuring to build with lesstif toolkit support"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=motif"
+		fi
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	if use aqua; then
+		einfo "Configuring to build with Carbon Emacs"
+		econf \
+			--enable-carbon-app=/Applications/Gentoo \
+			--without-x \
+			$(use_with jpeg) $(use_with tiff) \
+			$(use_with gif) $(use_with png) \
+			 || die "econf carbon emacs failed"
+	else
+		econf \
+			--program-suffix=.emacs-${SLOT} \
+			--without-carbon \
+			${myconf} || die "econf emacs failed"
+	fi
+
+	emake CC="$(tc-getCC) " bootstrap \
+		|| die "make bootstrap failed."
+}
+
+src_install () {
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	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
+		fi
+	done
+
+	if has_version 'app-text/aspell' ; then
+		# defaults to aspell if installed
+		elisp-site-file-install "${FILESDIR}/40aspell-gentoo.el"
+	fi
+	insinto /etc/env.d
+	cat >"${D}"/etc/env.d/50emacs-cvs-${SLOT} <<EOF
+INFOPATH=/usr/share/info/emacs-${SLOT}
+EOF
+	einfo "Fixing manpages..."
+	for m in  "${D}"/usr/share/man/man1/* ; do
+		mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
+	done
+
+	if use source; then
+		insinto /usr/share/emacs/${SLOT}/src
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.[ch]
+		cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+(when (substring emacs-version 0 (length "${SLOT}"))
+  (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src"))
+EOF
+		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+	fi
+
+	if ! use gzip-el; then
+		find ${D} -type f -name \*.el.gz -print0 |xargs -0 gunzip
+	fi
+	dodoc BUGS ChangeLog README
+
+	make_desktop_entry /usr/bin/emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png  editors
+}
+
+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
+	elisp-site-regen
+	if use X; then
+		elog "You need to install some fonts for Emacs.  Under monolithic"
+		elog "XFree86/Xorg you typically had such fonts installed by default."
+		elog "With modular Xorg, you will have to perform this step yourself."
+		elog "Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic"
+		elog "Emacs requirements under X11."
+	fi
+}
+
+pkg_postrm() {
+	use ppc-macos || update-alternatives
+	elisp-site-regen
+}
\ No newline at end of file
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r1
new file mode 100644
index 000000000000..f366c32d3a9d
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r1
@@ -0,0 +1,3 @@
+MD5 4e768a1489e514fbb78d1a5f9c512846 emacs-22.0.93.tar.gz 37118034
+RMD160 c70a745662495c68470f2b483f61d68d09e8ed73 emacs-22.0.93.tar.gz 37118034
+SHA256 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e emacs-22.0.93.tar.gz 37118034
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r1
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r1
@@ -0,0 +1 @@
+