diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py
index 259a73dd2..37fa159ca 100644
--- a/libraries/entropyTools.py
+++ b/libraries/entropyTools.py
@@ -2069,8 +2069,8 @@ def extractPkgData(package, etpBranch = etpConst['branch'], silent = False, inje
         else:
             data['useflags'].append("-"+x)
     data['sources'] = portage_metadata['SRC_URI'].split()
-    data['dependencies'] = [x for x in portage_metadata['RDEPEND'].split()+portage_metadata['PDEPEND'].split() if not x.startswith("!")]
-    data['conflicts'] = [x for x in portage_metadata['RDEPEND'].split()+portage_metadata['PDEPEND'].split() if x.startswith("!")]
+    data['dependencies'] = [x for x in portage_metadata['RDEPEND'].split()+portage_metadata['PDEPEND'].split() if not x.startswith("!") and if not x in ("(","||",")","")]
+    data['conflicts'] = [x for x in portage_metadata['RDEPEND'].split()+portage_metadata['PDEPEND'].split() if x.startswith("!") and if not x in ("(","||",")","")]
 
     if (kernelDependentModule):
         # add kname to the dependency
diff --git a/libraries/portageTools.py b/libraries/portageTools.py
index 0085da971..bd0122ae2 100644
--- a/libraries/portageTools.py
+++ b/libraries/portageTools.py
@@ -345,6 +345,7 @@ def calculate_dependencies(my_iuse, my_use, my_license, my_depend, my_rdepend, m
     use = [f for f in use if f in iuse]
     use.sort()
     metadata['USE'] = " ".join(use)
+    # FIXME: there's some portage trunk stuff
     try:
         from portage_dep import paren_reduce, use_reduce, paren_enclose
         p_normalize = paren_normalize