Version bumped. Fixed eix-patch for new eix syntax.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64

6 files changed, 174 insertions, 8 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 6533138892da..e7cac1ff6c36 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.27 2008/10/06 16:30:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.28 2008/11/21 17:13:40 matsuu Exp $
+
+*puppet-0.24.6 (21 Nov 2008)
+
+  21 Nov 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/puppet-0.24.6-eix.patch, files/puppet.init,
+  files/puppetmaster.init, +puppet-0.24.6.ebuild:
+  Version bumped. Fixed eix-patch for new eix syntax.
 
 *puppet-0.24.5-r4 (06 Oct 2008)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 1146905f947c..e9d5068f076a 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -2,13 +2,16 @@ AUX 50puppet-mode-gentoo.el 257 RMD160 c8ee412f60fed83c44091bb56d18e200bb0c7e03
 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.5-eix-0.14.0.patch 1285 RMD160 a5d3894afb3f026e0f44a3bfbcab3d9157f52b7c SHA1 f072684527a9b6b30e7c8fb7dd7d833a58d33a9c SHA256 59c71450f000175c1c11c8844ce837c643ea039ecd0b4545b38a1b50634a0dbd
-AUX puppet.init 880 RMD160 00f774cb8ca7cc9b6da2cd601c44101ed6a0826b SHA1 1affb19d499d5da3453c8389d9b620cfb2db42f4 SHA256 2f4bd61d9e6beba8c562cc9bee5f22b7a766f37453452391e02174ade043b7e5
+AUX puppet-0.24.6-eix.patch 1286 RMD160 3bfe29635c0a7862880463859327556411323e76 SHA1 60502f03ef42e556bc1d6c3d3b898edad7b3f7df SHA256 e50a849273a51222167181e258eeb955a5cc4ae5230e7f5c79bbf878df5b2c5e
+AUX puppet.init 893 RMD160 419bbfebadf6c98bc27930b6eb4583b6fc8129c4 SHA1 9f1a1979a74c4130c08857275952b8749a5f0c38 SHA256 220b2723769110e644e984babb5a19657f1b9e062edd70c60e87a86146ada6c9
 AUX puppetmaster.confd 279 RMD160 64824fc2c88d9069b25d0548fac5981f1ff4fa6b SHA1 d521616310e7a27986c27138bd4d4382238d609a SHA256 6db68d9e093d3d231c8ad35968e8d276f68cdd7aec8577b3f7ac2998d1f91692
-AUX puppetmaster.init 998 RMD160 ec2c12e660a8c45bece1d7ac68012a78b3c43188 SHA1 aa99eacf98930df81a8b1293f2a2fff980f49dac SHA256 7c8fd128e97cd282ff44dd09f82dc3a637cf07f014faf544b9f02aa5e566c915
+AUX puppetmaster.init 976 RMD160 2f3ba179a2642b17e82bedf86765bf9cfe7fd5bc SHA1 e5fcf58f85ddde9dc2599c87b5698622559146e9 SHA256 d3754a931b63939dd030feef4d18b12cd1b9a4d66b8b3dc7645e349fa5115666
 DIST puppet-0.24.4.tgz 652572 RMD160 e675d27216dfeb3717c8140d3c89625e6be351e9 SHA1 e79671d8765e08df93c6a4c76b198467c3e13a7a SHA256 0d54f6db7cf1210d123264bcb35b07b36837ebc12a4f2bd01aee6127836adfb9
 DIST puppet-0.24.5.tgz 872803 RMD160 be85ce18ce6a56939eaf83c60cc55d1c5134ef36 SHA1 fe3d63bf30169eb6ec2b30e43d489a51bb36d090 SHA256 0b5ff82b06699a5d10b2ee6e995f427b76540cc0e67ffa8243ee6fc03d8e641d
+DIST puppet-0.24.6.tgz 894124 RMD160 5fba245b7dcd196f734558ab8bc00a3637dc49fc SHA1 2deaf43934c149430dec46d97af17aa4afc41442 SHA256 1cf0f7914b6ed13314bff2f517a42fd224ef24bd99b46e323d2bc793fe58b936
 EBUILD puppet-0.24.4.ebuild 3269 RMD160 1e94112b41772cf206799ac18e46a55fa4bd616c SHA1 f213a6b927f9daefc0b2e8f0b5dc9dbe5ecd69a5 SHA256 177b3d1c9613c42eae6966119c13e7ea71ccb849dd1c6730339fa4f8d60efbc1
 EBUILD puppet-0.24.5-r3.ebuild 3722 RMD160 d6edd50fe210598d685fdb5970f00903a0feb35f SHA1 9bd9f11e875864f574ca4a7add63013669ca26ff SHA256 229a904d0b5a464217b3fd25f710db754884f641c774900b1f01871946732847
 EBUILD puppet-0.24.5-r4.ebuild 3913 RMD160 f99498d4ad1d37f67a855dd2ae6b19daaf07fe21 SHA1 980876c89613d2726cfc0355b2d55319724f2838 SHA256 808e78a01447ce77e2ff630ce7bf0ef271ec9a4dd018bf20e948e974dcd895a9
-MISC ChangeLog 5314 RMD160 194b89043985ee52a143dadabf54fcdb59fe2b72 SHA1 ea1b48e785a97611492a3ca9aa58fa3a246c2f07 SHA256 da8e9f3fb4b39c80b4e8d5961b023ac2118c78e66ed8ae1a07db579dc4dc0b00
+EBUILD puppet-0.24.6.ebuild 3903 RMD160 b6ce6ce24b4f5c4412246ff56b1ede8314bae354 SHA1 d669a4b46d601b1d8e90205b9bfbf681e8804725 SHA256 c4418364b44cea03bf1a8d37518690bfde6749cd0281bd8673b0bd8114d1288f
+MISC ChangeLog 5551 RMD160 d5f5324f32266fe2dcda7b535667ed0864bde4b5 SHA1 f7d6600cfc999a686df2e9d1ffb4091a37f06ad5 SHA256 0e2d4ae8cc09f4f4c2a62babd03058aef2d71996c4dfb0b0c5822bb221f14c9a
 MISC metadata.xml 1002 RMD160 172f4fc2883017a49b71d7e48c558bbc6c54770b SHA1 0386fcc01ff39593cf1755051a3d1283e6b4f2b7 SHA256 eb49ad59455c53c1666eeca292c0670b399968f9e10e9017b88f1e206098f8a5
diff --git a/app-admin/puppet/files/puppet-0.24.6-eix.patch b/app-admin/puppet/files/puppet-0.24.6-eix.patch
new file mode 100644
index 000000000000..ba1a4c94a74b
--- /dev/null
+++ b/app-admin/puppet/files/puppet-0.24.6-eix.patch
@@ -0,0 +1,12 @@
+diff -Naur puppet-0.24.6.orig/lib/puppet/provider/package/portage.rb puppet-0.24.6/lib/puppet/provider/package/portage.rb
+--- puppet-0.24.6.orig/lib/puppet/provider/package/portage.rb	2008-10-09 22:51:05.000000000 +0900
++++ puppet-0.24.6/lib/puppet/provider/package/portage.rb	2008-11-22 00:47:35.000000000 +0900
+@@ -12,7 +12,7 @@
+     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_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]*)?)(?:\(([^\)]+)\))?(?:\+[ilvs]|![fmpbstuid])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
+         result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
+ 
+         search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}"
diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init
index afdf5dc7f824..27b453024750 100755
--- a/app-admin/puppet/files/puppet.init
+++ b/app-admin/puppet/files/puppet.init
@@ -4,7 +4,7 @@
 
 depend() {
 	need net
-	use dns logger
+	use dns logger puppetmaster
 }
 
 checkconfig() {
diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init
index 200ab9ecb3e2..03297cb489c5 100755
--- a/app-admin/puppet/files/puppetmaster.init
+++ b/app-admin/puppet/files/puppetmaster.init
@@ -4,9 +4,7 @@
 
 depend() {
 	need net
-	after slapd
-	before puppet
-	use dns logger
+	use dns logger slapd
 }
 
 checkconfig() {
diff --git a/app-admin/puppet/puppet-0.24.6.ebuild b/app-admin/puppet/puppet-0.24.6.ebuild
new file mode 100644
index 000000000000..683153f78a58
--- /dev/null
+++ b/app-admin/puppet/puppet-0.24.6.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.6.ebuild,v 1.1 2008/11/21 17:13:40 matsuu Exp $
+
+inherit elisp-common eutils ruby
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
+SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="emacs ldap rrdtool vim-syntax"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="emacs? ( virtual/emacs )
+	>=dev-ruby/facter-1.1.0"
+RDEPEND="${DEPEND}
+	>=app-portage/eix-0.9.4
+	ldap? ( dev-ruby/ruby-ldap )
+	rrdtool? (
+		|| (
+			>=net-analyzer/rrdtool-1.2.23
+			dev-ruby/ruby-rrd
+		)
+	)"
+#	|| (
+#		www-servers/webrick
+#		www-servers/mongrel
+#	)
+#	dev-ruby/diff-lcs
+#	dev-ruby/rails
+#	dev-ruby/ruby-shadow
+
+USE_RUBY="ruby18 ruby19"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	built_with_use virtual/ruby ipv6 || \
+		die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run"
+
+	if use rrdtool && \
+		has_version '>=net-analyzer/rrdtool-1.2.23' && \
+		! built_with_use '>=net-analyzer/rrdtool-1.2.23' ruby
+	then
+		die "net-analyzer/rrdtool must be built with ruby USE flag."
+	fi
+
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-0.24.2-gentoo.patch"
+	epatch "${FILESDIR}/${P}-eix.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
+}