misc fixes, typoes, etc

manifests/init.pp

@@ -21,7 +21,7 @@ class gentoo {
     }
 
     concat::fragment { "makeconf_base":
-        target  => $makeconf,
+        target  => "/etc/make.conf",
         content => template("gentoo/makeconf.base.conf.erb"),
         order   => 00,
     }

manifests/keywords.pp

@@ -3,9 +3,9 @@ define gentoo::keywords ($source="", $ensure=present) {
         "gentoo_keywords_${name}":
             path    => "/etc/portage/package.keywords/${name}",
             source  => "${source}",
-            ensure  => $ensure,
-            require => File["/etc/portage/package.keywords"];
-        "/etc/portage/package.keywords":
-            ensure  => directory;
+            ensure  => $ensure;
+    #        require => File["/etc/portage/package.keywords"];
+    #    "/etc/portage/package.keywords":
+    #        ensure  => directory;
     }
 }

manifests/makeconf.pp

-define gentoo::makeconf( $source="", $content="", comment="", $order=10,
-                         ensure=present ) {
+define gentoo::makeconf( $source="", $content="", $comment="", $order=10,
+                         $ensure=present ) {
     include concat::setup
 
     if $content {
@@ -7,7 +7,8 @@ define gentoo::makeconf( $source="", $content="", comment="", $order=10,
             target  => "/etc/make.conf",
             order   => $order,
             ensure  => $ensure,
-            content => template("gentoo/make.conf.erb"),
+            content => template("gentoo/makeconf.conf.erb"),
+        }
     }
 
     if $source {
@@ -16,5 +17,6 @@ define gentoo::makeconf( $source="", $content="", comment="", $order=10,
             order   => $order,
             ensure  => $ensure,
             source  => $source,
+        }
     }
 }

manifests/postsync.pp

@@ -4,9 +4,9 @@ define gentoo::postsync ($content="", $ensure=present) {
             path    => "/etc/portage/postsync.d/${name}",
             content => template("gentoo/postsync.sh.erb"),
             mode    => 755,
-            ensure  => $ensure,
-            require => File["/etc/portage/postsync.d"];
-        "/etc/portage/postsync.d":
-            ensure  => directory;
+            ensure  => $ensure;
+        #    require => File["/etc/portage/postsync.d"];
+        #"/etc/portage/postsync.d":
+        #    ensure  => directory;
     }
 }

manifests/unmask.pp

@@ -3,9 +3,9 @@ define gentoo::unmask ($source="", $ensure=present) {
         "gentoo_unmask_${name}":
             path    => "/etc/portage/package.unmask/${name}",
             source  => "${source}",
-            ensure  => $ensure,
-            require => File["/etc/portage/package.unmask"];
-        "/etc/portage/package.unmask":
-            ensure  => directory;
+            ensure  => $ensure;
+    #        require => File["/etc/portage/package.unmask"];
+    #    "/etc/portage/package.unmask":
+    #        ensure  => directory;
     }
 }

manifests/use.pp

-define gentoo::use ($source="", $ensure=present) {
+define gentoo::use ($source='', $ensure=present) {
     file {
         "gentoo_use_${name}":
             path    => "/etc/portage/package.use/${name}",
-            source  => "${source}",
-            ensure  => $ensure,
-            require => File["/etc/portage/package.use"];
-        "/etc/portage/package.use":
-            ensure  => directory;
+            source  => $source,
+            ensure  => $ensure;
+    #        require => File["/etc/portage/package.use"];
+    #    "/etc/portage/package.use":
+    #        ensure  => directory;
     }
 }

templates/makeconf.conf.erb

-# <%=priority%><%=name%>
+# <%=order%><%=name%>
 <% if comment != ""-%>
 # <%=comment%>
 <% end-%>
-<% content %>
+<%=content%>
 

templates/postsync.sh.erb

 #!/bin/sh
-<% content %>
+<%= content %>
 :