--- ../../../../app-emacs/wanderlust/wanderlust-2.14.0-r2.ebuild	2006-03-06 08:11:08.000000000 +0100
+++ wanderlust-2.14.0-r2.ebuild	2007-02-25 17:08:32.000000000 +0100
@@ -6,7 +6,7 @@
 
 MY_P="wl-${PV/_/}"
 
-IUSE="ssl"
+IUSE="bbdb ssl"
 
 DESCRIPTION="Wanderlust -- Yet Another Message Interface on Emacsen"
 HOMEPAGE="http://www.gohome.org/wl/"
@@ -21,6 +21,7 @@
 DEPEND=">=app-emacs/apel-10.6
 	virtual/flim
 	virtual/semi
+	bbdb? ( app-emacs/bbdb )
 	!app-emacs/wanderlust-cvs"
 
 S="${WORKDIR}/${MY_P}"
@@ -35,8 +36,11 @@
 	use ssl && echo "(setq wl-install-utils t)" >> WL-CFG
 	make || die
 	make info || die
-	cd utils
-	elisp-comp bbdb-wl.el
+
+	if use bbdb; then
+		cd utils
+		EMACS="emacs -L ../../elmo -L ../../wl" elisp-comp bbdb-wl.el
+	fi
 }
 
 src_install() {
@@ -45,7 +49,7 @@
 		PIXMAPDIR=${D}/usr/share/wl/icons \
 		install || die
 
-	elisp-install wl utils/bbdb-wl.{el,elc}
+	use bbdb && elisp-install wl utils/bbdb-wl.{el,elc}
 	elisp-site-file-install ${FILESDIR}/70wl-gentoo.el || die
 
 	dodir /usr/share/wl/samples