Fixed rrd issue again, bug #294304. Removed old versions.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

7 files changed, 34 insertions, 345 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 056ead9b427f..3fc0caa1f0bf 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.53 2010/03/02 10:42:59 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.54 2010/03/02 12:11:53 matsuu Exp $
+
+*puppet-0.25.4-r1 (02 Mar 2010)
+
+  02 Mar 2010; MATSUU Takuto <matsuu@gentoo.org>
+  -files/puppet-0.25.0-cert-names.patch, -puppet-0.25.1-r1.ebuild,
+  -files/puppet-0.25.1-eix-0.18.patch, -puppet-0.25.4.ebuild,
+  +puppet-0.25.4-r1.ebuild, +files/puppet-0.25.4-r1-rrd.patch,
+  -files/puppet-0.25.4-rrd.patch:
+  Fixed rrd issue again, bug #294304. Removed old versions.
 
   02 Mar 2010; Christian Faulhammer <fauli@gentoo.org> puppet-0.25.3.ebuild:
   stable x86, bug 306195
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index cd170388a246..ba3ea0419d6f 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -4,28 +4,34 @@ Hash: SHA1
 AUX 50puppet-mode-gentoo.el 217 RMD160 6ab7ace77c4e2da030c894f6b7f1a520e4950311 SHA1 7f6e97e1db4079bc45021360b0ada69c0482c008 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91
 AUX puppet-0.24.6-eix.patch 2228 RMD160 a2465eba3775cacb54d9e20f97efd6cbb3e91627 SHA1 17e828e676d6e8f6abd7b008ca250e69557b2ea9 SHA256 d822a12eaaa6eaf8316fe04fc6c9b654f0427e4d80fb6c5cd15ca2a7368bb754
 AUX puppet-0.24.8-rc-update-show.patch 961 RMD160 2fed961a81b4e5b7659db3c587b17e81ea463bc5 SHA1 832b1a2bd32e6efc0764fa82bf4ef9f705348df3 SHA256 94a32f3d969d00de29564f895426f8c7c9cdbe6b8962d051a4f28b02efa17449
-AUX puppet-0.25.0-cert-names.patch 3638 RMD160 88033cb249bcb1daa1c13dcf820d8aeeec9bcf4b SHA1 27b02cb25bd81785d427469b5e25deb878ebc27a SHA256 f068e491cbe613675e7538c531069ff7055ec16e2ee40a56388277f15e601c55
-AUX puppet-0.25.1-eix-0.18.patch 5924 RMD160 4891ba568bc9a2e9aff88a1b480bb550cf00a47f SHA1 a2d42a8de3b187176a6fbdadec63bf21aa8ff6e6 SHA256 0a8e2d28c12107686641ec0f8e8f4d3117856c5e72f1717b84669b0309489419
-AUX puppet-0.25.4-rrd.patch 7226 RMD160 d5b0e7ebd3189e548c0a69efb79b503364e8ec08 SHA1 ae397b38bdf3dedc3db9e198032a431172ce858c SHA256 21edf7af0ae57458f8bdbc41f0303a3522c0c34c4b4ca8b2c20774e7fa03b3e7
+AUX puppet-0.25.4-r1-rrd.patch 7033 RMD160 49e5530e97a59428ec173f922d3772312806d954 SHA1 5497fe7abe4b0d9e56a48d48d49c7b1fd5741274 SHA256 c0dd90de8f01fdb2cc9a80d5ccf60a5fd386a5c890bfd9e4b9d36af735e86ff1
 AUX puppet-0.25.init 923 RMD160 2133414233baee5f12542618747a6ccc278e8df9 SHA1 a009d9d266a49ca8065dec62cb7828a5ae550a48 SHA256 e60dfe6639ef591b4e9795499b7abe872a4069212e8beac72a2b1e6541ca98df
 AUX puppet.init 922 RMD160 428dca973054f771b829bc24781b75ba5ccf3ef1 SHA1 bea4c5e97c2749be6874516beb71f501d3fbb1d3 SHA256 c355dfb24bb73ff21a750a73513518620cde2c63f0969074d81c60bb4e315425
 AUX puppetmaster-0.25.init 1006 RMD160 9b1878992fc0380cbacf7c1eada2e6a283749a26 SHA1 3dfa2be66706183518a03b7a7a52da66d4934d45 SHA256 6a2acb189cfe4541348fd16c4e48e6a2fd97f59cd36f314c32d9c7fd3fb00d2c
 AUX puppetmaster.confd 279 RMD160 64824fc2c88d9069b25d0548fac5981f1ff4fa6b SHA1 d521616310e7a27986c27138bd4d4382238d609a SHA256 6db68d9e093d3d231c8ad35968e8d276f68cdd7aec8577b3f7ac2998d1f91692
 AUX puppetmaster.init 1005 RMD160 eca4418abb7b6de674e7580f949b27f73b3c9b59 SHA1 3efa92e55e7f1df55d384b59b36704f6a0ee42d8 SHA256 c3a658b778d89084fa8a21b477c7caf77f59e82bb1bef8c8086afed533da5a3a
 DIST puppet-0.24.8.tgz 1099188 RMD160 edb187da9225c9faee9839a5d644b5c9c91f3d5f SHA1 a871aef6f3e8e060f5109bb022967066e32875be SHA256 9e9dcfdd26f96e0b0b4ca9bcfe6f473c679ff082a0cd7226c2058ae652d4fdc8
-DIST puppet-0.25.1.tar.gz 1388451 RMD160 2b2bb5b0def03ddeebe99df1ee29648b6bca794d SHA1 c791b8f06a5775c63aaa2b48bffaf0540c3d3f88 SHA256 b91975b7f6304fca416b0bc26606639fc838b75237c049b4b0419dfe7e689b0c
 DIST puppet-0.25.3.tar.gz 1424590 RMD160 2c313e798f2f9e6db947ff5efd857af70d102581 SHA1 33cfbf9aa8d42191b06592b071a124001c7adbd7 SHA256 a187019264c2b2d1cad6e103765f616f6e0afa7cc3fbad37fec318ab00e859fe
 DIST puppet-0.25.4.tar.gz 1424240 RMD160 67610414d6e5c41e9541eb7f392f391b94f1802e SHA1 290dcc20eb670b5b8e26d50301430e1333a037ab SHA256 c2dd640a31d1e57ad09929001f90247cd83908485f1f737abca352eb1866fbf3
 EBUILD puppet-0.24.8-r1.ebuild 3628 RMD160 0899d628f3bf08b6db4a386680902d236a48f956 SHA1 fd01ce2d33e9055e706ff4665e9d3d41be98a05b SHA256 09d71b16ce2506306b7a22bcd8f258a5e92772bd4c713108d473ac49d96961e9
-EBUILD puppet-0.25.1-r1.ebuild 3379 RMD160 276fc57a4219ae540fd2f828d7832e848a66e78a SHA1 d18d53ab014e4a8e7d6a65db2bc6a18f74ea7bef SHA256 892942f7660601f65d39a87fe62e5e60f188c23d627ee28597bcff0104267b34
 EBUILD puppet-0.25.3.ebuild 3445 RMD160 d42c699e3dbaf5dddc268d51723f59223be76be4 SHA1 37e8cc242fd306afc0618575e5efe89ebc0e1076 SHA256 74614106c4dc2617f063c816c020567ea9e4007dd435e31371424a0ab10f95ca
-EBUILD puppet-0.25.4.ebuild 3478 RMD160 49a0a1fdec2c31321ce0e2f83cb46df101ea1061 SHA1 a1bdef47a3847b773ba82bcc70d7590369449dbf SHA256 a0716467092fa5277188507986a266ca00461e49e59eae52243ece84fd098c6d
-MISC ChangeLog 10064 RMD160 dff00bbbddda0b4db7ae393abcfc977ae0694e32 SHA1 b9d73c3d208de4ac1537e6ded826216f8d5aec0c SHA256 5de36b8a8cfb8e215fdc4a1afc17a75d91bf7e3ad27ae29a6f9c463dbe9356d1
+EBUILD puppet-0.25.4-r1.ebuild 3482 RMD160 dfbadeeeeecd9cfe606d14ea3b14aed68c981098 SHA1 52861061deefc233599fed7495345de6efb5d6c3 SHA256 bee03f19a17152af2a51d08c82358ce02b3fe5d2920c4b26ef5e58780c92f9a2
+MISC ChangeLog 10434 RMD160 ca92a4d27e3240dad7593a4c7b7300d12f1f77a7 SHA1 75ea8d51726f8edb1d32edb5ef900123b80c6806 SHA256 74985baf16c6a42a79e021154b03a628dda363f248f310dab67bf8b31162310b
 MISC metadata.xml 1104 RMD160 c2e40f737c1f334d2d4e7a34e1dba61b53ebdfff SHA1 ab42f340e0d8add11e9c4cd6c6791f3cc5ec6484 SHA256 c228b29cc44ea8fe2545f43d05688bc6364395adf7cf2d86290d25e86207fefb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuM67kACgkQNQqtfCuFnePHhQCfRj8tH5iZ9iiYsjgK5bmqaAs9
-hmYAnA1HBQB6pP6ThBhoWlMpsXBC5H4w
-=ExAj
+iQIcBAEBAgAGBQJLjQEVAAoJECaGw+YFKA1pJwQP/RRfTLLnxLI/zPesXhK6IbnF
+z9ejSrm3kbL0Fmn0VOyy/eG4yPlHoMd2peMcR1rtarmrbPBZAM9RQ8xkyvGFF05k
+5hSQznd+LrCXGaSvrAMw8DzUlJhufPOI48M+jd0soeVHXK7oqLf2e0Zb8FcRUpzs
+VuvHeqyeEUum5XlWHup6j6mtfDkhmdzHcR/1MP8k0LJ9y+J8KAgA0vxsUWP53EmS
+KhsIsI6/Wd9bslqWeN+R7LaXNfZpD5gFh7nTafQML+JkD/krC1I9EEinEkNsVMJl
+3haFcABwk2ZOLDmomO0lwmxROVzmcuU0siro4vI2j+hPR75dKFTh/DYpJQMehUjz
+11UxUP04JBQBrlnG5kRdDMOe1MY6gjLG6gAM6y/SMJmJMKf4O6ZJMcsmk7YhQKGo
+Q6wlU6eBZROpBQZfvLR0fxNv3TFznmB2rOKjezq3zAKZxfakvDmYQWrh0VtHQnQF
+CLVIlvn9wKF5vmMrQM3027zgJiS/vjDlTZ1EEeah0k1W2FOHtoaB/F+SuJi1Szrp
+lHTGV/M0oes9rdH/IAWkRu6yttUsY8EiTNiF+WLJPhjls4hSObBKs4Iyr03mfnAX
+/ASXLu06wItwPgMjr2x0IYI0Jm/4UEE7p38eS9Ut6FErmitt7U2YqWmAAW9LyBwW
+8BCNdssk0sPbMqP6YDXE
+=heDv
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/files/puppet-0.25.0-cert-names.patch b/app-admin/puppet/files/puppet-0.25.0-cert-names.patch
deleted file mode 100644
index 4a5f891733ea..000000000000
--- a/app-admin/puppet/files/puppet-0.25.0-cert-names.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-commit a1d3b04296babc42b6a00956508c86c18e2b39bc
-Author: Luke Kanies <luke@madstop.com>
-Date:   Fri Sep 18 12:09:44 2009 -0700
-
-    Fixing #2617 - use the cert name as specified
-    
-    This allows us to search for a cert, and we use the searched-for
-    term as the cert name (for the wrapper, not the actual cert object),
-    rather than the real cert name.
-    
-    This allows us to use symbolic names like 'ca', as we're currently doing.
-    
-    Signed-off-by: Luke Kanies <luke@madstop.com>
-
-diff --git a/lib/puppet/indirector/certificate/rest.rb b/lib/puppet/indirector/certificate/rest.rb
-index 5999830..6f47c25 100644
---- a/lib/puppet/indirector/certificate/rest.rb
-+++ b/lib/puppet/indirector/certificate/rest.rb
-@@ -6,4 +6,10 @@ class Puppet::SSL::Certificate::Rest < Puppet::Indirector::REST
- 
-     use_server_setting(:ca_server)
-     use_port_setting(:ca_port)
-+
-+    def find(request)
-+        return nil unless result = super
-+        result.name = request.key unless result.name == request.key
-+        result
-+    end
- end
-diff --git a/spec/integration/indirector/certificate/rest.rb b/spec/integration/indirector/certificate/rest.rb
-index 3ebd1e5..71ef443 100755
---- a/spec/integration/indirector/certificate/rest.rb
-+++ b/spec/integration/indirector/certificate/rest.rb
-@@ -64,6 +64,8 @@ describe "Certificate REST Terminus" do
- 
-         # There's no good '==' method on certs.
-         result.content.to_s.should == @host.certificate.content.to_s
--        result.name.should == @host.certificate.name
-+
-+        # also make sure it uses the provided name, rather than the internal one.
-+        result.name.should == "bar"
-     end
- end
-diff --git a/spec/unit/indirector/certificate/rest.rb b/spec/unit/indirector/certificate/rest.rb
-index d5959c4..a325754 100755
---- a/spec/unit/indirector/certificate/rest.rb
-+++ b/spec/unit/indirector/certificate/rest.rb
-@@ -20,4 +20,38 @@ describe Puppet::SSL::Certificate::Rest do
-     it "should set port_setting to :ca_port" do
-         Puppet::SSL::Certificate::Rest.port_setting.should == :ca_port
-     end
-+
-+    it "should make sure found certificates have their names set to the search string" do
-+        terminus = Puppet::SSL::Certificate::Rest.new
-+
-+        # This has 'boo.com' in the CN
-+        cert_string = "-----BEGIN CERTIFICATE-----
-+MIICPzCCAaigAwIBAgIBBDANBgkqhkiG9w0BAQUFADAWMRQwEgYDVQQDDAtidWNr
-+eS5sb2NhbDAeFw0wOTA5MTcxNzI1MzJaFw0xNDA5MTYxNzI1MzJaMBIxEDAOBgNV
-+BAMMB2Jvby5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKG9B+DkTCNh
-+F5xHchNDfnbC9NzWKM600oxrr84pgUVAG6B2wAZcdfoEtXszhsY9Jzpwqkvxk4Mx
-+AbYqo9+TCi4UoiH6e+vAKOOJD3DHrlf+/RW4hGtyaI41DBhf4+B4/oFz5PH9mvKe
-+NSfHFI/yPW+1IXYjxKLQNwF9E7q3JbnzAgMBAAGjgaAwgZ0wOAYJYIZIAYb4QgEN
-+BCsWKVB1cHBldCBSdWJ5L09wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMAwG
-+A1UdEwEB/wQCMAAwHQYDVR0OBBYEFJOxEUeyf4cNOBmf9zIaE1JTuNdLMAsGA1Ud
-+DwQEAwIFoDAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwME
-+MA0GCSqGSIb3DQEBBQUAA4GBAFTJxKprMg6tfhGnvEvURPmlJrINn9c2b5Y4AGYp
-+tO86PFFkWw/EIJvvJzbj3s+Butr+eUo//+f1xxX7UCwwGqGxKqjtVS219oU/wkx8
-+h7rW4Xk7MrLl0auSS1p4wLcAMm+ZImf94+j8Cj+tkr8eGozZceRV13b8+EkdaE3S
-+rn/G
-+-----END CERTIFICATE-----
-+"
-+
-+        network = stub 'network'
-+        terminus.stubs(:network).returns network
-+
-+        response = stub 'response', :code => "200", :body => cert_string
-+        response.stubs(:[]).with('content-type').returns "text/plain"
-+        network.expects(:get).returns response
-+
-+        request = Puppet::Indirector::Request.new(:certificate, :find, "foo.com")
-+        result = terminus.find(request)
-+        result.should_not be_nil
-+        result.name.should == "foo.com"
-+    end
- end
diff --git a/app-admin/puppet/files/puppet-0.25.1-eix-0.18.patch b/app-admin/puppet/files/puppet-0.25.1-eix-0.18.patch
deleted file mode 100644
index c4e997e1da3e..000000000000
--- a/app-admin/puppet/files/puppet-0.25.1-eix-0.18.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
-index e920580..2a8654c 100644
---- a/lib/puppet/provider/package/portage.rb
-+++ b/lib/puppet/provider/package/portage.rb
-@@ -1,7 +1,6 @@
- require 'puppet/provider/package'
- 
- Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do
--    include Puppet::Util::Execution
-     desc "Provides packaging support for Gentoo's portage system."
- 
-     has_feature :versionable
-@@ -13,33 +12,32 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
-     defaultfor :operatingsystem => :gentoo
- 
-     def self.instances
--        result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
--        result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
-+        result_format = /(\S+) (\S+) \[(\S+)\] \[(\S+)\] (\S+) (.*)/
-+        result_fields = [:category, :name, :ensure, :version_available, :vendor, :description]
- 
--        version_format = "<version>{!last} {}"
--        search_format = "<category> <name> [<installedversions:SPLITVERSIONS>] [<bestversion:SPLITVERSIONS>] <homepage> <description>"
-+        version_format = "{last}<version>{}"
-+        search_format = "<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] <homepage> <description>\n"
- 
-         begin
-             if !FileUtils.uptodate?("/var/cache/eix", %w(/usr/bin/eix /usr/portage/metadata/timestamp))
-                 update_eix
-             end
-+
-             search_output = nil
--            withenv :SPLITVERSIONS => version_format do
--                search_output = eix "--nocolor", "--pure-packages", "--installed", "--format", search_format
-+            Puppet::Util::Execution.withenv :LASTVERSION => version_format do
-+                search_output = eix "--nocolor", "--pure-packages", "--stable", "--installed", "--format", search_format
-             end
- 
-             packages = []
-             search_output.each do |search_result|
--                match = result_format.match( search_result )
-+                match = result_format.match(search_result)
- 
-                 if match
-                     package = {}
--                    result_fields.zip(match.captures) { |field, value|
-+                    result_fields.zip(match.captures) do |field, value|
-                         package[field] = value unless !value or value.empty?
--                    }
-+                    end
-                     package[:provider] = :portage
--                    package[:ensure] = package[:ensure].split.last
--
-                     packages << new(package)
-                 end
-             end
-@@ -74,36 +72,35 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
-     end
- 
-     def query
--        result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
--        result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
-+        result_format = /(\S+) (\S+) \[(\S*)\] \[(\S+)\] (\S+) (.*)/
-+        result_fields = [:category, :name, :ensure, :version_available, :vendor, :description]
-+
-+        version_format = "{last}<version>{}"
-+        search_format = "<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] <homepage> <description>\n"
- 
-         search_field = package_name.count('/') > 0 ? "--category-name" : "--name"
-         search_value = package_name
- 
--        version_format = "<version>{!last} {}"
--        search_format = "<category> <name> [<installedversions:FORMAT_PVERSION>] [<bestversion:FORMAT_PVERSION>] <homepage> <description>"
--
-         begin
-             if !FileUtils.uptodate?("/var/cache/eix", %w(/usr/bin/eix /usr/portage/metadata/timestamp))
-                 update_eix
-             end
-+
-             search_output = nil
--            withenv :SPLITVERSIONS => version_format do
--                search_output = eix "--nocolor", "--pure-packages", "--format", search_format, "--exact", search_field, search_value
-+            Puppet::Util::Execution.withenv :LASTVERSION => version_format do
-+                search_output = eix "--nocolor", "--pure-packages", "--stable", "--format", search_format, "--exact", search_field, search_value
-             end
- 
-             packages = []
-             search_output.each do |search_result|
--                match = result_format.match( search_result )
-+                match = result_format.match(search_result)
- 
--                if( match )
-+                if match
-                     package = {}
--                    result_fields.zip( match.captures ) { |field, value| package[field] = value unless !value or value.empty? }
--                    if package[:ensure]
--                        package[:ensure] = package[:ensure].split.last
--                    else
--                        package[:ensure] = :absent
-+                    result_fields.zip(match.captures) do |field, value|
-+                        package[field] = value unless !value or value.empty?
-                     end
-+                    package[:ensure] = package[:ensure] ? package[:ensure] : :absent
-                     packages << package
-                 end
-             end
-@@ -126,4 +123,3 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
-         return self.query[:version_available]
-     end
- end
--
diff --git a/app-admin/puppet/files/puppet-0.25.4-rrd.patch b/app-admin/puppet/files/puppet-0.25.4-r1-rrd.patch
index ef0de5ad5c00..23d17af0d727 100644
--- a/app-admin/puppet/files/puppet-0.25.4-rrd.patch
+++ b/app-admin/puppet/files/puppet-0.25.4-r1-rrd.patch
@@ -32,15 +32,8 @@ diff -Naur puppet-0.25.4.orig//lib/puppet/reports/rrdgraph.rb puppet-0.25.4//lib
          of the metrics generated during transactions, and it will create a
 diff -Naur puppet-0.25.4.orig//lib/puppet/util/metric.rb puppet-0.25.4//lib/puppet/util/metric.rb
 --- puppet-0.25.4.orig//lib/puppet/util/metric.rb	2010-01-28 12:48:34.000000000 +0900
-+++ puppet-0.25.4//lib/puppet/util/metric.rb	2010-02-28 11:35:34.000000000 +0900
-@@ -1,5 +1,6 @@
- # included so we can test object types
- require 'puppet'
-+require 'RRD'
- 
- # A class for handling metrics.  This is currently ridiculously hackish.
- class Puppet::Util::Metric
-@@ -31,7 +32,6 @@
++++ puppet-0.25.4//lib/puppet/util/metric.rb	2010-03-02 20:19:40.000000000 +0900
+@@ -31,7 +31,6 @@
  
          start ||= Time.now.to_i - 5
  
@@ -48,7 +41,7 @@ diff -Naur puppet-0.25.4.orig//lib/puppet/util/metric.rb puppet-0.25.4//lib/pupp
          args = []
  
          values.each { |value|
-@@ -42,14 +42,17 @@
+@@ -42,14 +41,17 @@
          args.push "RRA:AVERAGE:0.5:1:300"
  
          begin
@@ -68,7 +61,7 @@ diff -Naur puppet-0.25.4.orig//lib/puppet/util/metric.rb puppet-0.25.4//lib/pupp
      end
  
      def graph(range = nil)
-@@ -84,12 +87,12 @@
+@@ -84,12 +86,12 @@
              if range
                  args.push("--start",range[0],"--end",range[1])
              else
@@ -84,7 +77,7 @@ diff -Naur puppet-0.25.4.orig//lib/puppet/util/metric.rb puppet-0.25.4//lib/pupp
              rescue => detail
                  Puppet.err "Failed to graph %s: %s" % [self.name,detail]
              end
-@@ -122,7 +125,6 @@
+@@ -122,7 +124,6 @@
              self.create(time - 5)
          end
  
@@ -92,7 +85,7 @@ diff -Naur puppet-0.25.4.orig//lib/puppet/util/metric.rb puppet-0.25.4//lib/pupp
  
          # XXX this is not terribly error-resistant
          args = [time]
-@@ -135,7 +137,9 @@
+@@ -135,7 +136,9 @@
          arg = args.join(":")
          template = temps.join(":")
          begin
diff --git a/app-admin/puppet/puppet-0.25.1-r1.ebuild b/app-admin/puppet/puppet-0.25.1-r1.ebuild
deleted file mode 100644
index af680a83c305..000000000000
--- a/app-admin/puppet/puppet-0.25.1-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.25.1-r1.ebuild,v 1.1 2009/11/22 17:38:35 hollow Exp $
-
-EAPI="2"
-inherit elisp-common eutils ruby
-
-MY_P="${P/_}"
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://reductivelabs.com/projects/puppet"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="augeas emacs ldap rrdtool shadow vim-syntax"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="dev-lang/ruby[ssl]
-	emacs? ( virtual/emacs )
-	>=dev-ruby/facter-1.5.0"
-RDEPEND="${DEPEND}
-	>=app-portage/eix-0.18.0
-	augeas? ( dev-ruby/ruby-augeas )
-	ldap? ( dev-ruby/ruby-ldap )
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	shadow? ( dev-ruby/ruby-shadow )"
-
-S="${WORKDIR}/${MY_P}"
-USE_RUBY="ruby18"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.25.1-eix-0.18.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
-
-	newinitd "${FILESDIR}"/puppetmaster-0.25.init puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-	newinitd "${FILESDIR}"/puppet-0.25.init 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 ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	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
-	docinto conf; dodoc conf/namespaceauth.conf
-}
-
-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.25.4.ebuild b/app-admin/puppet/puppet-0.25.4-r1.ebuild
index 4f1dfbefa884..7e1fb5d1f91f 100644
--- a/app-admin/puppet/puppet-0.25.4.ebuild
+++ b/app-admin/puppet/puppet-0.25.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.25.4.ebuild,v 1.1 2010/02/28 03:04:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.25.4-r1.ebuild,v 1.1 2010/03/02 12:11:53 matsuu Exp $
 
 EAPI="2"
 inherit elisp-common eutils ruby
@@ -35,7 +35,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Bug #294304
-	epatch "${FILESDIR}/${P}-rrd.patch"
+	epatch "${FILESDIR}/${PF}-rrd.patch"
 }
 
 src_compile() {