summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2011-11-12 16:17:13 +0000
committerSven Vermeulen <swift@gentoo.org>2011-11-12 16:17:13 +0000
commitd214947a58e7d548c0e3bef906c8630c6fd899eb (patch)
tree04d3fb0fcd5049261d4d8c2e66b3759f63513913 /sec-policy/selinux-gpg
parentUse the metadata.xml upstream doc element to reference the 'Working with Port... (diff)
downloadgentoo-2-d214947a58e7d548c0e3bef906c8630c6fd899eb.tar.gz
gentoo-2-d214947a58e7d548c0e3bef906c8630c6fd899eb.tar.bz2
gentoo-2-d214947a58e7d548c0e3bef906c8630c6fd899eb.zip
Add minor block on selinux-gnupg to ensure that collisions do not occur
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'sec-policy/selinux-gpg')
-rw-r--r--sec-policy/selinux-gpg/ChangeLog6
-rw-r--r--sec-policy/selinux-gpg/selinux-gpg-2.20110726-r1.ebuild4
-rw-r--r--sec-policy/selinux-gpg/selinux-gpg-2.20110726-r2.ebuild4
3 files changed, 11 insertions, 3 deletions
diff --git a/sec-policy/selinux-gpg/ChangeLog b/sec-policy/selinux-gpg/ChangeLog
index 7ac925771168..3b492c71d314 100644
--- a/sec-policy/selinux-gpg/ChangeLog
+++ b/sec-policy/selinux-gpg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sec-policy/selinux-gpg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/ChangeLog,v 1.5 2011/10/23 12:42:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/ChangeLog,v 1.6 2011/11/12 16:17:13 swift Exp $
+
+ 12 Nov 2011; <swift@gentoo.org> selinux-gpg-2.20110726-r1.ebuild,
+ selinux-gpg-2.20110726-r2.ebuild:
+ Add minor block on selinux-gnupg to ensure that collisions do not occur
23 Oct 2011; <swift@gentoo.org> selinux-gpg-2.20110726-r2.ebuild:
Stabilization (tracker #384231)
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20110726-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20110726-r1.ebuild
index 3482e9d97109..c91816772ef1 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20110726-r1.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20110726-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/selinux-gpg-2.20110726-r1.ebuild,v 1.2 2011/09/09 18:38:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/selinux-gpg-2.20110726-r1.ebuild,v 1.3 2011/11/12 16:17:13 swift Exp $
EAPI="4"
IUSE=""
@@ -12,3 +12,5 @@ inherit selinux-policy-2
DESCRIPTION="SELinux policy for GnuPG"
KEYWORDS="~amd64 ~x86"
+RDEPEND="!<=sec-policy/selinux-gnupg-2.20101213-r1
+ >=sys-apps/policycoreutils-2.1.0"
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20110726-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20110726-r2.ebuild
index e3224e80038a..7d1dbf9c8ff9 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20110726-r2.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20110726-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/selinux-gpg-2.20110726-r2.ebuild,v 1.2 2011/10/23 12:42:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/selinux-gpg-2.20110726-r2.ebuild,v 1.3 2011/11/12 16:17:13 swift Exp $
EAPI="4"
IUSE=""
@@ -11,3 +11,5 @@ inherit selinux-policy-2
DESCRIPTION="SELinux policy for GnuPG"
KEYWORDS="amd64 x86"
+RDEPEND="!<=sec-policy/selinux-gnupg-2.20101213-r1
+ >=sys-apps/policycoreutils-2.1.0"