Version bumped, bug #385149.

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

4 files changed, 362 insertions, 2 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 4e4186bdbf90..fb8e7ca77c85 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,13 @@
 # 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.81 2011/09/30 20:59:24 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.82 2011/09/30 23:58:51 matsuu Exp $
+
+*puppet-2.7.5 (30 Sep 2011)
+*puppet-2.6.11 (30 Sep 2011)
+
+  30 Sep 2011; MATSUU Takuto <matsuu@gentoo.org> +puppet-2.6.11.ebuild,
+  +puppet-2.7.5.ebuild:
+  Version bumped, bug #385149.
 
   30 Sep 2011; Steve Dibb <beandog@gentoo.org> puppet-2.6.10.ebuild:
   amd64 stable, security bug 384859
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index df038dd9ef51..9f5be28c6e28 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50puppet-mode-gentoo.el 217 RMD160 6ab7ace77c4e2da030c894f6b7f1a520e4950311 SHA1 7f6e97e1db4079bc45021360b0ada69c0482c008 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91
 AUX puppet-0.25.4-r1-rrd.patch 7033 RMD160 49e5530e97a59428ec173f922d3772312806d954 SHA1 5497fe7abe4b0d9e56a48d48d49c7b1fd5741274 SHA256 c0dd90de8f01fdb2cc9a80d5ccf60a5fd386a5c890bfd9e4b9d36af735e86ff1
 AUX puppet-0.25.init 923 RMD160 2133414233baee5f12542618747a6ccc278e8df9 SHA1 a009d9d266a49ca8065dec62cb7828a5ae550a48 SHA256 e60dfe6639ef591b4e9795499b7abe872a4069212e8beac72a2b1e6541ca98df
@@ -7,11 +10,32 @@ AUX puppetmaster.confd 279 RMD160 64824fc2c88d9069b25d0548fac5981f1ff4fa6b SHA1
 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.10.gem 1546752 RMD160 06cd2b24b6aeb282eacf809a792132dc8ab33455 SHA1 a2878c09b0acefc60cb9821eebf9c7a55bbee10b SHA256 231f6b2859e7adae598b1791c0a47fc5d466fbd5c92479fbe7660ef236729983
+DIST puppet-2.6.11.gem 1545728 RMD160 ee9672ace49bcc8d08ebec61428feefe8f0c9dd5 SHA1 ed55d1338b774c8ca1201092aefedeb68160cc04 SHA256 ce86eba1c2804d9459aa4f461b04cba3bfc78fe7e488244c34a7cd2dd200746e
 DIST puppet-2.6.9.gem 1546240 RMD160 4ebee3a195c8b28d654973fea1c1b948c78aeae4 SHA1 90b884c02f6d14d8ced9d4bbf36f5f64cf6374a2 SHA256 f83f709ad87e88483736c4117366a4451a19159a6b68425e6c2953d44ceb706b
 DIST puppet-2.7.4.gem 1734144 RMD160 8bae9520c36718556ecd8c646c1aee8c7a76986a SHA1 204cb93f778781d338d90c08b444917ba03daa3e SHA256 d090cb358d43266e80493fa280813eec4c0a50c133abba581fb29b336737b406
+DIST puppet-2.7.5.gem 1732608 RMD160 a29be8c85c498c99158be743127383ca718e7eea SHA1 db1b63bf1d1ac63d2be76103f636d3d1c5788b1c SHA256 24e476e414b278e55b27f7690d5eb6ec3b667d9dae39f65400d5a576b6752eb5
 EBUILD puppet-0.25.5.ebuild 3469 RMD160 ca5579a820b9e66cd4a55418a0937a1ba7460a2a SHA1 7cb8b09e16b598351986d6e14d6e8a97652ba441 SHA256 e36d5c99627572ed2c51b9f6da2dc1d7a2ff3806c186d30b6ba2a10106315407
 EBUILD puppet-2.6.10.ebuild 4816 RMD160 4f15e8df646dd5e2e561ff17b3dd810133416246 SHA1 2cc4c2cf8945826683b5100df5811eb648b1ea2f SHA256 5283780b01d6ae47c11e9419d7229f27cc984ead8c0db462ef0507304127700f
+EBUILD puppet-2.6.11.ebuild 4816 RMD160 ee06f87d2c8618b9b9c437c96ced7dfafd5d93d1 SHA1 4b4289daa87880eed6785667837fd2579fefec4d SHA256 b89ff2233144e5df540bb61fb44cdea2b2e4b3d4019ea265b5b8e376ed6c0c22
 EBUILD puppet-2.6.9.ebuild 4813 RMD160 4d143ddeec62f49193cf70a5d4ab723dbd92b68b SHA1 f9af15f7706a2e9ead171b42f98bd663a92897eb SHA256 d039074bb0658d83173f689a6794b9f9d3adf3c792078fc19326316f9bddf75e
 EBUILD puppet-2.7.4.ebuild 4697 RMD160 ccf0b60c48da20ed6aac53f149f64586a62f52ec SHA1 6dc3aec37f07abd87c63ab53400aeced7a2c0fe0 SHA256 0a44c92da21d31906e0fe698ee84a4690e0477bc8161e0d60f63c32a74050f21
-MISC ChangeLog 14354 RMD160 556b9b4416edae220f492fd12c5d8b154ea23b5a SHA1 e4908637a5fc5bb4522414d2cc53a4cf0f15a010 SHA256 715daaa081010ae082b6bb7967c61ddd56bb6220f691555c7d47280273ec5bbc
+EBUILD puppet-2.7.5.ebuild 4697 RMD160 7e23c01e0b8cdfa6b13308a07257f8e81f4ff48f SHA1 5518c234663329247fb08075feb05f18cc585ef1 SHA256 28cbf52905bd5e981477e90c4c3fefcf0fe5137b98f109c96f55381bbc5fda68
+MISC ChangeLog 14539 RMD160 6d7a2ebb774183ec906a586a21bd5779ab394a0e SHA1 55ee63fc1c544bb450fe7ba961038700daab5628 SHA256 8761e1e710f8c2a2ab3dbccf84c19e383c1feae294fb4b3be387707e9fed22fe
 MISC metadata.xml 1129 RMD160 64eb4cc09f22194da11da3c4e01441d846d1e9eb SHA1 bd76204117d9000ea1b3704054dbac3945a09026 SHA256 4e7dfa915273eb359790f38782099255c8e788794539b83205ed866b400d09cf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOhlfFAAoJECaGw+YFKA1pQAYP/jm72E+eOj5JdDkdPyfVscH1
+SGNxYpdfZU7J2lvUyhfgylWHCD+e709tiFKqdkT4GvJ8Q2Y6Y0a6QsYPHqkI2isO
+w5YKHxY9KUA0rVmcx+nSe0QcX+T9f6nSObFwUTXIKLnSzTml4RR33QUirSTHiQcS
++cDmjcst4rDiRr1p2Zot7jEuLJ/q7sM8ktUK9vEfOwSc9Cy2M+dLY8eHXSJABuSR
+Lt6+Om4EMZ6MGRAMwCVfxPZqGtFxxjzqxkjjqiigH6ysLASNvAlVtry4iVBFTavN
+dHgjpOnGRwR6kY1pWKnjL8WcNZL7MVIHT2Av9mmdvde1FVUU09T/3yQS2RKo/Csv
+8Xzm6i1ORKbfhaTe8IP3AxdNPx2+MkoUGKUlDRzS2tfimeGZDCkiiJh/K7YdKTcT
+EwCaEKDIW7/SM8sU0E5JX1bx9KnG2tWlJCoryz5zXRQr7h/+oLoGoY7+msvQxxHI
+IKA3EiBMl4KN9hSsdgubL3TjvgFp4yi6lWmSJbK/IJTjh2VGpMOMJEpd6IDppNC1
+jW/UQ2o2+Fsxx8IWJEsrSgNazT0gRSIyiOXNz/FgHH4QorUOdSZyT7NrbNoKf2M7
+T1t6NmDmRF+EnFs0pA+q+8AAGwl1mIioF5rXfE8lzncNTdcwe1w7pkB0HKsIsuuj
+pvUPB2w9vD8UpYGMqrGN
+=9IOc
+-----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-2.6.11.ebuild b/app-admin/puppet/puppet-2.6.11.ebuild
new file mode 100644
index 000000000000..479296d670f2
--- /dev/null
+++ b/app-admin/puppet/puppet-2.6.11.ebuild
@@ -0,0 +1,165 @@
+# 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.11.ebuild,v 1.1 2011/09/30 23:58:51 matsuu Exp $
+
+EAPI="3"
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
+
+inherit elisp-common xemacs-elisp-common eutils ruby-fakegem
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+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"
+#	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 )
+	xemacs? ( app-editors/xemacs )"
+RDEPEND="${RDEPEND}
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	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"
+
+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
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs || die
+		cp ext/emacs/* ext/xemacs/ || die
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el || die "xemacs-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
+	keepdir /etc/puppet/modules || 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/facts || 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 xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* || die "xemacs-elisp-install failed"
+		xemacs-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/ftdetect; doins ext/vim/ftdetect/puppet.vim || die
+		insinto /usr/share/vim/vimfiles/ftplugin; doins ext/vim/ftplugin/puppet.vim || die
+		insinto /usr/share/vim/vimfiles/indent; doins ext/vim/indent/puppet.vim || die
+		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/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 "${EPREFIX}/etc/puppet/puppetd.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
+		-f "${EPREFIX}/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
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-2.7.5.ebuild b/app-admin/puppet/puppet-2.7.5.ebuild
new file mode 100644
index 000000000000..3b489a0b8bb3
--- /dev/null
+++ b/app-admin/puppet/puppet-2.7.5.ebuild
@@ -0,0 +1,164 @@
+# 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.7.5.ebuild,v 1.1 2011/09/30 23:58:51 matsuu Exp $
+
+EAPI="3"
+# ruby19: dev-ruby/ruby-ldap has no ruby19
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
+
+inherit elisp-common xemacs-elisp-common eutils ruby-fakegem
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+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"
+#	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 )
+	xemacs? ( app-editors/xemacs )"
+RDEPEND="${RDEPEND}
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	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"
+
+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
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs || die
+		cp ext/emacs/* ext/xemacs/ || die
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el || die "xemacs-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
+	keepdir /etc/puppet/modules || 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/facts || 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 xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* || die "xemacs-elisp-install failed"
+		xemacs-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/ftdetect; doins ext/vim/ftdetect/puppet.vim || die
+		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/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 "${EPREFIX}/etc/puppet/puppetd.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
+		-f "${EPREFIX}/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
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}