Fixed rrdtool dependency, bug #238568. Fixed to work with >=app-portage/eix-0.14.0.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 164 insertions, 2 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 47b9603ce7a0..fcacd96d27f5 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,13 @@
 # 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.25 2008/09/29 12:48:31 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.26 2008/10/02 17:06:06 matsuu Exp $
+
+*puppet-0.24.5-r3 (02 Oct 2008)
+
+  02 Oct 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/puppet-0.24.5-eix-0.14.0.patch, +puppet-0.24.5-r3.ebuild:
+  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,
   files/puppetmaster.init:
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 12a731b9950d..e082faf9d03a 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,6 +1,7 @@
 AUX 50puppet-mode-gentoo.el 257 RMD160 c8ee412f60fed83c44091bb56d18e200bb0c7e03 SHA1 208a9a008dec0de89839c71e4d3a86c08be6931d SHA256 1dbae981327dd736b9e0b0a63be0bc6bf662eeb51506da60394f9c9a9b314fde
 AUX puppet-0.24.2-gentoo.patch 628 RMD160 9149d2b68a82a87dc4bcdae3ef5608ca0f152973 SHA1 d7bd432ef27be9dc14dc4e37b8302659caa0f3f4 SHA256 abc592df144baec0c93cc90459ab273fe2aec9f195670ca5dba5d8bc4e6ee886
 AUX puppet-0.24.4-openrc_initd.patch 624 RMD160 1cc74a411a961f13e752fb2f05a21f102118e220 SHA1 3fa676dd62d7e7efffbd1888effe6b19d18b3d95 SHA256 c723c1f2bb56e6013b8d4deeba0ce73c7c798508d4425dbd18a280719babeb0b
+AUX puppet-0.24.5-eix-0.14.0.patch 1285 RMD160 a5d3894afb3f026e0f44a3bfbcab3d9157f52b7c SHA1 f072684527a9b6b30e7c8fb7dd7d833a58d33a9c SHA256 59c71450f000175c1c11c8844ce837c643ea039ecd0b4545b38a1b50634a0dbd
 AUX puppet.init 880 RMD160 00f774cb8ca7cc9b6da2cd601c44101ed6a0826b SHA1 1affb19d499d5da3453c8389d9b620cfb2db42f4 SHA256 2f4bd61d9e6beba8c562cc9bee5f22b7a766f37453452391e02174ade043b7e5
 AUX puppetmaster.init 1438 RMD160 5063b085b3325f1143f80305e46da62995928d56 SHA1 5851e5d6b1b289c286f9cdabc3ef996175676372 SHA256 901a603d5e9abe1e6119ecad700615b5022b44961441951e1f5ba726111926fd
 DIST puppet-0.24.4.tgz 652572 RMD160 e675d27216dfeb3717c8140d3c89625e6be351e9 SHA1 e79671d8765e08df93c6a4c76b198467c3e13a7a SHA256 0d54f6db7cf1210d123264bcb35b07b36837ebc12a4f2bd01aee6127836adfb9
@@ -8,5 +9,6 @@ DIST puppet-0.24.5.tgz 872803 RMD160 be85ce18ce6a56939eaf83c60cc55d1c5134ef36 SH
 EBUILD puppet-0.24.4.ebuild 3269 RMD160 1e94112b41772cf206799ac18e46a55fa4bd616c SHA1 f213a6b927f9daefc0b2e8f0b5dc9dbe5ecd69a5 SHA256 177b3d1c9613c42eae6966119c13e7ea71ccb849dd1c6730339fa4f8d60efbc1
 EBUILD puppet-0.24.5-r1.ebuild 3229 RMD160 66b9bfc732908fcac806a7b92f82a959d0d4c179 SHA1 5a2d083f1f4301f78714d32252bb80db3d104639 SHA256 a955b77b0a328051b278e171bcd3702cfd8c87dfd5f11bf4ebe89c1818e214e8
 EBUILD puppet-0.24.5-r2.ebuild 3461 RMD160 e9d623db5a3d1c14c0b600c215b9d7b47ae3f8a5 SHA1 baa3b47bb4bf534a4467e621fa35da42f2eff366 SHA256 19842ccc4ee44bae200ff42deff843e8ccd7b0cc0c48bd525b889f04b1da4336
-MISC ChangeLog 4704 RMD160 1f1f107e271e6de75cadca62af42084ad878c7f1 SHA1 41357619e2c7f9369be3affbffb2b0a0e4dca419 SHA256 c2c398390e8f9d564cfd2f6fb0e1879aafe861f37944e075d5427ab331dea657
+EBUILD puppet-0.24.5-r3.ebuild 3722 RMD160 d6edd50fe210598d685fdb5970f00903a0feb35f SHA1 9bd9f11e875864f574ca4a7add63013669ca26ff SHA256 229a904d0b5a464217b3fd25f710db754884f641c774900b1f01871946732847
+MISC ChangeLog 4940 RMD160 25238719170c1d09a7d678d11f4143341bdcada9 SHA1 d8243671ece628acd15aa1da46defe9ca593cae1 SHA256 a2eccbd676f12b5ffeecfec870dcbe026160efe5a345717077455aa0b862bcf4
 MISC metadata.xml 1002 RMD160 172f4fc2883017a49b71d7e48c558bbc6c54770b SHA1 0386fcc01ff39593cf1755051a3d1283e6b4f2b7 SHA256 eb49ad59455c53c1666eeca292c0670b399968f9e10e9017b88f1e206098f8a5
diff --git a/app-admin/puppet/files/puppet-0.24.5-eix-0.14.0.patch b/app-admin/puppet/files/puppet-0.24.5-eix-0.14.0.patch
new file mode 100644
index 000000000000..416d8f25ecbc
--- /dev/null
+++ b/app-admin/puppet/files/puppet-0.24.5-eix-0.14.0.patch
@@ -0,0 +1,12 @@
+diff -Naur puppet-0.24.5.orig/lib/puppet/provider/package/portage.rb puppet-0.24.5/lib/puppet/provider/package/portage.rb
+--- puppet-0.24.5.orig/lib/puppet/provider/package/portage.rb	2008-07-08 22:46:19.000000000 +0900
++++ puppet-0.24.5/lib/puppet/provider/package/portage.rb	2008-10-03 01:45:15.000000000 +0900
+@@ -10,7 +10,7 @@
+     defaultfor :operatingsystem => :gentoo
+ 
+     def self.instances
+-        result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
++        result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:\+[ilvs]|![fmpbstuid])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
+         result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
+ 
+         search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}"
diff --git a/app-admin/puppet/puppet-0.24.5-r3.ebuild b/app-admin/puppet/puppet-0.24.5-r3.ebuild
new file mode 100644
index 000000000000..af4dfb171d44
--- /dev/null
+++ b/app-admin/puppet/puppet-0.24.5-r3.ebuild
@@ -0,0 +1,141 @@
+# 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.5-r3.ebuild,v 1.1 2008/10/02 17:06:06 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.1.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"
+
+	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.2-gentoo.patch"
+	epatch "${FILESDIR}/${P}-eix-0.14.0.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
+	#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 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
+}
+
+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
+}