diff options
Diffstat (limited to 'app-admin/puppet')
| -rw-r--r-- | app-admin/puppet/Manifest | 2 | ||||
| -rw-r--r-- | app-admin/puppet/puppet-5.5.22.ebuild | 4 | ||||
| -rw-r--r-- | app-admin/puppet/puppet-7.1.0.ebuild (renamed from app-admin/puppet/puppet-5.5.21.ebuild) | 33 |
3 files changed, 16 insertions, 23 deletions
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index 0fcc97dea85a..d2a968cacbe5 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -1,5 +1,5 @@ DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3 -DIST puppet-5.5.21.tar.gz 2997149 BLAKE2B b42fd79132ce0aab02724c7aa38fc39a216df38266b9ee8078b433860b675f36b3c4da0d13d8fb456069250e6cb6470686c83581bc6b57801a44375f829be195 SHA512 b33191c104cb58fc842d065c3cf7dec8ce723ddc9b273c930f56692e252eb6c51bc3b0442db6500cf015fe24ec3eb133428aa09d845ca92b05de2da39bce8bfd DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58 DIST puppet-6.18.0.tar.gz 2911742 BLAKE2B 75ecb14a0cf96c1c54d09f88f91984805834288a166e74c5b9648d5f9ad60a6c279100f32f148659772a22fc01d21345bf765ed47518bfa9bd81d06c17587efd SHA512 a14994aea502fbc78219967e2d711952b580df1e7befeab2d254a73f28036c6c7923d167a20bc61c9abe76000f93dcd3cba92b3353540e2a26fc27b10b06efe1 DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01 +DIST puppet-7.1.0.tar.gz 2827602 BLAKE2B 5e15c7304c7b91e40b95096482d6a71a3e9e1686f769c4c0334a533cd8b6faf31d4e126585c9b48c15bb524930e0410bff32201dd01d7faeb7487c29075f7477 SHA512 7cb5f8c472d28012a0b93893792611dd03081c7100be57e2fab60a0dabe164081fc40195d562ef8cf5e2d67f9d32f26704ecedee9cc772e568a116e12af70cda diff --git a/app-admin/puppet/puppet-5.5.22.ebuild b/app-admin/puppet/puppet-5.5.22.ebuild index 357fe27c4d21..d0814cc9e781 100644 --- a/app-admin/puppet/puppet-5.5.22.ebuild +++ b/app-admin/puppet/puppet-5.5.22.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ 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" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" RESTRICT="test" diff --git a/app-admin/puppet/puppet-5.5.21.ebuild b/app-admin/puppet/puppet-7.1.0.ebuild index e80f5165b8c1..7347beb79605 100644 --- a/app-admin/puppet/puppet-5.5.21.ebuild +++ b/app-admin/puppet/puppet-7.1.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="6" -USE_RUBY="ruby25 ruby26 ruby27" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" RUBY_FAKEGEM_RECIPE_TEST="rspec3" @@ -11,11 +11,11 @@ RUBY_FAKEGEM_TASK_DOC="doc:all" RUBY_FAKEGEM_EXTRAINSTALL="locales" -inherit ruby-fakegem +inherit eutils ruby-fakegem eapi7-ver DESCRIPTION="A system automation and configuration management software." HOMEPAGE="https://puppet.com/" -SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" +SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" @@ -24,11 +24,11 @@ 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/hiera + dev-ruby/json:= + dev-ruby/semantic_puppet >=dev-ruby/facter-3.0.0 - >=dev-ruby/fast_gettext-1.1.2:0 - >=dev-ruby/locale-2.1:0 - >=dev-ruby/multi_json-1.10:0 + dev-ruby/concurrent-ruby augeas? ( dev-ruby/ruby-augeas ) diff? ( dev-ruby/diff-lcs ) doc? ( dev-ruby/rdoc ) @@ -65,7 +65,7 @@ all_ruby_prepare() { rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die # fix systemd path - eapply -p0 "${FILESDIR}/puppet-systemd.patch" + epatch "${FILESDIR}/puppet-systemd.patch" # Avoid specs that can only run in the puppet.git repository. This # should be narrowed down to the specific specs. @@ -93,8 +93,6 @@ all_ruby_install() { # 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 @@ -128,13 +126,8 @@ pkg_postinst() { 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 + 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 } |