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

Package-Manager: portage-2.2_rc49/cvs/Linux i686

6 files changed, 136 insertions, 23 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/Manifest b/app-admin/puppet/Manifest
index aac95c61b1f9..be19d41e3cb0 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -2,6 +2,7 @@ AUX 50puppet-mode-gentoo.el 217 RMD160 6ab7ace77c4e2da030c894f6b7f1a520e4950311
 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 6aa02e848bc9a6cd3dc276770de2f3053b85ae22 SHA1 f2974c2ef305952407d38abe32ff67ca9e84c2c1 SHA256 58485ca32240925cd4c3da3cc26e7e4760ca92d3be405ee7adbaf35b0aa39d95
 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
@@ -9,8 +10,9 @@ AUX puppetmaster.confd 279 RMD160 64824fc2c88d9069b25d0548fac5981f1ff4fa6b SHA1
 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.0.tar.gz 1405924 RMD160 eef9e5200959eb5f62c1d0419957158fcd2821ce SHA1 8396103deb91b6d8008d9df10422a7f70071c1bf SHA256 d7ac3dc1cb2d74e99b662b02599e5d045c3d34d4e16bb8f6686b899440443a3b
-EBUILD puppet-0.24.8-r1.ebuild 3605 RMD160 e18d10a463523e7e13b13036a387102b67e7da37 SHA1 8ec98bca66e2522ca5320c6a638c97f2152d3c3e SHA256 45ca9f938d1b0da29fd11b415f270e8a259f8b9f3509a9146f16e0b5ff1eff0b
-EBUILD puppet-0.25.0-r1.ebuild 3658 RMD160 a0bd6582bf6cf3b6c2116f5ec6b125198df257ca SHA1 5f9aa781e8197c1fbf408f46145fff8e72d55f97 SHA256 5767abd9cac5113f6cdbb49d661202952cc54ccb0757ba358fab8e635d30938b
-EBUILD puppet-0.25.0.ebuild 3603 RMD160 0c2102906edad42b3a9612f69c1678643886df46 SHA1 d895473d7f0b6af990479bfab59ec6a6f14cd91c SHA256 abf4f71992833394986645f797a93055762e1ad704e372825b907499400c88dd
-MISC ChangeLog 9110 RMD160 19581851921d57fff67067b04621a4eb011f2bfb SHA1 e13bd658dacc9be55fca5e98da8af43886c45209 SHA256 d9497bfcceae44e2572446f7ef4f81d13f3cde70ca416338865369af01dd1616
+DIST puppet-0.25.1.tar.gz 1388451 RMD160 2b2bb5b0def03ddeebe99df1ee29648b6bca794d SHA1 c791b8f06a5775c63aaa2b48bffaf0540c3d3f88 SHA256 b91975b7f6304fca416b0bc26606639fc838b75237c049b4b0419dfe7e689b0c
+EBUILD puppet-0.24.8-r1.ebuild 3628 RMD160 0899d628f3bf08b6db4a386680902d236a48f956 SHA1 fd01ce2d33e9055e706ff4665e9d3d41be98a05b SHA256 09d71b16ce2506306b7a22bcd8f258a5e92772bd4c713108d473ac49d96961e9
+EBUILD puppet-0.25.0-r1.ebuild 3681 RMD160 1e4c881c6be2904da12df5480adcbde27029d1e3 SHA1 d03abb7f46e1e6a8ad307d95e130cc2a65ea7b89 SHA256 51e8c39a8b772265ef5a0a939019627939f54ca5ccfcd3ae0fe0812523b59356
+EBUILD puppet-0.25.1.ebuild 3376 RMD160 4cf0e687ab737e445cbc6661d8ee5d7c6b2bc4fe SHA1 cf33391c817d658a2725d63ef07716e5749d6e88 SHA256 1b326303033224e27ac6958c915f8e386b09609b8e37a1d66b458fcee4e829c6
+MISC ChangeLog 9416 RMD160 65d3aec903253ad1928f58e782522ad077405151 SHA1 daedb0b29b8866559ba363626f53491b495805c4 SHA256 53ece200ca4fd61e9226a8e01afe5c7ff60b04b50dfb5eb2b4f8483dd81d49e0
 MISC metadata.xml 1104 RMD160 c2e40f737c1f334d2d4e7a34e1dba61b53ebdfff SHA1 ab42f340e0d8add11e9c4cd6c6791f3cc5ec6484 SHA256 c228b29cc44ea8fe2545f43d05688bc6364395adf7cf2d86290d25e86207fefb
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
 }