Version bumped.

(Portage version: 2.1.3.19)

5 files changed, 147 insertions, 9 deletions

diff --git a/app-admin/puppet/files/digest-puppet-0.22.4-r1 b/app-admin/puppet/files/digest-puppet-0.22.4-r1
deleted file mode 100644
index 681135e45b00..000000000000
--- a/app-admin/puppet/files/digest-puppet-0.22.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9bb853104f2616c7f2c8fa4e2f39b537 puppet-0.22.4.tgz 642077
-RMD160 c836292dc112e52d32bfdcd68d74799135e9c2e9 puppet-0.22.4.tgz 642077
-SHA256 7b26b50711c89ca1e1c12967a363c6f0bc6c04ddcd741358f74c107d04352042 puppet-0.22.4.tgz 642077
diff --git a/app-admin/puppet/files/digest-puppet-0.23.0-r1 b/app-admin/puppet/files/digest-puppet-0.23.0-r1
deleted file mode 100644
index 25992bc96a0e..000000000000
--- a/app-admin/puppet/files/digest-puppet-0.23.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c43342d7d24f1fe881ec97b59e7ea02d puppet-0.23.0.tgz 670293
-RMD160 7f8cb3152f9fe8587b3fc8a09710dbcbfbb3a001 puppet-0.23.0.tgz 670293
-SHA256 cd6959815e08ebc5e24cc49acefa4d4c5f4b277a0e75498d0ec48a4229c8ee4a puppet-0.23.0.tgz 670293
diff --git a/app-admin/puppet/files/digest-puppet-0.23.2 b/app-admin/puppet/files/digest-puppet-0.23.2
deleted file mode 100644
index 7334275c7a3d..000000000000
--- a/app-admin/puppet/files/digest-puppet-0.23.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 496373ce2a7affbb639f85bcff38da0b puppet-0.23.2.tgz 698593
-RMD160 bbc88da5a15ac65c05c103b123680515aadec6b5 puppet-0.23.2.tgz 698593
-SHA256 eb80e4d4adeb174c2ec5198f73d581f9a77cb07a2cae15114b9b11b13021bfa8 puppet-0.23.2.tgz 698593
diff --git a/app-admin/puppet/files/digest-puppet-0.24.1 b/app-admin/puppet/files/digest-puppet-0.24.1
new file mode 100644
index 000000000000..01b8de0e4696
--- /dev/null
+++ b/app-admin/puppet/files/digest-puppet-0.24.1
@@ -0,0 +1,3 @@
+MD5 74111be5615714ac980473e8d24b52db puppet-0.24.1.tgz 678506
+RMD160 7d52e6659a1acc4251a8fc4fc5ea37df2961f2c2 puppet-0.24.1.tgz 678506
+SHA256 5ed1dc3da91124f3c1e701c9727ee7bb7747e8abcc612bc47c808015a0f3bba6 puppet-0.24.1.tgz 678506
diff --git a/app-admin/puppet/files/puppet-0.24.1-gentoo.patch b/app-admin/puppet/files/puppet-0.24.1-gentoo.patch
new file mode 100644
index 000000000000..fba9ca2f0d13
--- /dev/null
+++ b/app-admin/puppet/files/puppet-0.24.1-gentoo.patch
@@ -0,0 +1,144 @@
+diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppet.conf puppet-0.24.1/conf/gentoo/puppet/puppet.conf
+--- puppet-0.24.1.orig/conf/gentoo/puppet/puppet.conf	1970-01-01 09:00:00.000000000 +0900
++++ puppet-0.24.1/conf/gentoo/puppet/puppet.conf	2008-01-07 23:24:05.000000000 +0900
+@@ -0,0 +1,29 @@
++[main]
++    # Where Puppet stores dynamic and growing data.
++    # The default value is '/var/puppet'.
++    vardir = /var/lib/puppet
++
++    # The Puppet log directory.
++    # The default value is '$vardir/log'.
++    logdir = /var/log/puppet
++
++    # Where Puppet PID files are kept.
++    # The default value is '$vardir/run'.
++    rundir = /var/run/puppet
++
++    # Where SSL certificates are kept.
++    # The default value is '$confdir/ssl'.
++    ssldir = $vardir/ssl
++
++[puppetd]
++    # The file in which puppetd stores a list of the classes
++    # associated with the retrieved configuratiion.  Can be loaded in
++    # the separate ``puppet`` executable using the ``--loadclasses``
++    # option.
++    # The default value is '$confdir/classes.txt'.
++    classfile = $vardir/classes.txt
++
++    # Where puppetd caches the local configuration.  An
++    # extension indicating the cache format is added automatically.
++    # The default value is '$confdir/localconfig'.
++    localconfig = $vardir/localconfig
+diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppetca.conf puppet-0.24.1/conf/gentoo/puppet/puppetca.conf
+--- puppet-0.24.1.orig/conf/gentoo/puppet/puppetca.conf	2007-11-01 04:44:27.000000000 +0900
++++ puppet-0.24.1/conf/gentoo/puppet/puppetca.conf	1970-01-01 09:00:00.000000000 +0900
+@@ -1,29 +0,0 @@
+-[puppet]
+-    # Where Puppet stores dynamic and growing data.
+-    # The default value is '/var/puppet'.
+-    vardir = /var/lib/puppet
+-
+-    # The Puppet log directory.
+-    # The default value is '$vardir/log'.
+-    logdir = /var/log/puppet
+-
+-    # Where Puppet PID files are kept.
+-    # The default value is '$vardir/run'.
+-    rundir = /var/run/puppet
+-
+-    # Where SSL certificates are kept.
+-    # The default value is '$confdir/ssl'.
+-    ssldir = $vardir/ssl
+-
+-[puppetd]
+-    # The file in which puppetd stores a list of the classes
+-    # associated with the retrieved configuratiion.  Can be loaded in
+-    # the separate ``puppet`` executable using the ``--loadclasses``
+-    # option.
+-    # The default value is '$confdir/classes.txt'.
+-    classfile = $vardir/classes.txt
+-
+-    # Where puppetd caches the local configuration.  An
+-    # extension indicating the cache format is added automatically.
+-    # The default value is '$confdir/localconfig'.
+-    localconfig = $vardir/localconfig
+diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppetd.conf puppet-0.24.1/conf/gentoo/puppet/puppetd.conf
+--- puppet-0.24.1.orig/conf/gentoo/puppet/puppetd.conf	2007-11-01 04:44:27.000000000 +0900
++++ puppet-0.24.1/conf/gentoo/puppet/puppetd.conf	1970-01-01 09:00:00.000000000 +0900
+@@ -1,29 +0,0 @@
+-[puppet]
+-    # Where Puppet stores dynamic and growing data.
+-    # The default value is '/var/puppet'.
+-    vardir = /var/lib/puppet
+-
+-    # The Puppet log directory.
+-    # The default value is '$vardir/log'.
+-    logdir = /var/log/puppet
+-
+-    # Where Puppet PID files are kept.
+-    # The default value is '$vardir/run'.
+-    rundir = /var/run/puppet
+-
+-    # Where SSL certificates are kept.
+-    # The default value is '$confdir/ssl'.
+-    ssldir = $vardir/ssl
+-
+-[puppetd]
+-    # The file in which puppetd stores a list of the classes
+-    # associated with the retrieved configuratiion.  Can be loaded in
+-    # the separate ``puppet`` executable using the ``--loadclasses``
+-    # option.
+-    # The default value is '$confdir/classes.txt'.
+-    classfile = $vardir/classes.txt
+-
+-    # Where puppetd caches the local configuration.  An
+-    # extension indicating the cache format is added automatically.
+-    # The default value is '$confdir/localconfig'.
+-    localconfig = $vardir/localconfig
+diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppetmasterd.conf puppet-0.24.1/conf/gentoo/puppet/puppetmasterd.conf
+--- puppet-0.24.1.orig/conf/gentoo/puppet/puppetmasterd.conf	2007-11-01 04:44:27.000000000 +0900
++++ puppet-0.24.1/conf/gentoo/puppet/puppetmasterd.conf	1970-01-01 09:00:00.000000000 +0900
+@@ -1,29 +0,0 @@
+-[puppet]
+-    # Where Puppet stores dynamic and growing data.
+-    # The default value is '/var/puppet'.
+-    vardir = /var/lib/puppet
+-
+-    # The Puppet log directory.
+-    # The default value is '$vardir/log'.
+-    logdir = /var/log/puppet
+-
+-    # Where Puppet PID files are kept.
+-    # The default value is '$vardir/run'.
+-    rundir = /var/run/puppet
+-
+-    # Where SSL certificates are kept.
+-    # The default value is '$confdir/ssl'.
+-    ssldir = $vardir/ssl
+-
+-[puppetd]
+-    # The file in which puppetd stores a list of the classes
+-    # associated with the retrieved configuratiion.  Can be loaded in
+-    # the separate ``puppet`` executable using the ``--loadclasses``
+-    # option.
+-    # The default value is '$confdir/classes.txt'.
+-    classfile = $vardir/classes.txt
+-
+-    # Where puppetd caches the local configuration.  An
+-    # extension indicating the cache format is added automatically.
+-    # The default value is '$confdir/localconfig'.
+-    localconfig = $vardir/localconfig
+diff -Naur puppet-0.24.1.orig/lib/puppet/provider/service/gentoo.rb puppet-0.24.1/lib/puppet/provider/service/gentoo.rb
+--- puppet-0.24.1.orig/lib/puppet/provider/service/gentoo.rb	2007-11-01 04:44:27.000000000 +0900
++++ puppet-0.24.1/lib/puppet/provider/service/gentoo.rb	2008-01-07 23:24:10.000000000 +0900
+@@ -29,7 +29,7 @@
+         return :false unless line
+ 
+         # If it's enabled then it will print output showing service | runlevel
+-        if output =~ /#{@resource[:name]}\s*|\s*default/
++        if output =~ /#{@resource[:name]}\s*\|\s*default/
+             return :true
+         else
+             return :false