version bump + backported portage provider for eix-0.18 compatibility (see #287714)

(Portage version: 2.2_rc49/cvs/Linux i686)

5 files changed, 130 insertions, 19 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 4c0f5a2b0126..e156fed7f9ec 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.48 2009/10/08 09:53:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.49 2009/11/16 20:18:49 hollow Exp $
+
+*puppet-0.25.1 (16 Nov 2009)
+
+  16 Nov 2009; Benedikt Böhm <hollow@gentoo.org> puppet-0.24.8-r1.ebuild,
+  -puppet-0.25.0.ebuild, puppet-0.25.0-r1.ebuild, +puppet-0.25.1.ebuild,
+  +files/puppet-0.25.1-eix-0.18.patch:
+  version bump + backported portage provider for eix-0.18 compatibility (see
+  #287714)
 
 *puppet-0.25.0-r1 (08 Oct 2009)
 
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
new file mode 100644
index 000000000000..438507e9a072
--- /dev/null
+++ b/app-admin/puppet/files/puppet-0.25.1-eix-0.18.patch
@@ -0,0 +1,111 @@
+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/puppet-0.24.8-r1.ebuild b/app-admin/puppet/puppet-0.24.8-r1.ebuild
index c04ca8ef068c..65b8788540fe 100644
--- a/app-admin/puppet/puppet-0.24.8-r1.ebuild
+++ b/app-admin/puppet/puppet-0.24.8-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.24.8-r1.ebuild,v 1.6 2009/09/05 22:21:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.8-r1.ebuild,v 1.7 2009/11/16 20:18:49 hollow Exp $
 
 EAPI="2"
 inherit elisp-common eutils ruby
@@ -19,6 +19,7 @@ DEPEND="dev-lang/ruby[ssl]
 	>=dev-ruby/facter-1.5.0"
 RDEPEND="${DEPEND}
 	>=app-portage/eix-0.9.4
+	<app-portage/eix-0.18
 	augeas? ( dev-ruby/ruby-augeas )
 	ldap? ( dev-ruby/ruby-ldap )
 	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
diff --git a/app-admin/puppet/puppet-0.25.0-r1.ebuild b/app-admin/puppet/puppet-0.25.0-r1.ebuild
index 179a2ce32112..2251b3c17bf1 100644
--- a/app-admin/puppet/puppet-0.25.0-r1.ebuild
+++ b/app-admin/puppet/puppet-0.25.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.0-r1.ebuild,v 1.1 2009/10/08 09:53:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.25.0-r1.ebuild,v 1.2 2009/11/16 20:18:49 hollow Exp $
 
 EAPI="2"
 inherit elisp-common eutils ruby
@@ -20,6 +20,7 @@ DEPEND="dev-lang/ruby[ssl]
 	>=dev-ruby/facter-1.5.0"
 RDEPEND="${DEPEND}
 	>=app-portage/eix-0.9.4
+	<app-portage/eix-0.18
 	augeas? ( dev-ruby/ruby-augeas )
 	ldap? ( dev-ruby/ruby-ldap )
 	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
diff --git a/app-admin/puppet/puppet-0.25.0.ebuild b/app-admin/puppet/puppet-0.25.1.ebuild
index 3fb97feb9291..3b7c7b348b0e 100644
--- a/app-admin/puppet/puppet-0.25.0.ebuild
+++ b/app-admin/puppet/puppet-0.25.1.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.1 2009/09/06 23:00:10 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.25.1.ebuild,v 1.1 2009/11/16 20:18:49 hollow Exp $
 
 EAPI="2"
 inherit elisp-common eutils ruby
@@ -19,17 +19,11 @@ DEPEND="dev-lang/ruby[ssl]
 	emacs? ( virtual/emacs )
 	>=dev-ruby/facter-1.5.0"
 RDEPEND="${DEPEND}
-	>=app-portage/eix-0.9.4
+	>=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 )"
-#	|| (
-#		www-servers/webrick
-#		www-servers/mongrel
-#	)
-#	dev-ruby/diff-lcs
-#	dev-ruby/rails
 
 S="${WORKDIR}/${MY_P}"
 USE_RUBY="ruby18"
@@ -42,7 +36,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.24.6-eix.patch"
+	epatch "${FILESDIR}/${PN}-0.25.1-eix-0.18.patch"
 }
 
 src_compile() {
@@ -55,14 +49,8 @@ src_install() {
 	DESTDIR="${D}" ruby_einstall "$@" || die
 	DESTDIR="${D}" erubydoc
 
-	#
-	# bug #237071
-	#
-	#doinitd conf/gentoo/init.d/puppetmaster
 	newinitd "${FILESDIR}"/puppetmaster-0.25.init puppetmaster
-	#doconfd conf/gentoo/conf.d/puppetmaster
 	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-	#doinitd conf/gentoo/init.d/puppet
 	newinitd "${FILESDIR}"/puppet-0.25.init puppet
 	doconfd conf/gentoo/conf.d/puppet
 
@@ -104,7 +92,7 @@ pkg_postinst() {
 	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 "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
@@ -125,8 +113,10 @@ pkg_postinst() {
 		elog "	/etc/puppet/puppetmasterd.conf"
 		elog
 	fi
+
 	use emacs && elisp-site-regen
 }
+
 pkg_postrm() {
 	use emacs && elisp-site-regen
 }