commit:     0e0ee9c934eb04c1556dcf2636d5646a94d13e02
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 06:07:31 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 06:07:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e0ee9c9

app-admin/puppetserver: cleanup

Package-Manager: portage-2.3.0

 app-admin/puppetserver/Manifest                    |   3 -
 app-admin/puppetserver/puppetserver-2.5.0.ebuild   | 110 --------------------
 app-admin/puppetserver/puppetserver-2.6.0.ebuild   | 110 --------------------
 .../puppetserver/puppetserver-2.7.0-r1.ebuild      | 114 ---------------------
 4 files changed, 337 deletions(-)

diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 5e893f0..7009227 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,6 +1,3 @@
 DIST puppetserver-2.3.2.tar.gz 33673099 SHA256 
81e92875c07f73e636143405804f1214f31f0f840d521f03289d93bd7b2a0899 SHA512 
3ab750128bd11d1e3d9815a1c9907fc81b673281ec21def56318557c134635bca0418ed445d090da6257da9dd64e65a9c2b9e82257868d5a895459c7458cc731
 WHIRLPOOL 
55b679e1eed246ad10bea4f973ca51f65b50b2bf112a6d90d8bda600a1d0e4c09abf74756851a4844cf68705d1b94b9f80f688f1523813d9fe14fbc4424d14e0
 DIST puppetserver-2.4.0.tar.gz 33822659 SHA256 
81d574f7483760bd70cafc079486fe14d243137612f0c130069d94ba7d4fded4 SHA512 
c9afab58bb2f432874d302cb63fb213ead561e2bcecc44f776be49dc09eb86deda3019eae1bddb7369bb7bdc1a3d82f47f6053d526b2b28b189358a2bdded852
 WHIRLPOOL 
079186ecd239a1be1dde847b23a5fe1bc4dedc543b510f2197cd776bc59f943166d3f403727e1cc0ac0232a8519a36944cb4e6ec6bb6bfdc0e822405c4b7fd96
-DIST puppetserver-2.5.0.tar.gz 33907947 SHA256 
d058d49133b3adba86c8b01c7ab5c1f4511c191fd50e75be583b28ddfc824cd5 SHA512 
c822d320a9ce98c6e96e4838770fc52760f08aab9fee26e62174762947b9ccb09234cb1edba0a5e17f4c08e76adccec83d8353f5aa47d08864c5bb9b2dab2574
 WHIRLPOOL 
1d2fde7aade7e9e6c5117d8d2c88d787a93d1aacdea81ad3235fdb90384d8578739a54ccfcff28e217a86bd5d29c48c4dbbea4d38d3e34c4099ecf21adc9f995
-DIST puppetserver-2.6.0.tar.gz 34157248 SHA256 
633ad9d1a4da7fa514edd7be6501aa61f779b50e7ec40aeedbc955175945f771 SHA512 
3702321a99d8e9f528e2457ceb7bff513619db31687c54884fcf9b47626b680628879b65488c3cad45fa5b3b1d0af9967e40adf1c313b7eb6e0de8c8697af659
 WHIRLPOOL 
d63c3579b4a9f6de94b44d526489509efd7b420bc6fcd4d8ba8c57a7d3d31a209a94b919143f90426a0151224c77ba694d22530cb98169dc94f0b4548d3bb2ba
-DIST puppetserver-2.7.0.tar.gz 33990965 SHA256 
36f18bdf8e05c9836459aeb5850bd33ebd5d0f63da68d7ca5907974869d3100a SHA512 
cf303df7af2ac0a26feda25820b3fae0407e2d6475fef0fd945811d9decd276fee4b301a3513634190a6fec9d63b6420088b7c192abec0123f7100baa61fdb91
 WHIRLPOOL 
b20722600d7a8a04fa459efd0c2011edd217d7198d0ef107e0e6cd04c3d4e3a906849054fa00ebf692c5bb8788f71b23f785033d826603c1e9d429ca2687e4bd
 DIST puppetserver-2.7.1.tar.gz 33989388 SHA256 
9e2ad86fedb719e824d42055383dbbbb4f66c621e21c4c285e70b5c1dbc158c0 SHA512 
91fd1ee7bf9726e3d2fca9a81227756076b1945b3ad6fd63bf5be85957cdda81601cd707af2533c53fe182fe6945ec48c75b0f7cfef5a64e81643adf633df778
 WHIRLPOOL 
3661d09f04e85db94320acf6afc842557bde66d969a7e3164edcc9f74e4f1f8a5849b7a766fcf98339d47652d6ae4cda1d766e5a09e5a54d062b27306863aa1d

diff --git a/app-admin/puppetserver/puppetserver-2.5.0.ebuild 
b/app-admin/puppetserver/puppetserver-2.5.0.ebuild
deleted file mode 100644
index 5f23401..00000000
--- a/app-admin/puppetserver/puppetserver-2.5.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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
-}
-
-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
-       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.6.0.ebuild 
b/app-admin/puppetserver/puppetserver-2.6.0.ebuild
deleted file mode 100644
index 5f23401..00000000
--- a/app-admin/puppetserver/puppetserver-2.6.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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
-}
-
-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
-       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.7.0-r1.ebuild 
b/app-admin/puppetserver/puppetserver-2.7.0-r1.ebuild
deleted file mode 100644
index 3e64b1e..00000000
--- a/app-admin/puppetserver/puppetserver-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-}

Reply via email to