1 |
commit: dff361d1560130bb680ada13cdb95e5137c3f591 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 18 02:45:44 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 18 02:46:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff361d1 |
7 |
|
8 |
app-admin/puppet: 5.5.3 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.44, Repoman-2.3.10 |
11 |
|
12 |
app-admin/puppet/Manifest | 1 - |
13 |
app-admin/puppet/puppet-5.5.1.ebuild | 144 ----------------------------------- |
14 |
app-admin/puppet/puppet-5.5.3.ebuild | 2 +- |
15 |
3 files changed, 1 insertion(+), 146 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest |
18 |
index 2c6b424501f..2c2c72d22b5 100644 |
19 |
--- a/app-admin/puppet/Manifest |
20 |
+++ b/app-admin/puppet/Manifest |
21 |
@@ -1,5 +1,4 @@ |
22 |
DIST puppet-4.10.11.tar.gz 3022878 BLAKE2B d3eec840bb1c46e0dfbbc9dad598b362049a76c7ee60b4ff314e7ba2ce19613f834baced94afbbf499b513391107c4229be5f40c275d0724b200358722db0e96 SHA512 5eaac8bd973d0013e7774c9bda81524332f2b3b0177c04e78554bfb0815697b4b296d5dd11a04f7fad782ad975b350b149b1cd97fc5f06974952314f163f1b40 |
23 |
DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2 |
24 |
-DIST puppet-5.5.1.tar.gz 3035639 BLAKE2B 2930ca9eb928d7c6a69ea76673fc4d002e230bf6dbcd28764e8d5bd504ae11326dc856ed64480e13c9eb1d683ad5e8ef64fc9e217942b59d90c6a0bc98e0197c SHA512 20bf7094193f30cfc7a91244275fc79eef0296036ffbc6bbe405e9ca75123b722be6855c746ef8cd35f80bd7a7308408a9205d064f0f910e11877e4db0ebdabc |
25 |
DIST puppet-5.5.2.tar.gz 3036714 BLAKE2B 8be2c2fa7b66a2fd8d413f01afad22f7e0724c31a0a92b777f1b61e2139f14f3284a11cfb52fea8833556208d8bb3e99f20b1ed4fa2816809eaa4b92fa730cd5 SHA512 4995b6b6d1b75d68dd4c8eba37585c0afa88f9c6b78857e837886ea72b373c884182adf8791e0c9f2a5079f22681a40073e512e6b727ecfcaff463c8024cf5db |
26 |
DIST puppet-5.5.3.tar.gz 3040000 BLAKE2B d2534da5956806e5280c59e82332f1ffca79e72f73b1abb460f155aac936a5ba1719f18dc5742c85fca365ff6b03a602ca0ceaa04714091045ab2afac1b57823 SHA512 14a711002c64f0598930f64e9e2b81c03daddda750860acb349271c1cc9d04c0d149b14817b200dda26f0ca75c3f79593990ecf28a5cca83220a3f5a16eac34d |
27 |
|
28 |
diff --git a/app-admin/puppet/puppet-5.5.1.ebuild b/app-admin/puppet/puppet-5.5.1.ebuild |
29 |
deleted file mode 100644 |
30 |
index 646ad4fb535..00000000000 |
31 |
--- a/app-admin/puppet/puppet-5.5.1.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="ruby22 ruby23 ruby24" |
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 |
-} |
178 |
|
179 |
diff --git a/app-admin/puppet/puppet-5.5.3.ebuild b/app-admin/puppet/puppet-5.5.3.ebuild |
180 |
index a5bdb149250..8aa23c0b2c8 100644 |
181 |
--- a/app-admin/puppet/puppet-5.5.3.ebuild |
182 |
+++ b/app-admin/puppet/puppet-5.5.3.ebuild |
183 |
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
184 |
|
185 |
LICENSE="Apache-2.0 GPL-2" |
186 |
SLOT="0" |
187 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
188 |
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
189 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
190 |
RESTRICT="test" |