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