diff options
author | Matthew Thode <prometheanfire@gentoo.org> | 2014-06-15 03:11:47 +0000 |
---|---|---|
committer | Matthew Thode <prometheanfire@gentoo.org> | 2014-06-15 03:11:47 +0000 |
commit | 5dbce2e2bfd261c180bd470d36fd61c3dce55101 (patch) | |
tree | c4d000f13af893e366290b15923a6e48752deec8 /app-admin | |
parent | fixes for CVE-2014-32[48,50] bug 513284 (diff) | |
download | gentoo-2-5dbce2e2bfd261c180bd470d36fd61c3dce55101.tar.gz gentoo-2-5dbce2e2bfd261c180bd470d36fd61c3dce55101.tar.bz2 gentoo-2-5dbce2e2bfd261c180bd470d36fd61c3dce55101.zip |
removing another
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/puppet/ChangeLog | 6 | ||||
-rw-r--r-- | app-admin/puppet/puppet-3.4.3-r1.ebuild | 167 |
2 files changed, 5 insertions, 168 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog index 821f9e3e3c63..b2aad83220a0 100644 --- a/app-admin/puppet/ChangeLog +++ b/app-admin/puppet/ChangeLog @@ -1,6 +1,10 @@ # 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.199 2014/06/15 03:10:35 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.200 2014/06/15 03:11:47 prometheanfire Exp $ + + 15 Jun 2014; Matthew Thode <prometheanfire@gentoo.org> + -puppet-3.4.3-r1.ebuild: + removing another *puppet-3.6.2 (15 Jun 2014) *puppet-2.7.25 (15 Jun 2014) diff --git a/app-admin/puppet/puppet-3.4.3-r1.ebuild b/app-admin/puppet/puppet-3.4.3-r1.ebuild deleted file mode 100644 index b90aebb55282..000000000000 --- a/app-admin/puppet/puppet-3.4.3-r1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# 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.4.3-r1.ebuild,v 1.1 2014/03/16 21:52:37 prometheanfire Exp $ - -EAPI="5" - -USE_RUBY="ruby19 ruby20" - -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 - >=dev-ruby/facter-1.6.2 - 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_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 - - 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 -} |