summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2012-11-11 01:40:27 +0000
committerChristian Ruppert <idl0r@gentoo.org>2012-11-11 01:40:27 +0000
commite9a7ce786b5ef19b913355e5612fb0af775c312b (patch)
tree665f40dbc40fe0c8b0b001c6b111f1d0efe46df6 /app-admin
parentadd patch to fix building against AGP-less kernel, bug #435322. (diff)
downloadgentoo-2-e9a7ce786b5ef19b913355e5612fb0af775c312b.tar.gz
gentoo-2-e9a7ce786b5ef19b913355e5612fb0af775c312b.tar.bz2
gentoo-2-e9a7ce786b5ef19b913355e5612fb0af775c312b.zip
The puppetmasterd is no longer provided by puppet 3.x so there's no need to remove it any longer.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/puppet/ChangeLog6
-rw-r--r--app-admin/puppet/puppet-3.0.1.ebuild3
2 files changed, 6 insertions, 3 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 7215ebdb9e2b..801b82c07957 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/puppet
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.131 2012/11/07 21:33:31 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.132 2012/11/11 01:40:27 idl0r Exp $
+
+ 11 Nov 2012; Christian Ruppert <idl0r@gentoo.org> puppet-3.0.1.ebuild:
+ The puppetmasterd is no longer provided by puppet 3.x so there's no need to
+ remove it any longer.
07 Nov 2012; Christian Ruppert <idl0r@gentoo.org> puppet-3.0.1.ebuild:
Update deps according to
diff --git a/app-admin/puppet/puppet-3.0.1.ebuild b/app-admin/puppet/puppet-3.0.1.ebuild
index 9050ce4bfc35..564e09aa6316 100644
--- a/app-admin/puppet/puppet-3.0.1.ebuild
+++ b/app-admin/puppet/puppet-3.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.0.1.ebuild,v 1.6 2012/11/07 21:33:31 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.0.1.ebuild,v 1.7 2012/11/11 01:40:27 idl0r Exp $
EAPI="4"
@@ -78,7 +78,6 @@ all_ruby_install() {
fowners -R puppet:puppet /var/log/puppet
if use minimal ; then
- rm "${ED}/usr/bin/puppetmasterd"
rm "${ED}/etc/puppet/auth.conf"
else
newinitd "${FILESDIR}"/puppetmaster.init puppetmaster