[gentoo-commits] repo/gentoo:master commit in: app-admin/puppetserver/

[Matt Thode]

commit:     981e381dc1ca00a87bb3792d1b32f34da990c583
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 22:02:07 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 22:02:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=981e381d

app-admin/puppetserver: 2.8.0 stable amd64 and x86

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-admin/puppetserver/Manifest                  |   1 -
 app-admin/puppetserver/puppetserver-2.7.1.ebuild | 113 -----------------------
 app-admin/puppetserver/puppetserver-2.8.0.ebuild |   2 +-
 3 files changed, 1 insertion(+), 115 deletions(-)

diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 251877134ba..6dbaebf32c0 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,3 +1,2 @@
-DIST puppetserver-2.7.1.tar.gz 33989388 SHA256 9e2ad86fedb719e824d42055383dbbbb4f66c621e21c4c285e70b5c1dbc158c0 SHA512 91fd1ee7bf9726e3d2fca9a81227756076b1945b3ad6fd63bf5be85957cdda81601cd707af2533c53fe182fe6945ec48c75b0f7cfef5a64e81643adf633df778 WHIRLPOOL 3661d09f04e85db94320acf6afc842557bde66d969a7e3164edcc9f74e4f1f8a5849b7a766fcf98339d47652d6ae4cda1d766e5a09e5a54d062b27306863aa1d
 DIST puppetserver-2.8.0.tar.gz 34015599 SHA256 0f6f49b149639b80c3caecaeced44c7c0cb98728da7ce12f6725b061f3152812 SHA512 7023278fe501614f1ff9650f72b9193054cb79888ce03f29932a10fa826ee07d67e96eee80a3f2c19007b8bae14008846ea850fb98544bcd39e1ada11fadd22c WHIRLPOOL 6319b7aaefd45b5c49189e15eb06575841c8ca24f3032739515f48f35efcc0ea4d3490f84b2325ff864b57e1a789263596d7f6095a4b35171d3b17a77b07ae68
 DIST puppetserver-5.0.0.tar.gz 66380485 SHA256 b1b62c31d31a69cf1912d6b785f53cbff219a98e0e7300b7f50114694b06ccbf SHA512 1dd7b332871abf12981a7ef33ee92a813275c86ca0cd72a24c3853679c3e93aaf264b76bf4108bf62c04021889e0b7ee0bb46963bd1f3df1f8e67c48e41698e8 WHIRLPOOL 89d15509f3afc96ccdae5370346c101dc48daa68dddbfc98b51151d0e706945858b4485d7358710223c43760f317b5aa6a27b247db3fa02d80077694b0ee4a9c

diff --git a/app-admin/puppetserver/puppetserver-2.7.1.ebuild b/app-admin/puppetserver/puppetserver-2.7.1.ebuild
deleted file mode 100644
index d18d2f40151..00000000000
--- a/app-admin/puppetserver/puppetserver-2.7.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.7.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/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/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/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/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
-	# 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
-	# 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
-}
-
-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"
-}

diff --git a/app-admin/puppetserver/puppetserver-2.8.0.ebuild b/app-admin/puppetserver/puppetserver-2.8.0.ebuild
index d1251d54ef7..7dfbffdcbbc 100644
--- a/app-admin/puppetserver/puppetserver-2.8.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.8.0.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.7.0