Version bumped, bug #349188.

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

5 files changed, 22 insertions, 392 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index dab9f0dba43f..0ca51464420d 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,13 @@
 # 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.71 2010/11/04 07:13:35 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.72 2010/12/31 04:02:12 matsuu Exp $
+
+*puppet-2.6.4 (31 Dec 2010)
+
+  31 Dec 2010; MATSUU Takuto <matsuu@gentoo.org> -puppet-0.25.4-r1.ebuild,
+  -puppet-2.6.0.ebuild, -puppet-2.6.0-r1.ebuild, -puppet-2.6.1.ebuild,
+  +puppet-2.6.4.ebuild:
+  Version bumped, bug #349188. Removed old versions.
 
 *puppet-2.6.2 (04 Nov 2010)
 
@@ -15,10 +22,10 @@
   20 Sep 2010; Guy Martin <gmsoft@gentoo.org> puppet-0.25.5.ebuild:
   hppa stable wrt #325129
 
-  18 Sep 2010; Raúl Porcel <armin76@gentoo.org> puppet-0.25.5.ebuild:
+  18 Sep 2010; Ra炭l Porcel <armin76@gentoo.org> puppet-0.25.5.ebuild:
   sparc stable wrt #325129
 
-  15 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> puppet-2.6.0.ebuild,
+  15 Aug 2010; Diego E. Petten嘆 <flameeyes@gentoo.org> puppet-2.6.0.ebuild,
   puppet-2.6.0-r1.ebuild:
   Update to the new ruby_add_rdepend syntax (classic-style) and use
   virtual/ruby-ssl rather than reimplementing it by hand.
@@ -64,7 +71,7 @@
   puppet-0.25.4-r1.ebuild:
   stable x86, bug 306195
 
-  04 Mar 2010; Raúl Porcel <armin76@gentoo.org> puppet-0.25.4-r1.ebuild:
+  04 Mar 2010; Ra炭l Porcel <armin76@gentoo.org> puppet-0.25.4-r1.ebuild:
   sparc stable wrt #306195
 
 *puppet-0.25.4-r1 (02 Mar 2010)
@@ -93,13 +100,13 @@
 
 *puppet-0.25.1-r1 (22 Nov 2009)
 
-  22 Nov 2009; Benedikt Böhm <hollow@gentoo.org> +puppet-0.25.1-r1.ebuild,
+  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)
 
-  16 Nov 2009; Benedikt Böhm <hollow@gentoo.org> puppet-0.24.8-r1.ebuild,
+  16 Nov 2009; Benedikt B旦hm <hollow@gentoo.org> puppet-0.24.8-r1.ebuild,
   -puppet-0.25.0.ebuild, puppet-0.25.0-r1.ebuild, +puppet-0.25.1.ebuild,
   +files/puppet-0.25.1-eix-0.18.patch:
   version bump + backported portage provider for eix-0.18 compatibility (see
@@ -107,7 +114,7 @@
 
 *puppet-0.25.0-r1 (08 Oct 2009)
 
-  08 Oct 2009; Benedikt Böhm <hollow@gentoo.org> +puppet-0.25.0-r1.ebuild,
+  08 Oct 2009; Benedikt B旦hm <hollow@gentoo.org> +puppet-0.25.0-r1.ebuild,
   +files/puppet-0.25.0-cert-names.patch:
   add hotfix for 0.24.x CA compatibility. Upstream bug #2617
 
@@ -152,7 +159,7 @@
 
 *puppet-0.24.8-r1 (19 Apr 2009)
 
-  19 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
+  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
@@ -229,7 +236,7 @@
   Fixed rrdtool dependency, bug #238568. Fixed to work with
   >=app-portage/eix-0.14.0.
 
-  29 Sep 2008; Tiziano Müller <dev-zero@gentoo.org> files/puppet.init,
+  29 Sep 2008; Tiziano M端ller <dev-zero@gentoo.org> files/puppet.init,
   files/puppetmaster.init:
   Removed bashism from init-scripts
 
@@ -275,7 +282,7 @@
   16 Jun 2008; nixnut <nixnut@gentoo.org> puppet-0.24.4.ebuild:
   Stable on ppc wrt bug 227375
 
-  16 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  16 Jun 2008; Tiziano M端ller <dev-zero@gentoo.org>
   +files/puppet-0.24.4-openrc_initd.patch, files/puppetmaster.init,
   puppet-0.24.4.ebuild:
   Added fix to make scripts work with baselayout-2/openrc (bug #218071)
diff --git a/app-admin/puppet/puppet-0.25.4-r1.ebuild b/app-admin/puppet/puppet-0.25.4-r1.ebuild
deleted file mode 100644
index fcdf87faf28d..000000000000
--- a/app-admin/puppet/puppet-0.25.4-r1.ebuild
+++ /dev/null
@@ -1,122 +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-0.25.4-r1.ebuild,v 1.5 2010/05/26 11:15:15 pacho 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}.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 )"
-
-USE_RUBY="ruby18"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-src_prepare() {
-	# Bug #294304
-	epatch "${FILESDIR}/${PF}-rrd.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 || die
-
-	newinitd "${FILESDIR}"/puppetmaster-0.25.init puppetmaster || die
-	doconfd conf/gentoo/conf.d/puppetmaster || die
-	newinitd "${FILESDIR}"/puppet-0.25.init puppet || die
-	doconfd conf/gentoo/conf.d/puppet || die
-
-	# Initial configuration files
-	keepdir /etc/puppet/manifests || die
-	insinto /etc/puppet
-	doins conf/gentoo/puppet/* || 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.0-r1.ebuild b/app-admin/puppet/puppet-2.6.0-r1.ebuild
deleted file mode 100644
index 561c08c4f779..000000000000
--- a/app-admin/puppet/puppet-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,132 +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.0-r1.ebuild,v 1.2 2010/08/15 13:21:30 flameeyes Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="unit"
-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"
-
-RESTRICT="test"
-
-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
-	doins conf/gentoo/puppet/* || 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.0.ebuild b/app-admin/puppet/puppet-2.6.0.ebuild
deleted file mode 100644
index 8ca2a3bad65b..000000000000
--- a/app-admin/puppet/puppet-2.6.0.ebuild
+++ /dev/null
@@ -1,126 +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.0.ebuild,v 1.2 2010/08/15 13:21:30 flameeyes Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-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
-	doins conf/gentoo/puppet/* || 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.1.ebuild b/app-admin/puppet/puppet-2.6.4.ebuild
index 091421496ce0..d72a90351f7d 100644
--- a/app-admin/puppet/puppet-2.6.1.ebuild
+++ b/app-admin/puppet/puppet-2.6.4.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2010/09/23 06:15:21 matsuu Exp $
+# $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"
@@ -64,7 +64,10 @@ all_ruby_install() {
 	# Initial configuration files
 	keepdir /etc/puppet/manifests || die
 	insinto /etc/puppet
-	doins conf/gentoo/puppet/* || die
+
+	# Bug #338439
+	#doins conf/gentoo/puppet/* || die
+	doins conf/redhat/*.conf || die
 	doins conf/auth.conf || die
 
 	# Location of log and data files