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-agent/
Date: Mon, 17 Feb 2020 22:36:29
Message-Id: 1581978971.60e0e4901df7ae888b9b4a877bf7429799c69cc7.prometheanfire@gentoo
1 commit: 60e0e4901df7ae888b9b4a877bf7429799c69cc7
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 17 22:05:32 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 17 22:36:11 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60e0e490
7
8 app-admin/puppet-agent: cleanup
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 app-admin/puppet-agent/Manifest | 2 -
14 .../puppet-agent/puppet-agent-6.11.1-r1.ebuild | 77 ---------------------
15 app-admin/puppet-agent/puppet-agent-6.11.1.ebuild | 79 ----------------------
16 3 files changed, 158 deletions(-)
17
18 diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
19 index a4d5d74bb12..d3596be6b61 100644
20 --- a/app-admin/puppet-agent/Manifest
21 +++ b/app-admin/puppet-agent/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST puppet-agent_6.11.1-1stretch_amd64.deb 19948710 BLAKE2B 256588922cfacb1d8146cd1142c43d893a55dfb67d7f70ca311df6178e7f9a82a0702d8306e0575d3f817e53c091fd3010027512cb4ce95956bdfa968372cc21 SHA512 90c39d55a8761185f82c9ac106d696ae48a170679e6043b6b3db32254e918b1b9c1b32c4e9721e5751189f84f002415f21a627daa22738a8c1ae3cb5df514eb3
24 -DIST puppet-agent_6.11.1-1stretch_i386.deb 20327410 BLAKE2B c2a105139df97395f54bb54d7ac971d914dcd3b69614dca55fe443d9fe5360118b899610a6d2d85b96b8b45715864df608d0783a3aabad3a2ae5555a0d510a2e SHA512 5d1173534beb53325d3c7c2fd500a7bd82a389fa8cbc9e867f6acbb6c2647190339d3b096e8a054aff268f27c5bd7de65c371a474b9c8263e8fa36bab75452bd
25 DIST puppet-agent_6.12.0-1stretch_amd64.deb 20011636 BLAKE2B f83b795f07771d70220cac71d9b6d8ac7270a20fd5b78471ccef1c8ff802af3c035477f7741e775b10bc609d016a6e9fb79b199987e34b7d4f9a427c4adcd39f SHA512 dda8fa45b961d4a775da7eb128887eee3ceb9887d1062bc2fc748f6055811600162dfb2c4fbf87e401ad404813d2de0cc58ce7aade0aa23af637bb3707896126
26 DIST puppet-agent_6.12.0-1stretch_i386.deb 20369446 BLAKE2B f01e39a1b307657569084e2ade1d41f17eefaa2048035f635437159e4373386c6413fa71756594d4a8748ffa0bbbdc2c54c72e696a390380bc9c57721ef010b3 SHA512 fc58e5ea22bd3dd36278db37e46d20809e284db5645ab680fb2c461ee9e4f9e635550f924278905ec13a8f9a71fbf604959e8522e4c0da52709c42f309a04921
27
28 diff --git a/app-admin/puppet-agent/puppet-agent-6.11.1-r1.ebuild b/app-admin/puppet-agent/puppet-agent-6.11.1-r1.ebuild
29 deleted file mode 100644
30 index 36e4354f6f3..00000000000
31 --- a/app-admin/puppet-agent/puppet-agent-6.11.1-r1.ebuild
32 +++ /dev/null
33 @@ -1,77 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -inherit eutils systemd unpacker user
39 -
40 -DESCRIPTION="general puppet client utils along with hiera and facter"
41 -HOMEPAGE="https://puppetlabs.com/"
42 -SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
43 -SRC_URI="
44 - amd64? ( ${SRC_BASE}_amd64.deb )
45 - x86? ( ${SRC_BASE}_i386.deb )"
46 -
47 -LICENSE="Apache-2.0"
48 -SLOT="0"
49 -KEYWORDS="~amd64 ~x86"
50 -IUSE="puppetdb selinux"
51 -RESTRICT="strip"
52 -
53 -CDEPEND="!app-admin/puppet
54 - !dev-ruby/hiera
55 - !dev-ruby/facter
56 - !app-emulation/virt-what"
57 -
58 -DEPEND="
59 - ${CDEPEND}
60 - app-admin/augeas"
61 -RDEPEND="${CDEPEND}
62 - app-portage/eix
63 - sys-apps/dmidecode
64 - sys-libs/glibc
65 - sys-libs/readline:0/7
66 - sys-libs/ncurses:0[tinfo]
67 - selinux? (
68 - sys-libs/libselinux[ruby]
69 - sec-policy/selinux-puppet
70 - )
71 - puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
72 -
73 -S=${WORKDIR}
74 -
75 -pkg_setup() {
76 - enewgroup puppet
77 - enewuser puppet -1 -1 /var/run/puppet puppet
78 -}
79 -
80 -src_install() {
81 - # conf.d
82 - doconfd etc/default/puppet
83 - doconfd etc/default/pxp-agent
84 - # logrotate.d
85 - insinto /etc/logrotate.d
86 - doins etc/logrotate.d/pxp-agent
87 - # puppet itself
88 - insinto /etc/puppetlabs
89 - doins -r etc/puppetlabs/*
90 - # logdir for systemd
91 - dodir var/log/puppetlabs/puppet/
92 - fperms 0750 var/log/puppetlabs/puppet/
93 - # the rest
94 - insinto /opt
95 - dodir opt/puppetlabs/puppet/cache
96 - doins -r opt/*
97 - fperms 0750 /opt/puppetlabs/puppet/cache
98 - # init
99 - newinitd "${FILESDIR}/puppet.initd" puppet
100 - systemd_dounit lib/systemd/system/puppet.service
101 - systemd_dounit lib/systemd/system/pxp-agent.service
102 - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
103 - # symlinks
104 - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
105 - chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
106 - dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
107 - dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
108 - dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
109 - dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
110 -}
111
112 diff --git a/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild b/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild
113 deleted file mode 100644
114 index c648209a4a7..00000000000
115 --- a/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild
116 +++ /dev/null
117 @@ -1,79 +0,0 @@
118 -# Copyright 1999-2019 Gentoo Authors
119 -# Distributed under the terms of the GNU General Public License v2
120 -
121 -EAPI=7
122 -inherit eutils systemd unpacker user
123 -
124 -DESCRIPTION="general puppet client utils along with hiera and facter"
125 -HOMEPAGE="https://puppetlabs.com/"
126 -SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
127 -SRC_URI="
128 - amd64? ( ${SRC_BASE}_amd64.deb )
129 - x86? ( ${SRC_BASE}_i386.deb )"
130 -
131 -LICENSE="Apache-2.0"
132 -SLOT="0"
133 -KEYWORDS="amd64 x86"
134 -IUSE="puppetdb selinux"
135 -RESTRICT="strip"
136 -
137 -CDEPEND="!app-admin/augeas
138 - !app-admin/puppet
139 - !dev-ruby/hiera
140 - !dev-ruby/facter
141 - !app-emulation/virt-what"
142 -
143 -DEPEND="
144 - ${CDEPEND}"
145 -RDEPEND="${CDEPEND}
146 - app-portage/eix
147 - sys-apps/dmidecode
148 - sys-libs/glibc
149 - sys-libs/readline:0/7
150 - sys-libs/ncurses:0[tinfo]
151 - selinux? (
152 - sys-libs/libselinux[ruby]
153 - sec-policy/selinux-puppet
154 - )
155 - puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
156 -
157 -S=${WORKDIR}
158 -
159 -pkg_setup() {
160 - enewgroup puppet
161 - enewuser puppet -1 -1 /var/run/puppet puppet
162 -}
163 -
164 -src_install() {
165 - # conf.d
166 - doconfd etc/default/puppet
167 - doconfd etc/default/pxp-agent
168 - # logrotate.d
169 - insinto /etc/logrotate.d
170 - doins etc/logrotate.d/pxp-agent
171 - # puppet itself
172 - insinto /etc/puppetlabs
173 - doins -r etc/puppetlabs/*
174 - # logdir for systemd
175 - dodir var/log/puppetlabs/puppet/
176 - fperms 0750 var/log/puppetlabs/puppet/
177 - # the rest
178 - insinto /opt
179 - dodir opt/puppetlabs/puppet/cache
180 - doins -r opt/*
181 - fperms 0750 /opt/puppetlabs/puppet/cache
182 - # init
183 - newinitd "${FILESDIR}/puppet.initd" puppet
184 - systemd_dounit lib/systemd/system/puppet.service
185 - systemd_dounit lib/systemd/system/pxp-agent.service
186 - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
187 - # symlinks
188 - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
189 - chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
190 - dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
191 - dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
192 - dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
193 - dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
194 - dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
195 - dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
196 -}