Fixed some more small stuff

3 files changed, 13 insertions, 3 deletions

diff --git a/cli.py b/cli.py
index bab1089..500c8ae 100755
--- a/cli.py
+++ b/cli.py
@@ -59,6 +59,9 @@ gpackages = set()
 for dep in inclst[0]:
     gpackages.add(linkdeps.deptopackage(dep,[])[0])
 #print(gpackages)
+if "__cplusplus" in inclst[2]:
+    for dep in inclst[2]["__cplusplus"][0]:
+        gpackages.add(linkdeps.deptopackage(dep,[])[0])
 
 usedeps = {}
 for use in useargs:
@@ -67,10 +70,15 @@ for use in useargs:
         newpack = linkdeps.deptopackage(dep,[])[0]
         if not newpack in gpackages:
             packages.add(newpack)
+    if "__cplusplus" in useargs[use][2]:
+        for dep in useargs[use][2]["__cplusplus"][0]:
+            newpack = linkdeps.deptopackage(dep,[])[0]
+            if not newpack in gpackages:
+                packages.add(newpack)
     usedeps[use] = packages
 
 #print(usedeps)
-#print(iuse)        
+#print(iuse)
 ebuildgen.genebuild(iuse,gpackages,usedeps,dltype,args.dir,targets,binaries)
 
 if args.ginc == args.linc == args.ifdef == args.quiet == False:
diff --git a/ebuildgen.py b/ebuildgen.py
index fee6233..d25fa7c 100644
--- a/ebuildgen.py
+++ b/ebuildgen.py
@@ -123,7 +123,9 @@ def outputebuild(iuse,deps,usedeps,dltype,adress,installmethod):
                 ]
         for use in iuse:
             text += ['\t\t$(use_' + use.split("_")[0] + ' ' + use.split("_")[1] + ') \\']
-        text += ['}']
+
+        #add \n here because the ebuild will fail if there is no extra newline between '\' and '}'
+        text += ['\n}']
 
     text += [
             '',
diff --git a/linkdeps.py b/linkdeps.py
index d498a88..f9902c8 100644
--- a/linkdeps.py
+++ b/linkdeps.py
@@ -38,7 +38,7 @@ def qfiletopackage(dep,addpaths):
             n += 2
 
         if len(package) > 1:
-            print("more than one matching package where found!")
+            print("more than one matching package were found!")
 
         if not package:
             package = pfltopackage(dep,incpaths)