diff options
author | Matsuu Takuto <matsuu@gentoo.org> | 2008-08-13 16:51:01 +0000 |
---|---|---|
committer | Matsuu Takuto <matsuu@gentoo.org> | 2008-08-13 16:51:01 +0000 |
commit | 3a19efdfc0468a201ad4bd197a2be667ade5809e (patch) | |
tree | 799b05b550b62de1db3ffe7e9d37372f29edd621 | |
parent | always disable ffmpeg since it fails with later ffmpeg versions (diff) | |
download | gentoo-2-3a19efdfc0468a201ad4bd197a2be667ade5809e.tar.gz gentoo-2-3a19efdfc0468a201ad4bd197a2be667ade5809e.tar.bz2 gentoo-2-3a19efdfc0468a201ad4bd197a2be667ade5809e.zip |
Version bumped.
(Portage version: 2.1.4.4)
-rw-r--r-- | app-admin/puppet/ChangeLog | 10 | ||||
-rw-r--r-- | app-admin/puppet/files/puppet-0.23.2-gentoo.patch | 182 | ||||
-rw-r--r-- | app-admin/puppet/files/puppet-0.24.1-gentoo.patch | 144 | ||||
-rw-r--r-- | app-admin/puppet/files/puppet-0.24.1-service.patch | 14 | ||||
-rw-r--r-- | app-admin/puppet/puppet-0.23.2-r1.ebuild | 111 | ||||
-rw-r--r-- | app-admin/puppet/puppet-0.24.1-r1.ebuild | 116 | ||||
-rw-r--r-- | app-admin/puppet/puppet-0.24.5.ebuild (renamed from app-admin/puppet/puppet-0.24.3.ebuild) | 6 |
7 files changed, 12 insertions, 571 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog index 8d7c51aa1b4b..9268a63f7091 100644 --- a/app-admin/puppet/ChangeLog +++ b/app-admin/puppet/ChangeLog @@ -1,6 +1,14 @@ # 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.19 2008/08/13 15:54:40 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.20 2008/08/13 16:51:00 matsuu Exp $ + +*puppet-0.24.5 (13 Aug 2008) + + 13 Aug 2008; MATSUU Takuto <matsuu@gentoo.org> + -files/puppet-0.23.2-gentoo.patch, -files/puppet-0.24.1-gentoo.patch, + -files/puppet-0.24.1-service.patch, -puppet-0.23.2-r1.ebuild, + -puppet-0.24.1-r1.ebuild, -puppet-0.24.3.ebuild, +puppet-0.24.5.ebuild: + Version bumped. Removed old versions. 13 Aug 2008; Ferris McCormick <fmccor@gentoo.org> puppet-0.24.4.ebuild: Add ~sparc keyword at user (Juan Daza) request --- Bug #234621. diff --git a/app-admin/puppet/files/puppet-0.23.2-gentoo.patch b/app-admin/puppet/files/puppet-0.23.2-gentoo.patch deleted file mode 100644 index ec30064f20a7..000000000000 --- a/app-admin/puppet/files/puppet-0.23.2-gentoo.patch +++ /dev/null @@ -1,182 +0,0 @@ -diff -Naur puppet-0.23.2.orig/conf/gentoo/puppet/puppet.conf puppet-0.23.2/conf/gentoo/puppet/puppet.conf ---- puppet-0.23.2.orig/conf/gentoo/puppet/puppet.conf 1970-01-01 09:00:00.000000000 +0900 -+++ puppet-0.23.2/conf/gentoo/puppet/puppet.conf 2007-12-07 18:41:41.000000000 +0900 -@@ -0,0 +1,29 @@ -+[main] -+ # Where Puppet stores dynamic and growing data. -+ # The default value is '/var/puppet'. -+ vardir = /var/lib/puppet -+ -+ # The Puppet log directory. -+ # The default value is '$vardir/log'. -+ logdir = /var/log/puppet -+ -+ # Where Puppet PID files are kept. -+ # The default value is '$vardir/run'. -+ rundir = /var/run/puppet -+ -+ # Where SSL certificates are kept. -+ # The default value is '$confdir/ssl'. -+ ssldir = $vardir/ssl -+ -+[puppetd] -+ # The file in which puppetd stores a list of the classes -+ # associated with the retrieved configuratiion. Can be loaded in -+ # the separate ``puppet`` executable using the ``--loadclasses`` -+ # option. -+ # The default value is '$confdir/classes.txt'. -+ classfile = $vardir/classes.txt -+ -+ # Where puppetd caches the local configuration. An -+ # extension indicating the cache format is added automatically. -+ # The default value is '$confdir/localconfig'. -+ localconfig = $vardir/localconfig -diff -Naur puppet-0.23.2.orig/conf/gentoo/puppet/puppetca.conf puppet-0.23.2/conf/gentoo/puppet/puppetca.conf ---- puppet-0.23.2.orig/conf/gentoo/puppet/puppetca.conf 2007-06-18 07:06:39.000000000 +0900 -+++ puppet-0.23.2/conf/gentoo/puppet/puppetca.conf 1970-01-01 09:00:00.000000000 +0900 -@@ -1,29 +0,0 @@ --[puppet] -- # Where Puppet stores dynamic and growing data. -- # The default value is '/var/puppet'. -- vardir = /var/lib/puppet -- -- # The Puppet log directory. -- # The default value is '$vardir/log'. -- logdir = /var/log/puppet -- -- # Where Puppet PID files are kept. -- # The default value is '$vardir/run'. -- rundir = /var/run/puppet -- -- # Where SSL certificates are kept. -- # The default value is '$confdir/ssl'. -- ssldir = $vardir/ssl -- --[puppetd] -- # The file in which puppetd stores a list of the classes -- # associated with the retrieved configuratiion. Can be loaded in -- # the separate ``puppet`` executable using the ``--loadclasses`` -- # option. -- # The default value is '$confdir/classes.txt'. -- classfile = $vardir/classes.txt -- -- # Where puppetd caches the local configuration. An -- # extension indicating the cache format is added automatically. -- # The default value is '$confdir/localconfig'. -- localconfig = $vardir/localconfig -diff -Naur puppet-0.23.2.orig/conf/gentoo/puppet/puppetd.conf puppet-0.23.2/conf/gentoo/puppet/puppetd.conf ---- puppet-0.23.2.orig/conf/gentoo/puppet/puppetd.conf 2007-06-18 07:06:39.000000000 +0900 -+++ puppet-0.23.2/conf/gentoo/puppet/puppetd.conf 1970-01-01 09:00:00.000000000 +0900 -@@ -1,29 +0,0 @@ --[puppet] -- # Where Puppet stores dynamic and growing data. -- # The default value is '/var/puppet'. -- vardir = /var/lib/puppet -- -- # The Puppet log directory. -- # The default value is '$vardir/log'. -- logdir = /var/log/puppet -- -- # Where Puppet PID files are kept. -- # The default value is '$vardir/run'. -- rundir = /var/run/puppet -- -- # Where SSL certificates are kept. -- # The default value is '$confdir/ssl'. -- ssldir = $vardir/ssl -- --[puppetd] -- # The file in which puppetd stores a list of the classes -- # associated with the retrieved configuratiion. Can be loaded in -- # the separate ``puppet`` executable using the ``--loadclasses`` -- # option. -- # The default value is '$confdir/classes.txt'. -- classfile = $vardir/classes.txt -- -- # Where puppetd caches the local configuration. An -- # extension indicating the cache format is added automatically. -- # The default value is '$confdir/localconfig'. -- localconfig = $vardir/localconfig -diff -Naur puppet-0.23.2.orig/conf/gentoo/puppet/puppetmasterd.conf puppet-0.23.2/conf/gentoo/puppet/puppetmasterd.conf ---- puppet-0.23.2.orig/conf/gentoo/puppet/puppetmasterd.conf 2007-06-18 07:06:39.000000000 +0900 -+++ puppet-0.23.2/conf/gentoo/puppet/puppetmasterd.conf 1970-01-01 09:00:00.000000000 +0900 -@@ -1,29 +0,0 @@ --[puppet] -- # Where Puppet stores dynamic and growing data. -- # The default value is '/var/puppet'. -- vardir = /var/lib/puppet -- -- # The Puppet log directory. -- # The default value is '$vardir/log'. -- logdir = /var/log/puppet -- -- # Where Puppet PID files are kept. -- # The default value is '$vardir/run'. -- rundir = /var/run/puppet -- -- # Where SSL certificates are kept. -- # The default value is '$confdir/ssl'. -- ssldir = $vardir/ssl -- --[puppetd] -- # The file in which puppetd stores a list of the classes -- # associated with the retrieved configuratiion. Can be loaded in -- # the separate ``puppet`` executable using the ``--loadclasses`` -- # option. -- # The default value is '$confdir/classes.txt'. -- classfile = $vardir/classes.txt -- -- # Where puppetd caches the local configuration. An -- # extension indicating the cache format is added automatically. -- # The default value is '$confdir/localconfig'. -- localconfig = $vardir/localconfig -diff -Naur puppet-0.23.2.orig/lib/puppet/provider/package/portage.rb puppet-0.23.2/lib/puppet/provider/package/portage.rb ---- puppet-0.23.2.orig/lib/puppet/provider/package/portage.rb 2007-06-20 08:07:35.000000000 +0900 -+++ puppet-0.23.2/lib/puppet/provider/package/portage.rb 2007-12-07 18:46:49.000000000 +0900 -@@ -10,8 +10,8 @@ - defaultfor :operatingsystem => :gentoo - - def self.instances -- result_format = /(\S+) (\S+) \[(.*)\] \[[^0-9]*([^\s:]*)(:\S*)?\] ([\S]*) (.*)/ -- result_fields = [:category, :name, :ensure, :version_available, :slot, :vendor, :description] -+ result_format = /(\S+) (\S+) \[([^\[]*)(\[[^\]]*\])?\] \[[^0-9]*([^\s:\[]*)(\[[^\]]*\])?(:\S*)?\] ([\S]*) (.*)/ -+ result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :overlay, :slot, :vendor, :description] - - search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}" - -@@ -55,7 +55,7 @@ - - # The common package name format. - def package_name -- "%s/%s" % [@resource[:category], @resource[:name]] -+ @resource[:category] ? "%s/%s" % [@resource[:category], @resource[:name]] : @resource[:name] - end - - def uninstall -@@ -67,11 +67,11 @@ - end - - def query -- result_format = /(\S+) (\S+) \[(.*)\] \[[^0-9]*([^\s:]*)(:\S*)?\] ([\S]*) (.*)/ -- result_fields = [:category, :name, :ensure, :version_available, :slot, :vendor, :description] -+ result_format = /(\S+) (\S+) \[([^\[]*)(\[[^\]]*\])?\] \[[^0-9]*([^\s:\[]*)(\[[^\]]*\])?(:\S*)?\] ([\S]*) (.*)/ -+ result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :overlay, :slot, :vendor, :description] - - search_field = @resource[:category] ? "--category-name" : "--name" -- search_value = @resource[:category] ? package_name : @resource[:name] -+ search_value = package_name - search_format = "<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>" - - begin -diff -Naur puppet-0.23.2.orig/lib/puppet/provider/service/gentoo.rb puppet-0.23.2/lib/puppet/provider/service/gentoo.rb ---- puppet-0.23.2.orig/lib/puppet/provider/service/gentoo.rb 2007-06-18 07:06:39.000000000 +0900 -+++ puppet-0.23.2/lib/puppet/provider/service/gentoo.rb 2007-12-07 18:41:41.000000000 +0900 -@@ -29,7 +29,7 @@ - return :false unless line - - # If it's enabled then it will print output showing service | runlevel -- if output =~ /#{@resource[:name]}\s*|\s*default/ -+ if output =~ /#{@resource[:name]}\s*\|\s*default/ - return :true - else - return :false diff --git a/app-admin/puppet/files/puppet-0.24.1-gentoo.patch b/app-admin/puppet/files/puppet-0.24.1-gentoo.patch deleted file mode 100644 index fba9ca2f0d13..000000000000 --- a/app-admin/puppet/files/puppet-0.24.1-gentoo.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppet.conf puppet-0.24.1/conf/gentoo/puppet/puppet.conf ---- puppet-0.24.1.orig/conf/gentoo/puppet/puppet.conf 1970-01-01 09:00:00.000000000 +0900 -+++ puppet-0.24.1/conf/gentoo/puppet/puppet.conf 2008-01-07 23:24:05.000000000 +0900 -@@ -0,0 +1,29 @@ -+[main] -+ # Where Puppet stores dynamic and growing data. -+ # The default value is '/var/puppet'. -+ vardir = /var/lib/puppet -+ -+ # The Puppet log directory. -+ # The default value is '$vardir/log'. -+ logdir = /var/log/puppet -+ -+ # Where Puppet PID files are kept. -+ # The default value is '$vardir/run'. -+ rundir = /var/run/puppet -+ -+ # Where SSL certificates are kept. -+ # The default value is '$confdir/ssl'. -+ ssldir = $vardir/ssl -+ -+[puppetd] -+ # The file in which puppetd stores a list of the classes -+ # associated with the retrieved configuratiion. Can be loaded in -+ # the separate ``puppet`` executable using the ``--loadclasses`` -+ # option. -+ # The default value is '$confdir/classes.txt'. -+ classfile = $vardir/classes.txt -+ -+ # Where puppetd caches the local configuration. An -+ # extension indicating the cache format is added automatically. -+ # The default value is '$confdir/localconfig'. -+ localconfig = $vardir/localconfig -diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppetca.conf puppet-0.24.1/conf/gentoo/puppet/puppetca.conf ---- puppet-0.24.1.orig/conf/gentoo/puppet/puppetca.conf 2007-11-01 04:44:27.000000000 +0900 -+++ puppet-0.24.1/conf/gentoo/puppet/puppetca.conf 1970-01-01 09:00:00.000000000 +0900 -@@ -1,29 +0,0 @@ --[puppet] -- # Where Puppet stores dynamic and growing data. -- # The default value is '/var/puppet'. -- vardir = /var/lib/puppet -- -- # The Puppet log directory. -- # The default value is '$vardir/log'. -- logdir = /var/log/puppet -- -- # Where Puppet PID files are kept. -- # The default value is '$vardir/run'. -- rundir = /var/run/puppet -- -- # Where SSL certificates are kept. -- # The default value is '$confdir/ssl'. -- ssldir = $vardir/ssl -- --[puppetd] -- # The file in which puppetd stores a list of the classes -- # associated with the retrieved configuratiion. Can be loaded in -- # the separate ``puppet`` executable using the ``--loadclasses`` -- # option. -- # The default value is '$confdir/classes.txt'. -- classfile = $vardir/classes.txt -- -- # Where puppetd caches the local configuration. An -- # extension indicating the cache format is added automatically. -- # The default value is '$confdir/localconfig'. -- localconfig = $vardir/localconfig -diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppetd.conf puppet-0.24.1/conf/gentoo/puppet/puppetd.conf ---- puppet-0.24.1.orig/conf/gentoo/puppet/puppetd.conf 2007-11-01 04:44:27.000000000 +0900 -+++ puppet-0.24.1/conf/gentoo/puppet/puppetd.conf 1970-01-01 09:00:00.000000000 +0900 -@@ -1,29 +0,0 @@ --[puppet] -- # Where Puppet stores dynamic and growing data. -- # The default value is '/var/puppet'. -- vardir = /var/lib/puppet -- -- # The Puppet log directory. -- # The default value is '$vardir/log'. -- logdir = /var/log/puppet -- -- # Where Puppet PID files are kept. -- # The default value is '$vardir/run'. -- rundir = /var/run/puppet -- -- # Where SSL certificates are kept. -- # The default value is '$confdir/ssl'. -- ssldir = $vardir/ssl -- --[puppetd] -- # The file in which puppetd stores a list of the classes -- # associated with the retrieved configuratiion. Can be loaded in -- # the separate ``puppet`` executable using the ``--loadclasses`` -- # option. -- # The default value is '$confdir/classes.txt'. -- classfile = $vardir/classes.txt -- -- # Where puppetd caches the local configuration. An -- # extension indicating the cache format is added automatically. -- # The default value is '$confdir/localconfig'. -- localconfig = $vardir/localconfig -diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppetmasterd.conf puppet-0.24.1/conf/gentoo/puppet/puppetmasterd.conf ---- puppet-0.24.1.orig/conf/gentoo/puppet/puppetmasterd.conf 2007-11-01 04:44:27.000000000 +0900 -+++ puppet-0.24.1/conf/gentoo/puppet/puppetmasterd.conf 1970-01-01 09:00:00.000000000 +0900 -@@ -1,29 +0,0 @@ --[puppet] -- # Where Puppet stores dynamic and growing data. -- # The default value is '/var/puppet'. -- vardir = /var/lib/puppet -- -- # The Puppet log directory. -- # The default value is '$vardir/log'. -- logdir = /var/log/puppet -- -- # Where Puppet PID files are kept. -- # The default value is '$vardir/run'. -- rundir = /var/run/puppet -- -- # Where SSL certificates are kept. -- # The default value is '$confdir/ssl'. -- ssldir = $vardir/ssl -- --[puppetd] -- # The file in which puppetd stores a list of the classes -- # associated with the retrieved configuratiion. Can be loaded in -- # the separate ``puppet`` executable using the ``--loadclasses`` -- # option. -- # The default value is '$confdir/classes.txt'. -- classfile = $vardir/classes.txt -- -- # Where puppetd caches the local configuration. An -- # extension indicating the cache format is added automatically. -- # The default value is '$confdir/localconfig'. -- localconfig = $vardir/localconfig -diff -Naur puppet-0.24.1.orig/lib/puppet/provider/service/gentoo.rb puppet-0.24.1/lib/puppet/provider/service/gentoo.rb ---- puppet-0.24.1.orig/lib/puppet/provider/service/gentoo.rb 2007-11-01 04:44:27.000000000 +0900 -+++ puppet-0.24.1/lib/puppet/provider/service/gentoo.rb 2008-01-07 23:24:10.000000000 +0900 -@@ -29,7 +29,7 @@ - return :false unless line - - # If it's enabled then it will print output showing service | runlevel -- if output =~ /#{@resource[:name]}\s*|\s*default/ -+ if output =~ /#{@resource[:name]}\s*\|\s*default/ - return :true - else - return :false diff --git a/app-admin/puppet/files/puppet-0.24.1-service.patch b/app-admin/puppet/files/puppet-0.24.1-service.patch deleted file mode 100644 index e7aed5adcf2b..000000000000 --- a/app-admin/puppet/files/puppet-0.24.1-service.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur puppet-0.24.1.orig/lib/puppet/provider/service/gentoo.rb puppet-0.24.1/lib/puppet/provider/service/gentoo.rb ---- puppet-0.24.1.orig/lib/puppet/provider/service/gentoo.rb 2007-11-01 04:44:27.000000000 +0900 -+++ puppet-0.24.1/lib/puppet/provider/service/gentoo.rb 2008-02-08 01:41:22.000000000 +0900 -@@ -8,6 +8,10 @@ - - defaultfor :operatingsystem => :gentoo - -+ def self.defpath -+ superclass.defpath -+ end -+ - def disable - begin - output = update :del, @resource[:name], :default diff --git a/app-admin/puppet/puppet-0.23.2-r1.ebuild b/app-admin/puppet/puppet-0.23.2-r1.ebuild deleted file mode 100644 index 572c059e8b64..000000000000 --- a/app-admin/puppet/puppet-0.23.2-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.23.2-r1.ebuild,v 1.1 2007/12/08 00:39:30 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" -KEYWORDS="~x86 ~amd64" - -DEPEND="emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - >=dev-ruby/facter-1.3.5 - >=app-portage/eix-0.9.4" - -USE_RUBY="ruby18" - -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" - - enewgroup puppet || die "Problem creating group puppet" - enewuser puppet -1 -1 /var/lib/puppet puppet || die "Problem creating user puppet" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-gentoo.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 - - # Installation of init scripts and configuration - doinitd conf/gentoo/init.d/puppetmaster - doconfd conf/gentoo/conf.d/puppetmaster - doinitd conf/gentoo/init.d/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 - insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/*.vim - - # 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 -} diff --git a/app-admin/puppet/puppet-0.24.1-r1.ebuild b/app-admin/puppet/puppet-0.24.1-r1.ebuild deleted file mode 100644 index 6a9f1788ea0e..000000000000 --- a/app-admin/puppet/puppet-0.24.1-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# 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.1-r1.ebuild,v 1.1 2008/02/07 16:45:04 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 vim-syntax" -KEYWORDS="~x86 ~amd64" - -DEPEND="emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - >=dev-ruby/facter-1.3.5 - >=app-portage/eix-0.9.4" - -USE_RUBY="ruby18" - -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" - - enewgroup puppet || die "Problem creating group puppet" - enewuser puppet -1 -1 /var/lib/puppet puppet || die "Problem creating user puppet" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${P}-service.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 - - # Installation of init scripts and configuration - doinitd conf/gentoo/init.d/puppetmaster - doconfd conf/gentoo/conf.d/puppetmaster - doinitd conf/gentoo/init.d/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 -} diff --git a/app-admin/puppet/puppet-0.24.3.ebuild b/app-admin/puppet/puppet-0.24.5.ebuild index 6130f773901d..bd2c3c9b5155 100644 --- a/app-admin/puppet/puppet-0.24.3.ebuild +++ b/app-admin/puppet/puppet-0.24.5.ebuild @@ -1,6 +1,6 @@ # 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.3.ebuild,v 1.1 2008/03/20 22:48:42 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.5.ebuild,v 1.1 2008/08/13 16:51:00 matsuu Exp $ inherit elisp-common eutils ruby @@ -11,7 +11,7 @@ SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" IUSE="emacs vim-syntax" -KEYWORDS="~x86 ~amd64" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" DEPEND="emacs? ( virtual/emacs )" RDEPEND="${DEPEND} @@ -34,7 +34,7 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${PN}-0.24.2-gentoo.patch + epatch "${FILESDIR}/${PN}-0.24.2-gentoo.patch" } src_compile() { |