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/puppetdb/
Date: Mon, 06 May 2019 17:37:03
Message-Id: 1557164203.7ad2d78bbd88d9d6955e7a4413ade16877cda0d7.prometheanfire@gentoo
1 commit: 7ad2d78bbd88d9d6955e7a4413ade16877cda0d7
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 6 17:31:46 2019 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Mon May 6 17:36:43 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad2d78b
7
8 app-admin/puppetdb: 6.3.2 stable amd64/x86 with cleanup
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 app-admin/puppetdb/Manifest | 2 -
14 app-admin/puppetdb/puppetdb-6.2.0.ebuild | 92 --------------------------------
15 app-admin/puppetdb/puppetdb-6.3.1.ebuild | 92 --------------------------------
16 app-admin/puppetdb/puppetdb-6.3.2.ebuild | 2 +-
17 4 files changed, 1 insertion(+), 187 deletions(-)
18
19 diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
20 index d91daa6b5b7..8c4c56a1b4e 100644
21 --- a/app-admin/puppetdb/Manifest
22 +++ b/app-admin/puppetdb/Manifest
23 @@ -1,5 +1,3 @@
24 DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059
25 DIST puppetdb-5.2.7.tar.gz 24353701 BLAKE2B 196b336a92031a25f7f28ca070a831857f3e0dde3ecc02e12e6884f3628c12dcc27b347c39147636addc975841f340fbf89196e86b3c10efc2ad1f16cf6f882a SHA512 989fa232d0fbd90c975fe110caca9b9c92a90167eb7b8d0384282dd8cf85111a56174c6785d7c73800e19185e879e258b8e6cefb210c1c44a229ce994336ef1d
26 -DIST puppetdb-6.2.0.tar.gz 39922402 BLAKE2B 5d3c36bdeb902c7292d8da728ce225e3378bcb1283dbb2558f7aaa488e53351da41551606723d6c504118f5a653d92831cb55e0570dd7827c1be06f78592e0ef SHA512 33da6a7db688561d01302918cc0e85ff88f5490ac4007e4f20df6b0483aa1a7f65b2226f98966936333c7fa28060adca47f10ba7419a05d70c9c72bd8a40e8e5
27 -DIST puppetdb-6.3.1.tar.gz 41706703 BLAKE2B 74c1fc8a4702cdd94dab88d3e3bbf9e078d9c6e574454f49f2659bf8a9882ab51fd65392726834c032cb8e14881a349148a43ff05d6b186a1ece868be2fee2d4 SHA512 96ab60f0b0f531b1831ab3707b4c8496cea8fc921cd42fd828a1c86ed0e1d1324f1bec3df5345d0b5a0f737bfa638459941f1f6a9c41f95b745035249ebb01d3
28 DIST puppetdb-6.3.2.tar.gz 41707817 BLAKE2B 480737af3abc862e90a7075011327ce3821a5d9460c785602c105ec7accc82f2ea712ae488c585226126e88f817cbb1acda7fa09793b7508aa38cc47e1c76ab0 SHA512 e2a3ce73c976cbbfa6acc62612187478cf5ecc9d514ff4866a74e2c6364979f17c3daeba0f03a01e7fc3eeb1ca84a3c886fd5eed07d2a9fbaa5fd9f7c9d577af
29
30 diff --git a/app-admin/puppetdb/puppetdb-6.2.0.ebuild b/app-admin/puppetdb/puppetdb-6.2.0.ebuild
31 deleted file mode 100644
32 index 77d1c1ca9cc..00000000000
33 --- a/app-admin/puppetdb/puppetdb-6.2.0.ebuild
34 +++ /dev/null
35 @@ -1,92 +0,0 @@
36 -# Copyright 1999-2019 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -
41 -inherit multilib systemd user
42 -
43 -DESCRIPTION="PuppetDB collects data generated by Puppet."
44 -HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
45 -SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
46 -
47 -LICENSE="Apache-2.0"
48 -SLOT="0"
49 -IUSE=""
50 -# will need the same keywords as puppet
51 -KEYWORDS="amd64 x86"
52 -
53 -RDEPEND+=">=virtual/jdk-1.8.0"
54 -DEPEND+=""
55 -
56 -pkg_setup() {
57 - enewgroup puppetdb
58 - enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
59 -}
60 -
61 -src_prepare() {
62 - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
63 - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
64 - sed -i 's/sysconfig/conf\.d/g' install.sh || die
65 - sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
66 - sed -i 's/var\/run/run/g' install.sh || die
67 - default
68 -}
69 -
70 -src_compile() {
71 - einfo "not compiling"
72 -}
73 -
74 -src_install() {
75 - dodir /opt/puppetlabs/server/data/puppetdb
76 - insinto /opt/puppetlabs/server/apps/puppetdb
77 - insopts -m0744
78 - doins ext/ezbake-functions.sh
79 - insopts -m0644
80 - doins ext/ezbake.manifest
81 - doins puppetdb.jar
82 - insinto /etc/puppetlabs/puppetdb
83 - doins ext/config/logback.xml
84 - doins ext/config/bootstrap.cfg
85 - doins ext/config/request-logging.xml
86 - insinto /etc/puppetlabs/puppetdb/conf.d
87 - doins ext/config/conf.d/jetty.ini
88 - doins ext/config/conf.d/repl.ini
89 - doins ext/config/conf.d/database.ini
90 - doins ext/config/conf.d/config.ini
91 - insopts -m0755
92 - insinto /opt/puppetlabs/server/apps/puppetdb/scripts
93 - doins install.sh
94 - insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
95 - doins ext/cli/foreground
96 - doins ext/cli/ssl-setup
97 - doins ext/cli/config-migration
98 - doins ext/cli/foreground
99 - doins ext/cli/anonymize
100 - doins ext/cli/reload
101 - doins ext/cli/start
102 - doins ext/cli/stop
103 - insinto /opt/puppetlabs/server/apps/puppetdb/bin
104 - doins ext/bin/puppetdb
105 - insopts -m0644
106 - dodir /opt/puppetlabs/server/bin
107 - dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
108 - dodir /opt/puppetlabs/bin
109 - dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
110 - dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
111 - # init type tasks
112 - newconfd ext/default puppetdb
113 - systemd_dounit ext/redhat/puppetdb.service
114 - systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
115 - newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
116 - # misc
117 - insinto /etc/logrotate.d
118 - newins ext/puppetdb.logrotate.conf puppetdb
119 - fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
120 - fperms -R 770 /opt/puppetlabs/server/data/puppetdb
121 -}
122 -
123 -pkg_postinst() {
124 - elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
125 - elog
126 - elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
127 -}
128
129 diff --git a/app-admin/puppetdb/puppetdb-6.3.1.ebuild b/app-admin/puppetdb/puppetdb-6.3.1.ebuild
130 deleted file mode 100644
131 index 616793cb412..00000000000
132 --- a/app-admin/puppetdb/puppetdb-6.3.1.ebuild
133 +++ /dev/null
134 @@ -1,92 +0,0 @@
135 -# Copyright 1999-2019 Gentoo Authors
136 -# Distributed under the terms of the GNU General Public License v2
137 -
138 -EAPI=7
139 -
140 -inherit multilib systemd user
141 -
142 -DESCRIPTION="PuppetDB collects data generated by Puppet."
143 -HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
144 -SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
145 -
146 -LICENSE="Apache-2.0"
147 -SLOT="0"
148 -IUSE=""
149 -# will need the same keywords as puppet
150 -KEYWORDS="~amd64 ~x86"
151 -
152 -RDEPEND+=">=virtual/jdk-1.8.0"
153 -DEPEND+=""
154 -
155 -pkg_setup() {
156 - enewgroup puppetdb
157 - enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
158 -}
159 -
160 -src_prepare() {
161 - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
162 - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
163 - sed -i 's/sysconfig/conf\.d/g' install.sh || die
164 - sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
165 - sed -i 's/var\/run/run/g' install.sh || die
166 - default
167 -}
168 -
169 -src_compile() {
170 - einfo "not compiling"
171 -}
172 -
173 -src_install() {
174 - dodir /opt/puppetlabs/server/data/puppetdb
175 - insinto /opt/puppetlabs/server/apps/puppetdb
176 - insopts -m0744
177 - doins ext/ezbake-functions.sh
178 - insopts -m0644
179 - doins ext/ezbake.manifest
180 - doins puppetdb.jar
181 - insinto /etc/puppetlabs/puppetdb
182 - doins ext/config/logback.xml
183 - doins ext/config/bootstrap.cfg
184 - doins ext/config/request-logging.xml
185 - insinto /etc/puppetlabs/puppetdb/conf.d
186 - doins ext/config/conf.d/jetty.ini
187 - doins ext/config/conf.d/repl.ini
188 - doins ext/config/conf.d/database.ini
189 - doins ext/config/conf.d/config.ini
190 - insopts -m0755
191 - insinto /opt/puppetlabs/server/apps/puppetdb/scripts
192 - doins install.sh
193 - insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
194 - doins ext/cli/foreground
195 - doins ext/cli/ssl-setup
196 - doins ext/cli/config-migration
197 - doins ext/cli/foreground
198 - doins ext/cli/anonymize
199 - doins ext/cli/reload
200 - doins ext/cli/start
201 - doins ext/cli/stop
202 - insinto /opt/puppetlabs/server/apps/puppetdb/bin
203 - doins ext/bin/puppetdb
204 - insopts -m0644
205 - dodir /opt/puppetlabs/server/bin
206 - dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
207 - dodir /opt/puppetlabs/bin
208 - dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
209 - dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
210 - # init type tasks
211 - newconfd ext/default puppetdb
212 - systemd_dounit ext/redhat/puppetdb.service
213 - systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
214 - newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
215 - # misc
216 - insinto /etc/logrotate.d
217 - newins ext/puppetdb.logrotate.conf puppetdb
218 - fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
219 - fperms -R 770 /opt/puppetlabs/server/data/puppetdb
220 -}
221 -
222 -pkg_postinst() {
223 - elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
224 - elog
225 - elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
226 -}
227
228 diff --git a/app-admin/puppetdb/puppetdb-6.3.2.ebuild b/app-admin/puppetdb/puppetdb-6.3.2.ebuild
229 index 616793cb412..77d1c1ca9cc 100644
230 --- a/app-admin/puppetdb/puppetdb-6.3.2.ebuild
231 +++ b/app-admin/puppetdb/puppetdb-6.3.2.ebuild
232 @@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
233 SLOT="0"
234 IUSE=""
235 # will need the same keywords as puppet
236 -KEYWORDS="~amd64 ~x86"
237 +KEYWORDS="amd64 x86"
238
239 RDEPEND+=">=virtual/jdk-1.8.0"
240 DEPEND+=""