--- /var/portage/app-editors/xemacs/xemacs-21.4.12.ebuild	2003-06-29 20:50:52.000000000 +0200
+++ /var/local-portage/app-editors/xemacs/xemacs-21.4.12.ebuild	2003-07-02 08:08:15.000000000 +0200
@@ -79,26 +79,28 @@
 
 	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
+		elif [ "`use athena`" ] ; then
 			myconf="--with-widgets=athena"
 			if [ "`use Xaw3d`" ] ; then
-				myconf="${myconf} --with-athena=xaw3d"
+				myconf="${myconf} --with-athena=3d"
+				myconf="${myconf} --with-scrollbars=lucid"
 			elif [ "`use neXt`" ] ; then
 				myconf="${myconf} --with-athena=next"
+				myconf="${myconf} --with-scrollbars=athena"
 			else
-				myconf="${myconf} --with-athena=3d"
+				myconf="${myconf} --with-athena=xaw"
+				myconf="${myconf} --with-scrollbars=lucid"
 			fi
 			myconf="${myconf} --with-dialogs=athena"
+			myconf="${myconf} --with-menubars=lucid"
+		else
+			myconf="--with-widgets=lucid"
+			myconf="${myconf} --with-dialogs=lucid"
 			myconf="${myconf} --with-scrollbars=lucid"
 			myconf="${myconf} --with-menubars=lucid"
 		fi