Fixed bugs and cleanup, bug #190840.

maintainership takeover.
Package-Manager: portage-2.1.3.19

11 files changed, 339 insertions, 154 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 30c8854420f7..90ea29ea1db4 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.7 2007/08/07 21:09:43 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.8 2007/12/08 00:39:30 matsuu Exp $
+
+*puppet-0.23.2-r1 (08 Dec 2007)
+
+  08 Dec 2007; MATSUU Takuto <matsuu@gentoo.org>
+  +files/50puppet-mode-gentoo.el, +files/puppet-0.23.2-gentoo.patch,
+  metadata.xml, -puppet-0.22.4.ebuild, -puppet-0.23.0.ebuild,
+  +puppet-0.23.2-r1.ebuild:
+  Fixed some bugs and cleanup, bug #190840
+  maintainership takeover.
+  Removed old versions.
 
 *puppet-0.23.2 (07 Aug 2007)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 85c10e08be65..796b0b5d4429 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,3 +1,11 @@
+AUX 50puppet-mode-gentoo.el 257 RMD160 c8ee412f60fed83c44091bb56d18e200bb0c7e03 SHA1 208a9a008dec0de89839c71e4d3a86c08be6931d SHA256 1dbae981327dd736b9e0b0a63be0bc6bf662eeb51506da60394f9c9a9b314fde
+MD5 28e09ff0789e5fd3c63c2c680afa7081 files/50puppet-mode-gentoo.el 257
+RMD160 c8ee412f60fed83c44091bb56d18e200bb0c7e03 files/50puppet-mode-gentoo.el 257
+SHA256 1dbae981327dd736b9e0b0a63be0bc6bf662eeb51506da60394f9c9a9b314fde files/50puppet-mode-gentoo.el 257
+AUX puppet-0.23.2-gentoo.patch 7957 RMD160 cecf241522ad4400a942762e327496f0f8834a7f SHA1 352fbaeeccd479592a7447bf5bd106154de3c01a SHA256 4449467bd7b145bc42a019609c36afdfc8b1f6f35c60f59191d01475be165575
+MD5 5b7207e6d3ae4e668c9e1b725b8ebe57 files/puppet-0.23.2-gentoo.patch 7957
+RMD160 cecf241522ad4400a942762e327496f0f8834a7f files/puppet-0.23.2-gentoo.patch 7957
+SHA256 4449467bd7b145bc42a019609c36afdfc8b1f6f35c60f59191d01475be165575 files/puppet-0.23.2-gentoo.patch 7957
 DIST puppet-0.22.4.tgz 642077 RMD160 c836292dc112e52d32bfdcd68d74799135e9c2e9 SHA1 afc6e64dcbfab251dd433c6e0de5015cbe0a37ec SHA256 7b26b50711c89ca1e1c12967a363c6f0bc6c04ddcd741358f74c107d04352042
 DIST puppet-0.23.0.tgz 670293 RMD160 7f8cb3152f9fe8587b3fc8a09710dbcbfbb3a001 SHA1 6b1d813877c3e105dea35a045d276520baf91623 SHA256 cd6959815e08ebc5e24cc49acefa4d4c5f4b277a0e75498d0ec48a4229c8ee4a
 DIST puppet-0.23.2.tgz 698593 RMD160 bbc88da5a15ac65c05c103b123680515aadec6b5 SHA1 682e97473a80ebc29ea1c75966b26a1a3e95618d SHA256 eb80e4d4adeb174c2ec5198f73d581f9a77cb07a2cae15114b9b11b13021bfa8
@@ -5,42 +13,35 @@ EBUILD puppet-0.22.4-r1.ebuild 2126 RMD160 e8863db63b828a4f4973b8e1697165357a967
 MD5 342e1fb5484a9e88bbede6385a939304 puppet-0.22.4-r1.ebuild 2126
 RMD160 e8863db63b828a4f4973b8e1697165357a967c48 puppet-0.22.4-r1.ebuild 2126
 SHA256 5579e27aa463f791538b0436c21052b34873c3a5a52444b42ccdd35519fe66e6 puppet-0.22.4-r1.ebuild 2126
-EBUILD puppet-0.22.4.ebuild 2036 RMD160 f7ed353fe48e2358d21f2a43c0af4e41c9101a35 SHA1 dc1e805d25e86a170f0bbe0136f9d3c731f79e76 SHA256 0dc6d6459dcbc460646b15783d4c5be286d3f3a8b8b45b80e2f7bc4fc861de4d
-MD5 311aba906edc367d91607286c5916e56 puppet-0.22.4.ebuild 2036
-RMD160 f7ed353fe48e2358d21f2a43c0af4e41c9101a35 puppet-0.22.4.ebuild 2036
-SHA256 0dc6d6459dcbc460646b15783d4c5be286d3f3a8b8b45b80e2f7bc4fc861de4d puppet-0.22.4.ebuild 2036
 EBUILD puppet-0.23.0-r1.ebuild 2126 RMD160 7745178427933be95ce49acb8cd96b46950024e3 SHA1 0d9eb60a2f1c689ca1106a27ef85527f5e8df66f SHA256 16d790c48ce344b57adaffd86c92bb12025588a588443e7371040d095adab050
 MD5 5567e431500e68f1928172ab7263a39c puppet-0.23.0-r1.ebuild 2126
 RMD160 7745178427933be95ce49acb8cd96b46950024e3 puppet-0.23.0-r1.ebuild 2126
 SHA256 16d790c48ce344b57adaffd86c92bb12025588a588443e7371040d095adab050 puppet-0.23.0-r1.ebuild 2126
-EBUILD puppet-0.23.0.ebuild 2036 RMD160 10f34abe880c7aca2fc18f53695a5011c9c71e8a SHA1 470daab2a7669a168fa0c7af75231605aba1e21c SHA256 81de3c1f97718f2ec2e1fabf89c120c9b3c3dbc5e7ae7e6afe545a5c1e4f3e2e
-MD5 7b4ca5d5344f33cd982578f9ed95c9a6 puppet-0.23.0.ebuild 2036
-RMD160 10f34abe880c7aca2fc18f53695a5011c9c71e8a puppet-0.23.0.ebuild 2036
-SHA256 81de3c1f97718f2ec2e1fabf89c120c9b3c3dbc5e7ae7e6afe545a5c1e4f3e2e puppet-0.23.0.ebuild 2036
+EBUILD puppet-0.23.2-r1.ebuild 3082 RMD160 bc582501288f923a3d43bdbe8b07ee4ded92ad9e SHA1 473af40fd990bbf71ec0225e68b4558c971552ec SHA256 63b4f07cd206e2393b87de7d8255fb066140eea1e05f5ccd527eac8a22c2c5e0
+MD5 ff2d8188c1f44c4e15deae879ab7e689 puppet-0.23.2-r1.ebuild 3082
+RMD160 bc582501288f923a3d43bdbe8b07ee4ded92ad9e puppet-0.23.2-r1.ebuild 3082
+SHA256 63b4f07cd206e2393b87de7d8255fb066140eea1e05f5ccd527eac8a22c2c5e0 puppet-0.23.2-r1.ebuild 3082
 EBUILD puppet-0.23.2.ebuild 2123 RMD160 daa8aa65920b3883dc8826c1ca3a2db23e889a44 SHA1 fd3bb8f9e69fadbcd551b1e7b94e1c3e6abb9788 SHA256 142124090c49304c56f96ab5dedc5d2a32c05cd7127ef291c83ca6355d82bced
 MD5 a733ae667108027d6107c9e7961179b4 puppet-0.23.2.ebuild 2123
 RMD160 daa8aa65920b3883dc8826c1ca3a2db23e889a44 puppet-0.23.2.ebuild 2123
 SHA256 142124090c49304c56f96ab5dedc5d2a32c05cd7127ef291c83ca6355d82bced puppet-0.23.2.ebuild 2123
-MISC ChangeLog 1333 RMD160 366733fc6bbe11bdde8ead50b901d811fe213e21 SHA1 7c38ad6ef81ae099efb06d991da544bbefe00066 SHA256 f2ee833887223bf190a0a84f5dd3b0e34e34ed3233dc567d72e661fccf185e9e
-MD5 0fb2a98d32f6aab40f3b42880ba2a9c2 ChangeLog 1333
-RMD160 366733fc6bbe11bdde8ead50b901d811fe213e21 ChangeLog 1333
-SHA256 f2ee833887223bf190a0a84f5dd3b0e34e34ed3233dc567d72e661fccf185e9e ChangeLog 1333
-MISC metadata.xml 222 RMD160 21459c9da4e2cc307ee5f77d0ab36f5c2fd30d10 SHA1 56cc99d472625d9439d65a94af7254738cd499ea SHA256 b9a72edb072b0592bc3207fd41cd0c3826b72e82d6d6b8db0c6724b3f7898a56
-MD5 108181d1fded73455b48b0aa6bd28972 metadata.xml 222
-RMD160 21459c9da4e2cc307ee5f77d0ab36f5c2fd30d10 metadata.xml 222
-SHA256 b9a72edb072b0592bc3207fd41cd0c3826b72e82d6d6b8db0c6724b3f7898a56 metadata.xml 222
-MD5 44ee770e070e650776b6dd60b5ee38f7 files/digest-puppet-0.22.4 232
-RMD160 da7ee7b9728b02c1438b41e2f4cddcb9268c490c files/digest-puppet-0.22.4 232
-SHA256 291b7f3624b465ed0818063ee5325d2e36705378a8cf4a57df29ed61fa9fbf47 files/digest-puppet-0.22.4 232
+MISC ChangeLog 1669 RMD160 337eeee980b1db6b0834896d02d58e1cf68d2505 SHA1 fc9c937530ac23bb8418b4e01390da71ef984b98 SHA256 09878f7641a61fbe6b1201318a1722e7221eb18217f32df599ce5ac204e4aa12
+MD5 39188ba2d0f2b9e4fa4b805eb108f85f ChangeLog 1669
+RMD160 337eeee980b1db6b0834896d02d58e1cf68d2505 ChangeLog 1669
+SHA256 09878f7641a61fbe6b1201318a1722e7221eb18217f32df599ce5ac204e4aa12 ChangeLog 1669
+MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337
+MD5 ae35aecf3e681586ace5f8c15866aed7 metadata.xml 222
+RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 metadata.xml 222
+SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337 metadata.xml 222
 MD5 44ee770e070e650776b6dd60b5ee38f7 files/digest-puppet-0.22.4-r1 232
 RMD160 da7ee7b9728b02c1438b41e2f4cddcb9268c490c files/digest-puppet-0.22.4-r1 232
 SHA256 291b7f3624b465ed0818063ee5325d2e36705378a8cf4a57df29ed61fa9fbf47 files/digest-puppet-0.22.4-r1 232
-MD5 23433fe16df59f09e423e32b60ca857e files/digest-puppet-0.23.0 232
-RMD160 20af2939354a7f7f6fca8b92070dd4595bc9cc45 files/digest-puppet-0.23.0 232
-SHA256 96f88ca6c85887706c8a69283a370ace42bfeac2ec885407236e3430175480ec files/digest-puppet-0.23.0 232
 MD5 23433fe16df59f09e423e32b60ca857e files/digest-puppet-0.23.0-r1 232
 RMD160 20af2939354a7f7f6fca8b92070dd4595bc9cc45 files/digest-puppet-0.23.0-r1 232
 SHA256 96f88ca6c85887706c8a69283a370ace42bfeac2ec885407236e3430175480ec files/digest-puppet-0.23.0-r1 232
 MD5 8d3ce2aa236c35931e0d65b3641d3dfd files/digest-puppet-0.23.2 232
 RMD160 641fdfd4bcca5365c1bf8c3148cbef6b6b738e57 files/digest-puppet-0.23.2 232
 SHA256 342704b7fc0d7ee7c4a319c096ffc4f4fc98a590686f9bc7baca444bcfa2d547 files/digest-puppet-0.23.2 232
+MD5 8d3ce2aa236c35931e0d65b3641d3dfd files/digest-puppet-0.23.2-r1 232
+RMD160 641fdfd4bcca5365c1bf8c3148cbef6b6b738e57 files/digest-puppet-0.23.2-r1 232
+SHA256 342704b7fc0d7ee7c4a319c096ffc4f4fc98a590686f9bc7baca444bcfa2d547 files/digest-puppet-0.23.2-r1 232
diff --git a/app-admin/puppet/files/50puppet-mode-gentoo.el b/app-admin/puppet/files/50puppet-mode-gentoo.el
new file mode 100644
index 000000000000..8f551bfa8bb2
--- /dev/null
+++ b/app-admin/puppet/files/50puppet-mode-gentoo.el
@@ -0,0 +1,8 @@
+;;
+;; Setup puppet-mode for autoloading
+
+;;; puppet-mode site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
+(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
diff --git a/app-admin/puppet/files/digest-puppet-0.22.4 b/app-admin/puppet/files/digest-puppet-0.22.4
deleted file mode 100644
index 681135e45b00..000000000000
--- a/app-admin/puppet/files/digest-puppet-0.22.4
+++ /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 b/app-admin/puppet/files/digest-puppet-0.23.0
deleted file mode 100644
index 25992bc96a0e..000000000000
--- a/app-admin/puppet/files/digest-puppet-0.23.0
+++ /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-r1 b/app-admin/puppet/files/digest-puppet-0.23.2-r1
new file mode 100644
index 000000000000..7334275c7a3d
--- /dev/null
+++ b/app-admin/puppet/files/digest-puppet-0.23.2-r1
@@ -0,0 +1,3 @@
+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/puppet-0.23.2-gentoo.patch b/app-admin/puppet/files/puppet-0.23.2-gentoo.patch
new file mode 100644
index 000000000000..ec30064f20a7
--- /dev/null
+++ b/app-admin/puppet/files/puppet-0.23.2-gentoo.patch
@@ -0,0 +1,182 @@
+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/metadata.xml b/app-admin/puppet/metadata.xml
index d7784f57b44b..70313d27d4f6 100644
--- a/app-admin/puppet/metadata.xml
+++ b/app-admin/puppet/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>nakano@gentoo.org</email>
+  <email>matsuu@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/app-admin/puppet/puppet-0.22.4.ebuild b/app-admin/puppet/puppet-0.22.4.ebuild
deleted file mode 100644
index 7e1fa0d1f62d..000000000000
--- a/app-admin/puppet/puppet-0.22.4.ebuild
+++ /dev/null
@@ -1,62 +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.22.4.ebuild,v 1.2 2007/07/13 06:07:38 mr_bones_ Exp $
-
-inherit eutils ruby
-
-DESCRIPTION="A system automation and configuration management software"
-LICENSE="GPL-2"
-HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
-RDEPEND=">=dev-ruby/facter-1.3.5 >=app-portage/eix-0.7.9"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-
-USE_RUBY="ruby18"
-
-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_compile() {
-	DESTDIR=${D} ruby_econf || die
-	DESTDIR=${D} ruby_emake "$@" || die
-}
-
-src_install() {
-	DESTDIR=${D} ruby_einstall "$@" || die
-	DESTDIR=${D} erubydoc
-
-	# Installation of init scripts and configuration
-	doinitd ${S}/conf/gentoo/init.d/puppetmaster
-	doconfd ${S}/conf/gentoo/conf.d/puppetmaster
-	doinitd ${S}/conf/gentoo/init.d/puppet
-	doconfd ${S}/conf/gentoo/conf.d/puppet
-
-	# Initial configuration files
-	dodir /etc/puppet/manifests
-	insinto /etc/puppet
-	doins ${S}/conf/gentoo/puppet/*
-
-	# Location of log and data files
-	dodir /var/log/puppet
-	dodir /var/lib/puppet
-	keepdir /var/run/puppet
-}
-
-pkg_postinst() {
-	ewarn "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could cause puppet to hang"
-	ewarn "while installing packages."
-	ewarn
-	ewarn "Puppet uses eix to get information about currently installed	packages, so please keep the eix"
-	ewarn "metadata cache updated so puppet is able to properly handle package installations."
-	ewarn
-	ewarn "Currently puppet only supports adding and removing services to the default runlevel, if you"
-	ewarn "want to add/remove a service from another runlevel you may do so using symlinking."
-}
diff --git a/app-admin/puppet/puppet-0.23.0.ebuild b/app-admin/puppet/puppet-0.23.0.ebuild
deleted file mode 100644
index db10576df1c2..000000000000
--- a/app-admin/puppet/puppet-0.23.0.ebuild
+++ /dev/null
@@ -1,62 +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.0.ebuild,v 1.2 2007/07/13 06:07:38 mr_bones_ Exp $
-
-inherit eutils ruby
-
-DESCRIPTION="A system automation and configuration management software"
-LICENSE="GPL-2"
-HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
-RDEPEND=">=dev-ruby/facter-1.3.5 >=app-portage/eix-0.9.4"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-
-USE_RUBY="ruby18"
-
-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_compile() {
-	DESTDIR=${D} ruby_econf || die
-	DESTDIR=${D} ruby_emake "$@" || die
-}
-
-src_install() {
-	DESTDIR=${D} ruby_einstall "$@" || die
-	DESTDIR=${D} erubydoc
-
-	# Installation of init scripts and configuration
-	doinitd ${S}/conf/gentoo/init.d/puppetmaster
-	doconfd ${S}/conf/gentoo/conf.d/puppetmaster
-	doinitd ${S}/conf/gentoo/init.d/puppet
-	doconfd ${S}/conf/gentoo/conf.d/puppet
-
-	# Initial configuration files
-	dodir /etc/puppet/manifests
-	insinto /etc/puppet
-	doins ${S}/conf/gentoo/puppet/*
-
-	# Location of log and data files
-	dodir /var/log/puppet
-	dodir /var/lib/puppet
-	keepdir /var/run/puppet
-}
-
-pkg_postinst() {
-	ewarn "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could cause puppet to hang"
-	ewarn "while installing packages."
-	ewarn
-	ewarn "Puppet uses eix to get information about currently installed	packages, so please keep the eix"
-	ewarn "metadata cache updated so puppet is able to properly handle package installations."
-	ewarn
-	ewarn "Currently puppet only supports adding and removing services to the default runlevel, if you"
-	ewarn "want to add/remove a service from another runlevel you may do so using symlinking."
-}
diff --git a/app-admin/puppet/puppet-0.23.2-r1.ebuild b/app-admin/puppet/puppet-0.23.2-r1.ebuild
new file mode 100644
index 000000000000..572c059e8b64
--- /dev/null
+++ b/app-admin/puppet/puppet-0.23.2-r1.ebuild
@@ -0,0 +1,111 @@
+# 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
+}