diff options
Diffstat (limited to 'app-admin/puppetserver')
-rw-r--r-- | app-admin/puppetserver/Manifest | 6 | ||||
-rw-r--r-- | app-admin/puppetserver/puppetserver-6.4.0.ebuild | 2 | ||||
-rw-r--r-- | app-admin/puppetserver/puppetserver-6.5.0.ebuild (renamed from app-admin/puppetserver/puppetserver-5.3.8.ebuild) | 29 |
3 files changed, 21 insertions, 16 deletions
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index 3b7d534cc755..9e1d0952ffa8 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,8 +1,8 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11 -DIST puppetserver-5.3.8.tar.gz 53615153 BLAKE2B 82de090126c18a607089c2d260c38c4dcf28c9dd55dedde43952493ac0dd0553b718f1e96c36737514527e72fbd04a4b54eb5667123dd46d21ff7e7e6688dd08 SHA512 ac2b28bd506a92606f5458a079fe9ffcd8a7d3b091ccbfcd649f0a818d0459b57bc3f40fa599f2f6e7012ffbd4b7e95af8ac9787cda74928bd29bb59b7633ba3 DIST puppetserver-6.3.0.tar.gz 75698674 BLAKE2B 4eb88b15c936f8a66c5447e5761cc35772632420ca74de17f06453c9645f6f4d6483ec6a850810401efddf07f40710bd9563e78f5f870faaa85c0c6b2e450fa1 SHA512 a3c3e9c00e3dae274a2139a166c121d1d9b1dde8ad640e70d68433eee53a9bcf7ad8ba53d6e355ee1de93a522f8e0169eb80f52fc438ce6a76ebcd007398108b DIST puppetserver-6.4.0.tar.gz 75721867 BLAKE2B 299d73bab6f76464fc7b2e3b5a5b63e4b0d6f11752990d2926db247dc5d6aa475f5de571640ae38f22da75505153ce0f83e7a952bd0d037f4d3d12fd37c8f269 SHA512 cc9ac9a163b1ee7488b1afb95457cea4ae9da205d4cd91dd70c8cc995fad32829b5c4d9de8baa3ca325ac235bcaee2dca78ea9cd50bc9dfe11f2837f64587a11 -EBUILD puppetserver-5.3.8.ebuild 4891 BLAKE2B 98328c3b80442b6d2d2900f1fb9064074a04687ba4bfad2c34745a448c05a4a021c50aa53646139006a457b09249d951628be4ea340b8ab0d8dc9450b7529c71 SHA512 2e94ec40dd0b3dff133bb702fb002862373901fc84350c093b98970c567d2946902b0eda72770cdaa12e6d952b840c99b02159ec09157a84a22775e5197923e1 +DIST puppetserver-6.5.0.tar.gz 76080713 BLAKE2B 0562128001a24eae6cec071a366e16ab3ce5b0babbe50330ecddd13ab3dbfd35d6cb23634770e4bd7904cd231752ce923d4af8dc42d783cc137f300efcb05fb2 SHA512 d871f3817c370ddd08e8d791deb1a30aa50ab0d801192ebfb5ef225d8dce21885175fe4e9911287437b687b2bcbf5a098d8b9511b24bd05fdf4854575a686cfe EBUILD puppetserver-6.3.0.ebuild 5354 BLAKE2B c75b4c97ebd41fadf589e7ef752291425935af7d1f1528401f7dd1b2b670cc865570b8a610f1901eba1037bdaebb2d8dd2998380e001c046bcf54fe35b02153a SHA512 613533ffbcc1925f2ff040880d82f2a20c231d66697a49d6fc5fbf5a17528d3b3d1285918b83bf8ef4b4ee729656be610bb30f0bbefa827376f57da1fbd34950 -EBUILD puppetserver-6.4.0.ebuild 5372 BLAKE2B a4a00a13309207dc0cfc8f584bab29add3a2dd21c83cc1ca165e55631002fdb645c036665f55f580c27776dd4ac67dc993749a01d9938189442020660ab70598 SHA512 cc4934c876b59eb4eed05e4bbde2c6973623236c5fe243a4b6245aff2816477cbe9f168c89dfb9530ef5a2cd1f67410c8c532e5c8b6b29426ac2c6f18b189c19 +EBUILD puppetserver-6.4.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce +EBUILD puppetserver-6.5.0.ebuild 5372 BLAKE2B a4a00a13309207dc0cfc8f584bab29add3a2dd21c83cc1ca165e55631002fdb645c036665f55f580c27776dd4ac67dc993749a01d9938189442020660ab70598 SHA512 cc4934c876b59eb4eed05e4bbde2c6973623236c5fe243a4b6245aff2816477cbe9f168c89dfb9530ef5a2cd1f67410c8c532e5c8b6b29426ac2c6f18b189c19 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c diff --git a/app-admin/puppetserver/puppetserver-6.4.0.ebuild b/app-admin/puppetserver/puppetserver-6.4.0.ebuild index e064d2554eb5..9200fa82fd3f 100644 --- a/app-admin/puppetserver/puppetserver-6.4.0.ebuild +++ b/app-admin/puppetserver/puppetserver-6.4.0.ebuild @@ -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 diff --git a/app-admin/puppetserver/puppetserver-5.3.8.ebuild b/app-admin/puppetserver/puppetserver-6.5.0.ebuild index b2fc283c15d0..e064d2554eb5 100644 --- a/app-admin/puppetserver/puppetserver-5.3.8.ebuild +++ b/app-admin/puppetserver/puppetserver-6.5.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit multilib systemd tmpfiles user +inherit multilib systemd user DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" @@ -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,8 +106,11 @@ 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/jruby-gem-list.txt puppetserver-gem-list.txt - newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf + doins ext/build-scripts/jruby-gem-list.txt + doins ext/build-scripts/mri-gem-list-no-dependencies.txt + insopts -m 0644 + insinto /usr/lib/tmpfiles.d + newins ext/puppetserver.tmpfiles.conf puppetserver.conf } pkg_postinst() { @@ -122,9 +124,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" } |