Gentoo Archives: gentoo-commits

From: "Matt Thode (prometheanfire)" <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/puppet-agent: puppet-agent-1.2.2-r1.ebuild ChangeLog puppet-agent-1.2.1.ebuild puppet-agent-1.2.2.ebuild
Date: Tue, 28 Jul 2015 21:42:15
Message-Id: 20150728214209.8BFCFC1@oystercatcher.gentoo.org
1 prometheanfire 15/07/28 21:42:09
2
3 Modified: ChangeLog
4 Added: puppet-agent-1.2.2-r1.ebuild
5 Removed: puppet-agent-1.2.1.ebuild puppet-agent-1.2.2.ebuild
6 Log:
7 updating the conflicts to be runtime as well bug 556110
8
9 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
10
11 Revision Changes Path
12 1.8 app-admin/puppet-agent/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet-agent/ChangeLog?rev=1.8&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet-agent/ChangeLog?rev=1.8&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet-agent/ChangeLog?r1=1.7&r2=1.8
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/ChangeLog,v
21 retrieving revision 1.7
22 retrieving revision 1.8
23 diff -u -r1.7 -r1.8
24 --- ChangeLog 23 Jul 2015 22:53:12 -0000 1.7
25 +++ ChangeLog 28 Jul 2015 21:42:09 -0000 1.8
26 @@ -1,6 +1,13 @@
27 # ChangeLog for app-admin/puppet-agent
28 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/ChangeLog,v 1.7 2015/07/23 22:53:12 prometheanfire Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/ChangeLog,v 1.8 2015/07/28 21:42:09 prometheanfire Exp $
31 +
32 +*puppet-agent-1.2.2-r1 (28 Jul 2015)
33 +
34 + 28 Jul 2015; Matthew Thode <prometheanfire@g.o>
35 + +puppet-agent-1.2.2-r1.ebuild, -puppet-agent-1.2.1.ebuild,
36 + -puppet-agent-1.2.2.ebuild:
37 + updating the conflicts to be runtime as well bug 556110
38
39 *puppet-agent-1.2.2 (23 Jul 2015)
40
41
42
43
44 1.1 app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild
45
46 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
47 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
48
49 Index: puppet-agent-1.2.2-r1.ebuild
50 ===================================================================
51 # Copyright 1999-2015 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $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 $
54
55 EAPI=5
56 inherit eutils systemd unpacker
57
58 DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
59 HOMEPAGE="https://puppetlabs.com/"
60 SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
61 SRC_URI="
62 amd64? ( ${SRC_BASE}_amd64.deb )
63 x86? ( ${SRC_BASE}_i386.deb )
64 "
65
66 LICENSE="Apache-2.0"
67 SLOT="0"
68 KEYWORDS="~amd64 ~x86"
69 IUSE="puppetdb"
70 RESTRICT="strip"
71
72 CDEPEND="!app-admin/puppet
73 !app-admin/mcollective
74 !dev-ruby/hiera
75 !dev-ruby/facter"
76
77 DEPEND="
78 ${DEPEND}
79 ${CDEPEND}"
80 RDEPEND="${CDEPEND}
81 puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
82
83 S=${WORKDIR}
84
85 src_install() {
86 # conf.d
87 doconfd etc/default/puppet
88 doconfd etc/default/mcollective
89 # logrotate.d
90 insinto /etc/logrotate.d
91 doins etc/logrotate.d/mcollective
92 # puppet itself
93 insinto /etc/puppetlabs
94 doins -r etc/puppetlabs/*
95 # logdir for systemd
96 dodir var/log/puppetlabs/puppet/
97 fperms 0750 var/log/puppetlabs/puppet/
98 # the rest
99 insinto /opt
100 doins -r opt/*
101 fperms 0750 /opt/puppetlabs/puppet/cache
102 # init
103 newinitd "${FILESDIR}/puppet.initd" puppet
104 newinitd "${FILESDIR}/mcollective.initd" mcollective
105 systemd_dounit "${FILESDIR}/puppet.service"
106 systemd_dounit "${FILESDIR}/mcollective.service"
107 systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
108 # symlinks
109 chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
110 dosym /opt/puppetlabs/bin/facter /usr/bin/facter
111 dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
112 dosym /opt/puppetlabs/bin/mco /usr/bin/mco
113 dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
114 dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
115 }