gentoo resync 31.01.2019

2 files changed, 137 insertions, 0 deletions

diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index b6b72e1be042..63429448da96 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,7 +2,9 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 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-6.1.0.tar.gz 74953913 BLAKE2B 0a84e64209ad313bea375bbaa22197d0216138c3714551796df0cfe99e634ef3efb0cf5378fe0db4b329df21c57359a84f249cb7fe62d9369ec7e8702c5274a1 SHA512 b3f0f2ef86550879a2eeefaf187c5be0b9e7e9bd570e77669a3f20f8b6127aa8b04b8debb10ca66a60a1858285717bdfc27f3f31c8014de2e0af51746da2f1a8
+DIST puppetserver-6.2.0.tar.gz 75582622 BLAKE2B 09c651c89e7440f3c79db8ddc98fef3844a80424291cb80cd031a7a9e26faf02b5d42d4ac1ccc6c88afa062f2a23ff393c0868f0fd0af19c7061af7a811c8b3c SHA512 865b605deeb5064e51a1414f735a034cf7a0694cf74fa7d657c5da6c3da2a3b6159f251f2a71a2f956a7abfe5bb0fb6a33fe3ff43c7c9b4e743100d2edd63ed3
 EBUILD puppetserver-5.3.5-r1.ebuild 4894 BLAKE2B 23e8e5a9b5d544c5107e8c56b5fffe727a06883dfcd13cf55f519e70a77798424a217970c4c38c1c703466a2ac16fe0032b9ccb7e377db5c40bdebba238caa53 SHA512 f43549918d1bfe8a9ffd444bd9816e91cde25b4939432949f28e4be5bf7081175bf524cbb66e9c9aa177b9da1844cb58155b1340b301c282a721db036cb83443
 EBUILD puppetserver-5.3.7.ebuild 4893 BLAKE2B 802069d0b2e2f414ed43eade2f993c708c9769ea25bbfeb7a49ed40e6690039a10f3014f07292b3a95eb42b05597aaea385e386d986fefac2b42eb3de6b7f4c5 SHA512 77a1f8e429a109e1347e47ba13198b7bcea17ec6564e84d1bbd4bafe1652b74507b3086d0ccd47da4fa04dbbaa177c67d2a8a0fc1043938948a4b50598c74339
 EBUILD puppetserver-6.1.0.ebuild 5322 BLAKE2B 87f32494b7697944dd5b03e55c5c5bdbb32b67cd718fcdbf19066e8bb3d1ff65e5f05c1bb1a068347be4d99f4a345a437fd4c1af169d7a8f632cd9495f26c6e9 SHA512 f18c43fc1aaa91de048fe1f810e1656ecc0c6b5ac0323e355b1aca2294168df6ddea2a9cb5e317564ece2bf2cb9529ac220d5c377ff0926051117142b1ffffd5
+EBUILD puppetserver-6.2.0.ebuild 5356 BLAKE2B 4ef4f776eaebfc8e127a2233321fd5377e103be0454cab7752be03c69f835f4dc80c87c9a51cfb6c2f229ddfbd034ab284bf8b362c0fe5ee4e1cdc7038ca512c SHA512 0c5c622cebbea427f97b8feb82b615c17d730747de09448aae1d083e078e428f3a97723664bda0c1abcc0b83a43f3270903ce028ffa85327042c7949bea31c6f
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.2.0.ebuild b/app-admin/puppetserver/puppetserver-6.2.0.ebuild
new file mode 100644
index 000000000000..04fc3966a1c0
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-6.2.0.ebuild
@@ -0,0 +1,135 @@
+# 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"
+}