Some unfinished experimental XFT support; Modular X dependencies.

Package-Manager: portage-2.1_pre4-r1

9 files changed, 322 insertions, 14 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index b2ee73c21952..5f90d61e70d5 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/emacs-cvs
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.37 2005/12/18 01:21:45 ranger Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.38 2006/02/09 01:38:23 mkennedy Exp $
+
+*emacs-cvs-22.0.50-r1 (09 Feb 2006)
+
+  09 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/xft-bgalpha.patch, +files/xft-invertcursor.patch,
+  +files/xft-xfaces-fixcrash.patch, emacs-cvs-22.0.50.ebuild,
+  +emacs-cvs-22.0.50-r1.ebuild, emacs-cvs-23.0.0.ebuild:
+  Some unfinished experimental XFT support; Modular X dependencies.
 
   18 Dec 2005; Brent Baude <ranger@gentoo.org> emacs-cvs-23.0.0.ebuild:
   Marked ~ppc64 per bug 115361
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index d5f44035f88f..5e1dff2103c0 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,13 +1,64 @@
-MD5 75cc2f3b5fccd98dc400b8cec3670529 ChangeLog 5933
-MD5 1b7923e164465f8c83dab9e9096cc2eb emacs-cvs-22.0.50.ebuild 4700
-MD5 7d49571d48e340d3a3cbe70ce38411ac emacs-cvs-23.0.0.ebuild 4727
-MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 39d7571bd2730945a1fcb33995f1a41f ChangeLog 6272
+RMD160 f81a67fd5cf63fba5dc9fab7a0f3d8668a807477 ChangeLog 6272
+SHA256 22e063e659a5bb11d14e5abd8fca3e98bf899044d48cac843545295e1e6eb9bb ChangeLog 6272
+MD5 4fdc4b38b90503d3accdb0d1a309431c emacs-cvs-22.0.50-r1.ebuild 5421
+RMD160 d4913573def6fdd504558a836a72311b64f7ebc3 emacs-cvs-22.0.50-r1.ebuild 5421
+SHA256 105d2068c588dac79b83c20b4f1e4a759bb8301af0cdbdd5c56951aca5d512b7 emacs-cvs-22.0.50-r1.ebuild 5421
+MD5 781fe2cad1e2bbee7dafa54bf124bebf emacs-cvs-22.0.50.ebuild 4874
+RMD160 e69f73e2d60c8f1be7fd191f278ed48b642ec500 emacs-cvs-22.0.50.ebuild 4874
+SHA256 aee9a75fedc40ca8a5a121234e999b4126565b61afabe7c0ad088eb95a09dfcc emacs-cvs-22.0.50.ebuild 4874
+MD5 63bb16a2df85d465c00eaecbf3d69ac7 emacs-cvs-23.0.0.ebuild 4899
+RMD160 19de1b2d86d2c634745a595f2f9adeffcc9e80d4 emacs-cvs-23.0.0.ebuild 4899
+SHA256 ec967b1c001725926ba2bad9823b0155c402e63c7f4f21aff1fbe98f8fae14b1 emacs-cvs-23.0.0.ebuild 4899
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
+RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 files/40aspell-gentoo.el 80
+SHA256 b4d23344039e6d48efc893597295b3cacdad684c188a7fb2fada777e925f36b4 files/40aspell-gentoo.el 80
 MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/50emacs-22.0.50.envd 39
+RMD160 6264f1faa5b99e98251be427fd8ef60b52ca1370 files/50emacs-22.0.50.envd 39
+SHA256 5501f5818b4b88a34e93440e5fc6e2a44d2a1c83080358849b811b1d17234f43 files/50emacs-22.0.50.envd 39
 MD5 0b379e4c82898cbd3b9929d752b7bfab files/50emacs-23.0.0.envd 38
+RMD160 78ada93c0a6e3019d225eaecac89a5554d5344b9 files/50emacs-23.0.0.envd 38
+SHA256 6179b1cbc85458d3cb49605ec095aa9ddfedcbd3b68dcbad01679717d5b86b1a files/50emacs-23.0.0.envd 38
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0 0
 MD5 3a0ce8880fff1be2f5e8281633532546 files/emacs-22.0.50.desktop 242
+RMD160 dce325fa6cb9f5f97d1cfc644b0db7cc8172cabc files/emacs-22.0.50.desktop 242
+SHA256 13b1ed362039617b45a15feb3eda9ff6aef49c21be71ed3423e47e81f7497ce9 files/emacs-22.0.50.desktop 242
 MD5 5585d3da10b713e4f268c2ab75b4b2da files/emacs-23.0.0.desktop 240
+RMD160 ca1edb1c6dbb916658ee9b86130f400498f2e27e files/emacs-23.0.0.desktop 240
+SHA256 3931cd9401f587dae3bc898f39bffebe349b3597bbf7bd3199b7ec1ab01167d1 files/emacs-23.0.0.desktop 240
 MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-cvs-21.3.50-nofink.diff 1520
+RMD160 31c8fc31a4715d26e1566d87f09b947d1664b136 files/emacs-cvs-21.3.50-nofink.diff 1520
+SHA256 09f387ecc0a53f02acbe445b3e9c82cd815700c7313329e0bc5d8baa39a925a7 files/emacs-cvs-21.3.50-nofink.diff 1520
 MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
+RMD160 142e80ab7dc4620275ec9623f646e0b2c4a1c6bf files/emacs-subdirs-el-gentoo.diff 1369
+SHA256 c407b31c785b275f12337e41e58ff8386219b1c94a1c98b69eee82a10eb54074 files/emacs-subdirs-el-gentoo.diff 1369
+MD5 91da809381cbee2642bee45da75c182b files/xft-bgalpha.patch 690
+RMD160 eb4bee1226982b1b470f0b267960fd177cbc5eb1 files/xft-bgalpha.patch 690
+SHA256 51e1ee64d1fbfebec95e1863b476692c7291f44fb32a7f85e025b57c447d5f6f files/xft-bgalpha.patch 690
+MD5 3a1b3ce71cc21223bd102617c38cd23e files/xft-invertcursor.patch 1033
+RMD160 5cc8d806b0fa132d4ce54b7dd93e6309c8521ef5 files/xft-invertcursor.patch 1033
+SHA256 cbf87d20127afe9245611292577dda6daebc74bf31e6d8f2cbff138933ac2c9a files/xft-invertcursor.patch 1033
+MD5 2e8d8757cc9ed43a0ffe56c8dbcb93df files/xft-xfaces-fixcrash.patch 631
+RMD160 1e7ab9c6e776fdcf8c995330f96c234359d8ad48 files/xft-xfaces-fixcrash.patch 631
+SHA256 03643e029572a5bcbe6404d584537228c690df472426371b0585414b5d283966 files/xft-xfaces-fixcrash.patch 631
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
+SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD6p0cyiNZaEAZA+ARAtMOAJ9Xrf/U98xcH4amsI/cYtsMniVZHQCeMNgl
+9e+KwJKAUL5Iz2sUy79tEoQ=
+=gR5V
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.50-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r1.ebuild
new file mode 100644
index 000000000000..6dfb4c0a4668
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2006 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.50-r1.ebuild,v 1.1 2006/02/09 01:38:23 mkennedy Exp $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_BRANCH="HEAD"
+
+inherit elisp-common cvs alternatives flag-o-matic eutils
+
+IUSE="X Xaw3d aqua gif gtk jpeg nls png spell tiff"
+# IUSE="X Xaw3d aqua gif gtk jpeg nls png spell tiff xft"
+
+S=${WORKDIR}/emacs
+
+DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
+SRC_URI=""
+HOMEPAGE="http://www.gnu.org/software/emacs"
+
+# Never use the sandbox, it causes Emacs to segfault on startup
+SANDBOX_DISABLED="1"
+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-5.3
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
+	X? ( gif? ( >=media-libs/giflib-4.1.0.1b )
+		jpeg? ( >=media-libs/jpeg-6b )
+		tiff? ( >=media-libs/tiff-3.5.7 )
+		png? ( >=media-libs/libpng-1.2.5 )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
+	nls? ( >=sys-devel/gettext-0.11.5 )
+	sys-libs/zlib
+	>=sys-apps/portage-2.0.51_rc1"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="22.0.50"
+LICENSE="GPL-2"
+# KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc-macos"
+KEYWORDS="-*"					# until XFT support is finalized
+
+DFILE=emacs-${SLOT}.desktop
+
+# pkg_setup() {
+#	if use xft; then
+#		while read line; do ewarn "${line}"; done <<EOF
+
+# You have chosen to build Emacs using the XFT_JHD_BRANCH.	The
+# XFT_JHD_BRANCH is very early work towards supporting XFT in Emacs.
+# Emerging app-editors/emacs-cvs was risky enough, trying out the
+# XFT_JHD_BRANCH branch for XFT support even more so!
+
+# EOF
+#		ebeep
+#	fi
+# }
+
+src_unpack() {
+#	if use xft; then
+#		ECVS_BRANCH=XFT_JHD_BRANCH
+#	else
+		ECVS_BRANCH=HEAD
+#	fi
+	cvs_src_unpack
+	cd ${S};
+	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
+	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
+#	if use xft; then
+#		epatch ${FILESDIR}/xft-invertcursor.patch
+#		epatch ${FILESDIR}/xft-bgalpha.patch
+#		epatch ${FILESDIR}/xft-xfaces-fixcrash.patch
+#	fi
+}
+
+src_compile() {
+	# no flag is allowed
+	ALLOWED_FLAGS=" "
+	strip-flags
+	unset LDFLAGS
+
+	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
+	local myconf
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	if use X; then
+		myconf="${myconf} --with-x"
+		myconf="${myconf} --with-xpm --with-toolkit-scroll-bars"
+		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
+		myconf="${myconf} $(use_with gif) $(use_with png)"
+		if use gtk; then
+			einfo "Configuring to build with GTK support"
+			myconf="${myconf} --with-x-toolkit=gtk"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d support"
+			myconf="${myconf} --with-x-toolkit=athena"
+		else
+			einfo "Configuring to build with lucid toolkit support"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=lucid"
+		fi
+#		if use xft; then
+#			# this is only relevant when the source is patched for XFT
+#			# support, so it must remain within this if/then block
+#			myconf="${myconf} $(use_with xft)"
+#		fi
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	if use aqua ; then
+		einfo "Configuring to build with Carbon Emacs"
+		econf --enable-debug \
+			--enable-carbon-app=/Applications/Gentoo \
+			--without-x \
+			$(use_with jpeg) $(use_with tiff) \
+			$(use_with gif) $(use_with png) \
+			 || die "econf carbon emacs failed"
+		make bootstrap || die "make carbon emacs bootstrap failed"
+	fi
+
+	econf --enable-debug \
+		--program-suffix=.emacs-${SLOT} \
+		--without-carbon \
+		${myconf} || die "econf emacs failed"
+
+	make bootstrap || die "make emacs bootstrap failed"
+}
+
+src_install () {
+	# make DESTDIR=${D} install doesn't work
+	einstall || die "einstall 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
+			gzip -9 ${i/info/info/emacs-${SLOT}}.info
+		fi
+	done
+
+	if has_version 'app-text/aspell' ; then
+		# defaults to aspell if installed
+		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
+	fi
+	newenvd ${FILESDIR}/50emacs-${SLOT}.envd 50emacs-${SLOT}
+
+	einfo "Fixing manpages..."
+	for m in  ${D}/usr/share/man/man1/* ; do
+		mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
+	done
+
+	dodoc BUGS ChangeLog README
+
+	insinto /usr/share/applications
+	doins ${FILESDIR}/${DFILE}
+}
+
+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
+}
+
+pkg_postrm() {
+	use ppc-macos || update-alternatives
+}
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild
index 9edbd9db05cb..db947419cc3c 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.50.ebuild,v 1.9 2005/12/17 15:42:50 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild,v 1.10 2006/02/09 01:38:23 mkennedy Exp $
 
 ECVS_AUTH="pserver"
 export CVS_RSH="ssh"
@@ -25,10 +25,12 @@ HOMEPAGE="http://www.gnu.org/software/emacs"
 SANDBOX_DISABLED="1"
 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-5.3
 	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( virtual/x11
-		gif? ( >=media-libs/giflib-4.1.0.1b )
+	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
+	X? ( gif? ( >=media-libs/giflib-4.1.0.1b )
 		jpeg? ( >=media-libs/jpeg-6b )
 		tiff? ( >=media-libs/tiff-3.5.7 )
 		png? ( >=media-libs/libpng-1.2.5 )
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
index 5830ec409348..59b9b46d7704 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild,v 1.6 2005/12/18 01:21:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild,v 1.7 2006/02/09 01:38:23 mkennedy Exp $
 
 ECVS_AUTH="pserver"
 export CVS_RSH="ssh"
@@ -25,10 +25,12 @@ HOMEPAGE="http://www.gnu.org/software/emacs"
 SANDBOX_DISABLED="1"
 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-5.3
 	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( virtual/x11
-		gif? ( >=media-libs/giflib-4.1.0.1b )
+	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
+	X? ( gif? ( >=media-libs/giflib-4.1.0.1b )
 		jpeg? ( >=media-libs/jpeg-6b )
 		tiff? ( >=media-libs/tiff-3.5.7 )
 		png? ( >=media-libs/libpng-1.2.5 )
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r1
diff --git a/app-editors/emacs-cvs/files/xft-bgalpha.patch b/app-editors/emacs-cvs/files/xft-bgalpha.patch
new file mode 100644
index 000000000000..93afe4c104e5
--- /dev/null
+++ b/app-editors/emacs-cvs/files/xft-bgalpha.patch
@@ -0,0 +1,14 @@
+References:
+    http://lists.gnu.org/archive/html/emacs-pretest-bug/2005-07/msg00359.html
+    http://bugs.gentoo.org/show_bug.cgi?id=110626 Comment #3
+--- emacs/src/xfaces.c.orig	2005-12-03 20:58:39.000000000 -0800
++++ emacs/src/xfaces.c	2005-12-03 20:59:12.000000000 -0800
+@@ -5227,7 +5227,7 @@
+ 
+       XQueryColors (FRAME_X_DISPLAY (f), FRAME_X_DISPLAY_INFO (f)->cmap,
+                     colors, 2);
+-      face->xft_fg.color.alpha = face->xft_fg.color.alpha = 0xffff;
++      face->xft_fg.color.alpha = face->xft_bg.color.alpha = 0xffff;
+       face->xft_fg.color.red = colors[0].red;
+       face->xft_fg.color.green = colors[0].green;
+       face->xft_fg.color.blue = colors[0].blue;
diff --git a/app-editors/emacs-cvs/files/xft-invertcursor.patch b/app-editors/emacs-cvs/files/xft-invertcursor.patch
new file mode 100644
index 000000000000..ded4c2b30122
--- /dev/null
+++ b/app-editors/emacs-cvs/files/xft-invertcursor.patch
@@ -0,0 +1,23 @@
+References:
+    http://lists.gnu.org/archive/html/emacs-pretest-bug/2005-07/msg00359.html
+    http://bugs.gentoo.org/show_bug.cgi?id=110626 Comment #4
+--- emacs/src/xterm.c.orig	2005-12-03 21:06:24.000000000 -0800
++++ emacs/src/xterm.c	2005-12-03 21:09:32.000000000 -0800
+@@ -1360,7 +1360,7 @@
+           for (i = 0; i < s->nchars; ++i)
+             ch[i] = s->char2b[i].byte2 | (s->char2b[i].byte1 << 8);
+           XftDrawString16 (s->face->xft_draw,
+-                           &s->face->xft_fg,
++                           s->hl == DRAW_CURSOR ? &s->face->xft_bg : &s->face->xft_fg,
+                            s->face->font,
+                            x,
+                            s->ybase - boff,
+@@ -1369,7 +1369,7 @@
+         }
+       else
+         XftDrawString8 (s->face->xft_draw,
+-                        &s->face->xft_fg,
++                        s->hl == DRAW_CURSOR ? &s->face->xft_bg : &s->face->xft_fg,
+                         s->face->font,
+                         x,
+                         s->ybase - boff,
diff --git a/app-editors/emacs-cvs/files/xft-xfaces-fixcrash.patch b/app-editors/emacs-cvs/files/xft-xfaces-fixcrash.patch
new file mode 100644
index 000000000000..1e49dee2c14e
--- /dev/null
+++ b/app-editors/emacs-cvs/files/xft-xfaces-fixcrash.patch
@@ -0,0 +1,16 @@
+References:
+    http://lists.gnu.org/archive/html/emacs-pretest-bug/2005-07/msg00359.html
+    http://bugs.gentoo.org/show_bug.cgi?id=110626 Comment #2
+--- emacs/src/xfaces.c.orig	2005-12-03 20:58:39.000000000 -0800
++++ emacs/src/xfaces.c	2005-12-04 00:00:16.000000000 -0800
+@@ -7177,6 +7177,10 @@
+     {
+       bcopy (base_face, face, sizeof *face);
+       face->gc = 0;
++#ifdef HAVE_XFT
++      /* http://lists.gnu.org/archive/html/emacs-pretest-bug/2005-07/msg00359.html */
++      face->xft_draw = NULL;
++#endif
+ 
+       /* Don't try to free the colors copied bitwise from BASE_FACE.  */
+       face->colors_copied_bitwise_p = 1;