diff options
| -rw-r--r-- | profiles/base/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index 1c9f45e6ad58..cb3e6acfd0c5 100644 --- a/profiles/base/ChangeLog +++ b/profiles/base/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo base-profile # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.281 2011/07/03 23:34:00 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.282 2011/07/11 04:36:14 robbat2 Exp $ + + 11 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> package.use.mask: + Mask parse-clocks for ntp due to pps-tools. 03 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> package.use.mask: Mask maui use flag for torque diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 733d8910a3f7..e7cb2854eb8f 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,10 +1,13 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.250 2011/07/03 23:34:00 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.251 2011/07/11 04:36:14 robbat2 Exp $ # This file requires >=portage-2.1.1 # New entries go on top. +# PPS should work on all arches, but only keyworded on amd64/x86 +>=net-misc/ntp-4.2.6_p3-r1 parse-clocks + # Alexey Shvetsov <alexxy@gentoo.org> (4 Jul 2011) # Mask maui use flag for torque sys-cluster/torque maui |