Emacs 22.

Package-Manager: portage-2.1.2.9

7 files changed, 412 insertions, 5 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 863296d26ed8..05ca0816c5ac 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.158 2007/06/01 19:32:17 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.159 2007/06/02 12:44:33 ulm Exp $
+
+*emacs-22.1 (02 Jun 2007)
+
+  02 Jun 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-22.1-Xaw3d-headers.patch,
+  +files/emacs-22.1-disable_alsa_detection.patch,
+  +files/emacs-22.1-freebsd-sparc.patch, +emacs-22.1.ebuild:
+  Emacs 22 released. Ebuild and patchset based on emacs-cvs-22.0.990.
 
   01 Jun 2007; nixnut <nixnut@gentoo.org> emacs-21.4-r12.ebuild:
   Stable on ppc wrt bug 180100
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7a78882ffb27..04ae2440b3b3 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 60emacs-21.envd 34 RMD160 d1fdf805716cdf9bcd7744b3eb6f822c4a0d45af SHA1 b67d26aecf206d799eeee8cea2649486a3e024f9 SHA256 880372bcfead2fe980498ac54949933e46f7628c53c978affc93dcd1945a3153
 MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
 RMD160 d1fdf805716cdf9bcd7744b3eb6f822c4a0d45af files/60emacs-21.envd 34
@@ -58,6 +61,18 @@ AUX emacs-21.desktop 238 RMD160 57336e2584a671f642fa1cd5c458b33dbb1e44cc SHA1 92
 MD5 ab4757cbbda4ac6f848021b947d1f2b2 files/emacs-21.desktop 238
 RMD160 57336e2584a671f642fa1cd5c458b33dbb1e44cc files/emacs-21.desktop 238
 SHA256 3d40581e18f1f633d0f1c822b00a8d2fb2de8ea95660fe0815ac837616f6db58 files/emacs-21.desktop 238
+AUX emacs-22.1-Xaw3d-headers.patch 2045 RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 SHA1 a04c98c22ed9608ac6d81db0b9031da9a5b115db SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c
+MD5 2f28d7e33295c25205c50466d3deac65 files/emacs-22.1-Xaw3d-headers.patch 2045
+RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 files/emacs-22.1-Xaw3d-headers.patch 2045
+SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c files/emacs-22.1-Xaw3d-headers.patch 2045
+AUX emacs-22.1-disable_alsa_detection.patch 1573 RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b SHA1 bdb460012bd526d336e97cb7f6b7e9c852da5be4 SHA256 afab81ebc4ac289c6f2ff4cd93f3f10a29bed3e55d463b337ab8711f6ff8cfcc
+MD5 4d8a875faa61af1fa4d5fd31d85ad5d5 files/emacs-22.1-disable_alsa_detection.patch 1573
+RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b files/emacs-22.1-disable_alsa_detection.patch 1573
+SHA256 afab81ebc4ac289c6f2ff4cd93f3f10a29bed3e55d463b337ab8711f6ff8cfcc files/emacs-22.1-disable_alsa_detection.patch 1573
+AUX emacs-22.1-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
+MD5 33cdd958f1be433095a69bff6be18148 files/emacs-22.1-freebsd-sparc.patch 475
+RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 files/emacs-22.1-freebsd-sparc.patch 475
+SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b files/emacs-22.1-freebsd-sparc.patch 475
 AUX emacs-subdirs-el-gentoo.diff 1369 RMD160 142e80ab7dc4620275ec9623f646e0b2c4a1c6bf SHA1 8e1bf448e427efe51fcacad0f1b81cd7ea9c2ab1 SHA256 c407b31c785b275f12337e41e58ff8386219b1c94a1c98b69eee82a10eb54074
 MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
 RMD160 142e80ab7dc4620275ec9623f646e0b2c4a1c6bf files/emacs-subdirs-el-gentoo.diff 1369
@@ -66,6 +81,7 @@ DIST emacs-18-patches.tar.bz2 16526 RMD160 ab0ed5e428fd71f24f44b43945940d7d33670
 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.1.tar.gz 38172226 RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 SHA1 327664173eabe5db49d4e7e4a4b1794577af902e SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r4.ebuild 2550 RMD160 7ca1968659bccb05eadd4ae05a65fec1680dcfd3 SHA1 7115224583a1b7e459995f3c2e11d736c225d740 SHA256 c5e4a6cd90ca3b9125b6bde38f71e8095ede50ab1549f936748434e71bb51432
 MD5 8d0aa7f3f3145cfb8fe4246216c70ed5 emacs-18.59-r4.ebuild 2550
@@ -83,10 +99,14 @@ EBUILD emacs-21.4-r8.ebuild 5711 RMD160 249b044798438cf45407a262e3f751aea72a2796
 MD5 c26a6d9fbd64864d40dd82cffcde57f6 emacs-21.4-r8.ebuild 5711
 RMD160 249b044798438cf45407a262e3f751aea72a2796 emacs-21.4-r8.ebuild 5711
 SHA256 591014e674fe57645affe5ada46d06ac3ec937fb1862a7ee75e59c015a37e6bc emacs-21.4-r8.ebuild 5711
-MISC ChangeLog 23655 RMD160 72e36e647d9d01367df29aa44def61a493ecc32e SHA1 e24aa1ca3b2b4f59f057a0c74c6c5507951b30ae SHA256 b6b63c84130fbb086720835738301122b44ee11cd48e78fd25bd676323b20484
-MD5 972ceb008c1686adbe3c7d18339674eb ChangeLog 23655
-RMD160 72e36e647d9d01367df29aa44def61a493ecc32e ChangeLog 23655
-SHA256 b6b63c84130fbb086720835738301122b44ee11cd48e78fd25bd676323b20484 ChangeLog 23655
+EBUILD emacs-22.1.ebuild 7339 RMD160 79dc254fd654662095f009bb7764cc690def3bdb SHA1 481205d0259bc796400dc887ba75f82a31a4de06 SHA256 459c0751e7a81ac82aa11d5d855aa7be395cbad3b091d5724589d21be19177bf
+MD5 ac0b4ae156da260e259ee88d4c321b7e emacs-22.1.ebuild 7339
+RMD160 79dc254fd654662095f009bb7764cc690def3bdb emacs-22.1.ebuild 7339
+SHA256 459c0751e7a81ac82aa11d5d855aa7be395cbad3b091d5724589d21be19177bf emacs-22.1.ebuild 7339
+MISC ChangeLog 23949 RMD160 ade4d0db8eba1498952b7bf7f67add18c4a070a5 SHA1 1793df34191986f3a5f85151214cc9db5c4f119f SHA256 2ee5e9c9e89faaede1b37de5091de8ad60ba0e5f62ef026f5147b62f0517725e
+MD5 274a30af7f976db4816aeadbc1ebb1b5 ChangeLog 23949
+RMD160 ade4d0db8eba1498952b7bf7f67add18c4a070a5 ChangeLog 23949
+SHA256 2ee5e9c9e89faaede1b37de5091de8ad60ba0e5f62ef026f5147b62f0517725e ChangeLog 23949
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -103,3 +123,13 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di
 MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r8 473
 RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r8 473
 SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r8 473
+MD5 8c64069c07b5fdaf75a4679bad002334 files/digest-emacs-22.1 238
+RMD160 503cb2e6877f461b2adf972a8bbef02e81eb79ef files/digest-emacs-22.1 238
+SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/digest-emacs-22.1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGYWY6Oeoy/oIi7uwRAjYIAJoCKByvFweHSJ45Tiq7pFhY/ZjphQCfcPX0
+gU/d6ue1Xqeem9FslTPs8Xc=
+=H+dD
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-22.1.ebuild b/app-editors/emacs/emacs-22.1.ebuild
new file mode 100644
index 000000000000..e02dcb28b70d
--- /dev/null
+++ b/app-editors/emacs/emacs-22.1.ebuild
@@ -0,0 +1,235 @@
+# 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-22.1.ebuild,v 1.1 2007/06/02 12:44:33 ulm Exp $
+
+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"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="22"
+KEYWORDS="~x86"
+IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
+RESTRICT="strip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
+
+RDEPEND="!<app-editors/emacs-cvs-22.1
+	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? (
+					lesstif? ( x11-libs/lesstif )
+					!lesstif? ( x11-libs/openmotif )
+				)
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	gzip-el? ( app-arch/gzip )"
+
+PROVIDE="virtual/editor"
+
+# 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}"
+
+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}/${P}-Xaw3d-headers.patch"
+	epatch "${FILESDIR}/${P}-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}/${P}-disable_alsa_detection.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 alsa && ! use sound; then
+		echo
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "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"
+		elif use motif; then
+			einfo "Configuring to build with motif toolkit support"
+			myconf="${myconf} --with-x-toolkit=motif"
+			myconf="${myconf} --without-gtk"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --with-x-toolkit=no"
+			myconf="${myconf} --without-gtk"
+		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"
+
+	econf \
+		--program-suffix=-emacs-${SLOT} \
+		--infodir=/usr/share/info/emacs-${SLOT} \
+		--without-carbon \
+		${myconf} || die "econf emacs failed"
+
+	emake CC="$(tc-getCC)" || die "emake 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"
+
+	# move info documentation to the correct place
+	einfo "Fixing info documentation ..."
+	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
+		mv ${i} ${i}.info || die "mv info failed"
+	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]
+		sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<EOF
+(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+X    (setq find-function-C-source-directory
+X	  "/usr/share/emacs/${FULL_VERSION}/src"))
+EOF
+		elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
+	fi
+
+	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
+}
+
+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
+
+	if [[ "$(readlink ${ROOT}/usr/bin/emacs)" == emacs.emacs-${SLOT}* ]]; then
+		# transition from pre-eselect revision
+		eselect emacs set emacs-${SLOT}
+	else
+		eselect emacs update --if-unset
+	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."
+		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"
+	elog "the Emacs eselect module. Man and info pages are automatically"
+	elog "redirected, so you may have several installed Emacs versions at the"
+	elog "same time. \"man emacs.eselect\" for details."
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+}
diff --git a/app-editors/emacs/files/digest-emacs-22.1 b/app-editors/emacs/files/digest-emacs-22.1
new file mode 100644
index 000000000000..44943fdbcd94
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-22.1
@@ -0,0 +1,3 @@
+MD5 6949df37caec2d7a2e0eee3f1b422726 emacs-22.1.tar.gz 38172226
+RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 emacs-22.1.tar.gz 38172226
+SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0 emacs-22.1.tar.gz 38172226
diff --git a/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch b/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch
new file mode 100644
index 000000000000..0e6be8910334
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch
@@ -0,0 +1,76 @@
+*** emacs/src/xfns.c.~1.681.~	2007-03-24 11:49:48.000000000 -0400
+--- emacs/src/xfns.c	2007-04-18 01:18:52.000000000 -0400
+***************
+*** 72,79 ****
+--- 72,84 ----
+  #include <X11/Shell.h>
+  
+  #ifndef USE_MOTIF
++ #ifdef HAVE_XAW3D
++ #include <X11/Xaw3d/Paned.h>
++ #include <X11/Xaw3d/Label.h>
++ #else  /* !HAVE_XAW3D */
+  #include <X11/Xaw/Paned.h>
+  #include <X11/Xaw/Label.h>
++ #endif /* HAVE_XAW3D */
+  #endif /* USE_MOTIF */
+  
+  #ifdef USG
+*** emacs/src/xmenu.c.~1.317.~	2007-01-20 23:18:14.000000000 -0500
+--- emacs/src/xmenu.c	2007-04-18 01:15:43.000000000 -0400
+***************
+*** 82,88 ****
+--- 82,92 ----
+  #include <X11/StringDefs.h>
+  #include <X11/Shell.h>
+  #ifdef USE_LUCID
++ #ifdef HAVE_XAW3D
++ #include <X11/Xaw3d/Paned.h>
++ #else  /* !HAVE_XAW3D */
+  #include <X11/Xaw/Paned.h>
++ #endif /* HAVE_XAW3D */
+  #endif /* USE_LUCID */
+  #include "../lwlib/lwlib.h"
+  #else /* not USE_X_TOOLKIT */
+*** emacs/lwlib/lwlib.c.~1.55.~	2007-02-27 23:25:05.000000000 -0500
+--- emacs/lwlib/lwlib.c	2007-04-18 01:21:44.000000000 -0400
+***************
+*** 48,54 ****
+--- 48,58 ----
+  #endif /* not USE_MOTIF && USE_LUCID */
+  #endif
+  #if defined (USE_XAW)
++ #ifdef HAVE_XAW3D
++ #include <X11/Xaw3d/Paned.h>
++ #else  /* !HAVE_XAW3D */
+  #include <X11/Xaw/Paned.h>
++ #endif /* HAVE_XAW3D */
+  #include "lwlib-Xaw.h"
+  #endif
+  
+*** emacs/lwlib/lwlib-Xaw.c.~1.25.~	2007-02-26 22:07:08.000000000 -0500
+--- emacs/lwlib/lwlib-Xaw.c	2007-04-18 01:22:33.000000000 -0400
+***************
+*** 35,46 ****
+--- 35,55 ----
+  #include <X11/CoreP.h>
+  #include <X11/Shell.h>
+  
++ #ifdef HAVE_XAW3D
++ #include <X11/Xaw3d/Scrollbar.h>
++ #include <X11/Xaw3d/Paned.h>
++ #include <X11/Xaw3d/Dialog.h>
++ #include <X11/Xaw3d/Form.h>
++ #include <X11/Xaw3d/Command.h>
++ #include <X11/Xaw3d/Label.h>
++ #else /* !HAVE_XAW3D */
+  #include <X11/Xaw/Scrollbar.h>
+  #include <X11/Xaw/Paned.h>
+  #include <X11/Xaw/Dialog.h>
+  #include <X11/Xaw/Form.h>
+  #include <X11/Xaw/Command.h>
+  #include <X11/Xaw/Label.h>
++ #endif /* HAVE_XAW3D */
+  
+  #include <X11/Xatom.h>
+  
diff --git a/app-editors/emacs/files/emacs-22.1-disable_alsa_detection.patch b/app-editors/emacs/files/emacs-22.1-disable_alsa_detection.patch
new file mode 100644
index 000000000000..d4b630f362a8
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.1-disable_alsa_detection.patch
@@ -0,0 +1,42 @@
+--- configure.in	22 May 2007 15:54:32 -0000	1.448
++++ configure.in	30 May 2007 13:19:39 -0000
+@@ -1590,39 +1590,6 @@
+   # Emulation library used on NetBSD.
+   AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
+   AC_SUBST(LIBSOUND)
+-
+-  ALSA_REQUIRED=1.0.0
+-  ALSA_MODULES="alsa >= $ALSA_REQUIRED"
+-  dnl Check if --with-pkg-config-prog has been given.
+-  if test "X${with_pkg_config_prog}" != X; then
+-    PKG_CONFIG="${with_pkg_config_prog}"
+-  fi
+-  PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
+-  if test $HAVE_ALSA = yes; then
+-    SAVE_CFLAGS="$CFLAGS"
+-    SAVE_LDFLAGS="$LDFLAGS"
+-    CFLAGS="$ALSA_CFLAGS $CFLAGS"
+-    LDFLAGS="$ALSA_LIBS $LDFLAGS"
+-    AC_TRY_COMPILE([#include <asoundlib.h>], [snd_lib_error_set_handler (0);],
+-                    emacs_alsa_normal=yes,
+-	            emacs_alsa_normal=no)
+-    if test "$emacs_alsa_normal" != yes; then
+-      AC_TRY_COMPILE([#include <alsa/asoundlib.h>],
+-                     [snd_lib_error_set_handler (0);],
+-                     emacs_alsa_subdir=yes,
+-	             emacs_alsa_subdir=no)
+-      if test "$emacs_alsa_subdir" != yes; then
+-        AC_MSG_ERROR([pkg-config found alsa, but it does not compile.  See config.log for error messages.])
+-      fi
+-      ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
+-    fi
+-
+-    CFLAGS="$SAVE_CFLAGS"
+-    LDFLAGS="$SAVE_LDFLAGS"
+-    LIBSOUND="$LIBSOUND $ALSA_LIBS"
+-    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
+-    AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
+-  fi
+   AC_SUBST(CFLAGS_SOUND)
+ fi
+ 
diff --git a/app-editors/emacs/files/emacs-22.1-freebsd-sparc.patch b/app-editors/emacs/files/emacs-22.1-freebsd-sparc.patch
new file mode 100644
index 000000000000..d5e0793aa3de
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.1-freebsd-sparc.patch
@@ -0,0 +1,13 @@
+Index: emacs/src/alloc.c
+===================================================================
+--- emacs.orig/src/alloc.c
++++ emacs/src/alloc.c
+@@ -4522,7 +4522,7 @@ mark_stack ()
+   /* Fixme: Code in the Boehm GC suggests flushing (with `flushrs') is
+      needed on ia64 too.  See mach_dep.c, where it also says inline
+      assembler doesn't work with relevant proprietary compilers.  */
+-#ifdef sparc
++#if defined(sparc) && !defined(__FreeBSD__)
+   asm ("ta 3");
+ #endif
+