From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B0892138334 for ; Thu, 20 Sep 2018 18:28:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85A3BE088D; Thu, 20 Sep 2018 18:28:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 26343E088D for ; Thu, 20 Sep 2018 18:28:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 10D5D335CD6 for ; Thu, 20 Sep 2018 18:28:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D023838A for ; Thu, 20 Sep 2018 18:28:23 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1537468092.d2b3a2ae8c35b0ab6a01bb1924305bc5ebc7793c.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppetserver/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild app-admin/puppetserver/puppetserver-6.0.0.ebuild X-VCS-Directories: app-admin/puppetserver/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: d2b3a2ae8c35b0ab6a01bb1924305bc5ebc7793c X-VCS-Branch: master Date: Thu, 20 Sep 2018 18:28:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f9fd894c-f54d-4b96-b770-c8aa3d01da49 X-Archives-Hash: ef55e2d1c5c98643c39e29166c8f705c commit: d2b3a2ae8c35b0ab6a01bb1924305bc5ebc7793c Author: Matthew Thode gentoo org> AuthorDate: Thu Sep 20 18:26:10 2018 +0000 Commit: Matt Thode gentoo org> CommitDate: Thu Sep 20 18:28:12 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b3a2ae app-admin/puppetserver: 6 has ca command now Package-Manager: Portage-2.3.49, Repoman-2.3.10 ...server-6.0.0.ebuild => puppetserver-6.0.0-r1.ebuild} | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app-admin/puppetserver/puppetserver-6.0.0.ebuild b/app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild similarity index 82% rename from app-admin/puppetserver/puppetserver-6.0.0.ebuild rename to app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild index 29682ee956d..b4f7bc872f4 100644 --- a/app-admin/puppetserver/puppetserver-6.0.0.ebuild +++ b/app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild @@ -63,6 +63,7 @@ src_install() { 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 @@ -105,7 +106,8 @@ src_install() { 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 + doins ext/build-scripts/jruby-gem-list.txt + doins ext/build-scripts/mri-gem-list.txt newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf } @@ -120,9 +122,12 @@ pkg_postinst() { 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" + 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" }