commit: c0ac6c95602a6931e9564e33732632992a32d868 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sat Dec 2 05:55:37 2017 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Sat Dec 2 06:29:08 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ac6c95
app-admin/puppet: cleanup Package-Manager: Portage-2.3.13, Repoman-2.3.3 app-admin/puppet/Manifest | 1 - app-admin/puppet/puppet-4.10.6-r1.ebuild | 194 ------------------------------- app-admin/puppet/puppet-4.10.6.ebuild | 192 ------------------------------ 3 files changed, 387 deletions(-) diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index dac92b5672d..b252179e1d4 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -1,6 +1,5 @@ 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.6.tar.gz 2977099 BLAKE2B fea4ece994c9ee639bdc4a079760b04286e8d9804dc502c7598add658cd7abc975d74fcce49dc63223a6696565e8be6f6a2c495bf4cf40aded314d36f1ce839e SHA512 f983005d161bbd5fb81dfd15a32cb0ae2417557bd4faa1a62d2fb10fffa55c91ea29c1577785af9642a2878c78405ab99c7e6ee4268fcedcc107c07a0a5bfdd1 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d DIST puppet-5.1.0.tar.gz 2734018 BLAKE2B d4169fee328710b7685de2606196de68e21ca31f9a9945bdd84255f5185fd2d95c6543a7b88b5130f1f01e60e04294664de71a8ccd1319c2e0bebf4d031e6225 SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15 DIST puppet-5.3.3.tar.gz 2843386 SHA256 45360f64fe0375df617571d58e929515e2094daa1d0dc78e2b6718d7cbeaf18e SHA512 b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe WHIRLPOOL 19c8511ba58186692ee0ace02158c16529715cc213f0eb7266bb078a10db6e698081edc4b3e0735f1e79fb568066cc6f1699d0b1a954a29d74d1a91f393130fa diff --git a/app-admin/puppet/puppet-4.10.6-r1.ebuild b/app-admin/puppet/puppet-4.10.6-r1.ebuild deleted file mode 100644 index 62e5e757fb5..00000000000 --- a/app-admin/puppet/puppet-4.10.6-r1.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -USE_RUBY="ruby21 ruby22 ruby23" - -#RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_EXTRAINSTALL="locales" - -inherit 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 ~arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs" -RESTRICT="test" - -ruby_add_rdepend " - dev-ruby/hiera - >=dev-ruby/rgen-0.6.5 - dev-ruby/json:= - >=dev-ruby/facter-3.0.0 - 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:0.14 -# =dev-ruby/rack-1* -# dev-ruby/rspec-its -# dev-ruby/rspec-collection_matchers -# >=dev-ruby/vcr-2.9:2 -# >=dev-ruby/webmock-1.24:0 -# )" - -DEPEND+=" ${DEPEND} - 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" -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" - -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 - - # can't be run within portage. - epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch" - - # fix systemd path - epatch "${FILESDIR}/puppet-systemd.patch" - - if use experimental; then - epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch" - fi - - # Use working version of mocha - sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.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 || die - - # Avoid failing specs that need further investigation. - sed -i -e '/should resolve external facts/,/^ end/ s:^:#:' \ - spec/integration/indirector/facts/facter_spec.rb || die - sed -i -e "/describe 'cfacter'/,/^ end/ s:^:#:" spec/unit/defaults_spec.rb || die - rm -f spec/unit/indirector/ldap_spec.rb \ - spec/unit/parser/functions/create_resources_spec.rb || die - - # Avoid specs that rely on tools from other OSs - rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \ - spec/unit/provider/user/directoryservice_spec.rb || die - - # Avoid specs that depend on hiera-eyaml to avoid circular - # dependencies - rm -f spec/unit/functions/lookup_spec.rb || die - - # Avoid specs that fail due to an unpackaged file - sed -i -e '/when loading pp resource types using auto loading/,/^ end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die -} - -all_ruby_compile() { - 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 -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" -} - -all_ruby_install() { - all_fakegem_install - - # systemd stuffs - insinto /usr/lib/systemd/system - doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" - - # tmpfiles stuff - insinto /usr/lib/tmpfiles.d - newins "${FILESDIR}/tmpfiles.d" "puppet.conf" - - # openrc init stuff - newinitd "${FILESDIR}"/puppet.init-4.x puppet - newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster - newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster - - keepdir /etc/puppetlabs/puppet/ssl - - keepdir /var/lib/puppet/facts - keepdir /var/lib/puppet/files - fowners -R puppet:puppet /var/lib/puppet - - fperms 0750 /var/lib/puppet - - fperms 0750 /etc/puppetlabs - fperms 0750 /etc/puppetlabs/puppet - fperms 0750 /etc/puppetlabs/puppet/ssl - fowners -R :puppet /etc/puppetlabs - fowners -R :puppet /var/lib/puppet - - 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 - - local v - for v in ${REPLACING_VERSIONS}; do - if [ "$(get_major_version $v)" = "3" ]; then - elog - elog "If you're upgrading from 3.x then please move everything in /etc/puppet to" - elog "/etc/puppetlabs/puppet" - elog "Also, puppet now uses config directories for modules and manifests." - elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"; - elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"; - elog "for more information." - elog - fi - done - - use xemacs && xemacs-elisp-site-regen -} - -pkg_postrm() { - use xemacs && xemacs-elisp-site-regen -} diff --git a/app-admin/puppet/puppet-4.10.6.ebuild b/app-admin/puppet/puppet-4.10.6.ebuild deleted file mode 100644 index 90ba147596d..00000000000 --- a/app-admin/puppet/puppet-4.10.6.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -USE_RUBY="ruby21 ruby22 ruby23" - -#RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -inherit 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 ~arm ~hppa ~ppc ~x86" -IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs" -RESTRICT="test" - -ruby_add_rdepend " - dev-ruby/hiera - >=dev-ruby/rgen-0.6.5 - dev-ruby/json:= - >=dev-ruby/facter-3.0.0 - 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:0.14 -# =dev-ruby/rack-1* -# dev-ruby/rspec-its -# dev-ruby/rspec-collection_matchers -# >=dev-ruby/vcr-2.9:2 -# >=dev-ruby/webmock-1.24:0 -# )" - -DEPEND+=" ${DEPEND} - 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" -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" - -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 - - # can't be run within portage. - epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch" - - # fix systemd path - epatch "${FILESDIR}/puppet-systemd.patch" - - if use experimental; then - epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch" - fi - - # Use working version of mocha - sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.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 || die - - # Avoid failing specs that need further investigation. - sed -i -e '/should resolve external facts/,/^ end/ s:^:#:' \ - spec/integration/indirector/facts/facter_spec.rb || die - sed -i -e "/describe 'cfacter'/,/^ end/ s:^:#:" spec/unit/defaults_spec.rb || die - rm -f spec/unit/indirector/ldap_spec.rb \ - spec/unit/parser/functions/create_resources_spec.rb || die - - # Avoid specs that rely on tools from other OSs - rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \ - spec/unit/provider/user/directoryservice_spec.rb || die - - # Avoid specs that depend on hiera-eyaml to avoid circular - # dependencies - rm -f spec/unit/functions/lookup_spec.rb || die - - # Avoid specs that fail due to an unpackaged file - sed -i -e '/when loading pp resource types using auto loading/,/^ end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die -} - -all_ruby_compile() { - 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 -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" -} - -all_ruby_install() { - all_fakegem_install - - # systemd stuffs - insinto /usr/lib/systemd/system - doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" - - # tmpfiles stuff - insinto /usr/lib/tmpfiles.d - newins "${FILESDIR}/tmpfiles.d" "puppet.conf" - - # openrc init stuff - newinitd "${FILESDIR}"/puppet.init-4.x puppet - newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster - newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster - - keepdir /etc/puppetlabs/puppet/ssl - - keepdir /var/lib/puppet/facts - keepdir /var/lib/puppet/files - fowners -R puppet:puppet /var/lib/puppet - - fperms 0750 /var/lib/puppet - - fperms 0750 /etc/puppetlabs - fperms 0750 /etc/puppetlabs/puppet - fperms 0750 /etc/puppetlabs/puppet/ssl - fowners -R :puppet /etc/puppetlabs - fowners -R :puppet /var/lib/puppet - - 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 - - local v - for v in ${REPLACING_VERSIONS}; do - if [ "$(get_major_version $v)" = "3" ]; then - elog - elog "If you're upgrading from 3.x then please move everything in /etc/puppet to" - elog "/etc/puppetlabs/puppet" - elog "Also, puppet now uses config directories for modules and manifests." - elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"; - elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"; - elog "for more information." - elog - fi - done - - use xemacs && xemacs-elisp-site-regen -} - -pkg_postrm() { - use xemacs && xemacs-elisp-site-regen -}
