Revert eix patch.

Package-Manager: portage-2.1.6/cvs/Linux 2.6.27-gentoo-r4 x86_64

3 files changed, 156 insertions, 2 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index d97833803998..83fd89c11397 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.32 2008/12/19 18:07:43 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.33 2008/12/23 16:49:41 matsuu Exp $
+
+*puppet-0.24.7-r1 (23 Dec 2008)
+
+  23 Dec 2008; MATSUU Takuto <matsuu@gentoo.org> +puppet-0.24.7-r1.ebuild:
+  Revert eix patch.
 
 *puppet-0.24.7 (19 Dec 2008)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 4fdad399abc4..ba0acc5ddd56 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -13,6 +13,7 @@ DIST puppet-0.24.7.tgz 1088422 RMD160 fc5da816355878712cddc302ea964dfddcf7bf64 S
 EBUILD puppet-0.24.4.ebuild 3395 RMD160 1fb3c6d7f30c5c8e7b60677ec88f3a4783290253 SHA1 af75f2fa63d3d65d49d60dddeaf5093177d26468 SHA256 fa7b1964961008b3585cfc29b09204248cc9fcb3fde881f3c79e1ec8a520f4a8
 EBUILD puppet-0.24.5-r4.ebuild 4038 RMD160 3140da785fd0365a65b263197342963fcac3f037 SHA1 dd68af46e22eaf8423c0a99d60488547771caa98 SHA256 90405e56b976ac3752d50ca4f906880a8800310aa369eb87bbe9ab6c7131e2a1
 EBUILD puppet-0.24.6-r1.ebuild 4031 RMD160 a81502558f0f80857f031d6ee785b786a336fe51 SHA1 bbaa81b061844534e79790712fdd1acb59c5d016 SHA256 785f7d3807421a8941e468cd607338c4a02379b7acfa68c2b3881921d88cb6e7
+EBUILD puppet-0.24.7-r1.ebuild 3991 RMD160 cd8019049a7c4ce6e80e19acc4f00a32a5c33912 SHA1 ee78d6d8edfe4e0a973eac9efb5cd42d39cfeaae SHA256 6e47537fdceb775d0a38211030b925ae771cc482dbebf358201314f5ba501f4f
 EBUILD puppet-0.24.7.ebuild 3900 RMD160 c0f4b7c509c3e0c3626fb965129f008cc82fc524 SHA1 9d3df12eb5e82f03e4230fc53d9bf76d8482745a SHA256 b96a504cac425253da72ce850d8ac129dc2b6e777ffdda2afbfc816873ae8477
-MISC ChangeLog 6387 RMD160 3e4055437d5c632918bd767779e50d4813083e5e SHA1 dffe2df2cee301d5ea50ee2e416bc7d4d80c7ded SHA256 5a2bd60c471d050f4a81834716f18b2f4d7f766cbab7af01ba2d9e74c608dfc4
+MISC ChangeLog 6516 RMD160 057b652ad8623fd5ee601ee596d3ae75ba882648 SHA1 069e3648b0b55368cc69d4025c2ef398c24e5b83 SHA256 ff86eb2029021cb873b26dac0a7cf3ee3b721ab4c02e38e0cba171e77acfcd3c
 MISC metadata.xml 1002 RMD160 172f4fc2883017a49b71d7e48c558bbc6c54770b SHA1 0386fcc01ff39593cf1755051a3d1283e6b4f2b7 SHA256 eb49ad59455c53c1666eeca292c0670b399968f9e10e9017b88f1e206098f8a5
diff --git a/app-admin/puppet/puppet-0.24.7-r1.ebuild b/app-admin/puppet/puppet-0.24.7-r1.ebuild
new file mode 100644
index 000000000000..9bea4d605ddf
--- /dev/null
+++ b/app-admin/puppet/puppet-0.24.7-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.7-r1.ebuild,v 1.1 2008/12/23 16:49:41 matsuu Exp $
+
+inherit elisp-common eutils ruby
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
+SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="emacs ldap rrdtool vim-syntax"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="emacs? ( virtual/emacs )
+	>=dev-ruby/facter-1.5.0"
+RDEPEND="${DEPEND}
+	>=app-portage/eix-0.9.4
+	ldap? ( dev-ruby/ruby-ldap )
+	rrdtool? (
+		|| (
+			>=net-analyzer/rrdtool-1.2.23
+			dev-ruby/ruby-rrd
+		)
+	)"
+#	|| (
+#		www-servers/webrick
+#		www-servers/mongrel
+#	)
+#	dev-ruby/diff-lcs
+#	dev-ruby/rails
+#	dev-ruby/ruby-shadow
+
+USE_RUBY="ruby18 ruby19"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	built_with_use virtual/ruby ipv6 || \
+		die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run"
+
+	built_with_use virtual/ruby ssl || \
+		die "Ruby must be built with ssl support, otherwise puppet will not be able to run"
+
+	if use rrdtool && \
+		has_version '>=net-analyzer/rrdtool-1.2.23' && \
+		! built_with_use '>=net-analyzer/rrdtool-1.2.23' ruby
+	then
+		die "net-analyzer/rrdtool must be built with ruby USE flag."
+	fi
+
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-0.24.6-eix.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.init puppetmaster
+	#doconfd conf/gentoo/conf.d/puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+	#doinitd conf/gentoo/init.d/puppet
+	newinitd "${FILESDIR}"/puppet.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
+}