1 |
commit: f5b0ebe84d9d72961e11d7607b0a4d3c2ed41345 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 28 15:47:45 2021 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 28 15:51:55 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5b0ebe8 |
7 |
|
8 |
app-admin/puppet-agent: 7.6.1 stable amd64 with 7.4.0 cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppet-agent/Manifest | 1 - |
14 |
app-admin/puppet-agent/puppet-agent-7.4.0.ebuild | 74 ------------------------ |
15 |
app-admin/puppet-agent/puppet-agent-7.6.1.ebuild | 2 +- |
16 |
3 files changed, 1 insertion(+), 76 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest |
19 |
index 3cd908684a6..f939ecc2f66 100644 |
20 |
--- a/app-admin/puppet-agent/Manifest |
21 |
+++ b/app-admin/puppet-agent/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170 |
24 |
-DIST puppet-agent_7.4.0-1focal_amd64.deb 20897448 BLAKE2B 1ed2ad91dcba1851b5759591033cfd74ec9dc644b3da416f2c1f5598b89e7cfa1048f09331717fc2b72a479ae8a7137f8f0a074debfbc183aea1197ae31b5df4 SHA512 bd58032f38f349938843550bc1e238f1cadec685ab6f90969e12e47e021fcdf4ffd4aa7be98fd797976d7873045444ba20b4ad3d05f543897a8d3594949c55f4 |
25 |
DIST puppet-agent_7.5.0-1focal_amd64.deb 20900560 BLAKE2B a1f0e3da38cc98e677f66fd8887e4db1e1bd9d2af0b89597c0b1f2e569b78ccd8eb2d7c84c9cf5c8d03097dd6b22ae323ad7e9f989b06692a6ca7fbd28d5cf46 SHA512 250839f7d4a09545ae509273cbfb1ba004b8d0c5559b5312642b7483c605d32b7575c52b5e9a2b9d3f65e2fcfbf00f4ed85ee498ae9dc39629f1618aaab79361 |
26 |
DIST puppet-agent_7.6.1-1focal_amd64.deb 20894772 BLAKE2B 235f62750c1e7a42b8b4fa013b969926c4c168fd6a6d9cfc8f243ef5571360593572faad57326019c09cd1d1e67fcc985d699acbd07c3279ac350712828eb26f SHA512 36b9f69cbef0b51a80375231472e4bab195a08b14bb860419d2ad01f13d90cba377d796b3253643f77ff415f43d2f9598dc18c37d76d844a3ea98299e5d43e65 |
27 |
|
28 |
diff --git a/app-admin/puppet-agent/puppet-agent-7.4.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.4.0.ebuild |
29 |
deleted file mode 100644 |
30 |
index b9cc527c311..00000000000 |
31 |
--- a/app-admin/puppet-agent/puppet-agent-7.4.0.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,74 +0,0 @@ |
34 |
-# Copyright 1999-2021 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
-inherit systemd unpacker tmpfiles |
39 |
- |
40 |
-DESCRIPTION="general puppet client utils along with hiera and facter" |
41 |
-HOMEPAGE="https://puppetlabs.com/" |
42 |
-SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb" |
43 |
- |
44 |
-LICENSE="Apache-2.0" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="amd64" |
47 |
-IUSE="puppetdb selinux" |
48 |
-RESTRICT="strip" |
49 |
- |
50 |
-CDEPEND="!app-admin/puppet |
51 |
- !dev-ruby/hiera |
52 |
- !dev-ruby/facter |
53 |
- app-emulation/virt-what |
54 |
- acct-user/puppet |
55 |
- acct-group/puppet" |
56 |
- |
57 |
-DEPEND=" |
58 |
- ${CDEPEND} |
59 |
- app-admin/augeas" |
60 |
-RDEPEND="${CDEPEND} |
61 |
- app-portage/eix |
62 |
- sys-apps/dmidecode |
63 |
- sys-libs/libselinux |
64 |
- sys-libs/glibc |
65 |
- sys-libs/readline:0/8 |
66 |
- sys-libs/libxcrypt |
67 |
- sys-libs/ncurses:0[tinfo] |
68 |
- selinux? ( |
69 |
- sys-libs/libselinux[ruby] |
70 |
- sec-policy/selinux-puppet |
71 |
- ) |
72 |
- puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )" |
73 |
- |
74 |
-S=${WORKDIR} |
75 |
- |
76 |
-QA_PREBUILT="*" |
77 |
- |
78 |
-src_install() { |
79 |
- # conf.d |
80 |
- doconfd etc/default/puppet |
81 |
- doconfd etc/default/pxp-agent |
82 |
- # logrotate.d |
83 |
- insinto /etc/logrotate.d |
84 |
- doins etc/logrotate.d/pxp-agent |
85 |
- # puppet itself |
86 |
- insinto /etc/puppetlabs |
87 |
- doins -r etc/puppetlabs/* |
88 |
- # logdir for systemd |
89 |
- keepdir var/log/puppetlabs/puppet/ |
90 |
- chmod 0750 var/log/puppetlabs/puppet/ |
91 |
- # the rest |
92 |
- insinto /opt |
93 |
- dodir opt/puppetlabs/puppet/cache |
94 |
- doins -r opt/* |
95 |
- fperms 0750 /opt/puppetlabs/puppet/cache |
96 |
- # init |
97 |
- newinitd "${FILESDIR}/puppet.initd2" puppet |
98 |
- systemd_dounit lib/systemd/system/puppet.service |
99 |
- systemd_dounit lib/systemd/system/pxp-agent.service |
100 |
- newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf |
101 |
- # symlinks |
102 |
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" |
103 |
- dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter |
104 |
- dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera |
105 |
- dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet |
106 |
- dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1 |
107 |
-} |
108 |
|
109 |
diff --git a/app-admin/puppet-agent/puppet-agent-7.6.1.ebuild b/app-admin/puppet-agent/puppet-agent-7.6.1.ebuild |
110 |
index 4a86bc59357..b9cc527c311 100644 |
111 |
--- a/app-admin/puppet-agent/puppet-agent-7.6.1.ebuild |
112 |
+++ b/app-admin/puppet-agent/puppet-agent-7.6.1.ebuild |
113 |
@@ -10,7 +10,7 @@ SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV} |
114 |
|
115 |
LICENSE="Apache-2.0" |
116 |
SLOT="0" |
117 |
-KEYWORDS="~amd64" |
118 |
+KEYWORDS="amd64" |
119 |
IUSE="puppetdb selinux" |
120 |
RESTRICT="strip" |