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

(Portage version: 2.1.7.17/cvs/Linux x86_64)

6 files changed, 18 insertions, 335 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/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() {