commit: 959d167a4bd7a06d0b1f58c14d86e889782471ab Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Tue Feb 9 22:51:32 2021 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Tue Feb 9 22:52:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=959d167a
app-admin/puppetserver: 7.0.3 bump with 7.0.1/2 removal Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --force Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> app-admin/puppetserver/Manifest | 2 - app-admin/puppetserver/puppetserver-7.0.1.ebuild | 131 ----------------------- app-admin/puppetserver/puppetserver-7.0.2.ebuild | 131 ----------------------- app-admin/puppetserver/puppetserver-7.0.3.ebuild | 2 +- 4 files changed, 1 insertion(+), 265 deletions(-) diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index b72b6b7823f..bb69b7b167b 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,5 +1,3 @@ DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9 DIST puppetserver-6.14.0.tar.gz 61960111 BLAKE2B 760fb2114aef78f1d96d41023f43f162eccd14ee0fa50f8ce4c7954450087dc395d9a9347629a968d99193ba6964b11a2650513c229b48159df67e9f9d63f541 SHA512 5d66b57a0f3c64ff889c33ccf94077a0ab142b84ca17faffaf4b885ba4794a52afb1b227f101eced36655999ac402913363897a3823a387f3c48948d38471c43 -DIST puppetserver-7.0.1.tar.gz 62214010 BLAKE2B e0272e8dfc910f503cbd8aca8d4c689656d1356a6198766c5c82ab6658b2e7f5e956eb10022ca5336fd1bd0d655ca4c87e5c43290229cfd26c74c9943210cdef SHA512 67f3ba07d1f607eeee0f0520054711f36d0f6e59477930a6115c5f5127b9fc7e00075d6f863bfe9e9f92e4f45fe13f452c80759e3b496aebdca6fd97e50f3774 -DIST puppetserver-7.0.2.tar.gz 62359801 BLAKE2B dbfc5c2c5ba05666dda2308647d9a164c32e3f2bbf6d290e0137882ee88a1358af6dc73ddde853bc5ef0fe61121ec4eb5993809d7ce5f0e0cf9ab5b50974475a SHA512 5e880d1c267f469d5c7be70b154e7d68fd78b1b3e3f30bc7539dd000f146f70262700e877a16c4699ba0db57f244fc271fd2ff8c8d3971f8272a99eba4ae6a83 DIST puppetserver-7.0.3.tar.gz 62780509 BLAKE2B ca8762f503e69a8d22881218b1036aeaea19612a96a148999e1c32bb7a1bf53f1940051268896aed1e9c64c3552f4480bd45f2404eb6c4be7ad20b68d02ecff5 SHA512 eb849a4ee95c8f5545e0d92ed9c450ce77ffd327f7d88f320ef99245217ab0f5ecb55bafaef5a97047a5f7559e4f05d06fc4333f76ba0b6418b184e03c705733 diff --git a/app-admin/puppetserver/puppetserver-7.0.1.ebuild b/app-admin/puppetserver/puppetserver-7.0.1.ebuild deleted file mode 100644 index 4d5a6144923..00000000000 --- a/app-admin/puppetserver/puppetserver-7.0.1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib systemd - -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" - -RDEPEND+=" - >=virtual/jdk-1.8.0 - app-admin/puppet-agent[puppetdb?]" -DEPEND+="acct-user/puppet - acct-group/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 - keepdir /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-r1" 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-no-dependencies.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-document \$(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-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" - elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" -} diff --git a/app-admin/puppetserver/puppetserver-7.0.2.ebuild b/app-admin/puppetserver/puppetserver-7.0.2.ebuild deleted file mode 100644 index 0cf80aca0ef..00000000000 --- a/app-admin/puppetserver/puppetserver-7.0.2.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib systemd - -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" - -RDEPEND+=" - >=virtual/jdk-1.8.0 - app-admin/puppet-agent[puppetdb?]" -DEPEND+="acct-user/puppet - acct-group/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 - keepdir /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-r1" 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-no-dependencies.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-document \$(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-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" - elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" -} diff --git a/app-admin/puppetserver/puppetserver-7.0.3.ebuild b/app-admin/puppetserver/puppetserver-7.0.3.ebuild index 0cf80aca0ef..4d5a6144923 100644 --- a/app-admin/puppetserver/puppetserver-7.0.3.ebuild +++ b/app-admin/puppetserver/puppetserver-7.0.3.ebuild @@ -13,7 +13,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="puppetdb" # will need the same keywords as puppet -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND+=" >=virtual/jdk-1.8.0
