Version bumped. Fixed puppet.conf, bug #338439.

Package-Manager: portage-2.1.9.22/cvs/Linux x86_64

3 files changed, 155 insertions, 15 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 7bc969350832..dab9f0dba43f 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.70 2010/09/23 06:15:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.71 2010/11/04 07:13:35 matsuu Exp $
+
+*puppet-2.6.2 (04 Nov 2010)
+
+  04 Nov 2010; MATSUU Takuto <matsuu@gentoo.org> +puppet-2.6.2.ebuild:
+  Version bumped. Fixed puppet.conf, bug #338439.
 
 *puppet-2.6.1 (23 Sep 2010)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 94b865496daa..ad5316a5c62a 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -12,27 +12,29 @@ DIST puppet-0.25.4.tar.gz 1424240 RMD160 67610414d6e5c41e9541eb7f392f391b94f1802
 DIST puppet-0.25.5.tar.gz 1446756 RMD160 c9b934ef9135c5b0d5abe9b97a2491e52145abb7 SHA1 5d77345c35926efb57fedbb8fe97d9ad717701c8 SHA256 88038160a4a91790475012df10396e6292dcf39c0402ac42edf89f755fb9b105
 DIST puppet-2.6.0.gem 1482240 RMD160 4c4683ed5ec6647e766eb69d4df9cc89751bc56a SHA1 ae11e51c55433f006bd5a9bcbf0ec0a1308d71c3 SHA256 f186a08246d0ababbb99dda768dac9f986e397f455e646b125b69f452743564e
 DIST puppet-2.6.1.gem 1490432 RMD160 2e5fa3ba9c68e860f661812a38a3056b039ff6c4 SHA1 8158c11ed060e0e855dc55e84b775aef9c1f070f SHA256 63f46fb40fa15be27dd84af0d6dfbb40afa8e0e4fd675e8942200f90b28af33f
+DIST puppet-2.6.2.gem 1497088 RMD160 af6dc984dfcb59a3575462a19b57472a144e4bdf SHA1 8f483de251cd12d10f29384decb398ee15c9567c SHA256 b47be744c0ef560bbf1928d58c0557bd3ebae9e6aad8e11c2e48cde96606eb8b
 EBUILD puppet-0.25.4-r1.ebuild 3477 RMD160 bcf39391589e8fecf93dfb75a3d2b7445b6d7e7c SHA1 192038e8193a70a401021e5f0e911ae8d0d0b0d6 SHA256 cc49a02852b9f114a765a772469a06cebbd6b16c65f35f61a4711a16e224460f
 EBUILD puppet-0.25.5.ebuild 3469 RMD160 ca5579a820b9e66cd4a55418a0937a1ba7460a2a SHA1 7cb8b09e16b598351986d6e14d6e8a97652ba441 SHA256 e36d5c99627572ed2c51b9f6da2dc1d7a2ff3806c186d30b6ba2a10106315407
 EBUILD puppet-2.6.0-r1.ebuild 3617 RMD160 225f746c00a70d1de295a88154bdd00f9cccc466 SHA1 1ee3135818e1e51560461c65fe3fdc0cbfde7686 SHA256 0258fecfaf96a4936b1b2f46058889736a912e82088ae4513a26308c8d55dd2b
 EBUILD puppet-2.6.0.ebuild 3498 RMD160 2632bdbed7fc17f7289e9ffd6268426819375ca3 SHA1 95526f4808950d6cfd171e21904f49ad8cacd3c6 SHA256 a6955c0382a807c8f3dd329a461b663bca1a6bdb6a74a736d433b56d7b6825c1
 EBUILD puppet-2.6.1.ebuild 3594 RMD160 848bb66b08947e39134c7a41197d06cb57da0924 SHA1 d3934dbe1522e254d8581f6535f644d063c603c9 SHA256 7cc1205131f1ea5447da82c80b1446456c21811a4e92049bea8a5c2a1e549a6a
-MISC ChangeLog 12429 RMD160 da3f8e5321f6e01d93b8b5d7a2e272bba88d9642 SHA1 f8f394ad8a283a0a2e0ffc7c13039d3a505f3e79 SHA256 045f82424fe32551a03cf098be292cf22b5d5adff7bf8b54c7631e4238736b01
+EBUILD puppet-2.6.2.ebuild 3644 RMD160 eca97c7dfb4bbd727acd71f0917aa9de4258b27d SHA1 a4beb54b115a7eed94810e46c0be9989a6026e12 SHA256 03360358c28f0f52f181486dae710161181629231583aeb61f1477a0820bac95
+MISC ChangeLog 12580 RMD160 cff913acfcf3815ba81a644c279caf648809cfe7 SHA1 30007f18473ee5b152dbfaadd3e68be66a859a9c SHA256 1fa9f638e53b0e1fe1b2bc2ad50660d9d0c69a4b80fbb39961017cd9816b11ba
 MISC metadata.xml 1104 RMD160 ad88e28f2133835ffd72b6e4621bd3e5d61ed4ff SHA1 aa694fb688719a7a1fa327bbc5f40c7326daee0c SHA256 24012dce9971f449f7b4bad4402b7d229a5bb4fb073ce363ecb2b01f21c4acd2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMmvCGAAoJECaGw+YFKA1pCvkQAJB99mnhrANisqJB9u78hqrL
-ZU5BhsdztKtiPBSvcF1I63H10mW3U+7dc6qinT2Seu2AuCBQRPLBl3KzEz/r7US0
-5XlkrMVmNlW7Artgpdd7tWEIjV9QCADp9ruAoVk+ees1WzaNTojqOb/yEW+R2qgJ
-VeEFamazm2Goc0qaHzO5uO95XSacvyu7oLu7kECqE4KqzR3BMqmAeJzVXxomFh2z
-VMjnw4EqHy05rEx7G0BrJ1lW5qePu/QgscoQgko87zGcvOQugStSSx5q3F7DdQDB
-F19NHnyh5BMqXCl9B7Myq9AlYr4QzZN2sJkp/gjYomVx5lrkPXERllbpdjf+abxv
-joIrE3h3PQnSJQGiqCMmC30f9wENDiG8NZYMaQs5cDdo2jO5Vc1mjGdvxQscz4o4
-s/fyyet+cQIOwcK61oeDAo0vBnMnZMChMlBplsuievEX+Qlps1iNQlc9mYukmD6+
-V/7scjiO6ZxgWncrqzKQpGjGfE+CjVeL+WB2Wa5PW1wrld/1E8qDUQd+kehHFhl+
-/7FWFBZ0lNeE+o5LHWkwQcKja+L7GihYt4DIuCxCUt/O0wsTodhmsXlPOLpCXrw2
-zw3bLuogvaem+sPk4+hk3Ub/YYyf4EWTCfvnT2R6tHy5KmivJ/+9jISlve1vZM7M
-3dilyz0+aUvNbhyCADqm
-=n38M
+iQIcBAEBAgAGBQJM0l0lAAoJECaGw+YFKA1pSpIP/izsAA1cafj0tgMklfiweq5G
+iZA9hUNSGR23LbsmiIG1cgd+oZG7F6RJME1pqjRszhNXlWJoXCSUlaA9RcKoH5a6
++/aRRS0AAsTcNDm17hMXa33Wwg6L5zk8iDzKukytMsVFB3AMJuir8OQp/YLXbHGr
+PLMMfoLDo37T5SXZnBFQsTJwTxv/aUMY8akNX2UGYv3xefVX3ONDgj00ls47cwBj
+qW8NUK8gIfJ9nOp9jlmXpn4r2lzreoazD4Qd0zbuMeYkYyQ5M31FMOYJb30GHpGo
+pq4rFRomzV4N5Dr/77akGznVv68yndB77qUb9HlRbpaXAxOlHGlo2b/SimMcJEAD
+e7ynk5imgMuEQ7QO/wmc1AF1Yb+/IKhGysoMEgkk4GVqhQ/Gxi4aWwrn33JXstG4
+qbDnb1cwARX+HXPzC9P5W4tip2QWk1NXFA+iKD48246bciQHzJ4EOchNbIE/gLvR
+7nY3GA2WR7Y+ZOyegmJTJQY8FRx7ygKi2ey04gbQjOS6/uGAucESE2UtwP6OhCoX
+wWFzA7JEAeWDTQq3jE4FVv4x1YPLdVrwT6aGdop15aW45DfU5SvI3FsBjEvLsFvS
+nkolSVYPzMYrGcCZchDe+jSQQCvNMOAFN8vxwh2X8p1zJ0Bu9cmPOLYZstXwypaC
+Z6nm2rd2O24kVaRz4RaQ
+=0rFo
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-2.6.2.ebuild b/app-admin/puppet/puppet-2.6.2.ebuild
new file mode 100644
index 000000000000..455417a4c93c
--- /dev/null
+++ b/app-admin/puppet/puppet-2.6.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.2.ebuild,v 1.1 2010/11/04 07:13:35 matsuu Exp $
+
+EAPI="2"
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
+
+inherit elisp-common eutils ruby-fakegem
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="augeas emacs ldap rrdtool shadow vim-syntax"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/facter-1.5.1
+	augeas? ( dev-ruby/ruby-augeas )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	virtual/ruby-ssl"
+#rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+
+DEPEND="${DEPEND}
+	emacs? ( virtual/emacs )"
+RDEPEND="${RDEPEND}
+	emacs? ( virtual/emacs )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	>=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
+	fi
+}
+
+each_fakegem_install() {
+	${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newinitd "${FILESDIR}"/puppetmaster.init puppetmaster || die
+	doconfd conf/gentoo/conf.d/puppetmaster || die
+	newinitd "${FILESDIR}"/puppet.init puppet || die
+	doconfd conf/gentoo/conf.d/puppet || die
+
+	# Initial configuration files
+	keepdir /etc/puppet/manifests || die
+	insinto /etc/puppet
+
+	# Bug #338439
+	#doins conf/gentoo/puppet/* || die
+	doins conf/redhat/*.conf || die
+	doins conf/auth.conf || die
+
+	# Location of log and data files
+	keepdir /var/run/puppet || die
+	keepdir /var/log/puppet || die
+	keepdir /var/lib/puppet/ssl || die
+	keepdir /var/lib/puppet/files || die
+	fowners -R puppet:puppet /var/{run,log,lib}/puppet || die
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die
+		insinto /usr/share/vim/vimfiles/ftdetect; doins	ext/vim/ftdetect/puppet.vim || die
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}" || die
+	done
+	docinto conf; dodoc conf/namespaceauth.conf || die
+}
+
+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
+}