commit: c0fb9c0c6f542d840260d4b028e90378e0066f5f Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sat Dec 2 05:57:47 2017 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Sat Dec 2 06:29:10 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fb9c0c
app-admin/puppet: cleanup Package-Manager: Portage-2.3.13, Repoman-2.3.3 app-admin/puppet/Manifest | 1 - app-admin/puppet/puppet-3.8.7-r1.ebuild | 196 -------------------------------- 2 files changed, 197 deletions(-) diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index b252179e1d4..db54a04b803 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -1,4 +1,3 @@ -DIST puppet-3.8.7.tar.gz 2650247 BLAKE2B 20728a12c9c123f4a366ee89b25235fd73215a764ebe7fbd5f618d99f8db06935845778d3759722ccaf6f6a68536ea6de34a413824afba777d72e11d0543e864 SHA512 f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618 DIST puppet-4.10.1.tar.gz 2954351 BLAKE2B 6cf8ac28d8c09f4b82956b3fc8ebc17c0ec35c77818797e5101d03e099850b75fcfa35ec19bd351bcb51fb1d5071541f4f2b8b3be9eada3d21c00c8d8108aa95 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d DIST puppet-5.1.0.tar.gz 2734018 BLAKE2B d4169fee328710b7685de2606196de68e21ca31f9a9945bdd84255f5185fd2d95c6543a7b88b5130f1f01e60e04294664de71a8ccd1319c2e0bebf4d031e6225 SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15 diff --git a/app-admin/puppet/puppet-3.8.7-r1.ebuild b/app-admin/puppet/puppet-3.8.7-r1.ebuild deleted file mode 100644 index f7e608e5bbf..00000000000 --- a/app-admin/puppet/puppet-3.8.7-r1.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -USE_RUBY="ruby21 ruby22 ruby23" - -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://downloads.puppetlabs.com/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 sqlite vim-syntax xemacs" - -ruby_add_rdepend " - dev-ruby/hiera - >=dev-ruby/rgen-0.7.0 - >=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 ) - sqlite? ( dev-ruby/sqlite3 ) - virtual/ruby-ssl" - -ruby_add_bdepend "test? ( dev-ruby/mocha )" - -DEPEND="${DEPEND} - emacs? ( virtual/emacs ) - xemacs? ( app-editors/xemacs )" -RDEPEND="${RDEPEND} - 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() { - # Fix compatibility with ruby22 and later. Psych has been the - # default YAML engine since ruby 2.0 and ruby22 and later no longer - # define YAML::ENGINE at all. - sed -i -e '/YAML_ENGINE =/ s/syck/psych/' lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb - - # 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 - - local v - for v in ${REPLACING_VERSIONS}; do - if [ "$(get_major_version $v)" = "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 - done - - use emacs && elisp-site-regen - use xemacs && xemacs-elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen - use xemacs && xemacs-elisp-site-regen -}
