Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/
Date: Sat, 22 Sep 2018 21:19:02
Message-Id: 1537651119.d5ca0501824b5f79347748b49b194f1ee7045d8c.prometheanfire@gentoo
1 commit: d5ca0501824b5f79347748b49b194f1ee7045d8c
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 22 21:17:11 2018 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 22 21:18:39 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5ca0501
7
8 app-admin/puppet: cleanup
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 app-admin/puppet/Manifest | 1 -
13 app-admin/puppet/puppet-5.5.2.ebuild | 144 -----------------------------------
14 2 files changed, 145 deletions(-)
15
16 diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
17 index 51344cad81a..c0c0e92323f 100644
18 --- a/app-admin/puppet/Manifest
19 +++ b/app-admin/puppet/Manifest
20 @@ -1,6 +1,5 @@
21 DIST puppet-4.10.11.tar.gz 3022878 BLAKE2B d3eec840bb1c46e0dfbbc9dad598b362049a76c7ee60b4ff314e7ba2ce19613f834baced94afbbf499b513391107c4229be5f40c275d0724b200358722db0e96 SHA512 5eaac8bd973d0013e7774c9bda81524332f2b3b0177c04e78554bfb0815697b4b296d5dd11a04f7fad782ad975b350b149b1cd97fc5f06974952314f163f1b40
22 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
23 -DIST puppet-5.5.2.tar.gz 3036714 BLAKE2B 8be2c2fa7b66a2fd8d413f01afad22f7e0724c31a0a92b777f1b61e2139f14f3284a11cfb52fea8833556208d8bb3e99f20b1ed4fa2816809eaa4b92fa730cd5 SHA512 4995b6b6d1b75d68dd4c8eba37585c0afa88f9c6b78857e837886ea72b373c884182adf8791e0c9f2a5079f22681a40073e512e6b727ecfcaff463c8024cf5db
24 DIST puppet-5.5.3.tar.gz 3040000 BLAKE2B d2534da5956806e5280c59e82332f1ffca79e72f73b1abb460f155aac936a5ba1719f18dc5742c85fca365ff6b03a602ca0ceaa04714091045ab2afac1b57823 SHA512 14a711002c64f0598930f64e9e2b81c03daddda750860acb349271c1cc9d04c0d149b14817b200dda26f0ca75c3f79593990ecf28a5cca83220a3f5a16eac34d
25 DIST puppet-5.5.6.tar.gz 3026301 BLAKE2B eb05a0c4eed99ce1ce7a77be76da069be1e4b4f8917206b3811a3a7378c2e39b9c84b560bbcce0bee180ddb502251efb48362dd1c2494c79e6f441cde41a2707 SHA512 53bccc4cf3d4dde3079d96cd28b4cf380d004fdf67da8eaeaf70706ca5e1fe611910042f1aa03453fb29419bb9888a0eeef9a9d64e8f0cfe5d8d7a73e5bf5850
26 DIST puppet-6.0.0.tar.gz 2790790 BLAKE2B 1f31839ca21a525ecfbfec2531e8a7570a7c9da5b0e2a8bf3b8641eba9637c61509fb00b3445d0b6ad6b9ef814b9a27850704c897b62ab660eb864f80d990bc8 SHA512 4443f76ec2c8cc23adf112573e5f4e5cef26973c058a70cdf00471b8bd5ac4bc01fb9aa5ba62cb20585266de917c809a439c88a430f051b127d99ef02547c677
27
28 diff --git a/app-admin/puppet/puppet-5.5.2.ebuild b/app-admin/puppet/puppet-5.5.2.ebuild
29 deleted file mode 100644
30 index 8aa23c0b2c8..00000000000
31 --- a/app-admin/puppet/puppet-5.5.2.ebuild
32 +++ /dev/null
33 @@ -1,144 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
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 versionator
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/facter-3.0.0
63 - augeas? ( dev-ruby/ruby-augeas )
64 - diff? ( dev-ruby/diff-lcs )
65 - doc? ( dev-ruby/rdoc )
66 - ldap? ( dev-ruby/ruby-ldap )
67 - shadow? ( dev-ruby/ruby-shadow )
68 - sqlite? ( dev-ruby/sqlite3 )
69 - virtual/ruby-ssl
70 - dev-ruby/hocon"
71 -
72 -ruby_add_bdepend "
73 - doc? ( dev-ruby/yard )
74 - test? (
75 - dev-ruby/mocha
76 - dev-ruby/rack
77 - dev-ruby/rspec-its
78 - )"
79 -# this should go in the above lists, but isn't because of test deps not being keyworded
80 -# dev-ruby/rspec-collection_matchers
81 -
82 -RDEPEND+=" ${RDEPEND}
83 - rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
84 - selinux? (
85 - sys-libs/libselinux[ruby]
86 - sec-policy/selinux-puppet
87 - )
88 - vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
89 - >=app-portage/eix-0.18.0"
90 -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
91 -
92 -pkg_setup() {
93 - enewgroup puppet
94 - enewuser puppet -1 -1 /var/lib/puppet puppet
95 -}
96 -
97 -all_ruby_prepare() {
98 - # Avoid spec that require unpackaged json-schema.
99 - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
100 -
101 - # can't be run within portage.
102 - epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
103 -
104 - # fix systemd path
105 - epatch "${FILESDIR}/puppet-systemd.patch"
106 -
107 - # Avoid specs that can only run in the puppet.git repository. This
108 - # should be narrowed down to the specific specs.
109 - rm spec/integration/parser/compiler_spec.rb || die
110 -
111 - # Avoid failing spec that need further investigation.
112 - rm spec/unit/module_tool/metadata_spec.rb || die
113 -}
114 -
115 -each_ruby_install() {
116 - each_fakegem_install
117 -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
118 -}
119 -
120 -all_ruby_install() {
121 - all_fakegem_install
122 -
123 - # systemd stuffs
124 - insinto /usr/lib/systemd/system
125 - doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
126 -
127 - # tmpfiles stuff
128 - insinto /usr/lib/tmpfiles.d
129 - newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
130 -
131 - # openrc init stuff
132 - newinitd "${FILESDIR}"/puppet.init-4.x puppet
133 - newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
134 - newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
135 -
136 - keepdir /etc/puppetlabs/puppet/ssl
137 -
138 - keepdir /var/lib/puppet/facts
139 - keepdir /var/lib/puppet/files
140 - fowners -R puppet:puppet /var/lib/puppet
141 -
142 - fperms 0750 /var/lib/puppet
143 -
144 - fperms 0750 /etc/puppetlabs
145 - fperms 0750 /etc/puppetlabs/puppet
146 - fperms 0750 /etc/puppetlabs/puppet/ssl
147 - fowners -R :puppet /etc/puppetlabs
148 - fowners -R :puppet /var/lib/puppet
149 -
150 - if use ldap ; then
151 - insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
152 - fi
153 -
154 - # ext and examples files
155 - for f in $(find ext examples -type f) ; do
156 - docinto "$(dirname ${f})"; dodoc "${f}"
157 - done
158 -}
159 -
160 -pkg_postinst() {
161 - elog
162 - elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
163 - elog "cause puppet to hang while installing packages."
164 - elog
165 - elog "Portage Puppet module with Gentoo-specific resources:"
166 - elog "http://forge.puppetlabs.com/gentoo/portage"
167 - elog
168 -
169 - for v in ${REPLACING_VERSIONS}; do
170 - if [ "$(get_major_version $v)" = "4" ]; then
171 - elog
172 - elog "Please see the following url for the release notes for puppet-5"
173 - elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
174 - elog
175 - fi
176 - done
177 -}