--- esearch.orig	2009-03-06 14:15:12 +0100
+++ esearch	2009-03-06 14:15:48 +0100
@@ -9,6 +9,7 @@
 
 from getopt import *
 import sys
+import os
 
 sys.path.insert(0, "/usr/lib/portage/pym")
 sys.path.insert(0, "/usr/lib/esearch")
@@ -17,12 +18,16 @@
     from portage.output import bold, red, green, darkgreen, turquoise, nocolor
 except ImportError:
     from output import bold, red, green, darkgreen, turquoise, nocolor, blue
+from os import environ
 from os.path import exists
 import re
 
 from common import needdbversion
 
-esearchdbdir =  "/var/cache/edb/"
+if os.environ.get("EPREFIX") == None:
+    esearchdbdir = "/var/cache/edb/"
+else:
+    esearchdbdir =  os.environ.get("EPREFIX") + "/var/cache/edb/"    
 
 def usage():
     print "esearch (0.7.1) - Replacement for 'emerge search' with search-index"
--- eupdatedb.orig	2009-03-06 14:05:14 +0100
+++ eupdatedb	2009-03-06 14:12:10 +0100
@@ -32,7 +32,11 @@
 
 from common import needdbversion, version
 
-esearchdbdir =  "/var/cache/edb/"
+if os.environ.get("EPREFIX") == None:
+    esearchdbdir = "/var/cache/edb/"
+else:
+    esearchdbdir =  os.environ.get("EPREFIX") + "/var/cache/edb/"
+
 tmpfile =       "/tmp/esearchdb.py.tmp"
 
 vartree = portage.vartree()