1 |
commit: c9b5b3a4bd84d77d93899c722252f2005d6487b4 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 29 02:52:08 2021 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 29 02:54:07 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b5b3a4 |
7 |
|
8 |
app-admin/puppetdb: clean up more |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppetdb/Manifest | 2 - |
14 |
app-admin/puppetdb/puppetdb-6.13.0.ebuild | 87 ------------------------------- |
15 |
app-admin/puppetdb/puppetdb-7.2.0.ebuild | 87 ------------------------------- |
16 |
3 files changed, 176 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest |
19 |
index 0eeac6a6bc3..f2179a46eaa 100644 |
20 |
--- a/app-admin/puppetdb/Manifest |
21 |
+++ b/app-admin/puppetdb/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST puppetdb-6.13.0.tar.gz 46400373 BLAKE2B 2e3cdd4e7a3e84e11f23031dba3aadf5be885e118938a0a52140e612b4006a0fd4e97f162322c80731b2bfb63dcff2d73d5b2cd0882f7aabcb69fe30aa05151b SHA512 4d16ce44666634e88c538b06f6b2e91cf9786646134a6302a80ea941e3f73168b0f4981cecdb125cac881c0233c835893e9385004461b67e7d8635865f14aee9 |
24 |
-DIST puppetdb-7.2.0.tar.gz 47126306 BLAKE2B aa9213b3a6e7438f7f70c73d14d5a264fe8d45f41d15a21eb457f4264599d4ffc02339b1109aeba713b7afb09780a7ce66786fc03d27e49cd0786cc81042d36c SHA512 872ebc8caf5c9c2f9509f603809c942ef8b3fc0bab96dd39a51558cae88b07318fadb81aa2f8477d231c7caac513b304c6aa178deb3aa56a4a5f7a9f1917d90c |
25 |
DIST puppetdb-7.3.1.tar.gz 47173502 BLAKE2B e9f57300585cb556f75975c4a20c35c0789816a9f141a3979348200e28e24352870109fc3597a44d075b490b9da2308e963a24e64e37552f7124205beb87aae8 SHA512 aa15aebec2f7a24a2da125078017baabe054d741ee651b91219074a274400ae54862c38d3e253e904fe26165f4fc34fb3eb021937aa9ee4304b7e83bc3f5d0dc |
26 |
DIST puppetdb-7.4.1.tar.gz 47409868 BLAKE2B 0ac4234547b27e9ad12c9c008d76be8fff7f724d93acc2ca26700d18ac2e30bf9689c46550a8976b90e662d7af97994d7e299b94e2d68e5b5f7d1166a54d4ff8 SHA512 64c42477554039991b35dfd2d29f4fa507226cc3256b07ff3524cd287c1dbf09bdf60116dd12288d1340ca74ced2872ac886f4eadde8bd83965976579e99738d |
27 |
|
28 |
diff --git a/app-admin/puppetdb/puppetdb-6.13.0.ebuild b/app-admin/puppetdb/puppetdb-6.13.0.ebuild |
29 |
deleted file mode 100644 |
30 |
index 06b2986213b..00000000000 |
31 |
--- a/app-admin/puppetdb/puppetdb-6.13.0.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,87 +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 |
- |
39 |
-inherit multilib systemd tmpfiles |
40 |
- |
41 |
-DESCRIPTION="PuppetDB collects data generated by Puppet." |
42 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/" |
43 |
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" |
44 |
- |
45 |
-LICENSE="Apache-2.0" |
46 |
-SLOT="0" |
47 |
-IUSE="" |
48 |
-KEYWORDS="amd64 x86" |
49 |
- |
50 |
-RDEPEND+=">=virtual/jdk-1.8.0" |
51 |
-DEPEND+="acct-user/puppetdb |
52 |
- acct-group/puppetdb" |
53 |
- |
54 |
-src_prepare() { |
55 |
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die |
56 |
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die |
57 |
- sed -i 's/sysconfig/conf\.d/g' install.sh || die |
58 |
- sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die |
59 |
- sed -i 's/var\/run/run/g' install.sh || die |
60 |
- default |
61 |
-} |
62 |
- |
63 |
-src_compile() { |
64 |
- einfo "not compiling" |
65 |
-} |
66 |
- |
67 |
-src_install() { |
68 |
- dodir /opt/puppetlabs/server/data/puppetdb |
69 |
- insinto /opt/puppetlabs/server/apps/puppetdb |
70 |
- insopts -m0744 |
71 |
- doins ext/ezbake-functions.sh |
72 |
- insopts -m0644 |
73 |
- doins ext/ezbake.manifest |
74 |
- doins puppetdb.jar |
75 |
- insinto /etc/puppetlabs/puppetdb |
76 |
- doins ext/config/logback.xml |
77 |
- doins ext/config/bootstrap.cfg |
78 |
- doins ext/config/request-logging.xml |
79 |
- insinto /etc/puppetlabs/puppetdb/conf.d |
80 |
- doins ext/config/conf.d/jetty.ini |
81 |
- doins ext/config/conf.d/repl.ini |
82 |
- doins ext/config/conf.d/database.ini |
83 |
- doins ext/config/conf.d/config.ini |
84 |
- insopts -m0755 |
85 |
- insinto /opt/puppetlabs/server/apps/puppetdb/scripts |
86 |
- doins install.sh |
87 |
- insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps |
88 |
- doins ext/cli/foreground |
89 |
- doins ext/cli/ssl-setup |
90 |
- doins ext/cli/config-migration |
91 |
- doins ext/cli/foreground |
92 |
- doins ext/cli/anonymize |
93 |
- doins ext/cli/reload |
94 |
- doins ext/cli/start |
95 |
- doins ext/cli/stop |
96 |
- insinto /opt/puppetlabs/server/apps/puppetdb/bin |
97 |
- doins ext/bin/puppetdb |
98 |
- insopts -m0644 |
99 |
- dodir /opt/puppetlabs/server/bin |
100 |
- dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb |
101 |
- dodir /opt/puppetlabs/bin |
102 |
- dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb |
103 |
- dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb |
104 |
- # init type tasks |
105 |
- newconfd ext/default puppetdb |
106 |
- systemd_dounit ext/redhat/puppetdb.service |
107 |
- newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf |
108 |
- newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb |
109 |
- # misc |
110 |
- insinto /etc/logrotate.d |
111 |
- newins ext/puppetdb.logrotate.conf puppetdb |
112 |
- fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb |
113 |
- fperms -R 770 /opt/puppetlabs/server/data/puppetdb |
114 |
-} |
115 |
- |
116 |
-pkg_postinst() { |
117 |
- elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" |
118 |
- elog |
119 |
- elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" |
120 |
-} |
121 |
|
122 |
diff --git a/app-admin/puppetdb/puppetdb-7.2.0.ebuild b/app-admin/puppetdb/puppetdb-7.2.0.ebuild |
123 |
deleted file mode 100644 |
124 |
index 06b2986213b..00000000000 |
125 |
--- a/app-admin/puppetdb/puppetdb-7.2.0.ebuild |
126 |
+++ /dev/null |
127 |
@@ -1,87 +0,0 @@ |
128 |
-# Copyright 1999-2021 Gentoo Authors |
129 |
-# Distributed under the terms of the GNU General Public License v2 |
130 |
- |
131 |
-EAPI=7 |
132 |
- |
133 |
-inherit multilib systemd tmpfiles |
134 |
- |
135 |
-DESCRIPTION="PuppetDB collects data generated by Puppet." |
136 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/" |
137 |
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" |
138 |
- |
139 |
-LICENSE="Apache-2.0" |
140 |
-SLOT="0" |
141 |
-IUSE="" |
142 |
-KEYWORDS="amd64 x86" |
143 |
- |
144 |
-RDEPEND+=">=virtual/jdk-1.8.0" |
145 |
-DEPEND+="acct-user/puppetdb |
146 |
- acct-group/puppetdb" |
147 |
- |
148 |
-src_prepare() { |
149 |
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die |
150 |
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die |
151 |
- sed -i 's/sysconfig/conf\.d/g' install.sh || die |
152 |
- sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die |
153 |
- sed -i 's/var\/run/run/g' install.sh || die |
154 |
- default |
155 |
-} |
156 |
- |
157 |
-src_compile() { |
158 |
- einfo "not compiling" |
159 |
-} |
160 |
- |
161 |
-src_install() { |
162 |
- dodir /opt/puppetlabs/server/data/puppetdb |
163 |
- insinto /opt/puppetlabs/server/apps/puppetdb |
164 |
- insopts -m0744 |
165 |
- doins ext/ezbake-functions.sh |
166 |
- insopts -m0644 |
167 |
- doins ext/ezbake.manifest |
168 |
- doins puppetdb.jar |
169 |
- insinto /etc/puppetlabs/puppetdb |
170 |
- doins ext/config/logback.xml |
171 |
- doins ext/config/bootstrap.cfg |
172 |
- doins ext/config/request-logging.xml |
173 |
- insinto /etc/puppetlabs/puppetdb/conf.d |
174 |
- doins ext/config/conf.d/jetty.ini |
175 |
- doins ext/config/conf.d/repl.ini |
176 |
- doins ext/config/conf.d/database.ini |
177 |
- doins ext/config/conf.d/config.ini |
178 |
- insopts -m0755 |
179 |
- insinto /opt/puppetlabs/server/apps/puppetdb/scripts |
180 |
- doins install.sh |
181 |
- insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps |
182 |
- doins ext/cli/foreground |
183 |
- doins ext/cli/ssl-setup |
184 |
- doins ext/cli/config-migration |
185 |
- doins ext/cli/foreground |
186 |
- doins ext/cli/anonymize |
187 |
- doins ext/cli/reload |
188 |
- doins ext/cli/start |
189 |
- doins ext/cli/stop |
190 |
- insinto /opt/puppetlabs/server/apps/puppetdb/bin |
191 |
- doins ext/bin/puppetdb |
192 |
- insopts -m0644 |
193 |
- dodir /opt/puppetlabs/server/bin |
194 |
- dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb |
195 |
- dodir /opt/puppetlabs/bin |
196 |
- dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb |
197 |
- dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb |
198 |
- # init type tasks |
199 |
- newconfd ext/default puppetdb |
200 |
- systemd_dounit ext/redhat/puppetdb.service |
201 |
- newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf |
202 |
- newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb |
203 |
- # misc |
204 |
- insinto /etc/logrotate.d |
205 |
- newins ext/puppetdb.logrotate.conf puppetdb |
206 |
- fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb |
207 |
- fperms -R 770 /opt/puppetlabs/server/data/puppetdb |
208 |
-} |
209 |
- |
210 |
-pkg_postinst() { |
211 |
- elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" |
212 |
- elog |
213 |
- elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" |
214 |
-} |