Index: xemacs-21.4.15-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.15-r2.ebuild,v
retrieving revision 1.4
diff -u -r1.4 xemacs-21.4.15-r2.ebuild
--- xemacs-21.4.15-r2.ebuild	5 Oct 2004 12:19:44 -0000	1.4
+++ xemacs-21.4.15-r2.ebuild	17 Oct 2004 04:45:02 -0000
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.15-r2.ebuild,v 1.4 2004/10/05 12:19:44 pvdabeel Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="highly customizable open source text editor and application development system"
 HOMEPAGE="http://www.xemacs.org/"
@@ -12,7 +12,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ppc ~sparc alpha amd64 ppc64"
-IUSE="gpm postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna  athena neXt Xaw3d berkdb"
+IUSE="gpm postgres ldap xface nas dnd X jpeg tiff png mule motif lesstif freewnn canna  athena neXt Xaw3d berkdb"
 
 # esound is know to cause problems in XEmacs
 #esd? ( media-sound/esound )
@@ -34,7 +34,8 @@
 	dnd? ( x11-libs/dnd )
 
 	X? ( virtual/x11 )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
+	motif? ( lesstif? ( x11-libs/lesstif )
+		!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
 	athena? ( virtual/x11 )
 	Xaw3d? ( x11-libs/Xaw3d )
 	neXt? ( x11-libs/neXtaw )
@@ -48,7 +49,7 @@
 DEPEND="${RDEPEND}
 	>=sys-libs/ncurses-5.2"
 PDEPEND="app-xemacs/xemacs-base
-	mule? app-xemacs/mule-base"
+	mule? ( app-xemacs/mule-base )"
 PROVIDE="virtual/xemacs virtual/editor"
 
 src_unpack() {
@@ -77,6 +78,10 @@
 		myconf="${myconf} --with-scrollbars=lucid"
 		myconf="${myconf} --with-menubars=lucid"
 		if use motif ; then
+			if use lesstif ; then
+				append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
+				export CPPFLAGS="${CPPFLAG} -I/usr/X11R6/include/lesstif"
+			fi
 			myconf="--with-widgets=motif"
 			myconf="${myconf} --with-dialogs=motif"
 			myconf="${myconf} --with-scrollbars=motif"