diff options
| -rw-r--r-- | profiles/ChangeLog | 7 | ||||
| -rw-r--r-- | profiles/base/package.mask | 3 | ||||
| -rw-r--r-- | profiles/features/selinux/package.mask | 4 | ||||
| -rw-r--r-- | profiles/package.mask | 7 | ||||
| -rw-r--r-- | profiles/selinux/package.mask | 3 | ||||
| -rw-r--r-- | profiles/selinux/v2refpolicy/package.mask | 3 |
6 files changed, 16 insertions, 11 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 3bca1f305227..6a82503558a7 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,16 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5446 2011/06/15 22:03:13 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5447 2011/06/16 00:20:59 blueness Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided # here. If in doubt put a record here! + 16 Jun 2011; Anthony G. Basile <blueness@gentoo.org> base/package.mask, + features/selinux/package.mask, package.mask, selinux/package.mask, + selinux/v2refpolicy/package.mask: + Masked sec-policy/selinux-policykit for removal, bug #371441 + 15 Jun 2011; Jonathan Callen <abcd@gentoo.org> updates/2Q-2011: Add The Great KDE Slot Move: gentoo-x86 Edition diff --git a/profiles/base/package.mask b/profiles/base/package.mask index 7228bebefdea..e8c6fbfad977 100644 --- a/profiles/base/package.mask +++ b/profiles/base/package.mask @@ -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/profiles/base/package.mask,v 1.17 2011/04/16 13:21:56 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.18 2011/06/16 00:21:00 blueness Exp $ # Diego Elio Pettenò <flameeyes@gentoo.org> (8 Feb 2011) # on behalf of QA team <qa@gentoo.org @@ -151,7 +151,6 @@ sec-policy/selinux-openvpn sec-policy/selinux-pcmcia sec-policy/selinux-perdition sec-policy/selinux-podsleuth -sec-policy/selinux-policykit sec-policy/selinux-portmap sec-policy/selinux-postfix sec-policy/selinux-postgresql diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask index a8789eea938f..b3997080121a 100644 --- a/profiles/features/selinux/package.mask +++ b/profiles/features/selinux/package.mask @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.1 2011/05/17 10:46:49 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.2 2011/06/16 00:21:00 blueness Exp $ # >=sci-libs/acml-3.6 requires gcc-4.2. >=sci-libs/acml-3.6 @@ -144,7 +144,6 @@ -sec-policy/selinux-pcmcia -sec-policy/selinux-perdition -sec-policy/selinux-podsleuth --sec-policy/selinux-policykit -sec-policy/selinux-portmap -sec-policy/selinux-postfix -sec-policy/selinux-postgresql @@ -353,7 +352,6 @@ >=sec-policy/selinux-pcmcia-3 >=sec-policy/selinux-perdition-3 >=sec-policy/selinux-podsleuth-3 ->=sec-policy/selinux-policykit-3 >=sec-policy/selinux-portmap-3 >=sec-policy/selinux-postfix-3 >=sec-policy/selinux-postgresql-3 diff --git a/profiles/package.mask b/profiles/package.mask index ec9be1b52a82..d285a04e0383 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12840 2011/06/15 19:13:05 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12841 2011/06/16 00:20:59 blueness Exp $ # # When you add an entry to the top of this file, add your name, the date, and # an explanation of why something is getting masked. Please be extremely @@ -31,6 +31,11 @@ #--- END OF EXAMPLES --- +# Anthony G. Basile <blueness@gentoo.org> (15 Jun 2011) +# Masked for removal in 30 days. +# We don't have policykit in the tree anymore, bug #371441 +sec-policy/selinux-policykit + # Samuli Suominen <ssuominen@gentoo.org> (15 Jun 2011) # Retire gpixpod for bugs 221277 and 351307. Removal in 30 days. app-pda/gpixpod diff --git a/profiles/selinux/package.mask b/profiles/selinux/package.mask index 294b3e94bb6c..539cf0ee4770 100644 --- a/profiles/selinux/package.mask +++ b/profiles/selinux/package.mask @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.57 2011/04/16 13:21:57 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.58 2011/06/16 00:21:00 blueness Exp $ # >=sci-libs/acml-3.6 requires gcc-4.2. >=sci-libs/acml-3.6 @@ -144,7 +144,6 @@ -sec-policy/selinux-pcmcia -sec-policy/selinux-perdition -sec-policy/selinux-podsleuth --sec-policy/selinux-policykit -sec-policy/selinux-portmap -sec-policy/selinux-postfix -sec-policy/selinux-postgresql diff --git a/profiles/selinux/v2refpolicy/package.mask b/profiles/selinux/v2refpolicy/package.mask index 79bb507c1aac..a75b00aedbdd 100644 --- a/profiles/selinux/v2refpolicy/package.mask +++ b/profiles/selinux/v2refpolicy/package.mask @@ -1,5 +1,5 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/v2refpolicy/package.mask,v 1.8 2011/04/16 13:21:57 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/v2refpolicy/package.mask,v 1.9 2011/06/16 00:21:00 blueness Exp $ # force version 2.YYYYMMDD policy over version YYYYMMDD policy >=sec-policy/selinux-acct-3 @@ -128,7 +128,6 @@ >=sec-policy/selinux-pcmcia-3 >=sec-policy/selinux-perdition-3 >=sec-policy/selinux-podsleuth-3 ->=sec-policy/selinux-policykit-3 >=sec-policy/selinux-portmap-3 >=sec-policy/selinux-postfix-3 >=sec-policy/selinux-postgresql-3 |