[gentoo-commits] gentoo-x86 commit in app-admin/puppet/files: puppetmaster.init puppet.init puppet-0.24.6-eix.patch

[Matsuu Takuto (matsuu)]

matsuu      08/11/21 17:13:40

  Modified:             puppetmaster.init puppet.init
  Added:                puppet-0.24.6-eix.patch
  Log:
  Version bumped. Fixed eix-patch for new eix syntax.
  (Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)

Revision  Changes    Path
1.7                  app-admin/puppet/files/puppetmaster.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?r1=1.6&r2=1.7

Index: puppetmaster.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppetmaster.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- puppetmaster.init	6 Oct 2008 16:30:22 -0000	1.6
+++ puppetmaster.init	21 Nov 2008 17:13:40 -0000	1.7
@@ -4,9 +4,7 @@
 
 depend() {
 	need net
-	after slapd
-	before puppet
-	use dns logger
+	use dns logger slapd
 }
 
 checkconfig() {



1.4                  app-admin/puppet/files/puppet.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet.init?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet.init?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet.init?r1=1.3&r2=1.4

Index: puppet.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppet.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- puppet.init	29 Sep 2008 12:48:32 -0000	1.3
+++ puppet.init	21 Nov 2008 17:13:40 -0000	1.4
@@ -4,7 +4,7 @@
 
 depend() {
 	need net
-	use dns logger
+	use dns logger puppetmaster
 }
 
 checkconfig() {



1.1                  app-admin/puppet/files/puppet-0.24.6-eix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet-0.24.6-eix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet-0.24.6-eix.patch?rev=1.1&content-type=text/plain

Index: puppet-0.24.6-eix.patch
===================================================================
diff -Naur puppet-0.24.6.orig/lib/puppet/provider/package/portage.rb puppet-0.24.6/lib/puppet/provider/package/portage.rb
--- puppet-0.24.6.orig/lib/puppet/provider/package/portage.rb	2008-10-09 22:51:05.000000000 +0900
+++ puppet-0.24.6/lib/puppet/provider/package/portage.rb	2008-11-22 00:47:35.000000000 +0900
@@ -12,7 +12,7 @@
     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>{}"