Fixed pidfile issue, bug #330269. Fixed doc and test handling, bug #329305.

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

4 files changed, 8 insertions, 55 deletions

diff --git a/app-admin/puppet/files/puppet-0.24.6-eix.patch b/app-admin/puppet/files/puppet-0.24.6-eix.patch
deleted file mode 100644
index dcdc596e4152..000000000000
--- a/app-admin/puppet/files/puppet-0.24.6-eix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
-index ae7194f..5855441 100644
---- a/lib/puppet/provider/package/portage.rb
-+++ b/lib/puppet/provider/package/portage.rb
-@@ -12,7 +12,7 @@ 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_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]*)?)(?:\(([^\)]+)\))?(?:\+[ilvs]|![fmpbstuid])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
-         result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
- 
-         search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}"
-@@ -69,7 +69,7 @@ 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_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]*)?)(?:\(([^\)]+)\))?(?:\+[ilvs]|![fmpbstuid])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
-         result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
- 
-         search_field = package_name.count('/') > 0 ? "--category-name" : "--name"
diff --git a/app-admin/puppet/files/puppet-0.24.8-rc-update-show.patch b/app-admin/puppet/files/puppet-0.24.8-rc-update-show.patch
deleted file mode 100644
index d65a474e4e27..000000000000
--- a/app-admin/puppet/files/puppet-0.24.8-rc-update-show.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f888ceeeaf880e005d61387d01e7203f346c6974 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Benedikt=20B=C3=B6hm?= <bb@xnull.de>
-Date: Sun, 19 Apr 2009 13:17:47 +0200
-Subject: [PATCH] identify services with ambiguous suffixes correctly
-
----
- lib/puppet/provider/service/gentoo.rb |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/puppet/provider/service/gentoo.rb b/lib/puppet/provider/service/gentoo.rb
-index d62df1a..4d59d51 100644
---- a/lib/puppet/provider/service/gentoo.rb
-+++ b/lib/puppet/provider/service/gentoo.rb
-@@ -38,7 +38,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
-         return :false unless line
- 
-         # If it's enabled then it will print output showing service | runlevel
--        if output =~ /#{@resource[:name]}\s*\|\s*(boot|default)/
-+        if output =~ /^\s*#{@resource[:name]}\s*\|\s*(boot|default)/
-             return :true
-         else
-             return :false
--- 
-1.6.0.6
-
diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init
index 9aeebfd39595..5f15aeaa021e 100755
--- a/app-admin/puppet/files/puppet.init
+++ b/app-admin/puppet/files/puppet.init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -24,7 +24,7 @@ start() {
 
 	ebegin "Starting puppet"
 	start-stop-daemon --start --quiet \
-		--pidfile "${PUPPET_PID_DIR}/puppetd.pid" \
+		--pidfile "${PUPPET_PID_DIR}/agent.pid" \
 		--exec /usr/bin/puppetd -- ${options}
 	eend $? "Failed to start puppet"
 }
@@ -32,9 +32,9 @@ start() {
 stop() {
 	ebegin "Stopping puppet"
 	start-stop-daemon --stop --quiet \
-		--pidfile "${PUPPET_PID_DIR}/puppetd.pid"
+		--pidfile "${PUPPET_PID_DIR}/agent.pid"
 	local ret=$?
 	eend ${ret} "Failed to stop puppet"
-	rm -f "${PUPPET_PID_DIR}/puppetd.pid"
+	rm -f "${PUPPET_PID_DIR}/agent.pid"
 	return ${ret}
 }
diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init
index 56fcb1dca711..ba65c2113cad 100755
--- a/app-admin/puppet/files/puppetmaster.init
+++ b/app-admin/puppet/files/puppetmaster.init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -24,7 +24,7 @@ start() {
 
 	ebegin "Starting puppetmaster"
 	start-stop-daemon --start --quiet \
-		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid" \
+		--pidfile "${PUPPETMASTER_PID_DIR}/master.pid" \
 		--exec /usr/bin/puppetmasterd -- ${options}
 	eend $? "Failed to start puppetmaster"
 }
@@ -32,9 +32,9 @@ start() {
 stop() {
 	ebegin "Stopping puppetmaster"
 	start-stop-daemon --stop --quiet \
-		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
+		--pidfile "${PUPPETMASTER_PID_DIR}/master.pid"
 	local ret=$?
 	eend ${ret} "Failed to stop puppetmaster"
-	rm -f "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
+	rm -f "${PUPPETMASTER_PID_DIR}/master.pid"
 	return ${ret}
 }