Index: etcat/etcat
===================================================================
--- etcat/etcat	(revision 474)
+++ etcat/etcat	(working copy)
@@ -87,11 +87,14 @@
 import getopt
 import glob
 
-# portage and gentoolkit need special path modifications
-sys.path.insert(0, "/usr/lib/portage/pym")
-sys.path.insert(0, "/usr/lib/gentoolkit/pym")
+import gentoolkit
 
-import gentoolkit
+try:
+	import portage
+except ImportError:
+	sys.path.insert(0, "/usr/lib/portage/pym")
+	import portage
+
 from stat import *
 try:
 	from portage.output import *
Index: gensync/gensync
===================================================================
--- gensync/gensync	(revision 474)
+++ gensync/gensync	(working copy)
@@ -20,8 +20,11 @@
 import os
 import fileinput
 
-sys.path.insert(0, "/usr/lib/portage/pym")
-import portage
+try:
+	import portage
+except ImportError:
+	sys.path.insert(0, "/usr/lib/portage/pym")
+	import portage
 
 try:
 	from portage.output import *