identify services with ambiguous suffixes correctly

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

5 files changed, 169 insertions, 5 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 6b3fa9e592f0..55ba01c9d591 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,13 @@
 # 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.38 2009/04/12 12:47:45 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.39 2009/04/19 11:47:43 hollow Exp $
+
+*puppet-0.24.8-r1 (19 Apr 2009)
+
+  19 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
+  +files/puppet-0.24.8-rc-update-show.patch, puppet-0.24.8.ebuild,
+  +puppet-0.24.8-r1.ebuild:
+  identify services with ambiguous suffixes correctly
 
   12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org> puppet-0.24.8.ebuild:
   Add ~sparc keyword, bug #263526
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 14b778850666..150ed396c974 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.2-gentoo.patch 628 RMD160 9149d2b68a82a87dc4bcdae3ef5608ca0f152973 SHA1 d7bd432ef27be9dc14dc4e37b8302659caa0f3f4 SHA256 abc592df144baec0c93cc90459ab273fe2aec9f195670ca5dba5d8bc4e6ee886
 AUX puppet-0.24.4-openrc_initd.patch 624 RMD160 1cc74a411a961f13e752fb2f05a21f102118e220 SHA1 3fa676dd62d7e7efffbd1888effe6b19d18b3d95 SHA256 c723c1f2bb56e6013b8d4deeba0ce73c7c798508d4425dbd18a280719babeb0b
 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.init 893 RMD160 419bbfebadf6c98bc27930b6eb4583b6fc8129c4 SHA1 9f1a1979a74c4130c08857275952b8749a5f0c38 SHA256 220b2723769110e644e984babb5a19657f1b9e062edd70c60e87a86146ada6c9
 AUX puppetmaster.confd 279 RMD160 64824fc2c88d9069b25d0548fac5981f1ff4fa6b SHA1 d521616310e7a27986c27138bd4d4382238d609a SHA256 6db68d9e093d3d231c8ad35968e8d276f68cdd7aec8577b3f7ac2998d1f91692
 AUX puppetmaster.init 976 RMD160 2f3ba179a2642b17e82bedf86765bf9cfe7fd5bc SHA1 e5fcf58f85ddde9dc2599c87b5698622559146e9 SHA256 d3754a931b63939dd030feef4d18b12cd1b9a4d66b8b3dc7645e349fa5115666
@@ -10,6 +11,7 @@ DIST puppet-0.24.7.tgz 1088422 RMD160 fc5da816355878712cddc302ea964dfddcf7bf64 S
 DIST puppet-0.24.8.tgz 1099188 RMD160 edb187da9225c9faee9839a5d644b5c9c91f3d5f SHA1 a871aef6f3e8e060f5109bb022967066e32875be SHA256 9e9dcfdd26f96e0b0b4ca9bcfe6f473c679ff082a0cd7226c2058ae652d4fdc8
 EBUILD puppet-0.24.4.ebuild 3384 RMD160 4ff3c32277999475dcfe32f86d9edc18b3d3f249 SHA1 6269ed7fd264796547b8f62acd3144100a7ec066 SHA256 13190bbb1a61010e42d7f9b21f9b86873a550b2257d29ab47953923290015e00
 EBUILD puppet-0.24.7-r1.ebuild 3980 RMD160 c732f6badfd8d5ab9bfec8d22b3ec4fbb48946f7 SHA1 52c98590f176b7c4409b70d25b3eb18f951fe88d SHA256 a9f8eeb83aa38b69ae1af948ed5e7503b979b505aed03bb39b1e8c860309b6ad
-EBUILD puppet-0.24.8.ebuild 3595 RMD160 8b55627b54679dc3e06c4b04d1dd421f875a7c61 SHA1 28c0c31b4d1046752c742f24d1b1bea5d26d0e90 SHA256 4718a7aba57d1db01408484d64e11ec391a67d238f5c9965b80d350d6b2cfe70
-MISC ChangeLog 7271 RMD160 c433b6f2f19e2b37713b9968c216867a716202f9 SHA1 504fa500e7e92e79f0c993a1f96ffd01f746cebb SHA256 a175bd258a5b98745d129d0df26314c30a812c4ddf82dd481b67cafecd507e99
+EBUILD puppet-0.24.8-r1.ebuild 3616 RMD160 aad27616c8b9957dd89d96c50818a05dfa867b73 SHA1 92a1769241e88c1b3a4978c91b5f21abed223415 SHA256 8e2a36bce9a034c4b410f86426d8050540f3f7b116b75caae91e6cca35deaa42
+EBUILD puppet-0.24.8.ebuild 3557 RMD160 4d17172a884bc00db6f7e7060d7c1e3d709c616b SHA1 67ac72ee4e70a318b1a67ac76ad31b753eb745eb SHA256 aab859e6ef1db76de994edbf193d53229406367ba28986b5d8a0135044c2de0c
+MISC ChangeLog 7502 RMD160 b9d025b320287110fdc540ba3f6629a567bfd1d9 SHA1 2d5f40c7c998ffc2ec5c35071a39b37f7b9dc8dd SHA256 b284ef5eab693d2c86a29339a5ba714393eb548ac8d48bb0cc2f498d9ea8efa9
 MISC metadata.xml 1104 RMD160 c2e40f737c1f334d2d4e7a34e1dba61b53ebdfff SHA1 ab42f340e0d8add11e9c4cd6c6791f3cc5ec6484 SHA256 c228b29cc44ea8fe2545f43d05688bc6364395adf7cf2d86290d25e86207fefb
diff --git a/app-admin/puppet/files/puppet-0.24.8-rc-update-show.patch b/app-admin/puppet/files/puppet-0.24.8-rc-update-show.patch
new file mode 100644
index 000000000000..d65a474e4e27
--- /dev/null
+++ b/app-admin/puppet/files/puppet-0.24.8-rc-update-show.patch
@@ -0,0 +1,25 @@
+From f888ceeeaf880e005d61387d01e7203f346c6974 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Benedikt=20B=C3=B6hm?= <bb@xnull.de>
+Date: Sun, 19 Apr 2009 13:17:47 +0200
+Subject: [PATCH] identify services with ambiguous suffixes correctly
+
+---
+ lib/puppet/provider/service/gentoo.rb |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/puppet/provider/service/gentoo.rb b/lib/puppet/provider/service/gentoo.rb
+index d62df1a..4d59d51 100644
+--- a/lib/puppet/provider/service/gentoo.rb
++++ b/lib/puppet/provider/service/gentoo.rb
+@@ -38,7 +38,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
+         return :false unless line
+ 
+         # If it's enabled then it will print output showing service | runlevel
+-        if output =~ /#{@resource[:name]}\s*\|\s*(boot|default)/
++        if output =~ /^\s*#{@resource[:name]}\s*\|\s*(boot|default)/
+             return :true
+         else
+             return :false
+-- 
+1.6.0.6
+
diff --git a/app-admin/puppet/puppet-0.24.8-r1.ebuild b/app-admin/puppet/puppet-0.24.8-r1.ebuild
new file mode 100644
index 000000000000..96457789584f
--- /dev/null
+++ b/app-admin/puppet/puppet-0.24.8-r1.ebuild
@@ -0,0 +1,131 @@
+# 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.1 2009/04/19 11:47:43 hollow Exp $
+
+EAPI="2"
+inherit elisp-common eutils ruby
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://reductivelabs.com/projects/puppet"
+SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
+
+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.9.4
+	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
+
+USE_RUBY="ruby18 ruby19"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.24.6-eix.patch"
+	epatch "${FILESDIR}/${PN}-0.24.8-rc-update-show.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
+
+	#
+	# bug #237071
+	#
+	#doinitd conf/gentoo/init.d/puppetmaster
+	newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
+	#doconfd conf/gentoo/conf.d/puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+	#doinitd conf/gentoo/init.d/puppet
+	newinitd "${FILESDIR}"/puppet.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
+}
diff --git a/app-admin/puppet/puppet-0.24.8.ebuild b/app-admin/puppet/puppet-0.24.8.ebuild
index 1372e98dd832..4e42d899f13c 100644
--- a/app-admin/puppet/puppet-0.24.8.ebuild
+++ b/app-admin/puppet/puppet-0.24.8.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.ebuild,v 1.4 2009/04/12 12:47:45 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.8.ebuild,v 1.5 2009/04/19 11:47:43 hollow Exp $
 
 EAPI="2"
 inherit elisp-common eutils ruby
@@ -12,7 +12,6 @@ SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="augeas emacs ldap rrdtool shadow vim-syntax"
-#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="dev-lang/ruby[ssl]