gentoo: re-enable & fix directory requires

* Move all the directory requires outside of defines
* Require $source/$content in some cases

manifests/init.pp

@@ -18,6 +18,19 @@ class gentoo {
         require => Concat["/etc/make.conf"],
     }
 
+    file {
+        "/etc/portage/package.keywords":
+            ensure  => directory;
+        "/etc/portage/package.mask":
+            ensure  => directory;
+        "/etc/portage/package.unmask":
+            ensure  => directory;
+        "/etc/portage/package.use":
+            ensure  => directory;
+        "/etc/portage/postsync.d":
+            ensure  => directory;
+    }
+
     # make.conf
     concat { "/etc/make.conf":
         owner => root,

manifests/keywords.pp

-define gentoo::keywords ($source="", $ensure=present) {
+define gentoo::keywords ($source, $ensure=present) {
     file {
         "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"],
     }
 }

manifests/mask.pp

@@ -4,8 +4,6 @@ define gentoo::mask ($source="", $ensure=present) {
             path    => "/etc/portage/package.mask/${name}",
             source  => "${source}",
             ensure  => $ensure,
-            require => File["/etc/portage/package.mask"];
-        "/etc/portage/package.mask":
-            ensure  => directory;
+            require => File["/etc/portage/package.mask"],
     }
 }

manifests/postsync.pp

-define gentoo::postsync ($content="", $ensure=present) {
+define gentoo::postsync ($content, $ensure=present) {
     file {
         "gentoo_postsync_${name}":
             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"],
     }
 }

manifests/unmask.pp

-define gentoo::unmask ($source="", $ensure=present) {
+define gentoo::unmask ($source, $ensure=present) {
     file {
         "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"],
     }
 }

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;
+            ensure  => $ensure,
+            require => File["/etc/portage/package.use"],
     }
 }