summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2015-08-08 05:02:56 +0000
committerMatthew Thode <prometheanfire@gentoo.org>2015-08-08 05:02:56 +0000
commitfdb5d05b27639ec9cbfd1379177b69e062771e9c (patch)
treee040a057dd951d5069d93e03100df1b3b4038810 /app-admin
parentVersion bump for 5.5 series; Drop old 5.5s (diff)
downloadgentoo-2-fdb5d05b27639ec9cbfd1379177b69e062771e9c.tar.gz
gentoo-2-fdb5d05b27639ec9cbfd1379177b69e062771e9c.tar.bz2
gentoo-2-fdb5d05b27639ec9cbfd1379177b69e062771e9c.zip
block augeas as well bug 556936
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/puppet-agent/ChangeLog6
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild31
2 files changed, 21 insertions, 16 deletions
diff --git a/app-admin/puppet-agent/ChangeLog b/app-admin/puppet-agent/ChangeLog
index 695d965822bf..586b8b85bb47 100644
--- a/app-admin/puppet-agent/ChangeLog
+++ b/app-admin/puppet-agent/ChangeLog
@@ -1,6 +1,10 @@
# 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.11 2015/07/29 22:15:01 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/ChangeLog,v 1.12 2015/08/08 05:02:56 prometheanfire Exp $
+
+ 08 Aug 2015; Matthew Thode <prometheanfire@gentoo.org>
+ puppet-agent-1.2.2-r2.ebuild:
+ block augeas as well bug 556936
29 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
puppet-agent-1.2.2-r2.ebuild:
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild
index 0374f3c4f324..ebb64e63c992 100644
--- a/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild
@@ -1,6 +1,6 @@
# 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-r2.ebuild,v 1.2 2015/07/29 22:15:01 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild,v 1.3 2015/08/08 05:02:56 prometheanfire Exp $
EAPI=5
inherit eutils systemd unpacker
@@ -9,8 +9,8 @@ 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 )
+ amd64? ( ${SRC_BASE}_amd64.deb )
+ x86? ( ${SRC_BASE}_i386.deb )
"
LICENSE="Apache-2.0"
@@ -19,21 +19,22 @@ KEYWORDS="~amd64 ~x86"
IUSE="puppetdb selinux"
RESTRICT="strip"
-CDEPEND="!app-admin/puppet
- !app-admin/mcollective
- !dev-ruby/hiera
- !dev-ruby/facter
- !app-emulation/virt-what"
+CDEPEND="!app-admin/augeas
+ !app-admin/mcollective
+ !app-admin/puppet
+ !dev-ruby/hiera
+ !dev-ruby/facter
+ !app-emulation/virt-what"
DEPEND="
- ${CDEPEND}"
+ ${CDEPEND}"
RDEPEND="${CDEPEND}
- sys-apps/dmidecode
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
+ sys-apps/dmidecode
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
S=${WORKDIR}