commit: 027f61ab53740d605f10d5e72af3ccea9d2866cf Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Feb 29 00:18:32 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Feb 29 00:18:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=027f61ab
app-admin/puppet: update init.d for nfsmount removal Bug: https://bugs.gentoo.org/925459 Signed-off-by: Sam James <sam <AT> gentoo.org> app-admin/puppet/files/puppet.init | 2 +- ...uppet-7.24.0.ebuild => puppet-7.24.0-r1.ebuild} | 2 +- ...uppet-7.28.0.ebuild => puppet-7.27.0-r1.ebuild} | 0 app-admin/puppet/puppet-7.27.0.ebuild | 128 --------------------- ...uppet-7.28.0.ebuild => puppet-7.28.0-r1.ebuild} | 0 ...{puppet-8.4.0.ebuild => puppet-8.3.1-r1.ebuild} | 0 app-admin/puppet/puppet-8.3.1.ebuild | 125 -------------------- ...{puppet-8.4.0.ebuild => puppet-8.4.0-r1.ebuild} | 0 8 files changed, 2 insertions(+), 255 deletions(-) diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init index ad7a638bebb8..9821134c8ae3 100644 --- a/app-admin/puppet/files/puppet.init +++ b/app-admin/puppet/files/puppet.init @@ -14,7 +14,7 @@ command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPP depend() { need localmount - use dns logger puppetmaster netmount nfsmount + use dns logger puppetmaster netmount } start_pre() { diff --git a/app-admin/puppet/puppet-7.24.0.ebuild b/app-admin/puppet/puppet-7.24.0-r1.ebuild similarity index 98% rename from app-admin/puppet/puppet-7.24.0.ebuild rename to app-admin/puppet/puppet-7.24.0-r1.ebuild index 491d52e9696e..e6415c71f2b2 100644 --- a/app-admin/puppet/puppet-7.24.0.ebuild +++ b/app-admin/puppet/puppet-7.24.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" diff --git a/app-admin/puppet/puppet-7.28.0.ebuild b/app-admin/puppet/puppet-7.27.0-r1.ebuild similarity index 100% copy from app-admin/puppet/puppet-7.28.0.ebuild copy to app-admin/puppet/puppet-7.27.0-r1.ebuild diff --git a/app-admin/puppet/puppet-7.27.0.ebuild b/app-admin/puppet/puppet-7.27.0.ebuild deleted file mode 100644 index 92afd365eb3f..000000000000 --- a/app-admin/puppet/puppet-7.27.0.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -USE_RUBY="ruby27 ruby30 ruby31" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_TASK_DOC="doc:all" -RUBY_FAKEGEM_EXTRAINSTALL="locales" - -inherit ruby-fakegem systemd tmpfiles - -DESCRIPTION="A system automation and configuration management software" -HOMEPAGE="https://puppet.com/"; -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"; - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" -IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" -RESTRICT="test" - -ruby_add_rdepend " - dev-ruby/hiera - dev-ruby/json:= - dev-ruby/semantic_puppet - >=dev-ruby/facter-3.0.0 - dev-ruby/concurrent-ruby - 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 - dev-ruby/hocon" - -ruby_add_bdepend " - doc? ( dev-ruby/yard ) - test? ( - dev-ruby/mocha - dev-ruby/rack - dev-ruby/rspec-its - )" -# this should go in the above lists, but isn't because of test deps not being keyworded -# dev-ruby/rspec-collection_matchers - -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 - acct-user/puppet - acct-group/puppet" -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" - -all_ruby_prepare() { - # Avoid spec that require unpackaged json-schema. - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die - - # fix systemd path - eapply -p0 "${FILESDIR}/puppet-systemd.patch" - - # 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 spec that need further investigation. - rm spec/unit/module_tool/metadata_spec.rb || die -} - -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 - systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" - - # tmpfiles stuff - newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" - - # openrc init stuff - newinitd "${FILESDIR}"/puppet.init puppet - - 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 - - # ext and examples files - for f in $(find ext examples -type f) ; do - docinto "$(dirname ${f})" - dodoc "${f}" - done -} - -pkg_postinst() { - tmpfiles_process puppet.conf - - 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 - elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" - elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" - elog "not already done so." - elog -} diff --git a/app-admin/puppet/puppet-7.28.0.ebuild b/app-admin/puppet/puppet-7.28.0-r1.ebuild similarity index 100% rename from app-admin/puppet/puppet-7.28.0.ebuild rename to app-admin/puppet/puppet-7.28.0-r1.ebuild diff --git a/app-admin/puppet/puppet-8.4.0.ebuild b/app-admin/puppet/puppet-8.3.1-r1.ebuild similarity index 100% copy from app-admin/puppet/puppet-8.4.0.ebuild copy to app-admin/puppet/puppet-8.3.1-r1.ebuild diff --git a/app-admin/puppet/puppet-8.3.1.ebuild b/app-admin/puppet/puppet-8.3.1.ebuild deleted file mode 100644 index 740979b2b82c..000000000000 --- a/app-admin/puppet/puppet-8.3.1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -USE_RUBY="ruby31" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_TASK_DOC="doc:all" -RUBY_FAKEGEM_EXTRAINSTALL="locales" - -inherit ruby-fakegem systemd tmpfiles - -DESCRIPTION="A system automation and configuration management software" -HOMEPAGE="https://puppet.com/"; -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"; - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" -IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax" -RESTRICT="test" - -ruby_add_rdepend " - hiera? ( dev-ruby/hiera ) - dev-ruby/json:= - dev-ruby/semantic_puppet - >=dev-ruby/facter-3.0.0 - dev-ruby/deep_merge - dev-ruby/concurrent-ruby - 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 - dev-ruby/hocon" - -ruby_add_bdepend " - doc? ( dev-ruby/yard ) - test? ( - dev-ruby/mocha - dev-ruby/rack - dev-ruby/rspec-its - )" -# this should go in the above lists, but isn't because of test deps not being keyworded -# dev-ruby/rspec-collection_matchers - -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 - acct-user/puppet - acct-group/puppet" -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" - -all_ruby_prepare() { - # Avoid spec that require unpackaged json-schema. - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die - - # fix systemd path - eapply -p0 "${FILESDIR}/puppet-systemd.patch" - - # 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 spec that need further investigation. - rm spec/unit/module_tool/metadata_spec.rb || die -} - -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 - systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" - - # tmpfiles stuff - newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" - - # openrc init stuff - newinitd "${FILESDIR}"/puppet.init puppet - - 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 - - # ext and examples files - for f in $(find ext examples -type f) ; do - docinto "$(dirname ${f})" - dodoc "${f}" - done -} - -pkg_postinst() { - tmpfiles_process puppet.conf - - 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 -} diff --git a/app-admin/puppet/puppet-8.4.0.ebuild b/app-admin/puppet/puppet-8.4.0-r1.ebuild similarity index 100% rename from app-admin/puppet/puppet-8.4.0.ebuild rename to app-admin/puppet/puppet-8.4.0-r1.ebuild
