Add xim USE flag; fix #21264 for ia64; remove old versions.

(Portage version: 2.1.2-r9)

7 files changed, 44 insertions, 417 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index de915857e7bb..e83d3f8217ef 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.80 2007/02/06 21:30:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.81 2007/02/11 12:48:45 graaff Exp $
+
+*xemacs-21.4.20-r2 (11 Feb 2007)
+
+  11 Feb 2007; Hans de Graaff <graaff@gentoo.org> -xemacs-21.4.19.ebuild,
+  -xemacs-21.4.19-r1.ebuild, -xemacs-21.4.20.ebuild,
+  +xemacs-21.4.20-r2.ebuild:
+  Add xim USE flag to enable XiM input method, default to off as is not needed
+  for many people and may cause instability in some cases, thanks to Mats Lidell
+  for the suggestion. Also add a comment about hardened incompatibility #75028
+  and make sure ia64 compiles with the system malloc #21264. Remove several old
+  versions.
 
   06 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   xemacs-21.4.20-r1.ebuild:
diff --git a/app-editors/xemacs/files/digest-xemacs-21.4.19 b/app-editors/xemacs/files/digest-xemacs-21.4.19
deleted file mode 100644
index f2cd097270f6..000000000000
--- a/app-editors/xemacs/files/digest-xemacs-21.4.19
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 95c531ec2639990a09e92c59a855784e NeXT_XEmacs.tar.gz 39571
-RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 NeXT_XEmacs.tar.gz 39571
-SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 NeXT_XEmacs.tar.gz 39571
-MD5 3f753e2cc22a428c7d775339f29c7e46 xemacs-21.4.19.tar.gz 11122888
-RMD160 5e2fdd5073934efa6c42fd44cb6d9f6588754314 xemacs-21.4.19.tar.gz 11122888
-SHA256 222600b14465963dd827e2bf5a0a9a5133eabf6333e679d20f6afd5fe5bd122d xemacs-21.4.19.tar.gz 11122888
diff --git a/app-editors/xemacs/files/digest-xemacs-21.4.19-r1 b/app-editors/xemacs/files/digest-xemacs-21.4.19-r1
deleted file mode 100644
index f2cd097270f6..000000000000
--- a/app-editors/xemacs/files/digest-xemacs-21.4.19-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 95c531ec2639990a09e92c59a855784e NeXT_XEmacs.tar.gz 39571
-RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 NeXT_XEmacs.tar.gz 39571
-SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 NeXT_XEmacs.tar.gz 39571
-MD5 3f753e2cc22a428c7d775339f29c7e46 xemacs-21.4.19.tar.gz 11122888
-RMD160 5e2fdd5073934efa6c42fd44cb6d9f6588754314 xemacs-21.4.19.tar.gz 11122888
-SHA256 222600b14465963dd827e2bf5a0a9a5133eabf6333e679d20f6afd5fe5bd122d xemacs-21.4.19.tar.gz 11122888
diff --git a/app-editors/xemacs/files/digest-xemacs-21.4.20 b/app-editors/xemacs/files/digest-xemacs-21.4.20-r2
index 716056cfd79c..716056cfd79c 100644
--- a/app-editors/xemacs/files/digest-xemacs-21.4.20
+++ b/app-editors/xemacs/files/digest-xemacs-21.4.20-r2
diff --git a/app-editors/xemacs/xemacs-21.4.19-r1.ebuild b/app-editors/xemacs/xemacs-21.4.19-r1.ebuild
deleted file mode 100644
index e947b0987cc8..000000000000
--- a/app-editors/xemacs/xemacs-21.4.19-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.19-r1.ebuild,v 1.3 2006/12/09 15:52:18 graaff Exp $
-
-export WANT_AUTOCONF="2.1"
-inherit autotools eutils
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna athena neXt Xaw3d berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-DEPEND="virtual/libc
-	!virtual/xemacs
-	berkdb? ( =sys-libs/db-1* >=sys-libs/gdbm-1.8.0 )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	ldap? ( net-nds/openldap )
-	nas? ( media-libs/nas )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	athena? ( || ( ( $X_DEPEND	x11-libs/libXaw ) virtual/x11 ) )
-	Xaw3d? ( x11-libs/Xaw3d )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff )
-	png? ( =media-libs/libpng-1.2* )
-	jpeg? ( media-libs/jpeg )
-	canna? ( app-i18n/canna )
-	!amd64? ( freewnn? ( app-i18n/freewnn ) )
-	>=sys-libs/ncurses-5.2
-	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-PROVIDE="virtual/xemacs virtual/editor"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use neXt && unpack NeXT_XEmacs.tar.gz
-
-	cd "${S}"
-	epatch ${FILESDIR}/xemacs-21.4.19-texi.patch
-
-	# see bug 58350
-	epatch ${FILESDIR}/${PN}-21.4.17-gdbm.patch
-
-	# Run autoconf. XEmacs tries to be smart by providing a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_compile() {
-	local myconf=""
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		use tiff && myconf="${myconf} --with-tiff" ||
-			myconf="${myconf} --without-tiff"
-		use png && myconf="${myconf} --with-png" ||
-			myconf="${myconf} --without-png"
-		use jpeg && myconf="${myconf} --with-jpeg" ||
-			myconf="${myconf} --without-jpeg"
-		use xface && myconf="${myconf} --with-xface" ||
-			myconf="${myconf} --without-xface"
-
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-		use motif && myconf="${myconf} --with-xim=motif" ||
-			myconf="${myconf} --with-xim=xlib"
-			use canna && myconf="${myconf} --with-canna" ||
-					myconf="${myconf} --without-canna"
-		use freewnn && myconf="${myconf} --with-wnn" ||
-					myconf="${myconf} --without-wnn"
-	fi
-
-	local soundconf="native"
-
-	use nas	&& soundconf="${soundconf},nas"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	local dbconf="gnudbm"
-	if use berkdb; then
-		myconf="${myconf} --with-database=${dbconf}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	# fixes #21264
-	use alpha && myconf="${myconf} --with-system-malloc"
-
-	use ppc64 && myconf="${myconf} --with-system-malloc"
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	make prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin ; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-		dosym /usr/bin/${i}-xemacs /usr/bin/${i}
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	insinto /usr/share/pixmaps
-	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
-}
-
diff --git a/app-editors/xemacs/xemacs-21.4.19.ebuild b/app-editors/xemacs/xemacs-21.4.19.ebuild
deleted file mode 100644
index 5fd1b6c1ce99..000000000000
--- a/app-editors/xemacs/xemacs-21.4.19.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.19.ebuild,v 1.2 2006/11/26 13:39:50 graaff Exp $
-
-export WANT_AUTOCONF="2.1"
-inherit autotools eutils
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gpm postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna athena neXt Xaw3d berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-DEPEND="virtual/libc
-	!virtual/xemacs
-	berkdb? ( =sys-libs/db-1* >=sys-libs/gdbm-1.8.0 )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	ldap? ( net-nds/openldap )
-	nas? ( media-libs/nas )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	athena? ( || ( ( $X_DEPEND	x11-libs/libXaw ) virtual/x11 ) )
-	Xaw3d? ( x11-libs/Xaw3d )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff )
-	png? ( =media-libs/libpng-1.2* )
-	jpeg? ( media-libs/jpeg )
-	canna? ( app-i18n/canna )
-	!amd64? ( freewnn? ( app-i18n/freewnn ) )
-	>=sys-libs/ncurses-5.2
-	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-PROVIDE="virtual/xemacs virtual/editor"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	unpack NeXT_XEmacs.tar.gz
-
-	cd ${S}
-	epatch ${FILESDIR}/emodules.info-21.4.8-gentoo.patch
-
-	# see bug 58350
-	epatch ${FILESDIR}/${PN}-21.4.17-gdbm.patch
-
-	# Run autoconf. XEmacs tries to be smart by proivding a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_compile() {
-	local myconf=""
-
-	if use X; then
-
-		myconf="--with-widgets=lucid"
-		myconf="${myconf} --with-dialogs=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		myconf="${myconf} --with-menubars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-widgets=athena"
-			if use Xaw3d ; then
-				myconf="${myconf} --with-athena=xaw3d"
-			elif use neXt ; then
-				myconf="${myconf} --with-athena=next"
-			else
-				myconf="${myconf} --with-athena=3d"
-			fi
-			myconf="${myconf} --with-dialogs=athena"
-			myconf="${myconf} --with-scrollbars=lucid"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-
-		myconf="${myconf}
-			--with-gif=no"
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		use tiff && myconf="${myconf} --with-tiff" ||
-			myconf="${myconf} --without-tiff"
-		use png && myconf="${myconf} --with-png" ||
-			myconf="${myconf} --without-png"
-		use jpeg && myconf="${myconf} --with-jpeg" ||
-			myconf="${myconf} --without-jpeg"
-		use xface && myconf="${myconf} --with-xface" ||
-			myconf="${myconf} --without-xface"
-
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	use gpm	&& myconf="${myconf} --with-gpm" ||
-		myconf="${myconf} --without-gpm"
-	use postgres && myconf="${myconf} --with-postgresql" ||
-		myconf="${myconf} --without-postgresql"
-	use ldap && myconf="${myconf} --with-ldap" ||
-		myconf="${myconf} --without-ldap"
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-		use motif && myconf="${myconf} --with-xim=motif" ||
-			myconf="${myconf} --with-xim=xlib"
-			use canna && myconf="${myconf} --with-canna" ||
-					myconf="${myconf} --without-canna"
-		use freewnn && myconf="${myconf} --with-wnn" ||
-					myconf="${myconf} --without-wnn"
-	fi
-
-	local soundconf="native"
-
-	use nas	&& soundconf="${soundconf},nas"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	local dbconf="gnudbm"
-	if use berkdb; then
-		myconf="${myconf} --with-database=${dbconf}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	# fixes #21264
-	use alpha && myconf="${myconf} --with-system-malloc"
-
-	use ppc64 && myconf="${myconf} --with-system-malloc"
-
-	./configure ${myconf} ${EXTRA_ECONF} \
-		--prefix=/usr \
-		--with-pop \
-		--with-ncurses \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	make prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous files
-	cd ${D}/usr/share/info
-	rm -f dir info.info texinfo* termcap*
-	cd ${S}
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc ${FILESDIR}/README.Gentoo
-	rm -f ${D}/usr/share/info/emodules.info~*
-}
diff --git a/app-editors/xemacs/xemacs-21.4.20.ebuild b/app-editors/xemacs/xemacs-21.4.20-r2.ebuild
index e352aa234520..3dd39f65da61 100644
--- a/app-editors/xemacs/xemacs-21.4.20.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.20-r2.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.20.ebuild,v 1.1 2006/12/11 19:00:32 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.20-r2.ebuild,v 1.1 2007/02/11 12:48:45 graaff Exp $
+
+# Note: xemacs currently does not work with a hardened profile. If you
+# want to use xemacs on a hardened profile then compile with the
+# -nopie flag in CFLAGS or help fix bug #75028.
 
 export WANT_AUTOCONF="2.1"
 inherit autotools eutils
@@ -13,7 +17,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna athena neXt Xaw3d gdbm berkdb"
+IUSE="eolconv esd gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -27,10 +31,12 @@ DEPEND="virtual/libc
 	gpm? ( >=sys-libs/gpm-1.19.6 )
 	postgres? ( >=dev-db/postgresql-7.2 )
 	ldap? ( net-nds/openldap )
+	esd? ( media-sound/esound )
 	nas? ( media-libs/nas )
+	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
 	dnd? ( x11-libs/dnd )
 	motif? ( >=x11-libs/openmotif-2.1.30 )
-	athena? ( || ( ( $X_DEPEND	x11-libs/libXaw ) virtual/x11 ) )
+	athena? ( x11-libs/libXaw )
 	Xaw3d? ( x11-libs/Xaw3d )
 	neXt? ( x11-libs/neXtaw )
 	xface? ( media-libs/compface )
@@ -39,8 +45,7 @@ DEPEND="virtual/libc
 	jpeg? ( media-libs/jpeg )
 	canna? ( app-i18n/canna )
 	!amd64? ( freewnn? ( app-i18n/freewnn ) )
-	>=sys-libs/ncurses-5.2
-	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )"
+	>=sys-libs/ncurses-5.2"
 
 PDEPEND="app-xemacs/xemacs-base
 	mule? ( app-xemacs/mule-base )"
@@ -57,6 +62,9 @@ src_unpack() {
 	# see bug 58350, 102540 and 143580
 	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
 
+	# Fix constent crashes with the combination native sound,linux,wav
+	epatch "${FILESDIR}"/xemacs-21.4.20-linuxplay.patch
+
 	# Run autoconf. XEmacs tries to be smart by providing a stub
 	# configure.ac file for autoconf 2.59 but this throws our
 	# autotools eclass so it must be removed first.
@@ -114,17 +122,29 @@ src_compile() {
 
 	if use mule ; then
 		myconf="${myconf} --with-mule"
-		use motif && myconf="${myconf} --with-xim=motif" ||
-			myconf="${myconf} --with-xim=xlib"
-			use canna && myconf="${myconf} --with-canna" ||
+
+		if use xim ; then
+			if use motif ; then
+				myconf="${myconf} --with-xim=motif"
+			else
+				myconf="${myconf} --with-xim=xlib"
+			fi
+		else
+			myconf="${myconf} --with-xim=no"
+		fi
+
+		use canna && myconf="${myconf} --with-canna" ||
 					myconf="${myconf} --without-canna"
 		use freewnn && myconf="${myconf} --with-wnn" ||
 					myconf="${myconf} --without-wnn"
 	fi
 
+	# This determines the type of sounds we are playing
 	local soundconf="native"
 
+	# This determines how these sounds should be played
 	use nas	&& soundconf="${soundconf},nas"
+	use esd && soundconf="${soundcond},esd"
 
 	myconf="${myconf} --with-sound=${soundconf}"
 
@@ -138,10 +158,11 @@ src_compile() {
 		myconf="${myconf} --without-database"
 	fi
 
-	# fixes #21264
+	# fixes #21264, this should be fixed in 21.4.21 and has been fixed
+	# in 21.5 for sure.
 	use alpha && myconf="${myconf} --with-system-malloc"
-
 	use ppc64 && myconf="${myconf} --with-system-malloc"
+	use ia64  && myconf="${myconf} --with-system-malloc"
 
 	# Don't use econf because it uses options which this configure
 	# script does not understand (like --host).