1 |
commit: 576d923655cf141546d0ee02b59bc7b4013613bc |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 18 02:43:27 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 18 02:46:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=576d9236 |
7 |
|
8 |
app-admin/puppetdb: 5.2.4 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.44, Repoman-2.3.10 |
11 |
|
12 |
app-admin/puppetdb/Manifest | 1 - |
13 |
app-admin/puppetdb/puppetdb-5.2.1.ebuild | 92 -------------------------------- |
14 |
app-admin/puppetdb/puppetdb-5.2.4.ebuild | 2 +- |
15 |
3 files changed, 1 insertion(+), 94 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest |
18 |
index cdcc096c8db..838dda23ec7 100644 |
19 |
--- a/app-admin/puppetdb/Manifest |
20 |
+++ b/app-admin/puppetdb/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST puppetdb-5.2.1.tar.gz 25435195 BLAKE2B aed0e6175df0a603ea0aaf792c31b4933d408a4f7a037b557a8acb4b237e4c639a06f954232e049efe4b486d780a3af129c8a6a48833019168cd70f38e5bf403 SHA512 6d0b06f083093394f74e952112c6b388fd6c94452cf2954172dafc5dc42c7a0b45f6a9a7afcb6196f12316e15653943c3faed8a06ba7a7bd75a31db8515e0103 |
23 |
DIST puppetdb-5.2.2.tar.gz 25436396 BLAKE2B e30d80b7da29c8cf3b00c9cda3d6e0a4c5635b3bb3a4e6d3e2bf284531509828df6d845a0d30b2a7a454ec35ab4879019fc4c68fc3aa8b6a72c3d0896b9e75f7 SHA512 cc598539801bedd4ef0052f50013320be5dc1eaf8098db8898a0759609d6d4e26aa094550bc1a45c041f9fe65ee99b0c00c00586d3cc93003836f1415bd92456 |
24 |
DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059 |
25 |
|
26 |
diff --git a/app-admin/puppetdb/puppetdb-5.2.1.ebuild b/app-admin/puppetdb/puppetdb-5.2.1.ebuild |
27 |
deleted file mode 100644 |
28 |
index e2e9e4db500..00000000000 |
29 |
--- a/app-admin/puppetdb/puppetdb-5.2.1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,92 +0,0 @@ |
32 |
-# Copyright 1999-2018 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=6 |
36 |
- |
37 |
-inherit multilib systemd user |
38 |
- |
39 |
-DESCRIPTION="PuppetDB collects data generated by Puppet." |
40 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/" |
41 |
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" |
42 |
- |
43 |
-LICENSE="Apache-2.0" |
44 |
-SLOT="0" |
45 |
-IUSE="" |
46 |
-# will need the same keywords as puppet |
47 |
-KEYWORDS="amd64 x86" |
48 |
- |
49 |
-RDEPEND+=">=virtual/jdk-1.7.0" |
50 |
-DEPEND+="" |
51 |
- |
52 |
-pkg_setup() { |
53 |
- enewgroup puppetdb |
54 |
- enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb" |
55 |
-} |
56 |
- |
57 |
-src_prepare() { |
58 |
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die |
59 |
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die |
60 |
- sed -i 's/sysconfig/conf\.d/g' install.sh || die |
61 |
- sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die |
62 |
- sed -i 's/var\/run/run/g' install.sh || die |
63 |
- default |
64 |
-} |
65 |
- |
66 |
-src_compile() { |
67 |
- einfo "not compiling" |
68 |
-} |
69 |
- |
70 |
-src_install() { |
71 |
- dodir /opt/puppetlabs/server/data/puppetdb |
72 |
- insinto /opt/puppetlabs/server/apps/puppetdb |
73 |
- insopts -m0744 |
74 |
- doins ext/ezbake-functions.sh |
75 |
- insopts -m0644 |
76 |
- doins ext/ezbake.manifest |
77 |
- doins puppetdb.jar |
78 |
- insinto /etc/puppetlabs/puppetdb |
79 |
- doins ext/config/logback.xml |
80 |
- doins ext/config/bootstrap.cfg |
81 |
- doins ext/config/request-logging.xml |
82 |
- insinto /etc/puppetlabs/puppetdb/conf.d |
83 |
- doins ext/config/conf.d/jetty.ini |
84 |
- doins ext/config/conf.d/repl.ini |
85 |
- doins ext/config/conf.d/database.ini |
86 |
- doins ext/config/conf.d/config.ini |
87 |
- insopts -m0755 |
88 |
- insinto /opt/puppetlabs/server/apps/puppetdb/scripts |
89 |
- doins install.sh |
90 |
- insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps |
91 |
- doins ext/cli/foreground |
92 |
- doins ext/cli/ssl-setup |
93 |
- doins ext/cli/config-migration |
94 |
- doins ext/cli/foreground |
95 |
- doins ext/cli/anonymize |
96 |
- doins ext/cli/reload |
97 |
- doins ext/cli/start |
98 |
- doins ext/cli/stop |
99 |
- insinto /opt/puppetlabs/server/apps/puppetdb/bin |
100 |
- doins ext/bin/puppetdb |
101 |
- insopts -m0644 |
102 |
- dodir /opt/puppetlabs/server/bin |
103 |
- dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb |
104 |
- dodir /opt/puppetlabs/bin |
105 |
- dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb |
106 |
- dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb |
107 |
- # init type tasks |
108 |
- newconfd ext/default puppetdb |
109 |
- systemd_dounit ext/redhat/puppetdb.service |
110 |
- systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf |
111 |
- newinitd "${FILESDIR}/puppetdb.initd" puppetdb |
112 |
- # misc |
113 |
- insinto /etc/logrotate.d |
114 |
- newins ext/puppetdb.logrotate.conf puppetdb |
115 |
- fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb |
116 |
- fperms -R 770 /opt/puppetlabs/server/data/puppetdb |
117 |
-} |
118 |
- |
119 |
-pkg_postinst() { |
120 |
- elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" |
121 |
- elog |
122 |
- elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" |
123 |
-} |
124 |
|
125 |
diff --git a/app-admin/puppetdb/puppetdb-5.2.4.ebuild b/app-admin/puppetdb/puppetdb-5.2.4.ebuild |
126 |
index 5c45e1c342f..e2e9e4db500 100644 |
127 |
--- a/app-admin/puppetdb/puppetdb-5.2.4.ebuild |
128 |
+++ b/app-admin/puppetdb/puppetdb-5.2.4.ebuild |
129 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
130 |
SLOT="0" |
131 |
IUSE="" |
132 |
# will need the same keywords as puppet |
133 |
-KEYWORDS="~amd64 ~x86" |
134 |
+KEYWORDS="amd64 x86" |
135 |
|
136 |
RDEPEND+=">=virtual/jdk-1.7.0" |
137 |
DEPEND+="" |