diff -ur elephant-0.2.1.orig/Makefile elephant-0.2.1/Makefile
--- elephant-0.2.1.orig/Makefile	2004-10-09 16:09:30.000000000 -0500
+++ elephant-0.2.1/Makefile	2004-10-20 00:49:58.000000000 -0500
@@ -7,7 +7,7 @@
 SHELL=/bin/sh
 UNAME:=$(shell uname -s)
 
-DB42DIR=/usr/local/BerkeleyDB.4.2
+DB42DIR=/usr/
 DBLIBDIR=$(DB42DIR)/lib/
 DBINCDIR=$(DB42DIR)/include/
 
@@ -22,5 +22,5 @@
 endif
 
 libsleepycat.so: src/libsleepycat.c
-	gcc $(SHARED) -L$(DBLIBDIR) -I$(DBINCDIR) -fPIC -O3 -o $@ $< -ldb -lm
+	gcc $(SHARED) -L$(DBLIBDIR) -I$(DBINCDIR) -fPIC $(CFLAGS) -o $@ $< -ldb-4.2 -lm
 
Only in elephant-0.2.1/doc: elephant.info
diff -ur elephant-0.2.1.orig/src/sleepycat.lisp elephant-0.2.1/src/sleepycat.lisp
--- elephant-0.2.1.orig/src/sleepycat.lisp	2004-10-09 16:09:30.000000000 -0500
+++ elephant-0.2.1/src/sleepycat.lisp	2004-10-09 17:52:55.000000000 -0500
@@ -114,43 +114,11 @@
   (proclaim '(optimize (ext:inhibit-warnings 3))))
 
 (eval-when (:compile-toplevel :load-toplevel)
-  ;; UFFI
-  ;;(asdf:operate 'asdf:load-op :uffi)
 
-  ;; DSO loading - Edit these for your system!
-
-  ;; Under linux you may need to load some kind of pthread
-  ;; library.  I can't figure out which is the right one.
-  ;; This one worked for me.  There are known issues with
-  ;; Red Hat and Berkeley DB, search google.
-  #+linux
-  (unless 
-      (uffi:load-foreign-library "/lib/tls/libpthread.so.0" :module "pthread")
-    (error "Couldn't load libpthread!"))
-
-  (unless
-      (uffi:load-foreign-library 
-       ;; Sleepycat: this works on linux
-       #+linux
-       "/usr/local/BerkeleyDB.4.2/lib/libdb.so" 
-       ;; this works on FreeBSD
-       #+(and (or bsd freebsd) (not darwin))
-       "/usr/local/lib/db42/libdb.so" 
-       #+darwin
-       "/usr/local/BerkeleyDB.4.2/lib/libdb.dylib" 
-       :module "sleepycat")
-    (error "Couldn't load libdb (Sleepycat)!"))
-
-  ;; Libsleepycat.so: edit this
-  (unless
-      (uffi:load-foreign-library 
-       (if (find-package 'asdf)
-	   (merge-pathnames 
-	    #p"libsleepycat.so"
-	    (asdf:component-pathname (asdf:find-system 'elephant)))
-	   "/usr/local/share/common-lisp/elephant-0.2/libsleepycat.so")
-       :module "libsleepycat")
-    (error "Couldn't load libsleepycat!"))
+  (unless (uffi:load-foreign-library
+	   "/usr/lib/elephant/libsleepycat.so" 
+	   :module "libsleepycat")
+    (error "Cannot load libsleepycat.so; Please file a bug at http://bugs.gentoo.org"))
 
   ;; fini on user editable part