fix regression in the portage provider

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

4 files changed, 133 insertions, 4 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index e156fed7f9ec..c897b0569ab6 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,12 @@
 # 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.49 2009/11/16 20:18:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.50 2009/11/22 17:38:35 hollow Exp $
+
+*puppet-0.25.1-r1 (22 Nov 2009)
+
+  22 Nov 2009; Benedikt Böhm <hollow@gentoo.org> +puppet-0.25.1-r1.ebuild,
+  files/puppet-0.25.1-eix-0.18.patch:
+  fix regression in the portage provider
 
 *puppet-0.25.1 (16 Nov 2009)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index be19d41e3cb0..1a0b4f55b555 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -2,7 +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.1-eix-0.18.patch 5924 RMD160 4891ba568bc9a2e9aff88a1b480bb550cf00a47f SHA1 a2d42a8de3b187176a6fbdadec63bf21aa8ff6e6 SHA256 0a8e2d28c12107686641ec0f8e8f4d3117856c5e72f1717b84669b0309489419
 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
@@ -13,6 +13,7 @@ DIST puppet-0.25.0.tar.gz 1405924 RMD160 eef9e5200959eb5f62c1d0419957158fcd2821c
 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-r1.ebuild 3379 RMD160 276fc57a4219ae540fd2f828d7832e848a66e78a SHA1 d18d53ab014e4a8e7d6a65db2bc6a18f74ea7bef SHA256 892942f7660601f65d39a87fe62e5e60f188c23d627ee28597bcff0104267b34
 EBUILD puppet-0.25.1.ebuild 3376 RMD160 4cf0e687ab737e445cbc6661d8ee5d7c6b2bc4fe SHA1 cf33391c817d658a2725d63ef07716e5749d6e88 SHA256 1b326303033224e27ac6958c915f8e386b09609b8e37a1d66b458fcee4e829c6
-MISC ChangeLog 9416 RMD160 65d3aec903253ad1928f58e782522ad077405151 SHA1 daedb0b29b8866559ba363626f53491b495805c4 SHA256 53ece200ca4fd61e9226a8e01afe5c7ff60b04b50dfb5eb2b4f8483dd81d49e0
+MISC ChangeLog 9605 RMD160 9cece0a62d9436d0f82145f861708092fab0050d SHA1 df619e522f492e4a25935c519e26f51b9b6c96e5 SHA256 2c9b5a2293d43821de961df594ce5afc707f0491bfbf2688c4a4b3362201498b
 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
index 438507e9a072..c4e997e1da3e 100644
--- 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
@@ -60,7 +60,7 @@ index e920580..2a8654c 100644
      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_format = /(\S+) (\S+) \[(\S*)\] \[(\S+)\] (\S+) (.*)/
 +        result_fields = [:category, :name, :ensure, :version_available, :vendor, :description]
 +
 +        version_format = "{last}<version>{}"
diff --git a/app-admin/puppet/puppet-0.25.1-r1.ebuild b/app-admin/puppet/puppet-0.25.1-r1.ebuild
new file mode 100644
index 000000000000..af680a83c305
--- /dev/null
+++ b/app-admin/puppet/puppet-0.25.1-r1.ebuild
@@ -0,0 +1,122 @@
+# 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
+}