app-admin/puppetserver: 5.3.5-r1 stable amd64 and x86 with cleanup

Package-Manager: Portage-2.3.49, Repoman-2.3.10

diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 32372c5da5f28354f99e7b1e714277d78cfbfdfa..42bb69bd7825c3d556eea82b3e44f9a9f38c2bdc 100644 (file)
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,4 +1,3 @@
-DIST puppetserver-5.3.3.tar.gz 67238194 BLAKE2B 0a0b235f26ab15c8f461f6663c26531d3ae469c4467ae33caa98f70d94a02fb89eb0399405be6b1f65f65b2fe4add7a24129f367ae1ab028189d250b087d0915 SHA512 dced3a7b7b3acb8966e4eb6f35aa82c84d0bba81487fa0cffc60fa0751b5d5c633be925471145a3e21b8f74bcffaa74f02310644ecc8bf8ebef0222d967fa86a
 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.0.tar.gz 62345355 BLAKE2B 086337ef25b89699df07779676727a28f580f992b04ca8fb0d26c38121fef625798ebb064a8a19c87341fbf2c54362158b60b772b94ff6f2f77efe3acac266f9 SHA512 2ab477e381fcb853bb862065465a4a29388e94d01cda49d78d2149dd25636cf98b9f0501733028fe3c5e61c36fc8093bf0423e5df01401e1e8888c2c48f79a2d

diff --git a/app-admin/puppetserver/puppetserver-5.3.3.ebuild b/app-admin/puppetserver/puppetserver-5.3.3.ebuild
deleted file mode 100644 (file)
index 2013346..0000000
--- a/app-admin/puppetserver/puppetserver-5.3.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/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-5.3.5-r1.ebuild b/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild
index edafb5e368b404e041ce5c789a62a5bfcb05f2d2..abb2d3c69b4c09983efd842764b0757a16bbd010 100644 (file)
--- a/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.5-r1.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