New eselect-emacs; new Emacs revisions.

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

12 files changed, 1006 insertions, 8 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 9dca6a9..456cd61 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -3,6 +3,11 @@
 # $Header: $
 
   30 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  +emacs-cvs-22.0.96-r1.ebuild, +emacs-cvs-22.0.9999-r9.ebuild,
+  +emacs-cvs-23.0.0-r5.ebuild:
+  RDEPEND on x11-misc/emacs-desktop.
+
+  30 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
   emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
   emacs-cvs-23.0.0-r4.ebuild:
   Info rebuild moved to separate function.
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 168734b..e678316 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -11,6 +11,10 @@ MD5 33cdd958f1be433095a69bff6be18148 files/emacs-cvs-freebsd-sparc.patch 475
 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 files/emacs-cvs-freebsd-sparc.patch 475
 SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b files/emacs-cvs-freebsd-sparc.patch 475
 DIST emacs-22.0.96.tar.gz 37846686 RMD160 d980f7f8ec6c646a9b741718284b081987f9d73c SHA1 e2942bdbf693a0814fcc3b34d5ae55765d5d4ad8 SHA256 a9fa904e00e09d8b68e701edda208bd274053d26d0b50d97d6c977084e5c307d
+EBUILD emacs-cvs-22.0.96-r1.ebuild 7706 RMD160 5387f18dda92681a699c1c1f23171013b3b34f20 SHA1 339367b3e72044631aa2975109ff6c97ead40272 SHA256 4bf2628ba01647056c683479e371e2d8db7e261afc3deef33d0cfaea5a5b3356
+MD5 1e1a1ea86b398902fd01b31dd9101f8c emacs-cvs-22.0.96-r1.ebuild 7706
+RMD160 5387f18dda92681a699c1c1f23171013b3b34f20 emacs-cvs-22.0.96-r1.ebuild 7706
+SHA256 4bf2628ba01647056c683479e371e2d8db7e261afc3deef33d0cfaea5a5b3356 emacs-cvs-22.0.96-r1.ebuild 7706
 EBUILD emacs-cvs-22.0.96.ebuild 7684 RMD160 15591e699ab285477ee0b8f3d71997f1714b4194 SHA1 2ea11f5f4b6b1518eff99c260b2f58e7d62c479b SHA256 9f1455c373ee67f35c15682666e60e128c5f8de21fe27d3d61567d22526c5d00
 MD5 6d91a364dc46281cd4eea6a9df4309e5 emacs-cvs-22.0.96.ebuild 7684
 RMD160 15591e699ab285477ee0b8f3d71997f1714b4194 emacs-cvs-22.0.96.ebuild 7684
@@ -19,14 +23,22 @@ EBUILD emacs-cvs-22.0.9999-r8.ebuild 8002 RMD160 c21d854e299b31f63d2cfa5a1ba98eb
 MD5 dcf76f94a98e37d077859468ec9c6629 emacs-cvs-22.0.9999-r8.ebuild 8002
 RMD160 c21d854e299b31f63d2cfa5a1ba98ebc2ab424a0 emacs-cvs-22.0.9999-r8.ebuild 8002
 SHA256 6e4c90df4ecfede617d4f7be8ab65fb69dee07160b71e6ddc9d7a57c67e88a47 emacs-cvs-22.0.9999-r8.ebuild 8002
+EBUILD emacs-cvs-22.0.9999-r9.ebuild 8024 RMD160 f2feae88c218087a58a963935cb4d1173e083cb6 SHA1 df3b2f320a98113d81d6387f9e813458ba2f0d59 SHA256 7403e1c387954e5a74b57b37535f79bdf8b352816f0ba49597fafcdae8eafceb
+MD5 3e08ce66bbf5c843209419a52e123a7a emacs-cvs-22.0.9999-r9.ebuild 8024
+RMD160 f2feae88c218087a58a963935cb4d1173e083cb6 emacs-cvs-22.0.9999-r9.ebuild 8024
+SHA256 7403e1c387954e5a74b57b37535f79bdf8b352816f0ba49597fafcdae8eafceb emacs-cvs-22.0.9999-r9.ebuild 8024
 EBUILD emacs-cvs-23.0.0-r4.ebuild 8260 RMD160 0668f4dbd4773a2d7f908e08d9b02586d3853f9d SHA1 fa959e28a4e66bac783e18179a4664779d207bbc SHA256 8795a67d87f5256f2124ae3cdce69e6c64ed50f79587d61625afbff65357507a
 MD5 0580e5db1304b6fb136697ee33ba9faa emacs-cvs-23.0.0-r4.ebuild 8260
 RMD160 0668f4dbd4773a2d7f908e08d9b02586d3853f9d emacs-cvs-23.0.0-r4.ebuild 8260
 SHA256 8795a67d87f5256f2124ae3cdce69e6c64ed50f79587d61625afbff65357507a emacs-cvs-23.0.0-r4.ebuild 8260
-MISC ChangeLog 8410 RMD160 099bfb5300406b683bc80e9389732e36985cdc37 SHA1 62b3d7de9e4e36b73e47825a495ed3512b2ea5a5 SHA256 25c9e33f99ab5d01b2f503f58904b02ae1e69127fd2aa81c5840446b2b39ee1b
-MD5 f8c877769d6806b5bf7dab430f9b5f1d ChangeLog 8410
-RMD160 099bfb5300406b683bc80e9389732e36985cdc37 ChangeLog 8410
-SHA256 25c9e33f99ab5d01b2f503f58904b02ae1e69127fd2aa81c5840446b2b39ee1b ChangeLog 8410
+EBUILD emacs-cvs-23.0.0-r5.ebuild 8282 RMD160 ba51a8d194d691956894b95dcbe06c089bac6aa9 SHA1 1c9bc6142b155924e9a6e2835d6fdf6e3738ce99 SHA256 1f589d76040bc4396c0a48f58976871dc2e99ccd887e3356b1a68de70c763e89
+MD5 221bf426e39ac603678a76f29585ea0c emacs-cvs-23.0.0-r5.ebuild 8282
+RMD160 ba51a8d194d691956894b95dcbe06c089bac6aa9 emacs-cvs-23.0.0-r5.ebuild 8282
+SHA256 1f589d76040bc4396c0a48f58976871dc2e99ccd887e3356b1a68de70c763e89 emacs-cvs-23.0.0-r5.ebuild 8282
+MISC ChangeLog 8596 RMD160 c6ae590760833fde66458e29cabeb938499cb85f SHA1 84697753929a3eb1ad9d54f1da258421cd973371 SHA256 8da540864feaceaba5efe57ca5e4a66a097c15c655cf416081d7c495f2afa419
+MD5 dac04d4b56fbc670c734761aa01e764d ChangeLog 8596
+RMD160 c6ae590760833fde66458e29cabeb938499cb85f ChangeLog 8596
+SHA256 8da540864feaceaba5efe57ca5e4a66a097c15c655cf416081d7c495f2afa419 ChangeLog 8596
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -34,9 +46,18 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 MD5 01d52a9a1e26b99e5687f6898db299ed files/digest-emacs-cvs-22.0.96 247
 RMD160 3a36a623e9a4eeebc76ce3315de31dc60f49457e files/digest-emacs-cvs-22.0.96 247
 SHA256 1319658529d77893d7ccf241ca85d5e8c0805818f9ec7a8f92b99fff821c92c1 files/digest-emacs-cvs-22.0.96 247
+MD5 01d52a9a1e26b99e5687f6898db299ed files/digest-emacs-cvs-22.0.96-r1 247
+RMD160 3a36a623e9a4eeebc76ce3315de31dc60f49457e files/digest-emacs-cvs-22.0.96-r1 247
+SHA256 1319658529d77893d7ccf241ca85d5e8c0805818f9ec7a8f92b99fff821c92c1 files/digest-emacs-cvs-22.0.96-r1 247
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r8 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r8 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r8 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r9 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r9 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r9 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r4 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r4 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r5 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r5 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r5 0
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.96-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.96-r1.ebuild
new file mode 100644
index 0000000..c69196c
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.96-r1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+WANT_AUTOCONF="2.61"
+WANT_AUTOMAKE="latest"
+
+inherit 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 gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
+
+RESTRICT="$RESTRICT nostrip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-0.7-r1
+	sys-libs/zlib
+	hesiod? ( net-dns/hesiod )
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	alsa? ( media-sound/alsa-headers )
+	X? ( $X_DEPEND
+		x11-misc/emacs-desktop
+		gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		tiff? ( media-libs/tiff )
+		png? ( media-libs/libpng )
+		xpm? ( x11-libs/libXpm )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
+		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
+
+DEPEND="${RDEPEND}
+	gzip-el? ( app-arch/gzip )"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="22"
+# FULL_VERSION keeps the full version number, which is needed in order to
+# determine some path information correctly for copy/move operations later on
+FULL_VERSION="${PV}"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+S="${WORKDIR}/emacs-${PV}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	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"
+	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 "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
+	fi
+
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+	# ALSA is detected and used even if not requested by the USE=alsa flag.	So remove the
+	# automagic check
+	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch"
+	use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
+
+	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 alsa && ! use sound; then
+		echo
+		einfo "Although sound USE flag is disabled you chose to have alsa, so sound is switched on anyway."
+		echo
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} $(use_with sound)"
+	fi
+
+	if use X; then
+		# GTK+ is the default toolkit if USE=gtk is chosen with other possibilities.
+		# Emacs upstream thinks this should be standard policy on all
+		# distributions
+		myconf="${myconf} --with-x"
+		myconf="${myconf} $(use_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
+			echo
+			einfo "Configuring to build with GTK support, disabling all other toolkits"
+			echo
+			myconf="${myconf} --with-x-toolkit=gtk"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d(athena) support"
+			myconf="${myconf} --with-x-toolkit=athena"
+			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"
+		elif use lesstif; then
+			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
+
+	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks the build
+	# system (has been reported upstream)
+	use hesiod && myconf="${myconf} --with-hesiod"
+
+	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) $(use_with sound) \
+			 || 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-${FULL_VERSION}-emacs-${SLOT} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
+		|| die "moving Emacs executable failed"
+
+	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
+
+	# move info documentation to the correct place
+	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
+
+	# move man pages to the correct place
+	einfo "Fixing manpages..."
+	for m in "${D}"/usr/share/man/man1/* ; do
+		mv ${m} ${m/.1/-emacs-${SLOT}.1} || die "mv man failed"
+	done
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
+	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
+	keepdir /var/lib/games/emacs/
+
+	if use source; then
+		insinto /usr/share/emacs/${FULL_VERSION}/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
+(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	(setq find-function-C-source-directory
+	  "/usr/share/emacs/${FULL_VERSION}/src"))
+EOF
+		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+	fi
+
+	dodoc BUGS ChangeLog README
+}
+
+emacs-infodir-rebuild() {
+	# Depending on the Portage version, the Info dir file is compressed
+	# or removed. It is only rebuilt by Portage if our directory is in
+	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
+
+	local infodir=/usr/share/info/emacs-${SLOT} f
+	einfo "Regenerating Info directory index in ${infodir} ..."
+	rm -f ${ROOT}${infodir}/dir{,.*}
+	for f in ${ROOT}${infodir}/*.info*; do
+		[[ ${f##*/} == *[0-9].info* ]] \
+			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
+	done
+	echo
+}
+
+pkg_postinst() {
+	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+
+	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 on the X server's"
+		elog "machine would satisfy basic Emacs requirements under X11."
+	fi
+
+	echo
+	elog "You can set the version to be started by /usr/bin/emacs through the Emacs eselect module"
+	elog "Man and info pages are automatically redirected, so you are to test emacs-cvs along with the"
+	elog "stable release"
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+}
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r9.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r9.ebuild
new file mode 100644
index 0000000..70029d5
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r9.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_BRANCH="HEAD"
+ECVS_LOCALNAME="emacs-22"
+
+WANT_AUTOCONF="2.61"
+WANT_AUTOMAKE="latest"
+
+inherit 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 gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
+
+RESTRICT="${RESTRICT} nostrip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-0.7-r1
+	sys-libs/zlib
+	hesiod? ( net-dns/hesiod )
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	alsa? ( media-sound/alsa-headers )
+	X? ( $X_DEPEND
+		x11-misc/emacs-desktop
+		gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		tiff? ( media-libs/tiff )
+		png? ( media-libs/libpng )
+		xpm? ( x11-libs/libXpm )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
+		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
+
+DEPEND="${RDEPEND}
+	gzip-el? ( app-arch/gzip )"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="22"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+S="${WORKDIR}/${ECVS_LOCALNAME}"
+
+src_unpack() {
+	cvs_src_unpack
+
+	cd "${S}"
+	# FULL_VERSION keeps the full version number, which is needed in order to
+	# determine some path information correctly for copy/move operations later on
+	FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
+		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
+	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
+	echo
+	einfo "Emacs version number is ${FULL_VERSION}"
+	echo
+
+	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"
+	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 "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
+	fi
+
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+	# ALSA is detected and used even if not requested by the USE=alsa flag.	So remove the
+	# automagic check
+	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch"
+	use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
+
+	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 alsa && ! use sound; then
+		echo
+		einfo "Although sound USE flag is disabled you chose to have alsa, so sound is switched on anyway."
+		echo
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} $(use_with sound)"
+	fi
+
+	if use X; then
+		# GTK+ is the default toolkit if USE=gtk is chosen with other possibilities.
+		# Emacs upstream thinks this should be standard policy on all
+		# distributions
+		myconf="${myconf} --with-x"
+		myconf="${myconf} $(use_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
+			echo
+			einfo "Configuring to build with GTK support, disabling all other toolkits"
+			echo
+			myconf="${myconf} --with-x-toolkit=gtk"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d(athena) support"
+			myconf="${myconf} --with-x-toolkit=athena"
+			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"
+		elif use lesstif; then
+			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
+
+	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks the build
+	# system (has been reported upstream)
+	use hesiod && myconf="${myconf} --with-hesiod"
+
+	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) $(use_with sound) \
+			 || 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-${FULL_VERSION}-emacs-${SLOT} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
+		|| die "moving Emacs executable failed"
+
+	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
+
+	# move info documentation to the correct place
+	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
+
+	# move man pages to the correct place
+	einfo "Fixing manpages..."
+	for m in "${D}"/usr/share/man/man1/* ; do
+		mv ${m} ${m/.1/-emacs-${SLOT}.1} || die "mv man failed"
+	done
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
+	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
+	keepdir /var/lib/games/emacs/
+
+	if use source; then
+		insinto /usr/share/emacs/${FULL_VERSION}/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
+(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	(setq find-function-C-source-directory
+	  "/usr/share/emacs/${FULL_VERSION}/src"))
+EOF
+		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+	fi
+
+	dodoc BUGS ChangeLog README
+}
+
+emacs-infodir-rebuild() {
+	# Depending on the Portage version, the Info dir file is compressed
+	# or removed. It is only rebuilt by Portage if our directory is in
+	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
+
+	local infodir=/usr/share/info/emacs-${SLOT} f
+	einfo "Regenerating Info directory index in ${infodir} ..."
+	rm -f ${ROOT}${infodir}/dir{,.*}
+	for f in ${ROOT}${infodir}/*.info*; do
+		[[ ${f##*/} == *[0-9].info* ]] \
+			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
+	done
+	echo
+}
+
+pkg_postinst() {
+	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+
+	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 on the X server's"
+		elog "machine would satisfy basic Emacs requirements under X11."
+	fi
+
+	echo
+	elog "You can set the version to be started by /usr/bin/emacs through the Emacs eselect module"
+	elog "Man and info pages are automatically redirected, so you are to test emacs-cvs along with the"
+	elog "stable release"
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+}
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r5.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r5.ebuild
new file mode 100644
index 0000000..095ff0d
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r5.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_LOCALNAME="emacs-unicode"
+ECVS_BRANCH="emacs-unicode-2"
+
+WANT_AUTOCONF="2.61"
+WANT_AUTOMAKE="latest"
+
+inherit 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 gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xft xpm"
+
+RESTRICT="$RESTRICT nostrip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-0.7-r1
+	sys-libs/zlib
+	hesiod? ( net-dns/hesiod )
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	alsa? ( media-sound/alsa-headers )
+	X? ( $X_DEPEND
+		x11-misc/emacs-desktop
+		gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		tiff? ( media-libs/tiff )
+		png? ( media-libs/libpng )
+		xpm? ( x11-libs/libXpm )
+		xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
+		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
+
+DEPEND="${RDEPEND}
+	gzip-el? ( app-arch/gzip )"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="23"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+S="${WORKDIR}/${ECVS_LOCALNAME}"
+
+src_unpack() {
+	cvs_src_unpack
+
+	cd "${S}"
+	# FULL_VERSION keeps the full version number, which is needed in order to
+	# determine some path information correctly for copy/move operations later on
+	FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
+		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
+	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
+	echo
+	einfo "Emacs version number is ${FULL_VERSION}"
+	echo
+
+	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"
+	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 "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
+	fi
+
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+	# ALSA is detected and used even if not requested by the USE=alsa flag.	So remove the
+	# automagic check
+	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch"
+	use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
+
+	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 alsa && ! use sound; then
+		echo
+		einfo "Although sound USE flag is disabled you chose to have alsa, so sound is switched on anyway."
+		echo
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} $(use_with sound)"
+	fi
+
+	if use X; then
+		# GTK+ is the default toolkit if USE=gtk is chosen with other possibilities.
+		# Emacs upstream thinks this should be standard policy on all
+		# distributions
+		myconf="${myconf} --with-x"
+		myconf="${myconf} $(use_with xpm)"
+		myconf="${myconf} $(use_with toolkit-scroll-bars)"
+		myconf="${myconf} $(use_enable xft font-backend)"
+		myconf="${myconf} $(use_with xft freetype)"
+		myconf="${myconf} $(use_with xft)"
+		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
+		myconf="${myconf} $(use_with gif) $(use_with png)"
+		if use gtk; then
+			echo
+			einfo "Configuring to build with GTK support, disabling all other toolkits"
+			echo
+			myconf="${myconf} --with-x-toolkit=gtk"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d(athena) support"
+			myconf="${myconf} --with-x-toolkit=athena"
+			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"
+		elif use lesstif; then
+			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
+
+	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks the build
+	# system (has been reported upstream)
+	use hesiod && myconf="${myconf} --with-hesiod"
+
+	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_enable xft font-backend) \
+			$(use_with gif) $(use_with png) $(use_with sound) \
+			 || 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-${FULL_VERSION}-emacs-${SLOT} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
+		|| die "moving Emacs executable failed"
+
+	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
+
+	# move info documentation to the correct place
+	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
+
+	# move man pages to the correct place
+	einfo "Fixing manpages..."
+	for m in "${D}"/usr/share/man/man1/* ; do
+		mv ${m} ${m/.1/-emacs-${SLOT}.1} || die "mv man failed"
+	done
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
+	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
+	keepdir /var/lib/games/emacs/
+
+	if use source; then
+		insinto /usr/share/emacs/${FULL_VERSION}/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
+(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	(setq find-function-C-source-directory
+	  "/usr/share/emacs/${FULL_VERSION}/src"))
+EOF
+		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+	fi
+
+	dodoc BUGS ChangeLog README
+}
+
+emacs-infodir-rebuild() {
+	# Depending on the Portage version, the Info dir file is compressed
+	# or removed. It is only rebuilt by Portage if our directory is in
+	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
+
+	local infodir=/usr/share/info/emacs-${SLOT} f
+	einfo "Regenerating Info directory index in ${infodir} ..."
+	rm -f ${ROOT}${infodir}/dir{,.*}
+	for f in ${ROOT}${infodir}/*.info*; do
+		[[ ${f##*/} == *[0-9].info* ]] \
+			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
+	done
+	echo
+}
+
+pkg_postinst() {
+	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+
+	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 on the X server's"
+		elog "machine would satisfy basic Emacs requirements under X11."
+	fi
+
+	echo
+	elog "You can set the version to be started by /usr/bin/emacs through the Emacs eselect module"
+	elog "Man and info pages are automatically redirected, so you are to test emacs-cvs along with the"
+	elog "stable release"
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.96-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.96-r1
new file mode 100644
index 0000000..4797c8c
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.96-r1
@@ -0,0 +1,3 @@
+MD5 09fabcb5becb050acf1c88639330dac6 emacs-22.0.96.tar.gz 37846686
+RMD160 d980f7f8ec6c646a9b741718284b081987f9d73c emacs-22.0.96.tar.gz 37846686
+SHA256 a9fa904e00e09d8b68e701edda208bd274053d26d0b50d97d6c977084e5c307d emacs-22.0.96.tar.gz 37846686
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r9 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r9
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r9
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r5 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r5
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r5
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 8b57a73..f7c984b 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de> +emacs-21.4-r11.ebuild:
+  RDEPEND on x11-misc/emacs-desktop.
+
   30 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de> emacs-21.4-r10.ebuild:
   Info rebuild moved to separate function.
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 5ffdf6c..b281add 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -47,10 +47,14 @@ EBUILD emacs-21.4-r10.ebuild 5460 RMD160 3918acc7d4517cd9fcc14fd331951f7edd3e527
 MD5 61b1c53c85750622a9068aa3b0b4f4c1 emacs-21.4-r10.ebuild 5460
 RMD160 3918acc7d4517cd9fcc14fd331951f7edd3e527e emacs-21.4-r10.ebuild 5460
 SHA256 81edf10ed0d4e04ac086aa9808cd2f63cb7725468a11b7fc693f47b54351a1ed emacs-21.4-r10.ebuild 5460
-MISC ChangeLog 2508 RMD160 71cba626b8f195f27e24d4c83e1b1bcbc3860f8d SHA1 31b46d740a52977062cb2fe9ddafae6fc1a588be SHA256 a63b099d2d65ecf0f0bf1ae5aa8a21a43c28761d4fa2885d78966ee0e14c3263
-MD5 2acaaedeec31f1b3ceb9f665f5b21326 ChangeLog 2508
-RMD160 71cba626b8f195f27e24d4c83e1b1bcbc3860f8d ChangeLog 2508
-SHA256 a63b099d2d65ecf0f0bf1ae5aa8a21a43c28761d4fa2885d78966ee0e14c3263 ChangeLog 2508
+EBUILD emacs-21.4-r11.ebuild 5489 RMD160 12c88875eadf9cb65fe090e7edb69f0e7e03f529 SHA1 7c8df4b0960674865dc2176f103c19ddf3c46ee3 SHA256 1de5d3f9fcda8c93c646f1b14c61166793b775dbff8e354046329c79dfe83485
+MD5 1a900971cb87f2cd728fc35fa93fea9d emacs-21.4-r11.ebuild 5489
+RMD160 12c88875eadf9cb65fe090e7edb69f0e7e03f529 emacs-21.4-r11.ebuild 5489
+SHA256 1de5d3f9fcda8c93c646f1b14c61166793b775dbff8e354046329c79dfe83485 emacs-21.4-r11.ebuild 5489
+MISC ChangeLog 2623 RMD160 39368af3540f1befee0f669e1c39b58f851a6089 SHA1 ef3e633b4144348e5477d61f581c228f44f27461 SHA256 2bd8a3177e388e70f2b810fa82563294b8213fc4c503b0e5c17304ed59c24566
+MD5 6462c8babb21cceb0ed18ebbf03ac41e ChangeLog 2623
+RMD160 39368af3540f1befee0f669e1c39b58f851a6089 ChangeLog 2623
+SHA256 2bd8a3177e388e70f2b810fa82563294b8213fc4c503b0e5c17304ed59c24566 ChangeLog 2623
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -61,3 +65,6 @@ SHA256 a5d7f43b69d68028793ee45424a1fce37e65dd63802310ebfda5ca85a62e9ba7 files/di
 MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r10 473
 RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r10 473
 SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r10 473
+MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r11 473
+RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r11 473
+SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r11 473
diff --git a/app-editors/emacs/emacs-21.4-r11.ebuild b/app-editors/emacs/emacs-21.4-r11.ebuild
new file mode 100644
index 0000000..92162eb
--- /dev/null
+++ b/app-editors/emacs/emacs-21.4-r11.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic eutils toolchain-funcs autotools
+
+DESCRIPTION="An incredibly powerful, extensible text editor"
+HOMEPAGE="http://www.gnu.org/software/emacs"
+SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
+	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="21"
+KEYWORDS="~x86"
+IUSE="X Xaw3d leim lesstif motif nls nosendmail"
+
+RDEPEND="sys-libs/ncurses
+	X? ( x11-libs/libXext
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXmu
+			x11-libs/libXpm
+			x11-misc/emacs-desktop
+			>=media-libs/giflib-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 )
+				!Xaw3d? ( x11-libs/libXaw )
+				motif? (
+					lesstif? ( x11-libs/lesstif )
+				!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
+			)
+	)
+	nls? ( sys-devel/gettext )
+	!nosendmail? ( virtual/mta )
+	>=app-admin/eselect-emacs-0.7-r1"
+
+DEPEND="${RDEPEND}
+	X? ( x11-misc/xbitmaps )"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/emacs-21.3-xorg.patch"
+	epatch "${FILESDIR}/emacs-21.3-amd64.patch"
+	epatch "${FILESDIR}/emacs-21.3-hppa.patch"
+	epatch "${FILESDIR}/emacs-21.2-sh.patch"
+	epatch "${FILESDIR}/emacs-21.4-libungif-gif-gentoo.patch"
+
+	use ppc64 && epatch "${FILESDIR}/emacs-21.3-ppc64.patch"
+
+	epatch "${FILESDIR}/emacs-21.4-autosave-tmp.patch"
+	epatch "${FILESDIR}/emacs-21.4-blessmail-build.patch"
+	epatch "${FILESDIR}/emacs-21.4-qa.patch"
+
+	# install emacsclient.1 man page (#165466)
+	sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die
+
+	# 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" || die
+}
+
+src_compile() {
+	export SANDBOX_ON=0
+
+	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
+	filter-flags -fstack-protector
+
+	# emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002)
+	unset LDFLAGS
+
+	# 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=*"
+
+	eautoconf
+
+	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 CC="$(tc-getCC)" || die
+
+	einfo "Recompiling patched lisp files..."
+	(cd lisp; emake recompile) || die
+	emake CC="$(tc-getCC)" || 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{-emacs,}-${SLOT} || die "mv emacs failed"
+	rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
+
+	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
+	done
+	mv "${T}/emacs-${SLOT}" "${D}/usr/share/info"
+	mv "${T}/dir" "${D}/usr/share/info/emacs-${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
+
+	# avoid collision between slots
+	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
+
+	einfo "Fixing permissions..."
+	find "${D}" -perm 664 |xargs chmod -f 644 2>/dev/null
+	find "${D}" -type d |xargs chmod -f 755 2>/dev/null
+
+	keepdir /usr/share/emacs/${PV}/leim
+	keepdir /usr/share/emacs/site-lisp
+
+	dodoc BUGS ChangeLog README
+}
+
+emacs-infodir-rebuild() {
+	# Depending on the Portage version, the Info dir file is compressed
+	# or removed. It is only rebuilt by Portage if our directory is in
+	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
+
+	local infodir=/usr/share/info/emacs-${SLOT} f
+	einfo "Regenerating Info directory index in ${infodir} ..."
+	rm -f ${ROOT}${infodir}/dir{,.*}
+	for f in ${ROOT}${infodir}/*.info*; do
+		[[ ${f##*/} == *[0-9].info* ]] \
+			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
+	done
+	echo
+}
+
+pkg_postinst() {
+	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+		cp ${ROOT}/usr/share/emacs{/${PV},}/site-lisp/subdirs.el
+
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+
+	if use nosendmail; then
+		elog "You disabled sendmail support for Emacs. If you later install a MTA"
+		elog "then you will need to recompile Emacs.	See Bug #11104."
+	fi
+	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. With"
+		elog "modular Xorg, you will have to perform this step yourself on the machine"
+		elog  "your X server is running."
+		echo
+		elog "Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic"
+		elog "Emacs requirements under X11."
+	fi
+}
+
+pkg_postrm() {
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+}
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r11 b/app-editors/emacs/files/digest-emacs-21.4-r11
new file mode 100644
index 0000000..6898ecf
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-21.4-r11
@@ -0,0 +1,6 @@
+MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483
+RMD160 c312e739935b56d08783bbfe97992297a363cb8a emacs-21.4a.tar.gz 20403483
+SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 emacs-21.4a.tar.gz 20403483
+MD5 32938cb5a7505d995a1e835639d19707 leim-21.4.tar.gz 3291433
+RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca leim-21.4.tar.gz 3291433
+SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b leim-21.4.tar.gz 3291433