diff options
Diffstat (limited to 'app-admin/puppet')
-rw-r--r-- | app-admin/puppet/Manifest | 7 | ||||
-rw-r--r-- | app-admin/puppet/files/puppet.init (renamed from app-admin/puppet/files/puppet.init-4.x) | 4 | ||||
-rw-r--r-- | app-admin/puppet/files/puppetmaster.confd | 18 | ||||
-rw-r--r-- | app-admin/puppet/files/puppetmaster.init-4.x | 37 | ||||
-rw-r--r-- | app-admin/puppet/files/tmpfiles.d | 1 | ||||
-rw-r--r-- | app-admin/puppet/files/tmpfiles.d-2 | 1 | ||||
-rw-r--r-- | app-admin/puppet/metadata.xml | 5 | ||||
-rw-r--r-- | app-admin/puppet/puppet-5.5.22-r1.ebuild | 140 | ||||
-rw-r--r-- | app-admin/puppet/puppet-5.5.22-r2.ebuild | 141 | ||||
-rw-r--r-- | app-admin/puppet/puppet-7.28.0-r1.ebuild (renamed from app-admin/puppet/puppet-7.16.0.ebuild) | 13 | ||||
-rw-r--r-- | app-admin/puppet/puppet-8.5.1.ebuild (renamed from app-admin/puppet/puppet-7.14.0.ebuild) | 32 | ||||
-rw-r--r-- | app-admin/puppet/puppet-8.6.0.ebuild (renamed from app-admin/puppet/puppet-7.15.0.ebuild) | 32 |
12 files changed, 34 insertions, 397 deletions
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index bd43d766f1ce..c8a2bdc1a3f3 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -1,4 +1,3 @@ -DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58 -DIST puppet-7.14.0.tar.gz 2816077 BLAKE2B c4aacf7179208e801fad2aa384691e38ca4bd1329819d4ca15b7a3cf25c5787e8adef12c91d233c5adbc301ab77cdf9748f094a1904c78c62d6ac73dafb4a634 SHA512 36aaa9c8cce9d1c40e77eee1e3544c0b0c665bbfa3b8184401905d6f15c142be8490421af0dac57856849de343b288f67153c551db68f8cea9e0ed3ad251feb3 -DIST puppet-7.15.0.tar.gz 2817137 BLAKE2B ce76ad71251a9202d31e858706eb994c6210cbe97f31e56d95b8c36d541d0ce8d1e65ab33d399e7dca1c5ea8e7f4dfccb3a2a4d36baaed6ca31516b7e449bf2a SHA512 0d68bda85a5f61fdb74c3e70304d414afef238dff4f7a4cd60c17f5cc26fcb18ba7f81065d6295adde33bc181031b458d259daa84a41156c9589f5c0e3cb8951 -DIST puppet-7.16.0.tar.gz 2817116 BLAKE2B d367005ea69ceb0f89f4294e74639ad61305f23929e5edf0385eb2cce5da76fa157c5bc7408599dcca4d9adba39c3b29250e78d8f584873f72bb34452a90a74d SHA512 b1f3c6072821225c9068089f44ad9ab955534f2d91bf88b44f762e0588442b9d6191eb89909dc05b7efc3a82302d2d3dc5a5a040fbc84f81645817d695b4db72 +DIST puppet-7.28.0.tar.gz 2827538 BLAKE2B 65f25d9de60ed1b511acb5c9d72370198f68f3158cfede2ffda90ee23ebcfecfdabcf35459d1a048c3a204e13611f67852028233e4da4b9ed2ea08cad07a37c9 SHA512 d570452ceec764c657f4678f7179400d30f8513766edc6f020db35c3a4246c1d857615a647ca481920a7d1a40cf9a15057432468ccd4697e4335dca55e121faa +DIST puppet-8.5.1.tar.gz 1565085 BLAKE2B f352f9f70e090c4a32edd45ced5c01ed4eff891fb46c0f2d753ceeba43250960356ceb2d9047e7308732585ec114c5f728ec29a65b6a08348b74a9709ec92a89 SHA512 f1d661c34fc7c1381c6422ff7e027fdf4554a69939f5db926bf8a61a89583090fb8d28151f90093d3ca8037950ed911b0a5c7b8677a80ede72e83d9cbf89af7f +DIST puppet-8.6.0.tar.gz 1567398 BLAKE2B 749cc055c6797e5715907fdb768264774efba62e4681733a59a457cfda9dd2682990a96331cc04d313a367e32b820ce351fb103e19891976e900d99c30ca7ba5 SHA512 b08d59b4ec79fec5f3dd2d37c9b6a9f016cf25068e507866ab8d545f59792b9af84e302675182a0318c792814f0bff2bf052c8953b6b44c5441fa2c692a9f04d diff --git a/app-admin/puppet/files/puppet.init-4.x b/app-admin/puppet/files/puppet.init index f7106e6f0294..9821134c8ae3 100644 --- a/app-admin/puppet/files/puppet.init-4.x +++ b/app-admin/puppet/files/puppet.init @@ -2,7 +2,7 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}" +PUPPET_PID_DIR="${PUPPET_PID_DIR:-/run/puppet}" pidfile="${PUPPET_PID_DIR}/puppet.pid" PUPPET_LOG_DIR="/var/log/puppet" @@ -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/files/puppetmaster.confd b/app-admin/puppet/files/puppetmaster.confd deleted file mode 100644 index afecf479a6a1..000000000000 --- a/app-admin/puppet/files/puppetmaster.confd +++ /dev/null @@ -1,18 +0,0 @@ -# Location of PID files -PUPPETMASTER_PID_DIR="/var/run/puppet" - -# Where to log general messages to. -# Specify syslog to send log messages to the system log. -#PUPPETMASTER_LOG="syslog" - -# You may specify other parameters to the puppetmaster here -#PUPPETMASTER_EXTRA_OPTS="--noca" - -# You may specify an alternate port on which puppetmaster should listen. -# Default is: 8140 -#PUPPETMASTER_PORT="8140" - -# To start multiple servers: -# # cp /etc/conf.d/puppetmaster /etc/conf.d/puppetmaster.master_8141 -# # ln -s puppetmaster /etc/init.d/puppetmaster.master_8141 -# # ${EDITOR} /etc/conf.d/puppetmaster.master_8141 (set 8141 to PUPPETMASTER_PORT) diff --git a/app-admin/puppet/files/puppetmaster.init-4.x b/app-admin/puppet/files/puppetmaster.init-4.x deleted file mode 100644 index 286f7e67579a..000000000000 --- a/app-admin/puppet/files/puppetmaster.init-4.x +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -if [ "${SVCNAME}" = "puppetmaster" ] ; then - PUPPETMASTER_PID="master" -else - PUPPETMASTER_PID="${SVCNAME#*.}" -fi -PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}" -pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid" -PUPPET_LOG_DIR="/var/log/puppet" - -command_args="master --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPETMASTER_EXTRA_OPTS}" -if [ -n "${PUPPETMASTER_PORT}" ] ; then - command_args="${command_args} --masterport ${PUPPETMASTER_PORT}" -fi - -command="/usr/bin/puppet" -extra_started_commands="reload" - -depend() { - need localmount - use dns logger slapd netmount nfsmount -} - -start_pre() { - checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}" - checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR} - checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log" -} - -reload() { - ebegin "Reloading $RC_SVCNAME" - start-stop-daemon --signal SIGHUP --pidfile "${pidfile}" - eend $? -} diff --git a/app-admin/puppet/files/tmpfiles.d b/app-admin/puppet/files/tmpfiles.d deleted file mode 100644 index cd33231df7f7..000000000000 --- a/app-admin/puppet/files/tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -D /var/run/puppet 0755 puppet puppet - diff --git a/app-admin/puppet/files/tmpfiles.d-2 b/app-admin/puppet/files/tmpfiles.d-2 new file mode 100644 index 000000000000..b36eec4dbdfc --- /dev/null +++ b/app-admin/puppet/files/tmpfiles.d-2 @@ -0,0 +1 @@ +D /run/puppet 0755 puppet puppet - diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml index 74bbc6466d28..8f56170190b1 100644 --- a/app-admin/puppet/metadata.xml +++ b/app-admin/puppet/metadata.xml @@ -4,10 +4,6 @@ <maintainer type="person"> <email>prometheanfire@gentoo.org</email> </maintainer> - <maintainer type="person"> - <email>graaff@gentoo.org</email> - <description>Puppet 5.x only</description> - </maintainer> <maintainer type="project"> <email>sysadmin@gentoo.org</email> <name>Gentoo Sysadmin Project</name> @@ -33,6 +29,7 @@ <!-- <flag name='puppetdb'>Enable puppetdb support</flag> --> <flag name="augeas">Enable augeas support</flag> <flag name="diff">Enable diff support</flag> + <flag name="hiera">Enable hiera support</flag> <flag name="rrdtool">Enable rrdtool support</flag> <flag name="shadow">Enable shadow support</flag> </use> diff --git a/app-admin/puppet/puppet-5.5.22-r1.ebuild b/app-admin/puppet/puppet-5.5.22-r1.ebuild deleted file mode 100644 index f534c29f43f0..000000000000 --- a/app-admin/puppet/puppet-5.5.22-r1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby25 ruby26 ruby27" - -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="https://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 ldap rrdtool selinux shadow sqlite vim-syntax" -RESTRICT="test" - -ruby_add_rdepend " - >=dev-ruby/hiera-3.2.1:0 - =dev-ruby/facter-3* - >=dev-ruby/fast_gettext-1.1.2:0 - >=dev-ruby/locale-2.1:0 - >=dev-ruby/multi_json-1.10: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 - 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" "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 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() { - 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 - - for v in ${REPLACING_VERSIONS}; do - if [ "$(ver_cut 1 "$v")" -eq "4" ]; then - elog - elog "Please see the following url for the release notes for puppet-5" - elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x" - elog - fi - done -} diff --git a/app-admin/puppet/puppet-5.5.22-r2.ebuild b/app-admin/puppet/puppet-5.5.22-r2.ebuild deleted file mode 100644 index 7f79dde74e75..000000000000 --- a/app-admin/puppet/puppet-5.5.22-r2.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby26 ruby27" - -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="https://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 ldap rrdtool selinux shadow sqlite vim-syntax" -RESTRICT="test" - -ruby_add_rdepend " - >=dev-ruby/hiera-3.2.1:0 - =dev-ruby/facter-3* - >=dev-ruby/fast_gettext-1.1.2:0 - >=dev-ruby/locale-2.1:0 - >=dev-ruby/multi_json-1.10:0 - dev-ruby/sync - 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" "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 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() { - 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 - - for v in ${REPLACING_VERSIONS}; do - if [ "$(ver_cut 1 "$v")" -eq "4" ]; then - elog - elog "Please see the following url for the release notes for puppet-5" - elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x" - elog - fi - done -} diff --git a/app-admin/puppet/puppet-7.16.0.ebuild b/app-admin/puppet/puppet-7.28.0-r1.ebuild index b0c6d6d3ffe3..2331b40f31d2 100644 --- a/app-admin/puppet/puppet-7.16.0.ebuild +++ b/app-admin/puppet/puppet-7.28.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby27 ruby30 ruby31" RUBY_FAKEGEM_RECIPE_TEST="rspec3" RUBY_FAKEGEM_TASK_DOC="doc:all" RUBY_FAKEGEM_EXTRAINSTALL="locales" @@ -16,7 +16,7 @@ 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 x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" RESTRICT="test" @@ -74,7 +74,8 @@ all_ruby_prepare() { 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}" +# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \ +# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" } all_ruby_install() { @@ -84,10 +85,10 @@ all_ruby_install() { systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" # tmpfiles stuff - newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf" + newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" # openrc init stuff - newinitd "${FILESDIR}"/puppet.init-4.x puppet + newinitd "${FILESDIR}"/puppet.init puppet keepdir /etc/puppetlabs/puppet/ssl diff --git a/app-admin/puppet/puppet-7.14.0.ebuild b/app-admin/puppet/puppet-8.5.1.ebuild index b0c6d6d3ffe3..6ee8a0e304c8 100644 --- a/app-admin/puppet/puppet-7.14.0.ebuild +++ b/app-admin/puppet/puppet-8.5.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby31" RUBY_FAKEGEM_RECIPE_TEST="rspec3" RUBY_FAKEGEM_TASK_DOC="doc:all" RUBY_FAKEGEM_EXTRAINSTALL="locales" @@ -16,15 +16,16 @@ 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 x86" -IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" +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 " - dev-ruby/hiera + 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 ) @@ -58,23 +59,14 @@ RDEPEND+=" ${RDEPEND} 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}" +# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \ +# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" } all_ruby_install() { @@ -84,10 +76,10 @@ all_ruby_install() { systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" # tmpfiles stuff - newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf" + newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" # openrc init stuff - newinitd "${FILESDIR}"/puppet.init-4.x puppet + newinitd "${FILESDIR}"/puppet.init puppet keepdir /etc/puppetlabs/puppet/ssl @@ -120,8 +112,4 @@ pkg_postinst() { 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.15.0.ebuild b/app-admin/puppet/puppet-8.6.0.ebuild index b0c6d6d3ffe3..6ee8a0e304c8 100644 --- a/app-admin/puppet/puppet-7.15.0.ebuild +++ b/app-admin/puppet/puppet-8.6.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby31" RUBY_FAKEGEM_RECIPE_TEST="rspec3" RUBY_FAKEGEM_TASK_DOC="doc:all" RUBY_FAKEGEM_EXTRAINSTALL="locales" @@ -16,15 +16,16 @@ 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 x86" -IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" +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 " - dev-ruby/hiera + 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 ) @@ -58,23 +59,14 @@ RDEPEND+=" ${RDEPEND} 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}" +# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \ +# "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" } all_ruby_install() { @@ -84,10 +76,10 @@ all_ruby_install() { systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" # tmpfiles stuff - newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf" + newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf" # openrc init stuff - newinitd "${FILESDIR}"/puppet.init-4.x puppet + newinitd "${FILESDIR}"/puppet.init puppet keepdir /etc/puppetlabs/puppet/ssl @@ -120,8 +112,4 @@ pkg_postinst() { 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 } |