1 |
commit: a8e1f07645e1b269b31e50f8a226b5d2f85b7786 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 15 17:36:07 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 15 17:36:07 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e1f076 |
7 |
|
8 |
app-admin/puppetserver: 6.1.0 stable amd64 and x86 with 5.3.7 bump |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppetserver/Manifest | 2 +- |
14 |
...rver-6.0.1.ebuild => puppetserver-5.3.7.ebuild} | 23 ++++++++++------------ |
15 |
app-admin/puppetserver/puppetserver-6.1.0.ebuild | 4 ++-- |
16 |
3 files changed, 13 insertions(+), 16 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
19 |
index 898d58f835f..d59d3880ee8 100644 |
20 |
--- a/app-admin/puppetserver/Manifest |
21 |
+++ b/app-admin/puppetserver/Manifest |
22 |
@@ -1,3 +1,3 @@ |
23 |
DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c |
24 |
-DIST puppetserver-6.0.1.tar.gz 62362369 BLAKE2B 895eefe1f1d508a9a791fc30937bb778fe6d032fc0143caeafa695e73ee139cded8c6c839b90b4f168a641ab7952f4ba10a805e0a85112ca522e78df06838062 SHA512 485b24dbe74fe40c23b98693d02096052af23344a4c8d9bb5d29876cb4224ded482c5b741be1f2b8ff94d7e48041206acd4c301e9c188b3406b04b229fd51094 |
25 |
+DIST puppetserver-5.3.7.tar.gz 53517572 BLAKE2B e423169b92a1638b0fef1ee5adbd10899917d89eeaa9b3bea689ce9d6f4d3e3b9d5c6cfdddea897014493373429ebba375c1a9d7b77284de46f5a0a5d6555dbd SHA512 8a58d89dc44aa8ebf82f06bdfc4f52c7a25ae3f1a48ca516425a57180c73618a1e850a595aa0e46d6e3a0b360ea38d3f050790304689bfa3b47bb0c1a4fad17b |
26 |
DIST puppetserver-6.1.0.tar.gz 74953913 BLAKE2B 0a84e64209ad313bea375bbaa22197d0216138c3714551796df0cfe99e634ef3efb0cf5378fe0db4b329df21c57359a84f249cb7fe62d9369ec7e8702c5274a1 SHA512 b3f0f2ef86550879a2eeefaf187c5be0b9e7e9bd570e77669a3f20f8b6127aa8b04b8debb10ca66a60a1858285717bdfc27f3f31c8014de2e0af51746da2f1a8 |
27 |
|
28 |
diff --git a/app-admin/puppetserver/puppetserver-6.0.1.ebuild b/app-admin/puppetserver/puppetserver-5.3.7.ebuild |
29 |
similarity index 81% |
30 |
rename from app-admin/puppetserver/puppetserver-6.0.1.ebuild |
31 |
rename to app-admin/puppetserver/puppetserver-5.3.7.ebuild |
32 |
index cdf7e741d73..954d16fdc3b 100644 |
33 |
--- a/app-admin/puppetserver/puppetserver-6.0.1.ebuild |
34 |
+++ b/app-admin/puppetserver/puppetserver-5.3.7.ebuild |
35 |
@@ -1,4 +1,4 @@ |
36 |
-# Copyright 1999-2018 Gentoo Authors |
37 |
+# Copyright 1999-2019 Gentoo Authors |
38 |
# Distributed under the terms of the GNU General Public License v2 |
39 |
|
40 |
EAPI=6 |
41 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
42 |
SLOT="0" |
43 |
IUSE="puppetdb" |
44 |
# will need the same keywords as puppet |
45 |
-KEYWORDS="amd64 x86" |
46 |
+KEYWORDS="~amd64 ~x86" |
47 |
|
48 |
RDEPEND+=" |
49 |
>=virtual/jdk-1.8.0 |
50 |
@@ -46,6 +46,8 @@ src_install() { |
51 |
insopts -m0644 |
52 |
doins ext/ezbake.manifest |
53 |
doins puppet-server-release.jar |
54 |
+ doins jruby-9k.jar |
55 |
+ doins jruby-1_7.jar |
56 |
insinto /etc/puppetlabs/puppetserver |
57 |
doins ext/config/logback.xml |
58 |
doins ext/config/request-logging.xml |
59 |
@@ -63,7 +65,6 @@ src_install() { |
60 |
insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
61 |
doins install.sh |
62 |
insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
63 |
- doins ext/cli/ca |
64 |
doins ext/cli/irb |
65 |
doins ext/cli/foreground |
66 |
doins ext/cli/gem |
67 |
@@ -106,8 +107,7 @@ src_install() { |
68 |
fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
69 |
fperms -R 700 /var/log/puppetlabs/puppetserver |
70 |
insinto /opt/puppetlabs/server/data |
71 |
- doins ext/build-scripts/jruby-gem-list.txt |
72 |
- doins ext/build-scripts/mri-gem-list.txt |
73 |
+ newins ext/build-scripts/jruby-gem-list.txt puppetserver-gem-list.txt |
74 |
newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf |
75 |
} |
76 |
|
77 |
@@ -122,12 +122,9 @@ pkg_postinst() { |
78 |
elog |
79 |
elog "# install puppetserver gems" |
80 |
elog "cd /opt/puppetlabs/server/apps/puppetserver" |
81 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" |
82 |
- elog "while read LINE do" |
83 |
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" |
84 |
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" |
85 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" |
86 |
- elog "while read LINE do" |
87 |
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" |
88 |
- elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt" |
89 |
+ elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf" |
90 |
+ elog "while read LINE" |
91 |
+ elog "do" |
92 |
+ elog " java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" |
93 |
+ elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt" |
94 |
} |
95 |
|
96 |
diff --git a/app-admin/puppetserver/puppetserver-6.1.0.ebuild b/app-admin/puppetserver/puppetserver-6.1.0.ebuild |
97 |
index d62a1297c2c..f49052d8a32 100644 |
98 |
--- a/app-admin/puppetserver/puppetserver-6.1.0.ebuild |
99 |
+++ b/app-admin/puppetserver/puppetserver-6.1.0.ebuild |
100 |
@@ -1,4 +1,4 @@ |
101 |
-# Copyright 1999-2018 Gentoo Authors |
102 |
+# Copyright 1999-2019 Gentoo Authors |
103 |
# Distributed under the terms of the GNU General Public License v2 |
104 |
|
105 |
EAPI=6 |
106 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
107 |
SLOT="0" |
108 |
IUSE="puppetdb" |
109 |
# will need the same keywords as puppet |
110 |
-KEYWORDS="~amd64 ~x86" |
111 |
+KEYWORDS="amd64 x86" |
112 |
|
113 |
RDEPEND+=" |
114 |
>=virtual/jdk-1.8.0 |