diff options
author | Hans de Graaff <graaff@gentoo.org> | 2014-05-18 19:47:36 +0000 |
---|---|---|
committer | Hans de Graaff <graaff@gentoo.org> | 2014-05-18 19:47:36 +0000 |
commit | 71ec638f703d2bdb891da752c598d94050145f8f (patch) | |
tree | cc495a5f2c45dd86ca9d16079df2f5acc0563ffc /app-admin/puppet | |
parent | Add ruby20, ruby21. Drop jruby since newer timecop is no longer compatible. (diff) | |
download | gentoo-2-71ec638f703d2bdb891da752c598d94050145f8f.tar.gz gentoo-2-71ec638f703d2bdb891da752c598d94050145f8f.tar.bz2 gentoo-2-71ec638f703d2bdb891da752c598d94050145f8f.zip |
Version bump. Update dependencies. Run specs in the test phase.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'app-admin/puppet')
-rw-r--r-- | app-admin/puppet/ChangeLog | 7 | ||||
-rw-r--r-- | app-admin/puppet/puppet-3.6.0.ebuild | 189 |
2 files changed, 195 insertions, 1 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog index 900c5a4b7081..2be652709c92 100644 --- a/app-admin/puppet/ChangeLog +++ b/app-admin/puppet/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/puppet # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.196 2014/05/14 06:36:08 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.197 2014/05/18 19:47:36 graaff Exp $ + +*puppet-3.6.0 (18 May 2014) + + 18 May 2014; Hans de Graaff <graaff@gentoo.org> +puppet-3.6.0.ebuild: + Version bump. Update dependencies. Run specs in the test phase. *puppet-3.5.1 (14 May 2014) diff --git a/app-admin/puppet/puppet-3.6.0.ebuild b/app-admin/puppet/puppet-3.6.0.ebuild new file mode 100644 index 000000000000..17f17d76218a --- /dev/null +++ b/app-admin/puppet/puppet-3.6.0.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.6.0.ebuild,v 1.1 2014/05/18 19:47:36 graaff Exp $ + +EAPI="5" + +USE_RUBY="ruby19 ruby20" + +RUBY_FAKEGEM_RECIPE_TEST="rspec" + +inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator + +DESCRIPTION="A system automation and configuration management software" +HOMEPAGE="http://puppetlabs.com/" +SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" +IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs" + +ruby_add_rdepend " + dev-ruby/hiera + >=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6* + >=dev-ruby/facter-1.6.2 <dev-ruby/facter-3 + dev-ruby/json + 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 ) + virtual/ruby-ssl" + +DEPEND="${DEPEND} + ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) + emacs? ( virtual/emacs ) + xemacs? ( app-editors/xemacs )" +RDEPEND="${RDEPEND} + ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) + rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) + selinux? ( + sys-libs/libselinux[ruby] + sec-policy/selinux-puppet + ) + vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) + >=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_prepare() { + # Avoid spec that require unpackaged json-schema. + rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die + + # Avoid Rails specs to avoid this dependency and because they + # currently fail against Rails 4.1. + find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die + rm -r spec/unit/rails || die + rm spec/unit/parser/collector_spec.rb || die + + # Avoid specs that can only run in the puppet.git repository. This + # should be narrowed down to the specific specs. + rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die + + # Avoid failing spec that need further investigation. + rm spec/unit/module_tool/metadata_spec.rb || die +} + +all_ruby_compile() { + if use emacs ; then + elisp-compile ext/emacs/puppet-mode.el + fi + + if use xemacs ; then + # Create a separate version for xemacs to be able to install + # emacs and xemacs in parallel. + mkdir ext/xemacs + cp ext/emacs/* ext/xemacs/ + xemacs-elisp-compile ext/xemacs/puppet-mode.el + fi +} + +each_ruby_install() { + each_fakegem_install + #${RUBY} install.rb --destdir="${D}" install || die +} + +all_ruby_install() { + all_fakegem_install + + #systemd stuffs + insinto /usr/lib/systemd/system + doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" + insinto /usr/lib/tmpfiles.d + newins "${FILESDIR}/tmpfiles.d" "puppet.conf" + + newinitd "${FILESDIR}"/puppet.init-r1 puppet + + # Initial configuration files + insinto /etc/puppet + + # Location of log and data files + keepdir /var/log/puppet + fowners -R puppet:puppet /var/log/puppet + + if use minimal ; then + rm "${ED}/etc/puppet/auth.conf" + else + insinto /usr/lib/systemd/system + doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service" + newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster + newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster + + insinto /etc/puppet + + keepdir /etc/puppet/manifests + keepdir /etc/puppet/modules + + keepdir /var/lib/puppet/ssl + keepdir /var/lib/puppet/facts + keepdir /var/lib/puppet/files + fowners -R puppet:puppet /var/lib/puppet + fperms 0750 /var/lib/puppet + fi + fperms 0750 /etc/puppet + fowners :puppet /etc/puppet + + if use emacs ; then + elisp-install ${PN} ext/emacs/puppet-mode.el* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + if use xemacs ; then + xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* + xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + if use ldap ; then + insinto /etc/openldap/schema; doins ext/ldap/puppet.schema + 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 "Portage Puppet module with Gentoo-specific resources:" + elog "http://forge.puppetlabs.com/gentoo/portage" + 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 + + if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then + elog + elog "If you're upgrading from 2.x then we strongly suggest you to read:" + elog "http://docs.puppetlabs.com/guides/upgrading.html" + 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 +} |