1 |
commit: 1197e2f9dc66a4a9201e244b86b60a1204e3229f |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 23 15:29:09 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 23 15:29:09 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1197e2f9 |
7 |
|
8 |
app-admin/puppetdb: 6.5.0 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.17 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppetdb/Manifest | 1 - |
14 |
app-admin/puppetdb/puppetdb-6.3.4.ebuild | 92 -------------------------------- |
15 |
app-admin/puppetdb/puppetdb-6.5.0.ebuild | 2 +- |
16 |
3 files changed, 1 insertion(+), 94 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest |
19 |
index 89c8abd12c0..11650917a22 100644 |
20 |
--- a/app-admin/puppetdb/Manifest |
21 |
+++ b/app-admin/puppetdb/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
-DIST puppetdb-6.3.4.tar.gz 41716289 BLAKE2B c2f0c074229340234e8ce146d6d711f0311f4a4d6c091ef497a376a5cca02f7bc5a85fc63555f7408f16dc60784266ba126149fb27a9e0bf0592d7ee314e4b4a SHA512 9da3707f0ecf1b7664dbf44dbc6dda79adce6928298aa8e263bb134bfccaf2403245ed0176f8929583f5631ba3927f99d6d06233eca07720d0fd174da33e4990 |
24 |
DIST puppetdb-6.4.0.tar.gz 41720668 BLAKE2B a4637750c553eed8ee5bdd46212a7455fe1d59015aa78fe01f6fa9ee2b4a98ec50a2a8b551f65d4bc6965b2a969f559c53f5a6324a8e48983a1d027948387ce7 SHA512 c49afce1661ed284280e89ed9dbc2406a657e5f2cdbc501acf50900d431b58a341f1541789ea4ffe9109e8d30faf47eb85573a589426c40ad50597a7d81b5552 |
25 |
DIST puppetdb-6.5.0.tar.gz 41768030 BLAKE2B 2a52239dabb5c026f4d00ee2942e3128ce50f1de23aa5ff5d53f2020237b54867b48727e774ecc27f5f18bd1617b43fcf30fbd3b03a730ca60d5bab7296e3f9c SHA512 8aee40101a17e22ef5b9b7b965ffe8d8a9b8dfaa787721b3e6a5e7363b98e0c52dc0583216a058540618a6a980cf80f138fa6b358a9daac518abd50981910cf5 |
26 |
DIST puppetdb-6.6.0.tar.gz 43366185 BLAKE2B 224c13ff2583a7c8124f03845eca4756be6446e7470565c44d3fe1fcb756d5564ae2ded69d0bef1dda939efe082756c0e44afd3c6b0fc4268a744946860b5a02 SHA512 5076f52af51b7a3b43a0deb9cf1f10d77da98a5e531983d3661cda522c8d46f70882457934be6f70e77587b930077c0a4d2eaf7ed41eff9c6bcf4bc5ecbf2205 |
27 |
|
28 |
diff --git a/app-admin/puppetdb/puppetdb-6.3.4.ebuild b/app-admin/puppetdb/puppetdb-6.3.4.ebuild |
29 |
deleted file mode 100644 |
30 |
index 77d1c1ca9cc..00000000000 |
31 |
--- a/app-admin/puppetdb/puppetdb-6.3.4.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,92 +0,0 @@ |
34 |
-# Copyright 1999-2019 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-inherit multilib systemd user |
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 |
-# will need the same keywords as puppet |
49 |
-KEYWORDS="amd64 x86" |
50 |
- |
51 |
-RDEPEND+=">=virtual/jdk-1.8.0" |
52 |
-DEPEND+="" |
53 |
- |
54 |
-pkg_setup() { |
55 |
- enewgroup puppetdb |
56 |
- enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb" |
57 |
-} |
58 |
- |
59 |
-src_prepare() { |
60 |
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die |
61 |
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die |
62 |
- sed -i 's/sysconfig/conf\.d/g' install.sh || die |
63 |
- sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die |
64 |
- sed -i 's/var\/run/run/g' install.sh || die |
65 |
- default |
66 |
-} |
67 |
- |
68 |
-src_compile() { |
69 |
- einfo "not compiling" |
70 |
-} |
71 |
- |
72 |
-src_install() { |
73 |
- dodir /opt/puppetlabs/server/data/puppetdb |
74 |
- insinto /opt/puppetlabs/server/apps/puppetdb |
75 |
- insopts -m0744 |
76 |
- doins ext/ezbake-functions.sh |
77 |
- insopts -m0644 |
78 |
- doins ext/ezbake.manifest |
79 |
- doins puppetdb.jar |
80 |
- insinto /etc/puppetlabs/puppetdb |
81 |
- doins ext/config/logback.xml |
82 |
- doins ext/config/bootstrap.cfg |
83 |
- doins ext/config/request-logging.xml |
84 |
- insinto /etc/puppetlabs/puppetdb/conf.d |
85 |
- doins ext/config/conf.d/jetty.ini |
86 |
- doins ext/config/conf.d/repl.ini |
87 |
- doins ext/config/conf.d/database.ini |
88 |
- doins ext/config/conf.d/config.ini |
89 |
- insopts -m0755 |
90 |
- insinto /opt/puppetlabs/server/apps/puppetdb/scripts |
91 |
- doins install.sh |
92 |
- insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps |
93 |
- doins ext/cli/foreground |
94 |
- doins ext/cli/ssl-setup |
95 |
- doins ext/cli/config-migration |
96 |
- doins ext/cli/foreground |
97 |
- doins ext/cli/anonymize |
98 |
- doins ext/cli/reload |
99 |
- doins ext/cli/start |
100 |
- doins ext/cli/stop |
101 |
- insinto /opt/puppetlabs/server/apps/puppetdb/bin |
102 |
- doins ext/bin/puppetdb |
103 |
- insopts -m0644 |
104 |
- dodir /opt/puppetlabs/server/bin |
105 |
- dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb |
106 |
- dodir /opt/puppetlabs/bin |
107 |
- dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb |
108 |
- dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb |
109 |
- # init type tasks |
110 |
- newconfd ext/default puppetdb |
111 |
- systemd_dounit ext/redhat/puppetdb.service |
112 |
- systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf |
113 |
- newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb |
114 |
- # misc |
115 |
- insinto /etc/logrotate.d |
116 |
- newins ext/puppetdb.logrotate.conf puppetdb |
117 |
- fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb |
118 |
- fperms -R 770 /opt/puppetlabs/server/data/puppetdb |
119 |
-} |
120 |
- |
121 |
-pkg_postinst() { |
122 |
- elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" |
123 |
- elog |
124 |
- elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" |
125 |
-} |
126 |
|
127 |
diff --git a/app-admin/puppetdb/puppetdb-6.5.0.ebuild b/app-admin/puppetdb/puppetdb-6.5.0.ebuild |
128 |
index 616793cb412..77d1c1ca9cc 100644 |
129 |
--- a/app-admin/puppetdb/puppetdb-6.5.0.ebuild |
130 |
+++ b/app-admin/puppetdb/puppetdb-6.5.0.ebuild |
131 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
132 |
SLOT="0" |
133 |
IUSE="" |
134 |
# will need the same keywords as puppet |
135 |
-KEYWORDS="~amd64 ~x86" |
136 |
+KEYWORDS="amd64 x86" |
137 |
|
138 |
RDEPEND+=">=virtual/jdk-1.8.0" |
139 |
DEPEND+="" |