diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2018-12-19 13:39:49 -0600 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2018-12-19 13:42:56 -0600 |
| commit | 45362dfe361c34220589a51c05862e60f08b5ea1 (patch) | |
| tree | 2cb1abf81d459e55a5dc5f7dcd3370ba0605c438 /app-admin/puppetserver | |
| parent | app-admin/puppet-agent: 6.1.0 bump (diff) | |
| download | gentoo-45362dfe361c34220589a51c05862e60f08b5ea1.tar.gz gentoo-45362dfe361c34220589a51c05862e60f08b5ea1.tar.bz2 gentoo-45362dfe361c34220589a51c05862e60f08b5ea1.zip | |
app-admin/puppetserver: 6.1.0 bump
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
Diffstat (limited to 'app-admin/puppetserver')
| -rw-r--r-- | app-admin/puppetserver/Manifest | 2 | ||||
| -rw-r--r-- | app-admin/puppetserver/puppetserver-6.1.0.ebuild (renamed from app-admin/puppetserver/puppetserver-5.3.4.ebuild) | 23 |
2 files changed, 14 insertions, 11 deletions
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index 792ffd898f1f..898d58f835ff 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,3 +1,3 @@ -DIST puppetserver-5.3.4.tar.gz 67238476 BLAKE2B a92bdf77ffefc7c65c5cfd39431aa6b485bd92c617c4e32a281bfa431fbb428209b8834ef464a521e00d07f3ce0a443fe8a187f3a235c3200531533a1efa242d SHA512 edfa121d64fdbca9a8eef201fe6744e2694141deb318bec64c942bb1ebe6ea61ba1aaa15aee4f4e59913f79247b1c833c6633d3ff121eee836a83ccbaaece900 DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c DIST puppetserver-6.0.1.tar.gz 62362369 BLAKE2B 895eefe1f1d508a9a791fc30937bb778fe6d032fc0143caeafa695e73ee139cded8c6c839b90b4f168a641ab7952f4ba10a805e0a85112ca522e78df06838062 SHA512 485b24dbe74fe40c23b98693d02096052af23344a4c8d9bb5d29876cb4224ded482c5b741be1f2b8ff94d7e48041206acd4c301e9c188b3406b04b229fd51094 +DIST puppetserver-6.1.0.tar.gz 74953913 BLAKE2B 0a84e64209ad313bea375bbaa22197d0216138c3714551796df0cfe99e634ef3efb0cf5378fe0db4b329df21c57359a84f249cb7fe62d9369ec7e8702c5274a1 SHA512 b3f0f2ef86550879a2eeefaf187c5be0b9e7e9bd570e77669a3f20f8b6127aa8b04b8debb10ca66a60a1858285717bdfc27f3f31c8014de2e0af51746da2f1a8 diff --git a/app-admin/puppetserver/puppetserver-5.3.4.ebuild b/app-admin/puppetserver/puppetserver-6.1.0.ebuild index 20133466d29d..d62a1297c2c2 100644 --- a/app-admin/puppetserver/puppetserver-5.3.4.ebuild +++ b/app-admin/puppetserver/puppetserver-6.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="puppetdb" # will need the same keywords as puppet -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" RDEPEND+=" >=virtual/jdk-1.8.0 @@ -46,8 +46,6 @@ src_install() { insopts -m0644 doins ext/ezbake.manifest doins puppet-server-release.jar - doins jruby-9k.jar - doins jruby-1_7.jar insinto /etc/puppetlabs/puppetserver doins ext/config/logback.xml doins ext/config/request-logging.xml @@ -65,6 +63,7 @@ src_install() { insinto /opt/puppetlabs/server/apps/puppetserver/scripts doins install.sh insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps + doins ext/cli/ca doins ext/cli/irb doins ext/cli/foreground doins ext/cli/gem @@ -107,7 +106,8 @@ src_install() { fperms -R 775 /opt/puppetlabs/server/data/puppetserver fperms -R 700 /var/log/puppetlabs/puppetserver insinto /opt/puppetlabs/server/data - newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt + doins ext/build-scripts/jruby-gem-list.txt + doins ext/build-scripts/mri-gem-list.txt newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf } @@ -122,9 +122,12 @@ pkg_postinst() { elog elog "# install puppetserver gems" elog "cd /opt/puppetlabs/server/apps/puppetserver" - elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf" - elog "while read LINE" - elog "do" - 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}')" - elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt" + elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" + elog "while read LINE do" + 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}')" + elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" + elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" + elog "while read LINE do" + 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}')" + elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt" } |