summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2012-07-04 20:06:49 +0000
committerSven Vermeulen <swift@gentoo.org>2012-07-04 20:06:49 +0000
commit8ae7b184a6e927767979c4ed3932c6519d8858bd (patch)
treeb396f7f49231d03e5778e6d9a3a3991178d5a3de /app-admin/puppet
parentFixed license (diff)
downloadgentoo-2-8ae7b184a6e927767979c4ed3932c6519d8858bd.tar.gz
gentoo-2-8ae7b184a6e927767979c4ed3932c6519d8858bd.tar.bz2
gentoo-2-8ae7b184a6e927767979c4ed3932c6519d8858bd.zip
Fix bug #424771 - Add dependency on selinux-puppet when USE=selinux is set
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/puppet')
-rw-r--r--app-admin/puppet/ChangeLog6
-rw-r--r--app-admin/puppet/puppet-2.7.11.ebuild10
-rw-r--r--app-admin/puppet/puppet-2.7.12.ebuild10
-rw-r--r--app-admin/puppet/puppet-2.7.13.ebuild10
4 files changed, 26 insertions, 10 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 972569676923..bb330e0d9922 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.113 2012/05/31 02:36:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.114 2012/07/04 20:06:49 swift Exp $
+
+ 04 Jul 2012; <swift@gentoo.org> puppet-2.7.11.ebuild, puppet-2.7.12.ebuild,
+ puppet-2.7.13.ebuild:
+ Add USE=selinux triggered dependency on selinux-puppet, fix bug #424771
31 May 2012; Zac Medico <zmedico@gentoo.org> puppet-2.7.11.ebuild,
puppet-2.7.12.ebuild, puppet-2.7.13.ebuild:
diff --git a/app-admin/puppet/puppet-2.7.11.ebuild b/app-admin/puppet/puppet-2.7.11.ebuild
index ccfde87ecefa..f520f38d11d9 100644
--- a/app-admin/puppet/puppet-2.7.11.ebuild
+++ b/app-admin/puppet/puppet-2.7.11.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-2.7.11.ebuild,v 1.7 2012/05/31 02:36:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.11.ebuild,v 1.8 2012/07/04 20:06:49 swift Exp $
EAPI="4"
# ruby19: dev-ruby/ruby-ldap has no ruby19
@@ -40,12 +40,16 @@ ruby_add_rdepend "
DEPEND="${DEPEND}
emacs? ( virtual/emacs )
- xemacs? ( app-editors/xemacs )"
+ xemacs? ( app-editors/xemacs )
+ selinux? ( sec-policy/selinux-puppet )"
RDEPEND="${RDEPEND}
emacs? ( virtual/emacs )
xemacs? ( app-editors/xemacs )
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
- selinux? ( sys-libs/libselinux[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
>=app-portage/eix-0.18.0"
SITEFILE="50${PN}-mode-gentoo.el"
diff --git a/app-admin/puppet/puppet-2.7.12.ebuild b/app-admin/puppet/puppet-2.7.12.ebuild
index fdf03ba66a59..f8ac99870e70 100644
--- a/app-admin/puppet/puppet-2.7.12.ebuild
+++ b/app-admin/puppet/puppet-2.7.12.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-2.7.12.ebuild,v 1.3 2012/05/31 02:36:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.12.ebuild,v 1.4 2012/07/04 20:06:49 swift Exp $
EAPI="4"
# ruby19: dev-ruby/ruby-ldap has no ruby19
@@ -40,12 +40,16 @@ ruby_add_rdepend "
DEPEND="${DEPEND}
emacs? ( virtual/emacs )
- xemacs? ( app-editors/xemacs )"
+ xemacs? ( app-editors/xemacs )
+ selinux? ( sec-policy/selinux-puppet )"
RDEPEND="${RDEPEND}
emacs? ( virtual/emacs )
xemacs? ( app-editors/xemacs )
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
- selinux? ( sys-libs/libselinux[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
>=app-portage/eix-0.18.0"
SITEFILE="50${PN}-mode-gentoo.el"
diff --git a/app-admin/puppet/puppet-2.7.13.ebuild b/app-admin/puppet/puppet-2.7.13.ebuild
index 7c2a60be1d10..579c9ec67343 100644
--- a/app-admin/puppet/puppet-2.7.13.ebuild
+++ b/app-admin/puppet/puppet-2.7.13.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-2.7.13.ebuild,v 1.9 2012/05/31 02:36:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.13.ebuild,v 1.10 2012/07/04 20:06:49 swift Exp $
EAPI="4"
# ruby19: dev-ruby/ruby-ldap has no ruby19
@@ -41,12 +41,16 @@ ruby_add_rdepend "
DEPEND="${DEPEND}
emacs? ( virtual/emacs )
- xemacs? ( app-editors/xemacs )"
+ xemacs? ( app-editors/xemacs )
+ selinux? ( sec-policy/selinux-puppet )"
RDEPEND="${RDEPEND}
emacs? ( virtual/emacs )
xemacs? ( app-editors/xemacs )
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
- selinux? ( sys-libs/libselinux[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
>=app-portage/eix-0.18.0"
SITEFILE="50${PN}-mode-gentoo.el"