Version bumped.

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

4 files changed, 52 insertions, 164 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index c897b0569ab6..72f116d7d413 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/puppet
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.50 2009/11/22 17:38:35 hollow Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.51 2010/01/26 15:58:13 matsuu Exp $
+
+*puppet-0.25.3 (26 Jan 2010)
+
+  26 Jan 2010; MATSUU Takuto <matsuu@gentoo.org> -puppet-0.25.0-r1.ebuild,
+  -puppet-0.25.1.ebuild, +puppet-0.25.3.ebuild:
+  Version bumped.
 
 *puppet-0.25.1-r1 (22 Nov 2009)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 1a0b4f55b555..006c3a297471 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.24.6-eix.patch 2228 RMD160 a2465eba3775cacb54d9e20f97efd6cbb3e91627 SHA1 17e828e676d6e8f6abd7b008ca250e69557b2ea9 SHA256 d822a12eaaa6eaf8316fe04fc6c9b654f0427e4d80fb6c5cd15ca2a7368bb754
 AUX puppet-0.24.8-rc-update-show.patch 961 RMD160 2fed961a81b4e5b7659db3c587b17e81ea463bc5 SHA1 832b1a2bd32e6efc0764fa82bf4ef9f705348df3 SHA256 94a32f3d969d00de29564f895426f8c7c9cdbe6b8962d051a4f28b02efa17449
@@ -9,11 +12,27 @@ AUX puppetmaster-0.25.init 1006 RMD160 9b1878992fc0380cbacf7c1eada2e6a283749a26
 AUX puppetmaster.confd 279 RMD160 64824fc2c88d9069b25d0548fac5981f1ff4fa6b SHA1 d521616310e7a27986c27138bd4d4382238d609a SHA256 6db68d9e093d3d231c8ad35968e8d276f68cdd7aec8577b3f7ac2998d1f91692
 AUX puppetmaster.init 1005 RMD160 eca4418abb7b6de674e7580f949b27f73b3c9b59 SHA1 3efa92e55e7f1df55d384b59b36704f6a0ee42d8 SHA256 c3a658b778d89084fa8a21b477c7caf77f59e82bb1bef8c8086afed533da5a3a
 DIST puppet-0.24.8.tgz 1099188 RMD160 edb187da9225c9faee9839a5d644b5c9c91f3d5f SHA1 a871aef6f3e8e060f5109bb022967066e32875be SHA256 9e9dcfdd26f96e0b0b4ca9bcfe6f473c679ff082a0cd7226c2058ae652d4fdc8
-DIST puppet-0.25.0.tar.gz 1405924 RMD160 eef9e5200959eb5f62c1d0419957158fcd2821ce SHA1 8396103deb91b6d8008d9df10422a7f70071c1bf SHA256 d7ac3dc1cb2d74e99b662b02599e5d045c3d34d4e16bb8f6686b899440443a3b
 DIST puppet-0.25.1.tar.gz 1388451 RMD160 2b2bb5b0def03ddeebe99df1ee29648b6bca794d SHA1 c791b8f06a5775c63aaa2b48bffaf0540c3d3f88 SHA256 b91975b7f6304fca416b0bc26606639fc838b75237c049b4b0419dfe7e689b0c
+DIST puppet-0.25.3.tar.gz 1424590 RMD160 2c313e798f2f9e6db947ff5efd857af70d102581 SHA1 33cfbf9aa8d42191b06592b071a124001c7adbd7 SHA256 a187019264c2b2d1cad6e103765f616f6e0afa7cc3fbad37fec318ab00e859fe
 EBUILD puppet-0.24.8-r1.ebuild 3628 RMD160 0899d628f3bf08b6db4a386680902d236a48f956 SHA1 fd01ce2d33e9055e706ff4665e9d3d41be98a05b SHA256 09d71b16ce2506306b7a22bcd8f258a5e92772bd4c713108d473ac49d96961e9
-EBUILD puppet-0.25.0-r1.ebuild 3681 RMD160 1e4c881c6be2904da12df5480adcbde27029d1e3 SHA1 d03abb7f46e1e6a8ad307d95e130cc2a65ea7b89 SHA256 51e8c39a8b772265ef5a0a939019627939f54ca5ccfcd3ae0fe0812523b59356
 EBUILD puppet-0.25.1-r1.ebuild 3379 RMD160 276fc57a4219ae540fd2f828d7832e848a66e78a SHA1 d18d53ab014e4a8e7d6a65db2bc6a18f74ea7bef SHA256 892942f7660601f65d39a87fe62e5e60f188c23d627ee28597bcff0104267b34
-EBUILD puppet-0.25.1.ebuild 3376 RMD160 4cf0e687ab737e445cbc6661d8ee5d7c6b2bc4fe SHA1 cf33391c817d658a2725d63ef07716e5749d6e88 SHA256 1b326303033224e27ac6958c915f8e386b09609b8e37a1d66b458fcee4e829c6
-MISC ChangeLog 9605 RMD160 9cece0a62d9436d0f82145f861708092fab0050d SHA1 df619e522f492e4a25935c519e26f51b9b6c96e5 SHA256 2c9b5a2293d43821de961df594ce5afc707f0491bfbf2688c4a4b3362201498b
+EBUILD puppet-0.25.3.ebuild 3447 RMD160 8ada01748048d5d00967d02b2ddd627ead8af731 SHA1 4140e5cc42c27ef65ddc14779604eeb319c05093 SHA256 ff8e460858111f2ea8c13b5ec69e08aa22eae4600126a087d42b81c820dcc4b2
+MISC ChangeLog 9777 RMD160 b843b983b309b1ae5e48db228b8754eca2ae15c1 SHA1 5040c3b29142a0a9100570de343dfad2acee65c9 SHA256 5fb22d10baa3a37b46f0d10ebf20409d74063f0c5433a0206ac76161c854e774
 MISC metadata.xml 1104 RMD160 c2e40f737c1f334d2d4e7a34e1dba61b53ebdfff SHA1 ab42f340e0d8add11e9c4cd6c6791f3cc5ec6484 SHA256 c228b29cc44ea8fe2545f43d05688bc6364395adf7cf2d86290d25e86207fefb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBAgAGBQJLXxEXAAoJECaGw+YFKA1pEhsP+wcY30ew5Esb0MKrn/F9jTxw
+Y4WRE32hf95DxxdThcCeyDeqpHqg+cHmzIe4a4h4qrol4VEEEA1fZRivseFsEMj7
+JBA2b0TF1FgfjXaHQOnEsS6+MSg9DvH7TQeXM3YUGkNyOVGtmrPiYBLwSN/IcRVF
+rcU4QO7FToJkMOP12yEYq9KOeUbvZvM8rVGEtq9YPbfzlsk+dI1LrvECG2FzXgIC
+SOQqoZ/NN/vhwJxlXVLT3/ycNVpBryB/uxybx1Sxk+4mtojqXE/ZfL2lFkrAjZES
+TRmuzxG4CiE5O6IHnLx+Hx/5KbeD3I6gPxGQT04huj0CZe9/x1m2KetFunFTXRkx
+LxiQCKH1k2OrBukInjGAPWGiKMfQHKdg7yD/psSkIpJ945Fz/ayhKMCvVGBdZwAR
+uMPU8wctX3TvXRch4oOS3iEM4i4jkjsR0Dq7WAXR2V/nXSljedQFD3IN6AUdIUPJ
+B10w+qPRkeHlBseOUSwCW8yQhBOnb+NS2E8K/ZdXUZ4MSWKUjneNUa+WhnGRiWvD
+eu6uKljmgZ8K687pFcrclCPym350OFIorlDRGjcETG3mxpiWV2kdduIYrrdwLsi8
+3cIUaSdb+IxOLiGzhwH9OU6MxJz2QIjRMMz1Hi2H7zsDapz4yu8Fo7+BS8hXjVOl
+T3pFlqv9qeR5k7PMD5G5
+=tVjz
+-----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-0.25.0-r1.ebuild b/app-admin/puppet/puppet-0.25.0-r1.ebuild
deleted file mode 100644
index 2251b3c17bf1..000000000000
--- a/app-admin/puppet/puppet-0.25.0-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.25.0-r1.ebuild,v 1.2 2009/11/16 20:18:49 hollow Exp $
-
-EAPI="2"
-inherit elisp-common eutils ruby
-
-MY_P="${P/_}"
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://reductivelabs.com/projects/puppet"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${MY_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.9.4
-	<app-portage/eix-0.18
-	augeas? ( dev-ruby/ruby-augeas )
-	ldap? ( dev-ruby/ruby-ldap )
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	shadow? ( dev-ruby/ruby-shadow )"
-#	|| (
-#		www-servers/webrick
-#		www-servers/mongrel
-#	)
-#	dev-ruby/diff-lcs
-#	dev-ruby/rails
-
-S="${WORKDIR}/${MY_P}"
-USE_RUBY="ruby18"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.24.6-eix.patch"
-	epatch "${FILESDIR}/${PN}-0.25.0-cert-names.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-0.25.init puppetmaster
-	#doconfd conf/gentoo/conf.d/puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-	#doinitd conf/gentoo/init.d/puppet
-	newinitd "${FILESDIR}"/puppet-0.25.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
-}
diff --git a/app-admin/puppet/puppet-0.25.1.ebuild b/app-admin/puppet/puppet-0.25.3.ebuild
index 3b7c7b348b0e..a2e81819447e 100644
--- a/app-admin/puppet/puppet-0.25.1.ebuild
+++ b/app-admin/puppet/puppet-0.25.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.1.ebuild,v 1.1 2009/11/16 20:18:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.25.3.ebuild,v 1.1 2010/01/26 15:58:13 matsuu Exp $
 
 EAPI="2"
 inherit elisp-common eutils ruby
@@ -35,10 +35,6 @@ pkg_setup() {
 	enewuser puppet -1 -1 /var/lib/puppet puppet
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.25.1-eix-0.18.patch"
-}
-
 src_compile() {
 	if use emacs ; then
 		elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
@@ -47,44 +43,45 @@ src_compile() {
 
 src_install() {
 	DESTDIR="${D}" ruby_einstall "$@" || die
-	DESTDIR="${D}" erubydoc
+	DESTDIR="${D}" erubydoc || die
 
-	newinitd "${FILESDIR}"/puppetmaster-0.25.init puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-	newinitd "${FILESDIR}"/puppet-0.25.init puppet
-	doconfd conf/gentoo/conf.d/puppet
+	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
+	keepdir /etc/puppet/manifests || die
 	insinto /etc/puppet
-	doins conf/gentoo/puppet/*
+	doins conf/gentoo/puppet/* || die
+	doins conf/auth.conf || die
 
 	# 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
+	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}"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 	fi
 
 	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+		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
-		insinto /usr/share/vim/vimfiles/ftdetect; doins	ext/vim/ftdetect/puppet.vim
+		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}"
+		docinto "$(dirname ${f})"; dodoc "${f}" || die
 	done
-	docinto conf; dodoc conf/namespaceauth.conf
+	docinto conf; dodoc conf/namespaceauth.conf || die
 }
 
 pkg_postinst() {