Version bumped.

Package-Manager: portage-2.1.4.4

8 files changed, 15 insertions, 581 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 8d7c51aa1b4b..9268a63f7091 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.19 2008/08/13 15:54:40 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.20 2008/08/13 16:51:00 matsuu Exp $
+
+*puppet-0.24.5 (13 Aug 2008)
+
+  13 Aug 2008; MATSUU Takuto <matsuu@gentoo.org>
+  -files/puppet-0.23.2-gentoo.patch, -files/puppet-0.24.1-gentoo.patch,
+  -files/puppet-0.24.1-service.patch, -puppet-0.23.2-r1.ebuild,
+  -puppet-0.24.1-r1.ebuild, -puppet-0.24.3.ebuild, +puppet-0.24.5.ebuild:
+  Version bumped. Removed old versions.
 
   13 Aug 2008; Ferris McCormick <fmccor@gentoo.org> puppet-0.24.4.ebuild:
   Add ~sparc keyword at user (Juan Daza) request --- Bug #234621.
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 24b4271ed6bf..4b0fda238afa 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,17 +1,10 @@
 AUX 50puppet-mode-gentoo.el 257 RMD160 c8ee412f60fed83c44091bb56d18e200bb0c7e03 SHA1 208a9a008dec0de89839c71e4d3a86c08be6931d SHA256 1dbae981327dd736b9e0b0a63be0bc6bf662eeb51506da60394f9c9a9b314fde
-AUX puppet-0.23.2-gentoo.patch 7957 RMD160 cecf241522ad4400a942762e327496f0f8834a7f SHA1 352fbaeeccd479592a7447bf5bd106154de3c01a SHA256 4449467bd7b145bc42a019609c36afdfc8b1f6f35c60f59191d01475be165575
-AUX puppet-0.24.1-gentoo.patch 5898 RMD160 ad378ccb4e99f488b1a0b0a2e5f240b85fe577f3 SHA1 32abbc5b3fa07ba10a217623f12f13b3531ecff5 SHA256 0dd2837574e9007c3cf8900f94d8f3a8550dab94d13209077c2fe9729c9d3c67
-AUX puppet-0.24.1-service.patch 528 RMD160 8b3dc4ef4db1d3880ba5cb225f4dde87156ce6d3 SHA1 e0ac3359b297ac6fb780e5280bc7249062564c80 SHA256 87255fd26a5f21f4121a76ba46c5f666d17c49145ef67fbbc1183b7d5af8152d
 AUX puppet-0.24.2-gentoo.patch 628 RMD160 9149d2b68a82a87dc4bcdae3ef5608ca0f152973 SHA1 d7bd432ef27be9dc14dc4e37b8302659caa0f3f4 SHA256 abc592df144baec0c93cc90459ab273fe2aec9f195670ca5dba5d8bc4e6ee886
 AUX puppet-0.24.4-openrc_initd.patch 624 RMD160 1cc74a411a961f13e752fb2f05a21f102118e220 SHA1 3fa676dd62d7e7efffbd1888effe6b19d18b3d95 SHA256 c723c1f2bb56e6013b8d4deeba0ce73c7c798508d4425dbd18a280719babeb0b
 AUX puppetmaster.init 1387 RMD160 875af92960c94c2f135a72ec381eb38392d9cdbf SHA1 d49511ffe50b94f85d671d7df15fc2a1a9e2f16d SHA256 757bed4b949aa2f4ed84ea498e4d3366bad60bd41fec9429941aeda537688cff
-DIST puppet-0.23.2.tgz 698593 RMD160 bbc88da5a15ac65c05c103b123680515aadec6b5 SHA1 682e97473a80ebc29ea1c75966b26a1a3e95618d SHA256 eb80e4d4adeb174c2ec5198f73d581f9a77cb07a2cae15114b9b11b13021bfa8
-DIST puppet-0.24.1.tgz 678506 RMD160 7d52e6659a1acc4251a8fc4fc5ea37df2961f2c2 SHA1 0f9e128f9dbe3cac3a641017cfeb30c77cb1a208 SHA256 5ed1dc3da91124f3c1e701c9727ee7bb7747e8abcc612bc47c808015a0f3bba6
-DIST puppet-0.24.3.tgz 648742 RMD160 cfb7fba62e0e657ee5f13fbdd815dea1c8ec82d0 SHA1 b5f238bbe47f02c0e23dae6dbe4da785e563f1f1 SHA256 7e194752493bd82924d1d42533e2258a8a4bdc6728f6e452a9b73c8fda7f9de3
 DIST puppet-0.24.4.tgz 652572 RMD160 e675d27216dfeb3717c8140d3c89625e6be351e9 SHA1 e79671d8765e08df93c6a4c76b198467c3e13a7a SHA256 0d54f6db7cf1210d123264bcb35b07b36837ebc12a4f2bd01aee6127836adfb9
-EBUILD puppet-0.23.2-r1.ebuild 3082 RMD160 bc582501288f923a3d43bdbe8b07ee4ded92ad9e SHA1 473af40fd990bbf71ec0225e68b4558c971552ec SHA256 63b4f07cd206e2393b87de7d8255fb066140eea1e05f5ccd527eac8a22c2c5e0
-EBUILD puppet-0.24.1-r1.ebuild 3256 RMD160 35622336f22f8fcc7206bfe6699d0fe18c4e2cfb SHA1 47c555ab756b790e442fdecaba8cc203503212ba SHA256 181da2ea1a866ebcf6ece814b94701a0e3cc0c53fca96aa6e99fa87a9240259c
-EBUILD puppet-0.24.3.ebuild 3291 RMD160 3adbc4abc6e8695d7dedfbbf29cbd847577117b4 SHA1 3bdca2aadc70529251d03bc6f78e1d1c7903232b SHA256 721fe5cd114c353d84977a0300345f96d40078ebf8e45cf2b2e5bc1233fe8d06
+DIST puppet-0.24.5.tgz 872803 RMD160 be85ce18ce6a56939eaf83c60cc55d1c5134ef36 SHA1 fe3d63bf30169eb6ec2b30e43d489a51bb36d090 SHA256 0b5ff82b06699a5d10b2ee6e995f427b76540cc0e67ffa8243ee6fc03d8e641d
 EBUILD puppet-0.24.4.ebuild 3346 RMD160 9e8c306d87393709bdf719cdb2915717b96e0460 SHA1 bfaec805440ad87fe484030340eba132967e9755 SHA256 5cba4f4c72880c66d091dc25d80646d777446c9748c42da79503e8c0d6fac428
-MISC ChangeLog 3516 RMD160 562e62b08de68d3268baa2365209ba1514953a97 SHA1 ef26c7c5f6f98f1447a4be7fda9a2506988ddc87 SHA256 ab75f13bdd10d9cdc521adae391bf4517350984176e4ee511cc4bed366b56062
+EBUILD puppet-0.24.5.ebuild 3303 RMD160 53ab9a60459efd9d552ee53461428438a80caced SHA1 3f44330fa3f3f803eaf00c75537df19231e09474 SHA256 f168b1d6b890fd0195906ee4a971ee30c3041c56010edac9cb9db9d75dcc1ad3
+MISC ChangeLog 3846 RMD160 ab4ce7440540e5db32acf3f750e66a01fef20c29 SHA1 097d5e7079209ee4f64806f4cba5ead12b08abdb SHA256 fe83bbeccbd4466af1661f629bd133bcff02800040fc6008b3012ea693329868
 MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337
diff --git a/app-admin/puppet/files/puppet-0.23.2-gentoo.patch b/app-admin/puppet/files/puppet-0.23.2-gentoo.patch
deleted file mode 100644
index ec30064f20a7..000000000000
--- a/app-admin/puppet/files/puppet-0.23.2-gentoo.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff -Naur puppet-0.23.2.orig/conf/gentoo/puppet/puppet.conf puppet-0.23.2/conf/gentoo/puppet/puppet.conf
---- puppet-0.23.2.orig/conf/gentoo/puppet/puppet.conf	1970-01-01 09:00:00.000000000 +0900
-+++ puppet-0.23.2/conf/gentoo/puppet/puppet.conf	2007-12-07 18:41:41.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.23.2.orig/conf/gentoo/puppet/puppetca.conf puppet-0.23.2/conf/gentoo/puppet/puppetca.conf
---- puppet-0.23.2.orig/conf/gentoo/puppet/puppetca.conf	2007-06-18 07:06:39.000000000 +0900
-+++ puppet-0.23.2/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.23.2.orig/conf/gentoo/puppet/puppetd.conf puppet-0.23.2/conf/gentoo/puppet/puppetd.conf
---- puppet-0.23.2.orig/conf/gentoo/puppet/puppetd.conf	2007-06-18 07:06:39.000000000 +0900
-+++ puppet-0.23.2/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.23.2.orig/conf/gentoo/puppet/puppetmasterd.conf puppet-0.23.2/conf/gentoo/puppet/puppetmasterd.conf
---- puppet-0.23.2.orig/conf/gentoo/puppet/puppetmasterd.conf	2007-06-18 07:06:39.000000000 +0900
-+++ puppet-0.23.2/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.23.2.orig/lib/puppet/provider/package/portage.rb puppet-0.23.2/lib/puppet/provider/package/portage.rb
---- puppet-0.23.2.orig/lib/puppet/provider/package/portage.rb	2007-06-20 08:07:35.000000000 +0900
-+++ puppet-0.23.2/lib/puppet/provider/package/portage.rb	2007-12-07 18:46:49.000000000 +0900
-@@ -10,8 +10,8 @@
-     defaultfor :operatingsystem => :gentoo
- 
-     def self.instances
--        result_format = /(\S+) (\S+) \[(.*)\] \[[^0-9]*([^\s:]*)(:\S*)?\] ([\S]*) (.*)/
--        result_fields = [:category, :name, :ensure, :version_available, :slot, :vendor, :description]
-+        result_format = /(\S+) (\S+) \[([^\[]*)(\[[^\]]*\])?\] \[[^0-9]*([^\s:\[]*)(\[[^\]]*\])?(:\S*)?\] ([\S]*) (.*)/
-+        result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :overlay, :slot, :vendor, :description]
- 
-         search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}"
- 
-@@ -55,7 +55,7 @@
- 
-     # The common package name format.
-     def package_name
--        "%s/%s" % [@resource[:category], @resource[:name]]
-+        @resource[:category] ? "%s/%s" % [@resource[:category], @resource[:name]] : @resource[:name]
-     end
- 
-     def uninstall
-@@ -67,11 +67,11 @@
-     end
- 
-     def query
--        result_format = /(\S+) (\S+) \[(.*)\] \[[^0-9]*([^\s:]*)(:\S*)?\] ([\S]*) (.*)/
--        result_fields = [:category, :name, :ensure, :version_available, :slot, :vendor, :description]
-+        result_format = /(\S+) (\S+) \[([^\[]*)(\[[^\]]*\])?\] \[[^0-9]*([^\s:\[]*)(\[[^\]]*\])?(:\S*)?\] ([\S]*) (.*)/
-+        result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :overlay, :slot, :vendor, :description]
- 
-         search_field = @resource[:category] ? "--category-name" : "--name"
--        search_value = @resource[:category] ? package_name : @resource[:name]
-+        search_value = package_name
-         search_format = "<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>"
- 
-         begin
-diff -Naur puppet-0.23.2.orig/lib/puppet/provider/service/gentoo.rb puppet-0.23.2/lib/puppet/provider/service/gentoo.rb
---- puppet-0.23.2.orig/lib/puppet/provider/service/gentoo.rb	2007-06-18 07:06:39.000000000 +0900
-+++ puppet-0.23.2/lib/puppet/provider/service/gentoo.rb	2007-12-07 18:41:41.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
diff --git a/app-admin/puppet/files/puppet-0.24.1-gentoo.patch b/app-admin/puppet/files/puppet-0.24.1-gentoo.patch
deleted file mode 100644
index fba9ca2f0d13..000000000000
--- a/app-admin/puppet/files/puppet-0.24.1-gentoo.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-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
diff --git a/app-admin/puppet/files/puppet-0.24.1-service.patch b/app-admin/puppet/files/puppet-0.24.1-service.patch
deleted file mode 100644
index e7aed5adcf2b..000000000000
--- a/app-admin/puppet/files/puppet-0.24.1-service.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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-02-08 01:41:22.000000000 +0900
-@@ -8,6 +8,10 @@
- 
-     defaultfor :operatingsystem => :gentoo
- 
-+    def self.defpath
-+       superclass.defpath
-+    end
-+
-     def disable
-         begin
-             output = update :del, @resource[:name], :default
diff --git a/app-admin/puppet/puppet-0.23.2-r1.ebuild b/app-admin/puppet/puppet-0.23.2-r1.ebuild
deleted file mode 100644
index 572c059e8b64..000000000000
--- a/app-admin/puppet/puppet-0.23.2-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.23.2-r1.ebuild,v 1.1 2007/12/08 00:39:30 matsuu Exp $
-
-inherit elisp-common eutils ruby
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="emacs"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	>=dev-ruby/facter-1.3.5
-	>=app-portage/eix-0.9.4"
-
-USE_RUBY="ruby18"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	built_with_use virtual/ruby ipv6 || \
-		die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run"
-
-	enewgroup puppet || die "Problem creating group puppet"
-	enewuser puppet -1 -1 /var/lib/puppet puppet || die "Problem creating user puppet"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	DESTDIR="${D}" ruby_einstall "$@" || die
-	DESTDIR="${D}" erubydoc
-
-	# Installation of init scripts and configuration
-	doinitd conf/gentoo/init.d/puppetmaster
-	doconfd conf/gentoo/conf.d/puppetmaster
-	doinitd conf/gentoo/init.d/puppet
-	doconfd conf/gentoo/conf.d/puppet
-
-	# Initial configuration files
-	keepdir /etc/puppet/manifests
-	insinto /etc/puppet
-	doins conf/gentoo/puppet/*
-
-	# Location of log and data files
-	keepdir /var/run/puppet
-	keepdir /var/log/puppet
-	keepdir /var/lib/puppet/ssl
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/{run,log,lib}/puppet
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/*.vim
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto $(dirname ${f})
-		dodoc ${f}
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Puppet uses eix to get information about currently installed	packages,"
-	elog "so please keep the eix metadata cache updated so puppet is able to properly"
-	elog "handle package installations."
-	elog
-	elog "Currently puppet only supports adding and removing services to the default"
-	elog "runlevel, if you want to add/remove a service from another runlevel you may"
-	elog "do so using symlinking."
-	elog
-
-	if [ \
-		-f "${ROOT}/etc/puppet/puppetd.conf" -o \
-		-f "${ROOT}/etc/puppet/puppetmaster.conf" -o \
-		-f "${ROOT}/etc/puppet/puppetca.conf" \
-	] ; then
-		elog
-		elog "Please remove deprecated config files."
-		elog "	/etc/puppet/puppetca.conf"
-		elog "	/etc/puppet/puppetd.conf"
-		elog "	/etc/puppet/puppetmasterd.conf"
-		elog
-	fi
-	use emacs && elisp-site-regen
-}
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-0.24.1-r1.ebuild b/app-admin/puppet/puppet-0.24.1-r1.ebuild
deleted file mode 100644
index 6a9f1788ea0e..000000000000
--- a/app-admin/puppet/puppet-0.24.1-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.1-r1.ebuild,v 1.1 2008/02/07 16:45:04 matsuu Exp $
-
-inherit elisp-common eutils ruby
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="emacs vim-syntax"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	>=dev-ruby/facter-1.3.5
-	>=app-portage/eix-0.9.4"
-
-USE_RUBY="ruby18"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	built_with_use virtual/ruby ipv6 || \
-		die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run"
-
-	enewgroup puppet || die "Problem creating group puppet"
-	enewuser puppet -1 -1 /var/lib/puppet puppet || die "Problem creating user puppet"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-service.patch
-}
-
-src_compile() {
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	DESTDIR="${D}" ruby_einstall "$@" || die
-	DESTDIR="${D}" erubydoc
-
-	# Installation of init scripts and configuration
-	doinitd conf/gentoo/init.d/puppetmaster
-	doconfd conf/gentoo/conf.d/puppetmaster
-	doinitd conf/gentoo/init.d/puppet
-	doconfd conf/gentoo/conf.d/puppet
-
-	# Initial configuration files
-	keepdir /etc/puppet/manifests
-	insinto /etc/puppet
-	doins conf/gentoo/puppet/*
-
-	# Location of log and data files
-	keepdir /var/run/puppet
-	keepdir /var/log/puppet
-	keepdir /var/lib/puppet/ssl
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/{run,log,lib}/puppet
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
-		insinto /usr/share/vim/vimfiles/ftdetect; doins	ext/vim/ftdetect/puppet.vim
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto $(dirname ${f})
-		dodoc ${f}
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Puppet uses eix to get information about currently installed	packages,"
-	elog "so please keep the eix metadata cache updated so puppet is able to properly"
-	elog "handle package installations."
-	elog
-	elog "Currently puppet only supports adding and removing services to the default"
-	elog "runlevel, if you want to add/remove a service from another runlevel you may"
-	elog "do so using symlinking."
-	elog
-
-	if [ \
-		-f "${ROOT}/etc/puppet/puppetd.conf" -o \
-		-f "${ROOT}/etc/puppet/puppetmaster.conf" -o \
-		-f "${ROOT}/etc/puppet/puppetca.conf" \
-	] ; then
-		elog
-		elog "Please remove deprecated config files."
-		elog "	/etc/puppet/puppetca.conf"
-		elog "	/etc/puppet/puppetd.conf"
-		elog "	/etc/puppet/puppetmasterd.conf"
-		elog
-	fi
-	use emacs && elisp-site-regen
-}
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-0.24.3.ebuild b/app-admin/puppet/puppet-0.24.5.ebuild
index 6130f773901d..bd2c3c9b5155 100644
--- a/app-admin/puppet/puppet-0.24.3.ebuild
+++ b/app-admin/puppet/puppet-0.24.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.3.ebuild,v 1.1 2008/03/20 22:48:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.5.ebuild,v 1.1 2008/08/13 16:51:00 matsuu Exp $
 
 inherit elisp-common eutils ruby
 
@@ -11,7 +11,7 @@ SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="emacs vim-syntax"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="emacs? ( virtual/emacs )"
 RDEPEND="${DEPEND}
@@ -34,7 +34,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-0.24.2-gentoo.patch
+	epatch "${FILESDIR}/${PN}-0.24.2-gentoo.patch"
 }
 
 src_compile() {