gentoo resync : 11.02.2018

2 files changed, 30 insertions, 13 deletions

diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index c7b04f7863c4..0a70ef7b2d4c 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,7 +1,7 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.initd 2021 BLAKE2B 0c01e8f60bb78f54288fc3c8db6114dc73a490bd6bf947a5655db0482e9a0cbe0bdbeff7a9409c1c4118856970ec05ff5d399e25a2394847116c1018e4ef0e32 SHA512 e219da1099bb4183f5b835b93d414a0c3181332e6e898d14cfdaa6e7347c98d23b01b98ed0995e60ab37c755c407d90ee2ad73dc7e63488c9922f62d569d89c6
-DIST puppetserver-2.8.0.tar.gz 34015599 BLAKE2B a26348947478e5b752311cb3450cf29fff4683da6f2eddc1ff8fd73d91f8432be0b542ac1de0c10ae56e8f75711a15ecbed1a125b2208386834ffa25718db7ec SHA512 7023278fe501614f1ff9650f72b9193054cb79888ce03f29932a10fa826ee07d67e96eee80a3f2c19007b8bae14008846ea850fb98544bcd39e1ada11fadd22c
 DIST puppetserver-5.1.4.tar.gz 66628031 BLAKE2B 815f0eb1508589855556ae0f82a2f595a22fd3e13a8168c7c2d8add0f7c18981bb220feee9573d29a94a06e13ac801797e6d96a9ef378c4a743889c938e4238f SHA512 4444880041e36aaee8834476dacdbd5fb166326f054b8beca55f644d1c97318bc2dd0d3d3ae8bfbc1b072e61efcde87c31e763c48a77b05c3af5f873e969d820
-EBUILD puppetserver-2.8.0.ebuild 4052 BLAKE2B 0b24a1152032c58fd51d28dd825a6f076e599872db7710232025bac0acff398fc1d47b1c3b6f815422978a36375b321c802b116674c02d21c8c79ff893ead0e4 SHA512 10fe93d4747aa1d7f3f1c4f400c63ad4a75e5dc7f5a662c0601bbd22a69b3f29ef04bd7f7fdabdf3fe74e5d2fef2429a083db598f1869648e739d8d6f99974af
+DIST puppetserver-5.1.5.tar.gz 66639947 BLAKE2B 897b340711facada214e68d6ae571e5eca1d6f966a72509fb6d862f89a9e1befa388d1766ee8332edbd8a3a61ba320888525e265b93953a3c6e2931c760c44fc SHA512 7451ae86b5bce59aad502e344bdc60fe4fb3a2351ff1737bc249051e0628bbdf5d6b5fd3e2764c15783945d4604dc7c1efbeb2fd9faedd36d870cc3669d7af53
 EBUILD puppetserver-5.1.4.ebuild 4888 BLAKE2B 530aec65438466346b7f8a3499164ebb0c8b70b4c58d583fb6e97d8a1d3d841e278dd82d2089aef15bf4a45b412ec580052d9dd10bba47271394df934422ed2c SHA512 093de3334a5fab1e58a3f3202ed4f194af1441910e0282f9c5b58055a190f74605bd49c982f72851268086775212e63cfa79442997ec94b79fd45b9a9ed76dd5
+EBUILD puppetserver-5.1.5.ebuild 4890 BLAKE2B 53593fd7c160edd1ec9d8802cdd93dcb00b050721071ab09e41c385f791a3f5a59652e6336d41ef58b0a2a63dada18cd7fa85389a3b7a662f87a7e8c7e3635c3 SHA512 8f6e778ab9e799dc7b1211b4639e32d95e1d693938446a203e1824132e3132788a5d60e884f7a3851cdeb062e3bd0de84f7e8c9ba1fb377bec682e214bffac2e
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-2.8.0.ebuild b/app-admin/puppetserver/puppetserver-5.1.5.ebuild
index 7dfbffdcbbc8..2b6f7873b99e 100644
--- a/app-admin/puppetserver/puppetserver-2.8.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib systemd user
+inherit multilib systemd tmpfiles user
 
 DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
 HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
@@ -13,10 +13,10 @@ 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.7.0
+		>=virtual/jdk-1.8.0
 		app-admin/puppet-agent[puppetdb?]"
 DEPEND+=""
 
@@ -26,9 +26,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die
+	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
@@ -46,6 +46,8 @@ 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
@@ -57,6 +59,7 @@ src_install() {
 	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
@@ -69,6 +72,8 @@ src_install() {
 	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
@@ -85,13 +90,14 @@ src_install() {
 	dodir /etc/puppetlabs/puppet/ssl
 	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
 	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# init type tasks
-	newconfd ext/default puppetserver
-	newinitd "${FILESDIR}/puppetserver.initd" puppetserver
 	# systemd type things
 	insinto /etc/systemd/system/puppetserver.service.d/
-	newins ext/default gentoo.conf
 	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
@@ -100,6 +106,9 @@ src_install() {
 	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() {
@@ -110,4 +119,12 @@ pkg_postinst() {
 	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"
 }