commit: 52212ee76947bf04286fe0e110a5f208749ac758 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Mon May 6 17:33:49 2019 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Mon May 6 17:36:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52212ee7
app-admin/puppetserver: 6.3.0 stable amd64/x86 with cleanup Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> app-admin/puppetserver/Manifest | 2 - app-admin/puppetserver/puppetserver-5.3.7.ebuild | 130 ---------------------- app-admin/puppetserver/puppetserver-6.2.1.ebuild | 135 ----------------------- app-admin/puppetserver/puppetserver-6.3.0.ebuild | 2 +- 4 files changed, 1 insertion(+), 268 deletions(-) diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index 0fa9806d89a..e35214e3015 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,5 +1,3 @@ DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c -DIST puppetserver-5.3.7.tar.gz 53517572 BLAKE2B e423169b92a1638b0fef1ee5adbd10899917d89eeaa9b3bea689ce9d6f4d3e3b9d5c6cfdddea897014493373429ebba375c1a9d7b77284de46f5a0a5d6555dbd SHA512 8a58d89dc44aa8ebf82f06bdfc4f52c7a25ae3f1a48ca516425a57180c73618a1e850a595aa0e46d6e3a0b360ea38d3f050790304689bfa3b47bb0c1a4fad17b DIST puppetserver-5.3.8.tar.gz 53615153 BLAKE2B 82de090126c18a607089c2d260c38c4dcf28c9dd55dedde43952493ac0dd0553b718f1e96c36737514527e72fbd04a4b54eb5667123dd46d21ff7e7e6688dd08 SHA512 ac2b28bd506a92606f5458a079fe9ffcd8a7d3b091ccbfcd649f0a818d0459b57bc3f40fa599f2f6e7012ffbd4b7e95af8ac9787cda74928bd29bb59b7633ba3 -DIST puppetserver-6.2.1.tar.gz 75683557 BLAKE2B 7320d7abdc9d5c59953f41773c7f52946fe7944c5f0f4a816b599d75a324d0a49a7b59dc990df5875ed849a2e6d1aca9258b65947446f7780f700fe48ec06e74 SHA512 ad8cd8441ac76c0443f0fca14999a014c5511d930b96e9721ff9c236ffb48cb3273e0abb2e615fa3210c539173d472c4080466bc391a863c2c4fadb32d26868c DIST puppetserver-6.3.0.tar.gz 75698674 BLAKE2B 4eb88b15c936f8a66c5447e5761cc35772632420ca74de17f06453c9645f6f4d6483ec6a850810401efddf07f40710bd9563e78f5f870faaa85c0c6b2e450fa1 SHA512 a3c3e9c00e3dae274a2139a166c121d1d9b1dde8ad640e70d68433eee53a9bcf7ad8ba53d6e355ee1de93a522f8e0169eb80f52fc438ce6a76ebcd007398108b diff --git a/app-admin/puppetserver/puppetserver-5.3.7.ebuild b/app-admin/puppetserver/puppetserver-5.3.7.ebuild deleted file mode 100644 index 954d16fdc3b..00000000000 --- a/app-admin/puppetserver/puppetserver-5.3.7.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib systemd tmpfiles user - -DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." -HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"; -SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="puppetdb" -# will need the same keywords as puppet -KEYWORDS="~amd64 ~x86" - -RDEPEND+=" - >=virtual/jdk-1.8.0 - app-admin/puppet-agent[puppetdb?]" -DEPEND+="" - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" -} - -src_prepare() { - sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die - sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die - sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die - sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die - sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die - sed -i 's/var\/run/run/g' install.sh || die - default -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - insinto /opt/puppetlabs/server/apps/puppetserver - insopts -m0774 - doins ext/ezbake-functions.sh - 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 - insinto /etc/puppetlabs/puppetserver/services.d - doins ext/system-config/services.d/bootstrap.cfg - doins ext/config/services.d/ca.cfg - insinto /etc/puppetlabs/puppetserver/conf.d - doins ext/config/conf.d/puppetserver.conf - doins ext/config/conf.d/auth.conf - doins ext/config/conf.d/global.conf - doins ext/config/conf.d/web-routes.conf - doins ext/config/conf.d/metrics.conf - doins ext/config/conf.d/webserver.conf - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetserver/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps - doins ext/cli/irb - doins ext/cli/foreground - doins ext/cli/gem - doins ext/cli/ruby - doins ext/cli/reload - doins ext/cli/start - doins ext/cli/stop - insinto /opt/puppetlabs/server/apps/puppetserver/cli - doins ext/cli_defaults/cli-defaults.sh - insinto /opt/puppetlabs/server/apps/puppetserver/bin - doins ext/bin/puppetserver - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver - dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver - dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d - # other sys stuff - dodir /etc/puppetlabs/code - # needed for systemd - dodir /var/log/puppetlabs/puppetserver - dodir /etc/puppetlabs/puppet/ssl - fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl - fperms -R 771 /etc/puppetlabs/puppet/ssl - # systemd type things - insinto /etc/systemd/system/puppetserver.service.d/ - systemd_dounit ext/redhat/puppetserver.service - insinto /etc/default - newins ext/default puppetserver - # normal init type tasks - dosym ../default/puppetserver /etc/conf.d/puppetserver - newinitd "${FILESDIR}/puppetserver.init" puppetserver - # misc - insinto /etc/logrotate.d - newins ext/puppetserver.logrotate.conf puppetserver - # cleanup - dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems - fowners -R puppet:puppet /opt/puppetlabs/server/data - 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 -} - -pkg_postinst() { - elog "to install you may want to run the following:" - elog - elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" - elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" - elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" - elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" - elog "puppet config set --section master codedir /etc/puppetlabs/code" - 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" -} diff --git a/app-admin/puppetserver/puppetserver-6.2.1.ebuild b/app-admin/puppetserver/puppetserver-6.2.1.ebuild deleted file mode 100644 index 39165a39524..00000000000 --- a/app-admin/puppetserver/puppetserver-6.2.1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib systemd user - -DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." -HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"; -SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="puppetdb" -# will need the same keywords as puppet -KEYWORDS="amd64 x86" - -RDEPEND+=" - >=virtual/jdk-1.8.0 - app-admin/puppet-agent[puppetdb?]" -DEPEND+="" - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" -} - -src_prepare() { - sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die - sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die - sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die - sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die - sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die - sed -i 's/var\/run/run/g' install.sh || die - default -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - insinto /opt/puppetlabs/server/apps/puppetserver - insopts -m0774 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppet-server-release.jar - insinto /etc/puppetlabs/puppetserver - doins ext/config/logback.xml - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetserver/services.d - doins ext/system-config/services.d/bootstrap.cfg - doins ext/config/services.d/ca.cfg - insinto /etc/puppetlabs/puppetserver/conf.d - doins ext/config/conf.d/puppetserver.conf - doins ext/config/conf.d/auth.conf - doins ext/config/conf.d/global.conf - doins ext/config/conf.d/web-routes.conf - doins ext/config/conf.d/metrics.conf - doins ext/config/conf.d/webserver.conf - insopts -m0755 - 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 - doins ext/cli/ruby - doins ext/cli/reload - doins ext/cli/start - doins ext/cli/stop - insinto /opt/puppetlabs/server/apps/puppetserver/cli - doins ext/cli_defaults/cli-defaults.sh - insinto /opt/puppetlabs/server/apps/puppetserver/bin - doins ext/bin/puppetserver - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver - dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver - dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d - # other sys stuff - dodir /etc/puppetlabs/code - # needed for systemd - dodir /var/log/puppetlabs/puppetserver - dodir /etc/puppetlabs/puppet/ssl - fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl - fperms -R 771 /etc/puppetlabs/puppet/ssl - # systemd type things - insinto /etc/systemd/system/puppetserver.service.d/ - systemd_dounit ext/redhat/puppetserver.service - insinto /etc/default - newins ext/default puppetserver - # normal init type tasks - dosym ../default/puppetserver /etc/conf.d/puppetserver - newinitd "${FILESDIR}/puppetserver.init" puppetserver - # misc - insinto /etc/logrotate.d - newins ext/puppetserver.logrotate.conf puppetserver - # cleanup - dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems - fowners -R puppet:puppet /opt/puppetlabs/server/data - fperms -R 775 /opt/puppetlabs/server/data/puppetserver - fperms -R 700 /var/log/puppetlabs/puppetserver - insinto /opt/puppetlabs/server/data - doins ext/build-scripts/jruby-gem-list.txt - doins ext/build-scripts/mri-gem-list.txt - insopts -m 0644 - insinto /usr/lib/tmpfiles.d - newins ext/puppetserver.tmpfiles.conf puppetserver.conf -} - -pkg_postinst() { - elog "to install you may want to run the following:" - elog - elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" - elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" - elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" - elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" - elog "puppet config set --section master codedir /etc/puppetlabs/code" - 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 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" -} diff --git a/app-admin/puppetserver/puppetserver-6.3.0.ebuild b/app-admin/puppetserver/puppetserver-6.3.0.ebuild index 04fc3966a1c..39165a39524 100644 --- a/app-admin/puppetserver/puppetserver-6.3.0.ebuild +++ b/app-admin/puppetserver/puppetserver-6.3.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
