--- portage.py	2005-06-18 09:35:32.000000000 -0500
+++ portage.py.new	2005-06-18 09:35:09.000000000 -0500
@@ -483,7 +483,8 @@
 	  "KDEDIRS":[],"PATH":[],"CLASSPATH":[],"LDPATH":[],"MANPATH":[],
 		"INFODIR":[],"INFOPATH":[],"ROOTPATH":[],"CONFIG_PROTECT":[],
 		"CONFIG_PROTECT_MASK":[],"PRELINK_PATH":[],"PRELINK_PATH_MASK":[],
-		"PYTHONPATH":[], "ADA_INCLUDE_PATH":[], "ADA_OBJECTS_PATH":[]
+		"PYTHONPATH":[], "ADA_INCLUDE_PATH":[], "ADA_OBJECTS_PATH":[],
+		"LD_LIBRARY_MASK":[], "SEARCH_DIRS":[], "SEARCH_DIRS_MASK":[]
 	}
 	colon_separated = [
 		"ADA_INCLUDE_PATH",  "ADA_OBJECTS_PATH",
@@ -621,7 +622,7 @@
 		if len(specials[path])==0:
 			continue
 		outstring="export "+path+"='"
-		if path in ["CONFIG_PROTECT","CONFIG_PROTECT_MASK"]:
+		if path in ["CONFIG_PROTECT","CONFIG_PROTECT_MASK","LD_LIBRARY_MASK","SEARCH_DIRS","SEARCH_DIRS_MASK"]:
 			for x in specials[path][:-1]:
 				outstring += x+" "
 		else:
--- portage_const.py	2005-06-18 09:42:59.000000000 -0500
+++ portage_const.py.new	2005-06-18 09:41:22.000000000 -0500
@@ -40,7 +40,7 @@
 SANDBOX_PIDS_FILE       = "/tmp/sandboxpids.tmp"
 CONFIG_MEMORY_FILE      = PRIVATE_PATH + "/config"
 
-INCREMENTALS=["USE","FEATURES","ACCEPT_KEYWORDS","ACCEPT_LICENSE","CONFIG_PROTECT_MASK","CONFIG_PROTECT","PRELINK_PATH","PRELINK_PATH_MASK"]
+INCREMENTALS=["USE","FEATURES","ACCEPT_KEYWORDS","ACCEPT_LICENSE","CONFIG_PROTECT_MASK","CONFIG_PROTECT","PRELINK_PATH","PRELINK_PATH_MASK","LD_LIBRARY_MASK","SEARCH_DIRS","SEARCH_DIRS_MASK"]
 STICKIES=["KEYWORDS_ACCEPT","USE","CFLAGS","CXXFLAGS","MAKEOPTS","EXTRA_ECONF","EXTRA_EINSTALL","EXTRA_EMAKE"]
 
 # ===========================================================================