fix regression in the portage provider

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

3 files changed, 130 insertions, 2 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/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
+}