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

Package-Manager: portage-2.1.2-r9

8 files changed, 55 insertions, 452 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/Manifest b/app-editors/xemacs/Manifest
index 5207a19144fe..c659cf0d8186 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX README.Gentoo 1426 RMD160 2aee174f6eaa410ac036ad316fb860be340b17a7 SHA1 0f10e8c6907e6f4c33e284ef37ffee9f6467c84c SHA256 9fa4fa31fc4deb0742dd220c8a1cf41af2bb4f4651e4f995589389afcc9f5f92
 MD5 df382940daa67bb8888fbae22d617cb4 files/README.Gentoo 1426
 RMD160 2aee174f6eaa410ac036ad316fb860be340b17a7 files/README.Gentoo 1426
@@ -37,30 +34,22 @@ EBUILD xemacs-21.4.17.ebuild 5055 RMD160 70037d0363a969817440bff94cc0c1c5877396f
 MD5 8b1f6863027886f7a8fc5accd066d487 xemacs-21.4.17.ebuild 5055
 RMD160 70037d0363a969817440bff94cc0c1c5877396f6 xemacs-21.4.17.ebuild 5055
 SHA256 2dab6dff04290d0aa17cd38648c9ca65c13a5129459c35d22b6fa95d5a789590 xemacs-21.4.17.ebuild 5055
-EBUILD xemacs-21.4.19-r1.ebuild 5603 RMD160 cccb2ccc6e0c676c56411858b73352a91d68dee1 SHA1 ea6f9866354812b39a0c2ff98884c63b9058ac8e SHA256 7fdff922820219cacd1f78b6f9342591b4257d052e8dea9819879f4704906068
-MD5 140403ad902363df2dba393619356fd0 xemacs-21.4.19-r1.ebuild 5603
-RMD160 cccb2ccc6e0c676c56411858b73352a91d68dee1 xemacs-21.4.19-r1.ebuild 5603
-SHA256 7fdff922820219cacd1f78b6f9342591b4257d052e8dea9819879f4704906068 xemacs-21.4.19-r1.ebuild 5603
 EBUILD xemacs-21.4.19-r2.ebuild 5689 RMD160 20f1b33ee6b4f7d5b53f3a23015b862634700542 SHA1 7e5f8577f66f72c98f6ad3a1a161da5d992b7ec1 SHA256 34a3310638299bb2a7ebf22fa001c2552b683f7c69ee2e2b361d08d0b2c7b4c9
 MD5 65c9c527b49fcdcb2a4bfd6a34d15ee0 xemacs-21.4.19-r2.ebuild 5689
 RMD160 20f1b33ee6b4f7d5b53f3a23015b862634700542 xemacs-21.4.19-r2.ebuild 5689
 SHA256 34a3310638299bb2a7ebf22fa001c2552b683f7c69ee2e2b361d08d0b2c7b4c9 xemacs-21.4.19-r2.ebuild 5689
-EBUILD xemacs-21.4.19.ebuild 5255 RMD160 ee7812a5ce10db0f8c24e522e84750301dab1099 SHA1 8f7acdc0032b170626d226bccd0f30380c493fb7 SHA256 6bf06bef1e7a4419e5cd7ee8c21f187df69bfa7184447d011e003eb5516e9cc8
-MD5 37b66f3a6be83ba0305333ccaa9f13b1 xemacs-21.4.19.ebuild 5255
-RMD160 ee7812a5ce10db0f8c24e522e84750301dab1099 xemacs-21.4.19.ebuild 5255
-SHA256 6bf06bef1e7a4419e5cd7ee8c21f187df69bfa7184447d011e003eb5516e9cc8 xemacs-21.4.19.ebuild 5255
 EBUILD xemacs-21.4.20-r1.ebuild 5969 RMD160 50d1c386728b64fe2f50a71dd43900278b7babfc SHA1 f64327751269e981b0284cb3075d91d3674b5446 SHA256 a7fe5f52eaa90962eb346ba56ef51f1f2ab1f816b4f5ddcc8744dafcdbcae45a
 MD5 fdd968c57346c841f10bb14d5299218e xemacs-21.4.20-r1.ebuild 5969
 RMD160 50d1c386728b64fe2f50a71dd43900278b7babfc xemacs-21.4.20-r1.ebuild 5969
 SHA256 a7fe5f52eaa90962eb346ba56ef51f1f2ab1f816b4f5ddcc8744dafcdbcae45a xemacs-21.4.20-r1.ebuild 5969
-EBUILD xemacs-21.4.20.ebuild 5686 RMD160 56739e8a7151bf793e2ae8ef67f3b39f20f081d0 SHA1 8fcd97b5b9afa6db46dcead265912a5c64a8a08a SHA256 88d4f9aa0cd2cba7a6d43dc013e5b01775fcdb51c95338f6879537969ee139a3
-MD5 fde5f0a71099884953a6ee530253caa2 xemacs-21.4.20.ebuild 5686
-RMD160 56739e8a7151bf793e2ae8ef67f3b39f20f081d0 xemacs-21.4.20.ebuild 5686
-SHA256 88d4f9aa0cd2cba7a6d43dc013e5b01775fcdb51c95338f6879537969ee139a3 xemacs-21.4.20.ebuild 5686
-MISC ChangeLog 14442 RMD160 506d8827ae2e7929d8765c3ee977cd5c1e30b833 SHA1 24abe30b27da643faa37e2cbfaed59a53768cab8 SHA256 d2f9e715334aaf38934e1c31f2885991752f2141c739c18a83c54a15a35326b0
-MD5 96676a7268d07a8624afb5e84b3bbfda ChangeLog 14442
-RMD160 506d8827ae2e7929d8765c3ee977cd5c1e30b833 ChangeLog 14442
-SHA256 d2f9e715334aaf38934e1c31f2885991752f2141c739c18a83c54a15a35326b0 ChangeLog 14442
+EBUILD xemacs-21.4.20-r2.ebuild 6382 RMD160 4c7702c2b9cdb8d493c5007ff69ca0a666781128 SHA1 bd35bd0dc0cb4cb5c7a3f568c7d47f834121beb1 SHA256 009c87f96487e5482b78775b82ee86c19ffe4ec181dbc891f90749675baf4232
+MD5 d93cd340795f6bf6bcc9c01a074ebae3 xemacs-21.4.20-r2.ebuild 6382
+RMD160 4c7702c2b9cdb8d493c5007ff69ca0a666781128 xemacs-21.4.20-r2.ebuild 6382
+SHA256 009c87f96487e5482b78775b82ee86c19ffe4ec181dbc891f90749675baf4232 xemacs-21.4.20-r2.ebuild 6382
+MISC ChangeLog 14962 RMD160 7ac9e02119e58dacdefa14ee6a98ab4f2e86460e SHA1 fe10058b9e8b258d487bbce2091c508a3a7dfa80 SHA256 d17dd1b1a57e00d2230951ec17c02375aa3a33cbfa5e2a3b5d2fe292ef4b086c
+MD5 be538e5e7ddfcb83f076cc29b4415f24 ChangeLog 14962
+RMD160 7ac9e02119e58dacdefa14ee6a98ab4f2e86460e ChangeLog 14962
+SHA256 d17dd1b1a57e00d2230951ec17c02375aa3a33cbfa5e2a3b5d2fe292ef4b086c ChangeLog 14962
 MISC metadata.xml 365 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da SHA1 a9900a09ce68ac0ae674b5913d033c7afaa85272 SHA256 cbe62b1685c4809f53fc7b8243f0662f6a57bcfe7fd49ac7138f970a3f94f6ea
 MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da metadata.xml 365
@@ -68,25 +57,12 @@ SHA256 cbe62b1685c4809f53fc7b8243f0662f6a57bcfe7fd49ac7138f970a3f94f6ea metadata
 MD5 3314f2e2f21bfed60854f2ac9cc8034b files/digest-xemacs-21.4.17 482
 RMD160 620748ad633de80ec2ee8b98f1144e6ae81a9b9c files/digest-xemacs-21.4.17 482
 SHA256 040735bf31c71d29c042ed014cc6b0ddfc42d139d7e6482ceed287fce360c2fe files/digest-xemacs-21.4.17 482
-MD5 ab3fb5219939083562a9fe2fd5c588da files/digest-xemacs-21.4.19 482
-RMD160 08b6ce96a97da0c37b941073a5414d7fa03299b6 files/digest-xemacs-21.4.19 482
-SHA256 82c5f4c35e2008e6497baacaa4d06c7b07b9b9ebeebdc12a433fd8ae1262391f files/digest-xemacs-21.4.19 482
-MD5 ab3fb5219939083562a9fe2fd5c588da files/digest-xemacs-21.4.19-r1 482
-RMD160 08b6ce96a97da0c37b941073a5414d7fa03299b6 files/digest-xemacs-21.4.19-r1 482
-SHA256 82c5f4c35e2008e6497baacaa4d06c7b07b9b9ebeebdc12a433fd8ae1262391f files/digest-xemacs-21.4.19-r1 482
 MD5 ab3fb5219939083562a9fe2fd5c588da files/digest-xemacs-21.4.19-r2 482
 RMD160 08b6ce96a97da0c37b941073a5414d7fa03299b6 files/digest-xemacs-21.4.19-r2 482
 SHA256 82c5f4c35e2008e6497baacaa4d06c7b07b9b9ebeebdc12a433fd8ae1262391f files/digest-xemacs-21.4.19-r2 482
-MD5 860ba1eea1427bc1afbbe83b973c5af8 files/digest-xemacs-21.4.20 479
-RMD160 50b7164833764e4eb89d40f125a488c7201d835e files/digest-xemacs-21.4.20 479
-SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/digest-xemacs-21.4.20 479
 MD5 860ba1eea1427bc1afbbe83b973c5af8 files/digest-xemacs-21.4.20-r1 479
 RMD160 50b7164833764e4eb89d40f125a488c7201d835e files/digest-xemacs-21.4.20-r1 479
 SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/digest-xemacs-21.4.20-r1 479
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFyPOGkT4lNIS36YERAqxtAJ4giF3ZJ7VhaZio0lqfHefyIwoXdQCgwfc+
-6LvvxJST5NQFQ/UNIdTDTH4=
-=o+XS
------END PGP SIGNATURE-----
+MD5 860ba1eea1427bc1afbbe83b973c5af8 files/digest-xemacs-21.4.20-r2 479
+RMD160 50b7164833764e4eb89d40f125a488c7201d835e files/digest-xemacs-21.4.20-r2 479
+SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/digest-xemacs-21.4.20-r2 479
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).