Version bumped. Fixed test issue, bug #363451. Removed old versions.

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

4 files changed, 41 insertions, 157 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 6aa271a28852..d802b23cfac0 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.74 2011/04/11 15:04:16 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.75 2011/04/29 07:06:14 matsuu Exp $
+
+*puppet-2.6.8 (29 Apr 2011)
+
+  29 Apr 2011; MATSUU Takuto <matsuu@gentoo.org> -puppet-2.6.2.ebuild,
+  -puppet-2.6.4.ebuild, +puppet-2.6.8.ebuild:
+  Version bumped. Fixed test issue, bug #363451. Removed old versions.
 
 *puppet-2.6.7 (11 Apr 2011)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index cda4e1a24cd0..34010e435c8d 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -9,29 +9,27 @@ AUX puppetmaster-0.25.init 1006 RMD160 9b1878992fc0380cbacf7c1eada2e6a283749a26
 AUX puppetmaster.confd 279 RMD160 64824fc2c88d9069b25d0548fac5981f1ff4fa6b SHA1 d521616310e7a27986c27138bd4d4382238d609a SHA256 6db68d9e093d3d231c8ad35968e8d276f68cdd7aec8577b3f7ac2998d1f91692
 AUX puppetmaster.init 984 RMD160 0f64b00f6b67fd4a7df0ed765fae096d7708abe0 SHA1 73c53119ac29591f1119637eb8818225bc32b95f SHA256 62f0abb0a386620be83586adaf34c1baff4719618d08495a7cbadaa21cc2d101
 DIST puppet-0.25.5.tar.gz 1446756 RMD160 c9b934ef9135c5b0d5abe9b97a2491e52145abb7 SHA1 5d77345c35926efb57fedbb8fe97d9ad717701c8 SHA256 88038160a4a91790475012df10396e6292dcf39c0402ac42edf89f755fb9b105
-DIST puppet-2.6.2.gem 1497088 RMD160 af6dc984dfcb59a3575462a19b57472a144e4bdf SHA1 8f483de251cd12d10f29384decb398ee15c9567c SHA256 b47be744c0ef560bbf1928d58c0557bd3ebae9e6aad8e11c2e48cde96606eb8b
-DIST puppet-2.6.4.gem 1499648 RMD160 41d5cf24586a06336b24d10a6eff15dfafffd456 SHA1 1f0369d9824ad71176cbbcf10b912ee24d66c39a SHA256 182f551b5a96d0ace363b7a40041f887ee66567d407e76ea1649f448fc3f45e0
 DIST puppet-2.6.7.gem 1529856 RMD160 f4d2508e5d75361c4294eee3629d3a75676f41bd SHA1 cd49ae8f853c74b8767332f8c4b30631f9f98580 SHA256 9f5f85f1e4e87f9f8812c1a83a6246b223d3e8dd9bc9050750d5d19f35769518
+DIST puppet-2.6.8.gem 1547776 RMD160 856756bcf4578f8e9e00520951cd088be65b8337 SHA1 0943bbdcf41b041dcd0b96b2e58f134fed4efd1f SHA256 da268118d5a289cb5b16523896152ced6aad99a75c9f7b2eb57e9dedc0995751
 EBUILD puppet-0.25.5.ebuild 3469 RMD160 ca5579a820b9e66cd4a55418a0937a1ba7460a2a SHA1 7cb8b09e16b598351986d6e14d6e8a97652ba441 SHA256 e36d5c99627572ed2c51b9f6da2dc1d7a2ff3806c186d30b6ba2a10106315407
-EBUILD puppet-2.6.2.ebuild 3644 RMD160 eca97c7dfb4bbd727acd71f0917aa9de4258b27d SHA1 a4beb54b115a7eed94810e46c0be9989a6026e12 SHA256 03360358c28f0f52f181486dae710161181629231583aeb61f1477a0820bac95
-EBUILD puppet-2.6.4.ebuild 3644 RMD160 68df19d36bc99ff92d005c9d902bc3c6dfc5d6ce SHA1 620b61254e6900aeb04575c418823f48873b1085 SHA256 c33ddd6454ef260608e29d363daf86526fbcad4f4a26d796ec3a7bb7f778f0b5
 EBUILD puppet-2.6.7.ebuild 4013 RMD160 1148c22cdfc7803a0c6397bbdd04003b82fdc519 SHA1 8f9d4e13d496d09d3d264c9b1d6188abccc261e4 SHA256 6dd7eb80edf4919f0bca3819213ae8c5a4884f3bc97d3be38d87497c2cadd2fc
-MISC ChangeLog 13056 RMD160 d725d30e31469f768b3f0d1453bf6c20e590e65f SHA1 342f24c3603d40b368c1a6add1dbdb64d4a3b276 SHA256 b6f02196ae9b84cae91e3476820171a564e0b388451c19731b0ff20f624b3965
+EBUILD puppet-2.6.8.ebuild 4013 RMD160 b922f7e5917986d93a639d250137b79e7d65e486 SHA1 a64748d29a3fb5f3663b781ba9cc3a1fb0f85c81 SHA256 e50c66250ba02db3e295b4c67bf85e47443b7787c3dad9e82ad46526e48d5ea0
+MISC ChangeLog 13274 RMD160 384ee984d4d73492cb87b6df603b8f58ad2cfec5 SHA1 ba8a19b72275dfcd11408c91b1314ec7da3c7493 SHA256 0da77f6d0a0c4ff5eace1a8ce97c780009a71171d7db77a43c612df735d60502
 MISC metadata.xml 1151 RMD160 81b148273367dce9512e1dede5bdf5a860005009 SHA1 e3641e202c1280630301ee38ff2789832ac28904 SHA256 0cedfd44563872f39d902f2b2f07e152e3fe39b3c989f6dc1598745d50a08613
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNoxh2AAoJECaGw+YFKA1p05QP/ixurhTDZ7XWHxbwA/cEjrbW
-aUFnzc8yAxTkHOZNQjBb59WegAUfBsuY6xfjdUXTpP1HalU8y+2Z/XenjJslmm5J
-WTo4gw/aNR99+5wuYVAonraA11MrxyAKPtcRK9i0F4ObaL1rMDWNcTRrz5Tj2Xdh
-4+2uv6qlQ4O8aN2SPOkepbP89ObElUF00L9Rx+HEvLVhy/HiQtfsxK+IQUo274k3
-g4E4LGm74+b3PVOea1O/YP0GUj841dL2ehw5r/zePa2OaswgWTRUUdLrDuXMtkEo
-Hj88kWXbw3/flhYih2/DY5rQKIOZsWXGb1ufB3OfusYFPUXteRKFN3s3VZ938gNP
-WdIviAdAQStbBjJ0DZWY2K2VRdoQSFkqQTIfFK4lv+n6F6BkIBPy3Kb9xZPqEXfb
-yo/5II1vPeztm5qTs0lXVLJdrgS21nWq9Uln7e7GePi7r4XXCCQfFLOMJ4MOTn30
-rCeJupdiIkFVZama+qeCVBSmr1ue8odysToMmEo/C6Flra3EUUpCQnktW7zEKda3
-KqDfk8DbKDutH34cHqHnpmmDC0eGk9HjYJdk5KMBwdJe2hfDUVi51A5yr/T621RY
-y1Nju8UalSmZCp0LE7pFQsT1YjLAnkE+HcL1/QxN4oRMjsrHqkoTRFGHIPS97f/L
-a87E8HpnmHP5Yt6wrszn
-=cALO
+iQIcBAEBAgAGBQJNumN3AAoJECaGw+YFKA1pxlwP/2I6eIhPJPULS6LMfzLoF1fq
+P0UmyaJYMueALBeZnKUbgNeaTd7BSNlOQ27eB7LcnkZfm3efqiu7DWuRDIhRUhOe
+UEQjTZoZq5By4euXTLzj2RKdMu466vamUmxezmVGVyo1CDNI79pNe/P0knAIF8IP
+ieH92ubrlVvJQDvtgR73nIctjKT2UXYdFSgjyuyo1GDdcZ2VSko5LhUjUcSH211Z
+1RQL/5p5/gWtM4fVFEnQwyMbt95V6Q1TkfBzT2y+0ONZWm0p4Rm10ofXu5cnR5I9
+Q5DUTFweMQUZ1+qUYntvUxnpTqinrxpuoPQewD7cyYsR+hSXO7RjoPy4VGLBgZK+
+Vq6HM3ll7YMOVGia5de+xO0kwsTBlTd4IpUjH0yj4TPRq0SQjZtEiRnWAcls4w2T
+l5HI2LQq9meo2wrouVeOdtocQnHzQiW3VE0PO63nPy+FiQa9KywgkPoYvJkCfE4U
+DHmGk2a30K9hZBBn75lE/CGAhFcclmxYqQVq8cdY5PilPa6MHdf7MIJFQiBUg7Jr
+aKj57vnweesL68/0rWs1S+bG3XqmhQ8iozSzBqWe1nfBT9qg70oeSHzsM1zPI7UE
+pCNJredO8iqP+LCzekZR4C9sDVob2rKwCBKiqtBh/WDzQgqDssnhC9Hc+86MJBJn
+H9w366H3dpcewEDZ21x7
+=tv9w
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-2.6.4.ebuild b/app-admin/puppet/puppet-2.6.4.ebuild
deleted file mode 100644
index d72a90351f7d..000000000000
--- a/app-admin/puppet/puppet-2.6.4.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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.4.ebuild,v 1.1 2010/12/31 04:02:12 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
-}
diff --git a/app-admin/puppet/puppet-2.6.2.ebuild b/app-admin/puppet/puppet-2.6.8.ebuild
index 455417a4c93c..d8153f645399 100644
--- a/app-admin/puppet/puppet-2.6.2.ebuild
+++ b/app-admin/puppet/puppet-2.6.8.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.8.ebuild,v 1.1 2011/04/29 07:06:14 matsuu Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
 
 RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
 
 inherit elisp-common eutils ruby-fakegem
@@ -16,22 +16,33 @@ HOMEPAGE="http://puppetlabs.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="augeas emacs ldap rrdtool shadow vim-syntax"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/facter-1.5.1
 	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
 	ldap? ( dev-ruby/ruby-ldap )
 	shadow? ( dev-ruby/ruby-shadow )
+	sqlite3? ( dev-ruby/sqlite3-ruby )
 	virtual/ruby-ssl"
-#rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+#	couchdb? ( dev-ruby/couchrest )
+#	mongrel? ( www-servers/mongrel )
+#	rack? ( >=dev-ruby/rack-1 )
+#	rails? (
+#		dev-ruby/rails
+#		>=dev-ruby/activerecord-2.1
+#	)
+#	stomp? ( dev-ruby/stomp )
 
 DEPEND="${DEPEND}
 	emacs? ( virtual/emacs )"
 RDEPEND="${RDEPEND}
 	emacs? ( virtual/emacs )
 	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? ( sys-libs/libselinux[ruby] )
 	>=app-portage/eix-0.18.0"
 
 SITEFILE="50${PN}-mode-gentoo.el"
@@ -63,6 +74,7 @@ all_ruby_install() {
 
 	# Initial configuration files
 	keepdir /etc/puppet/manifests || die
+	keepdir /etc/puppet/modules || die
 	insinto /etc/puppet
 
 	# Bug #338439
@@ -74,6 +86,7 @@ all_ruby_install() {
 	keepdir /var/run/puppet || die
 	keepdir /var/log/puppet || die
 	keepdir /var/lib/puppet/ssl || die
+	keepdir /var/lib/puppet/facts || die
 	keepdir /var/lib/puppet/files || die
 	fowners -R puppet:puppet /var/{run,log,lib}/puppet || die