--- ./xemacs-21.4.19.ebuild.orig	2006-06-20 21:11:15.000000000 -0700
+++ ./xemacs-21.4.19.ebuild	2006-10-21 22:28:01.000000000 -0700
@@ -12,13 +12,14 @@
 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"
+IUSE="gpm postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna athena neXt Xaw3d berkdb gdbm"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext"
 
 DEPEND="virtual/libc
 	!virtual/xemacs
-	berkdb? ( =sys-libs/db-1* >=sys-libs/gdbm-1.8.0 )
+	berkdb? ( =sys-libs/db-4* )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/openssl-0.9.6
 	>=media-libs/audiofile-0.2.3
@@ -132,9 +133,10 @@
 
 	myconf="${myconf} --with-sound=${soundconf}"
 
-	local dbconf="gnudbm"
 	if use berkdb; then
-		myconf="${myconf} --with-database=${dbconf}"
+		myconf="${myconf} --with-database=berkdb --libs=-ldb"
+	elif use gdbm; then
+		myconf="${myconf} --with-database=gnudbm"
 	else
 		myconf="${myconf} --without-database"
 	fi