From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4A26B13835A for ; Tue, 2 Jun 2020 00:13:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F3C0E0896; Tue, 2 Jun 2020 00:13:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1960CE0896 for ; Tue, 2 Jun 2020 00:13:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 37B4C34F033 for ; Tue, 2 Jun 2020 00:13:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E4A61C8 for ; Tue, 2 Jun 2020 00:13:28 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1591056800.b4f16ac05ba09d575591f0d9e2879daf77f31205.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/puppet/Manifest app-admin/puppet/puppet-6.14.0.ebuild app-admin/puppet/puppet-6.15.0.ebuild X-VCS-Directories: app-admin/puppet/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: b4f16ac05ba09d575591f0d9e2879daf77f31205 X-VCS-Branch: master Date: Tue, 2 Jun 2020 00:13:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 281e250a-bbe8-401e-be97-5aafc5bebf9e X-Archives-Hash: 462d51aa7d4168494cec34c84f37fcd9 commit: b4f16ac05ba09d575591f0d9e2879daf77f31205 Author: Matthew Thode gentoo org> AuthorDate: Tue Jun 2 00:09:28 2020 +0000 Commit: Matthew Thode gentoo org> CommitDate: Tue Jun 2 00:13:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4f16ac0 app-admin/puppet: 6.15.0 stable amd64/x86 with cleanup Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Matthew Thode gentoo.org> app-admin/puppet/Manifest | 1 - app-admin/puppet/puppet-6.14.0.ebuild | 136 ---------------------------------- app-admin/puppet/puppet-6.15.0.ebuild | 2 +- 3 files changed, 1 insertion(+), 138 deletions(-) diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index 6502e552786..ae545332efe 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -1,4 +1,3 @@ DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3 DIST puppet-5.5.20.tar.gz 2995117 BLAKE2B f147be28967da748bf8d5f7250eae9045caafaa3925f850cc0a77acc19a6a47ed92d4ec81278334608839f6f8c83cab19324f2753bc05d3a042a3bfaccb72a46 SHA512 83b8f234697e13d6fd8ac16634fff4e4adfece70858c32c1001925c71cc4d9a482da1880c27c08e796facb46d5d17889f9521121a69cb49e160e3c031ad564c4 -DIST puppet-6.14.0.tar.gz 2842351 BLAKE2B db9a467d8e0f4f25d45c2f735ee9d11ac6ed4e47c16b95ded3ff9f1c5055ea866735bcda27c19c2988035d9592035e433ef0d79a19781c99f4e97388edf46b93 SHA512 066ad8de6393cb58b1f92fae450dc72dabcbe912cdbb3417848a66955fe17696a68abf67d86b107a2b1c54e7037d38da7264a9234a8833b56065c8e407ff57a4 DIST puppet-6.15.0.tar.gz 2880562 BLAKE2B 082f6a6b0ee56cdb1cd98b8cade8b07b7970ae0a78a9cf7c80e9af945eb722ad156b28004ad565c51750a63fa5932e99b1dd39ac0d4008d3ed225868e7671a31 SHA512 ac7e17bd87ee924fd928d565389b424ff2ed45b9b08e1be4eff4dec3688545657e2dfede46adeb48faecf3875c640c99b07ed6e09906b3e66b4654bb984d9296 diff --git a/app-admin/puppet/puppet-6.14.0.ebuild b/app-admin/puppet/puppet-6.14.0.ebuild deleted file mode 100644 index 11fd2d3c508..00000000000 --- a/app-admin/puppet/puppet-6.14.0.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2020 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 eutils ruby-fakegem eapi7-ver - -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 - - # can't be run within portage. - epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch" - - # 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-6.15.0.ebuild b/app-admin/puppet/puppet-6.15.0.ebuild index f50ee1410b0..11fd2d3c508 100644 --- a/app-admin/puppet/puppet-6.15.0.ebuild +++ b/app-admin/puppet/puppet-6.15.0.ebuild @@ -19,7 +19,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"