prometheanfire    15/07/28 21:42:09

  Modified:             ChangeLog
  Added:                puppet-agent-1.2.2-r1.ebuild
  Removed:              puppet-agent-1.2.1.ebuild puppet-agent-1.2.2.ebuild
  Log:
  updating the conflicts to be runtime as well bug 556110
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
0x33ED3FD25AFC78BA)

Revision  Changes    Path
1.8                  app-admin/puppet-agent/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet-agent/ChangeLog?rev=1.8&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet-agent/ChangeLog?rev=1.8&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet-agent/ChangeLog?r1=1.7&r2=1.8

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog   23 Jul 2015 22:53:12 -0000      1.7
+++ ChangeLog   28 Jul 2015 21:42:09 -0000      1.8
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/puppet-agent
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/ChangeLog,v 1.7 
2015/07/23 22:53:12 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/ChangeLog,v 1.8 
2015/07/28 21:42:09 prometheanfire Exp $
+
+*puppet-agent-1.2.2-r1 (28 Jul 2015)
+
+  28 Jul 2015; Matthew Thode <[email protected]>
+  +puppet-agent-1.2.2-r1.ebuild, -puppet-agent-1.2.1.ebuild,
+  -puppet-agent-1.2.2.ebuild:
+  updating the conflicts to be runtime as well bug 556110
 
 *puppet-agent-1.2.2 (23 Jul 2015)
 



1.1                  app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: puppet-agent-1.2.2-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild,v 
1.1 2015/07/28 21:42:09 prometheanfire Exp $

EAPI=5
inherit eutils systemd unpacker

DESCRIPTION="general puppet client utils along with mcollective hiera and 
facter"
HOMEPAGE="https://puppetlabs.com/";
SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy";
SRC_URI="
                amd64? ( ${SRC_BASE}_amd64.deb )
                x86?   ( ${SRC_BASE}_i386.deb )
"

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="puppetdb"
RESTRICT="strip"

CDEPEND="!app-admin/puppet
                !app-admin/mcollective
                !dev-ruby/hiera
                !dev-ruby/facter"

DEPEND="
                ${DEPEND}
                ${CDEPEND}"
RDEPEND="${CDEPEND}
                puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"

S=${WORKDIR}

src_install() {
        # conf.d
        doconfd etc/default/puppet
        doconfd etc/default/mcollective
        # logrotate.d
        insinto /etc/logrotate.d
        doins etc/logrotate.d/mcollective
        # puppet itself
        insinto /etc/puppetlabs
        doins -r etc/puppetlabs/*
        # logdir for systemd
        dodir var/log/puppetlabs/puppet/
        fperms 0750 var/log/puppetlabs/puppet/
        # the rest
        insinto /opt
        doins -r opt/*
        fperms 0750 /opt/puppetlabs/puppet/cache
        # init
        newinitd "${FILESDIR}/puppet.initd" puppet
        newinitd "${FILESDIR}/mcollective.initd" mcollective
        systemd_dounit "${FILESDIR}/puppet.service"
        systemd_dounit "${FILESDIR}/mcollective.service"
        systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" 
puppet-agent.conf
        # symlinks
        chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
        dosym /opt/puppetlabs/bin/facter /usr/bin/facter
        dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
        dosym /opt/puppetlabs/bin/mco /usr/bin/mco
        dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
        dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
}




Reply via email to