diff options
| author |   Sven Vermeulen <swift@gentoo.org> | 2011-11-12 16:17:13 +0000 |
|---|---|---|
| committer | Sven Vermeulen <swift@gentoo.org> | 2011-11-12 16:17:13 +0000 |
| commit | 88cacde932ff450a39cebd113a32978d1365bf54 (patch) | |
| tree | 112bf9fb1a5aa36ffb961a525ed6c18fb289fc6b /sec-policy | |
| parent | Use the metadata.xml upstream doc element to reference the 'Working with Port... (diff) | |
| download | historical-88cacde932ff450a39cebd113a32978d1365bf54.tar.gz historical-88cacde932ff450a39cebd113a32978d1365bf54.tar.bz2 historical-88cacde932ff450a39cebd113a32978d1365bf54.zip | |
Add minor block on selinux-gnupg to ensure that collisions do not occur
Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
Diffstat (limited to 'sec-policy')
| -rw-r--r-- | sec-policy/selinux-gpg/ChangeLog | 6 | ||||
| -rw-r--r-- | sec-policy/selinux-gpg/Manifest | 6 | ||||
| -rw-r--r-- | sec-policy/selinux-gpg/selinux-gpg-2.20110726-r1.ebuild | 4 | ||||
| -rw-r--r-- | sec-policy/selinux-gpg/selinux-gpg-2.20110726-r2.ebuild | 4 |
4 files changed, 14 insertions, 6 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/Manifest b/sec-policy/selinux-gpg/Manifest index 525e75ec629d..a4214ebc7188 100644 --- a/sec-policy/selinux-gpg/Manifest +++ b/sec-policy/selinux-gpg/Manifest @@ -5,7 +5,7 @@ DIST patchbundle-selinux-base-policy-2.20110726-r4.tar.bz2 22344 RMD160 b4ecb26f DIST refpolicy-2.20101213.tar.bz2 559450 RMD160 4858f792f4db5b179de6fb8419a626c29d59bdd3 SHA1 0e881e99b8950a358eadc44633551ca10f12eaee SHA256 b691ee8f6066cc19bb0d4384fe3be277d97d22e9d4ac2db0c252065e8c3535de DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb EBUILD selinux-gpg-2.20101213-r2.ebuild 539 RMD160 beac6b68a9f5ac1adfd382f16a89b28e0b988034 SHA1 fcda5ac90485881fb8766fd9ba839cef17f1b377 SHA256 f4c0e796255647baf47001532a2fcc651e8b7a71e2299298b92ceee0423662ec -EBUILD selinux-gpg-2.20110726-r1.ebuild 437 RMD160 8dcf8972e40ed5d3971c27b96618bccc5af2ad5b SHA1 165edbb9c53f3d8cce5ed51ebbbd2f207f0ab3fb SHA256 a97d9ec02ab7107b800c68bcc76520efae62792aa7e89d5893e14b2e1d73a8e0 -EBUILD selinux-gpg-2.20110726-r2.ebuild 376 RMD160 0435b70b2977a2cfb99f9aae94d7e83649f6bdaf SHA1 c0f63a06d6e9325221c0a8cecbc2f4016a5c7308 SHA256 26483dc7133c0fc90de84dc011ebdf03fc566d457ac171b23cf866b353e5a6d4 -MISC ChangeLog 1314 RMD160 bc3de8560da2eec2c68a26001cd1e0c17d983cd7 SHA1 ddafd002da0f259258e1fda03eb3f7dbfedd7244 SHA256 b8a377e06c2980820820b59823b2b681218c18c0eb2e720ae6d0f0ae20d91d53 +EBUILD selinux-gpg-2.20110726-r1.ebuild 523 RMD160 76373428eae4c7ffc5c0e5e32d34ace8112d9b16 SHA1 232a9c023a68f0c7701444f35cdb435fec27e4eb SHA256 cc3e450c76407ac1db4f3e178db16a3a47ca9857d24b457b7755d631e88d5b2e +EBUILD selinux-gpg-2.20110726-r2.ebuild 462 RMD160 cb73bdfdcede83de29a46326de1fb52d7293f4fe SHA1 8ecae640d245329c37022e5c9c59cb51d5b7b67f SHA256 68b0156e5fd97b382306fac64e1a51feeba47de6a464dc11b211f2138b59a03b +MISC ChangeLog 1493 RMD160 d100bfff7d2e88d97d069d2935705d65679451eb SHA1 3296fbc2912ec8e06e5270db2a707d4c8cdbec25 SHA256 f2a75c896ee977b2e94906ceaf8d828ca2aca513cbd6659d9adcbef5955b4370 MISC metadata.xml 229 RMD160 607113e566eb7e6c2a56c9080a289b1d50541c44 SHA1 977dca7e92bb80a2de6fd8e4e5dc1fc543336d87 SHA256 4b1146e64598e7b4a293418cfd78654db2596a7682765cfa06dc14e9098b76cc 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" |