Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/
Date: Thu, 28 Feb 2019 16:22:47
Message-Id: 1551370936.e666aab15b0180f4867657434cf9c4333498e118.prometheanfire@gentoo
1 commit: e666aab15b0180f4867657434cf9c4333498e118
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 28 16:12:14 2019 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 28 16:22:16 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e666aab1
7
8 app-admin/puppet: cleanup 6.0.5
9
10 Package-Manager: Portage-2.3.51, Repoman-2.3.12
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 app-admin/puppet/Manifest | 1 -
14 app-admin/puppet/puppet-6.0.5.ebuild | 138 -----------------------------------
15 2 files changed, 139 deletions(-)
16
17 diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
18 index 4cad506ea7c..bab0859f6f7 100644
19 --- a/app-admin/puppet/Manifest
20 +++ b/app-admin/puppet/Manifest
21 @@ -1,5 +1,4 @@
22 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
23 DIST puppet-5.5.10.tar.gz 3064457 BLAKE2B 04cac9cebc03343b8c6fcf762f681f63bce4ebe27b6e7e727d06b14f0013a6c4b0ed7ff793e01b170931a881a921b4a2f107a5e37d1ac9394046f8611a7adaaf SHA512 70a5684289fc576853bf908adff44c1b1ce4b37d71236e7d7a8d140fa0e3cdd46a4b570cc7e493a3f47641f6be0c3b736ab04a178c30cce4244abe686378bf4b
24 -DIST puppet-6.0.5.tar.gz 2811469 BLAKE2B de25af69b387a02b68fbb31ae13a9fa4aea8f25dcef32bead662e708060909b2f10813c1e889372a9167cb7a10b084679c20b5fa8312d2e06e2b53ebd573082a SHA512 0b34a27a0c21d24cf22e442b495dcfc49ac8b78e40f83eb9eb7f8b82b29350be436a63c6c9c9e969fc3d16096ccb927ca3c4d11e64e51d1e50150001d015bdbc
25 DIST puppet-6.2.0.tar.gz 2821615 BLAKE2B 88b8ec856cfc6dacba5dfe44da7abce56a351f514057d3c916ecb5f4188703713cf7981984c2a59cb8073da93eab91a815dc2f52ee4f621c9a412897e9387d5e SHA512 91540169d3c9c1715e78b416961f4f3957a01b0908c3b675fa75226361fb8161730ca47ed98a2e958d8841fd50086c75489c5ee53b41f933392f399d502bad9b
26 DIST puppet-6.3.0.tar.gz 2831909 BLAKE2B ccf6353c0fc1fcdd4ac06e79bd8d91980162b8f1b2012fc2bfc1cdea3d2d6b22bf55216cea9b94a4024273ca9f76eedcc92a861de9db348408a361596033b51c SHA512 1d30706049fe378facddb923a9ecb521d37faa84740251602ac340ea1299c247252fbdaca17f1ea450ff716ab26ac4e9524f1137080318e6d9237a9e2699f6b8
27
28 diff --git a/app-admin/puppet/puppet-6.0.5.ebuild b/app-admin/puppet/puppet-6.0.5.ebuild
29 deleted file mode 100644
30 index 87692a87fff..00000000000
31 --- a/app-admin/puppet/puppet-6.0.5.ebuild
32 +++ /dev/null
33 @@ -1,138 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI="6"
38 -
39 -USE_RUBY="ruby23 ruby24 ruby25"
40 -
41 -RUBY_FAKEGEM_RECIPE_TEST="rspec3"
42 -
43 -RUBY_FAKEGEM_TASK_DOC="doc:all"
44 -
45 -RUBY_FAKEGEM_EXTRAINSTALL="locales"
46 -
47 -inherit eutils user ruby-fakegem eapi7-ver
48 -
49 -DESCRIPTION="A system automation and configuration management software."
50 -HOMEPAGE="http://puppetlabs.com/"
51 -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
52 -
53 -LICENSE="Apache-2.0 GPL-2"
54 -SLOT="0"
55 -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
56 -IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
57 -RESTRICT="test"
58 -
59 -ruby_add_rdepend "
60 - dev-ruby/hiera
61 - dev-ruby/json:=
62 - dev-ruby/semantic_puppet
63 - >=dev-ruby/facter-3.0.0
64 - augeas? ( dev-ruby/ruby-augeas )
65 - diff? ( dev-ruby/diff-lcs )
66 - doc? ( dev-ruby/rdoc )
67 - ldap? ( dev-ruby/ruby-ldap )
68 - shadow? ( dev-ruby/ruby-shadow )
69 - sqlite? ( dev-ruby/sqlite3 )
70 - virtual/ruby-ssl
71 - dev-ruby/hocon"
72 -
73 -ruby_add_bdepend "
74 - doc? ( dev-ruby/yard )
75 - test? (
76 - dev-ruby/mocha
77 - dev-ruby/rack
78 - dev-ruby/rspec-its
79 - )"
80 -# this should go in the above lists, but isn't because of test deps not being keyworded
81 -# dev-ruby/rspec-collection_matchers
82 -
83 -RDEPEND+=" ${RDEPEND}
84 - rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
85 - selinux? (
86 - sys-libs/libselinux[ruby]
87 - sec-policy/selinux-puppet
88 - )
89 - vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
90 - >=app-portage/eix-0.18.0"
91 -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
92 -
93 -pkg_setup() {
94 - enewgroup puppet
95 - enewuser puppet -1 -1 /var/lib/puppet puppet
96 -}
97 -
98 -all_ruby_prepare() {
99 - # Avoid spec that require unpackaged json-schema.
100 - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
101 -
102 - # can't be run within portage.
103 - epatch "${FILESDIR}/puppet-fix-tests-6.0.0.patch"
104 -
105 - # fix systemd path
106 - epatch "${FILESDIR}/puppet-systemd.patch"
107 -
108 - # Avoid specs that can only run in the puppet.git repository. This
109 - # should be narrowed down to the specific specs.
110 - rm spec/integration/parser/compiler_spec.rb || die
111 -
112 - # Avoid failing spec that need further investigation.
113 - rm spec/unit/module_tool/metadata_spec.rb || die
114 -}
115 -
116 -each_ruby_install() {
117 - each_fakegem_install
118 -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
119 -}
120 -
121 -all_ruby_install() {
122 - all_fakegem_install
123 -
124 - # systemd stuffs
125 - insinto /usr/lib/systemd/system
126 - doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
127 -
128 - # tmpfiles stuff
129 - insinto /usr/lib/tmpfiles.d
130 - newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
131 -
132 - # openrc init stuff
133 - newinitd "${FILESDIR}"/puppet.init-4.x puppet
134 -
135 - keepdir /etc/puppetlabs/puppet/ssl
136 -
137 - keepdir /var/lib/puppet/facts
138 - keepdir /var/lib/puppet/files
139 - fowners -R puppet:puppet /var/lib/puppet
140 -
141 - fperms 0750 /var/lib/puppet
142 -
143 - fperms 0750 /etc/puppetlabs
144 - fperms 0750 /etc/puppetlabs/puppet
145 - fperms 0750 /etc/puppetlabs/puppet/ssl
146 - fowners -R :puppet /etc/puppetlabs
147 - fowners -R :puppet /var/lib/puppet
148 -
149 - if use ldap ; then
150 - insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
151 - fi
152 -
153 - # ext and examples files
154 - for f in $(find ext examples -type f) ; do
155 - docinto "$(dirname ${f})"; dodoc "${f}"
156 - done
157 -}
158 -
159 -pkg_postinst() {
160 - elog
161 - elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
162 - elog "cause puppet to hang while installing packages."
163 - elog
164 - elog "Portage Puppet module with Gentoo-specific resources:"
165 - elog "http://forge.puppetlabs.com/gentoo/portage"
166 - elog
167 - elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
168 - elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
169 - elog "not already done so."
170 - elog
171 -}