1 |
commit: 70c32c52866aaf5231efeb436af97c8aac4606c2 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 28 14:12:50 2016 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 28 14:13:23 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70c32c52 |
7 |
|
8 |
app-admin/puppet-agent: cleanup bug 581372 |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
app-admin/puppet-agent/Manifest | 4 - |
13 |
app-admin/puppet-agent/puppet-agent-1.3.6.ebuild | 99 ------------------------ |
14 |
app-admin/puppet-agent/puppet-agent-1.4.0.ebuild | 99 ------------------------ |
15 |
3 files changed, 202 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest |
18 |
index b97109d..42e9144 100644 |
19 |
--- a/app-admin/puppet-agent/Manifest |
20 |
+++ b/app-admin/puppet-agent/Manifest |
21 |
@@ -1,6 +1,2 @@ |
22 |
-DIST puppet-agent_1.3.6-1wheezy_amd64.deb 20097384 SHA256 47f04c848eff486660ba5ab4cc6c9340193ae0f9d703e0aba6094ccc7d15ec4f SHA512 a079f66bd0ff0b9535e037712ff4306ec16cc5303e1a19016a7ebb2d19f39eea1d91d758996d37e6d848cd0c1d8f047bcfad64550647de99de248071626a0845 WHIRLPOOL 42013e4abf062548b0349db3ebd628bfd887877462b3f24dbd47058bda59828c0f13f2f3bb8a7aace5d835faf3be0fbbaeb097c55c665aa71eec6d78881d71b7 |
23 |
-DIST puppet-agent_1.3.6-1wheezy_i386.deb 19873296 SHA256 aaf16cffcf33070eda0979025b72c87d1528bf017f65dadc333defe623190065 SHA512 4d6390c6f9fd3464029ae8bde02e5f7536de7ecb701bc50a7a4a24f50102fcd542448729259148bb62343ed44e4e5b41ced670aed7a8aa3897fa2f7729fff9db WHIRLPOOL 17f7231cd5c546aa8a104aadec07457abebb71cccc1f8f718e7e0e5544b46502979b3079e1d3931f58d3d2d4232eb2ac82e5ee2c49c0ed54e280ef515575b45f |
24 |
-DIST puppet-agent_1.4.0-1wheezy_amd64.deb 21367140 SHA256 322f3db0e1c2cebe675f6162411eecc9aec4e6a9d20daba4416ad914a7d562f0 SHA512 9d40ca518dfe5086f9fb738c971fed06b6f634f2069a0a10ae4ea4c1595db6c7122323dcbe1f871faed114acd1a3405146fb834fce964312391159b6e66edae5 WHIRLPOOL cf5f1649083e3224cffa5c1b16164e8cdb2a7fdc4756b97e12dfd6857e74e5923e04282d885ac963ef4fc386843e1014c489346836798eec1db5ed70d187a15e |
25 |
-DIST puppet-agent_1.4.0-1wheezy_i386.deb 21107662 SHA256 88adf39e5fd7dba87f497c348797207df1f3192228d8601de9cbd155d481c31f SHA512 6651bb55b7ab4db5ce738dfa8ff555d385c7ea5c3806e5e3a961afaf58fc8923e44264bbd33b920871a84ebaa8b7003374a269467fe13454f7f498c18ba3afec WHIRLPOOL bffdcf7cffc6bf6dcce925728ac032c2fd7e2e19641eef200b60b5ec3fd1e0b87b44a6fd43c001cec0b69d96f050243252a0a954240568344ddcdb481010a700 |
26 |
DIST puppet-agent_1.4.2-1wheezy_amd64.deb 21510444 SHA256 ee08eab9e50f9afdc979b2faa5633a3ea4d0ed7cc6fb3e9abc229098e06b9206 SHA512 fa9c47cab3847fde435c8e8a6ef875d392f86c1083e884ec4645e94d4a8620224cd5e43e3b5b8f343278b5fe6c73c41cec452a6872afc3f11a4ab0589e2b9292 WHIRLPOOL 4e082ac505baee8c4fb560ba72c12998cf72e0d13d6e13cce498239412fd638db7f36a680fbe54ddd0a9aafa4b494eba38fe11b9f29f7d28aed5171b370fbaef |
27 |
DIST puppet-agent_1.4.2-1wheezy_i386.deb 21254628 SHA256 4683fb7970805a815fe0b500de67e5d1e2b6fa88b19de36cd5326120a2eafdcb SHA512 bac02e08d8d753d6785e6a08c51009ff3ae02e547e942a21177bce6bf97b381a5110d1989fcdae6f3074b9dd9209bd5ff3d01a211f96efb25d24dcf271aa7a26 WHIRLPOOL 742bbcb6f6c55246f7e0f97978919a8d9f3b5f1acfd02e65b13973ffd3a3ebab62a385b0fdfb9076b27dfe2f7b68f25a37724eeec993a6f4c48ec7d145042892 |
28 |
|
29 |
diff --git a/app-admin/puppet-agent/puppet-agent-1.3.6.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.6.ebuild |
30 |
deleted file mode 100644 |
31 |
index 2fb3b34..0000000 |
32 |
--- a/app-admin/puppet-agent/puppet-agent-1.3.6.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,99 +0,0 @@ |
35 |
-# Copyright 1999-2015 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
-# $Id$ |
38 |
- |
39 |
-EAPI=5 |
40 |
-inherit eutils systemd unpacker user |
41 |
- |
42 |
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter" |
43 |
-HOMEPAGE="https://puppetlabs.com/" |
44 |
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy" |
45 |
-SRC_URI=" |
46 |
- amd64? ( ${SRC_BASE}_amd64.deb ) |
47 |
- x86? ( ${SRC_BASE}_i386.deb ) |
48 |
-" |
49 |
- |
50 |
-LICENSE="Apache-2.0" |
51 |
-SLOT="0" |
52 |
-KEYWORDS="amd64 x86" |
53 |
-IUSE="puppetdb selinux" |
54 |
-RESTRICT="strip" |
55 |
- |
56 |
-CDEPEND="!app-admin/augeas |
57 |
- !app-admin/mcollective |
58 |
- !app-admin/puppet |
59 |
- !dev-ruby/hiera |
60 |
- !dev-ruby/facter |
61 |
- !app-emulation/virt-what" |
62 |
- |
63 |
-DEPEND=" |
64 |
- ${CDEPEND}" |
65 |
-RDEPEND="${CDEPEND} |
66 |
- sys-apps/dmidecode |
67 |
- selinux? ( |
68 |
- sys-libs/libselinux[ruby] |
69 |
- sec-policy/selinux-puppet |
70 |
- ) |
71 |
- puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )" |
72 |
- |
73 |
-S=${WORKDIR} |
74 |
- |
75 |
-QA_PREBUILT=" |
76 |
- /opt/puppetlabs/puppet |
77 |
- /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/* |
78 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/* |
79 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/* |
80 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/* |
81 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/* |
82 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/* |
83 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/* |
84 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/* |
85 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/* |
86 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/* |
87 |
- /opt/puppetlabs/puppet/lib/engines/* |
88 |
- /opt/puppetlabs/puppet/lib/virt-what/* |
89 |
- /opt/puppetlabs/puppet/lib/* |
90 |
- /opt/puppetlabs/puppet/bin/*" |
91 |
- |
92 |
-pkg_setup() { |
93 |
- enewgroup puppet |
94 |
- enewuser puppet -1 -1 /var/run/puppet puppet |
95 |
-} |
96 |
- |
97 |
-src_install() { |
98 |
- # conf.d |
99 |
- doconfd etc/default/puppet |
100 |
- doconfd etc/default/mcollective |
101 |
- # logrotate.d |
102 |
- insinto /etc/logrotate.d |
103 |
- doins etc/logrotate.d/mcollective |
104 |
- # puppet itself |
105 |
- insinto /etc/puppetlabs |
106 |
- doins -r etc/puppetlabs/* |
107 |
- # logdir for systemd |
108 |
- dodir var/log/puppetlabs/puppet/ |
109 |
- fperms 0750 var/log/puppetlabs/puppet/ |
110 |
- # the rest |
111 |
- insinto /opt |
112 |
- dodir opt/puppetlabs/puppet/cache |
113 |
- doins -r opt/* |
114 |
- fperms 0750 /opt/puppetlabs/puppet/cache |
115 |
- # init |
116 |
- newinitd "${FILESDIR}/puppet.initd" puppet |
117 |
- newinitd "${FILESDIR}/mcollective.initd" mcollective |
118 |
- systemd_dounit "${FILESDIR}/puppet.service" |
119 |
- systemd_dounit "${FILESDIR}/mcollective.service" |
120 |
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf |
121 |
- # symlinks |
122 |
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" |
123 |
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" |
124 |
- dosym /opt/puppetlabs/bin/facter /usr/bin/facter |
125 |
- dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera |
126 |
- dosym /opt/puppetlabs/bin/mco /usr/bin/mco |
127 |
- dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet |
128 |
- dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived |
129 |
- dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what |
130 |
- dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse |
131 |
- dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool |
132 |
- dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera |
133 |
-} |
134 |
|
135 |
diff --git a/app-admin/puppet-agent/puppet-agent-1.4.0.ebuild b/app-admin/puppet-agent/puppet-agent-1.4.0.ebuild |
136 |
deleted file mode 100644 |
137 |
index b449a7a..0000000 |
138 |
--- a/app-admin/puppet-agent/puppet-agent-1.4.0.ebuild |
139 |
+++ /dev/null |
140 |
@@ -1,99 +0,0 @@ |
141 |
-# Copyright 1999-2016 Gentoo Foundation |
142 |
-# Distributed under the terms of the GNU General Public License v2 |
143 |
-# $Id$ |
144 |
- |
145 |
-EAPI=5 |
146 |
-inherit eutils systemd unpacker user |
147 |
- |
148 |
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter" |
149 |
-HOMEPAGE="https://puppetlabs.com/" |
150 |
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy" |
151 |
-SRC_URI=" |
152 |
- amd64? ( ${SRC_BASE}_amd64.deb ) |
153 |
- x86? ( ${SRC_BASE}_i386.deb ) |
154 |
-" |
155 |
- |
156 |
-LICENSE="Apache-2.0" |
157 |
-SLOT="0" |
158 |
-KEYWORDS="~amd64 ~x86" |
159 |
-IUSE="puppetdb selinux" |
160 |
-RESTRICT="strip" |
161 |
- |
162 |
-CDEPEND="!app-admin/augeas |
163 |
- !app-admin/mcollective |
164 |
- !app-admin/puppet |
165 |
- !dev-ruby/hiera |
166 |
- !dev-ruby/facter |
167 |
- !app-emulation/virt-what" |
168 |
- |
169 |
-DEPEND=" |
170 |
- ${CDEPEND}" |
171 |
-RDEPEND="${CDEPEND} |
172 |
- sys-apps/dmidecode |
173 |
- selinux? ( |
174 |
- sys-libs/libselinux[ruby] |
175 |
- sec-policy/selinux-puppet |
176 |
- ) |
177 |
- puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )" |
178 |
- |
179 |
-S=${WORKDIR} |
180 |
- |
181 |
-QA_PREBUILT=" |
182 |
- /opt/puppetlabs/puppet |
183 |
- /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/* |
184 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/* |
185 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/* |
186 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/* |
187 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/* |
188 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/* |
189 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/* |
190 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/* |
191 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/* |
192 |
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/* |
193 |
- /opt/puppetlabs/puppet/lib/engines/* |
194 |
- /opt/puppetlabs/puppet/lib/virt-what/* |
195 |
- /opt/puppetlabs/puppet/lib/* |
196 |
- /opt/puppetlabs/puppet/bin/*" |
197 |
- |
198 |
-pkg_setup() { |
199 |
- enewgroup puppet |
200 |
- enewuser puppet -1 -1 /var/run/puppet puppet |
201 |
-} |
202 |
- |
203 |
-src_install() { |
204 |
- # conf.d |
205 |
- doconfd etc/default/puppet |
206 |
- doconfd etc/default/mcollective |
207 |
- # logrotate.d |
208 |
- insinto /etc/logrotate.d |
209 |
- doins etc/logrotate.d/mcollective |
210 |
- # puppet itself |
211 |
- insinto /etc/puppetlabs |
212 |
- doins -r etc/puppetlabs/* |
213 |
- # logdir for systemd |
214 |
- dodir var/log/puppetlabs/puppet/ |
215 |
- fperms 0750 var/log/puppetlabs/puppet/ |
216 |
- # the rest |
217 |
- insinto /opt |
218 |
- dodir opt/puppetlabs/puppet/cache |
219 |
- doins -r opt/* |
220 |
- fperms 0750 /opt/puppetlabs/puppet/cache |
221 |
- # init |
222 |
- newinitd "${FILESDIR}/puppet.initd" puppet |
223 |
- newinitd "${FILESDIR}/mcollective.initd" mcollective |
224 |
- systemd_dounit "${FILESDIR}/puppet.service" |
225 |
- systemd_dounit "${FILESDIR}/mcollective.service" |
226 |
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf |
227 |
- # symlinks |
228 |
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" |
229 |
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" |
230 |
- dosym /opt/puppetlabs/bin/facter /usr/bin/facter |
231 |
- dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera |
232 |
- dosym /opt/puppetlabs/bin/mco /usr/bin/mco |
233 |
- dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet |
234 |
- dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived |
235 |
- dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what |
236 |
- dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse |
237 |
- dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool |
238 |
- dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera |
239 |
-} |