commit:     a8d5d6b6cc73283f9d7fc97e38b2b6604e9487b1
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 15:46:42 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri May 28 15:51:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8d5d6b6

app-admin/puppet: 7.6.1 stable amd64/x86 with cleanup of 7.4.0

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 app-admin/puppet/Manifest            |   1 -
 app-admin/puppet/puppet-7.4.0.ebuild | 130 -----------------------------------
 app-admin/puppet/puppet-7.6.1.ebuild |   2 +-
 3 files changed, 1 insertion(+), 132 deletions(-)

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index e0e356db3ba..5f75b21b450 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,6 +1,5 @@
 DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B 
aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd
 SHA512 
996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 
8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99
 SHA512 
5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
 DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 
06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f
 SHA512 
4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01
-DIST puppet-7.4.0.tar.gz 2857763 BLAKE2B 
980180d10c3329f8c94f02c6a8b403d88a3836fcc5567fd00eb4e2b4ae63d7a03709f3f14a337cdface62be04f9bb9082436f69b95f8d37996a9a933801a163a
 SHA512 
ffb4ffb5121fcbd4b61ab1ad51fce96c1f2415b85ec785c858721a7f5604a6a8de4d595b6806657b9b1757e70763b2c495ca4d8ee694d668532cd15dd38a9c7f
 DIST puppet-7.5.0.tar.gz 2859905 BLAKE2B 
59c6b8fee0ce13b1aeb7a59eab21e84835682e606598dac79a838d514352988d260f610aef0f0b00547a141c503f8779668006d109c3ad86133f413b57309adc
 SHA512 
7b3ac681a91160055e4b26c904153b0800f55222201a83e8e5f20d74a7ef153e6b029ab59b237726f20576379ea7d81e64e24126e72e8f709bbc6473c3c0793b
 DIST puppet-7.6.1.tar.gz 2861371 BLAKE2B 
acc117a03906d710329dcd4bc3881bc9792640b4685ffb771e67e819cf21705b1635178ec527b6548245b8312c3625622827fa744227d79a81af9bae194938a9
 SHA512 
f7b7265f5ffca4e342e0f687cf4fbf7704c6518025d178925ae04b8902a2df2ceaa76179ecd5a1c1eb3456e29c049f701e8b45c8da7dc3b0a8948ef85ee3268a

diff --git a/app-admin/puppet/puppet-7.4.0.ebuild 
b/app-admin/puppet/puppet-7.4.0.ebuild
deleted file mode 100644
index 4feaa50a174..00000000000
--- a/app-admin/puppet/puppet-7.4.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit epatch ruby-fakegem
-
-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 ~hppa ~ppc ~ppc64 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
-       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.
-       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
-       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
-
-       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() {
-       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.6.1.ebuild 
b/app-admin/puppet/puppet-7.6.1.ebuild
index d241ec554c3..65ed31b7def 100644
--- a/app-admin/puppet/puppet-7.6.1.ebuild
+++ b/app-admin/puppet/puppet-7.6.1.ebuild
@@ -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 ~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"
 

Reply via email to