From 81a1ca443329c8b99f5d3d2ea9f77c0f5948f8fe Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 9 Aug 2011 03:02:23 +0000 Subject: [PATCH] Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and future versions of sys-apps/portage. --- profiles/ChangeLog | 12 +++++++++++- profiles/arch/m68k/package.mask | 5 +++-- profiles/arch/m68k/packages | 5 ++--- profiles/arch/s390/package.mask | 5 +++++ profiles/arch/s390/packages | 1 - profiles/default/linux/m68k/10.0/package.mask | 6 ++++++ profiles/default/linux/m68k/10.0/packages | 6 ------ profiles/default/linux/m68k/2008.0/package.mask | 6 ++++++ profiles/default/linux/m68k/2008.0/packages | 6 ------ profiles/releases/10.0/package.mask | 6 ++++++ profiles/releases/10.0/packages | 6 ++---- profiles/releases/2008.0/package.mask | 6 ++++++ profiles/releases/2008.0/packages | 6 ++---- 13 files changed, 49 insertions(+), 27 deletions(-) create mode 100644 profiles/arch/s390/package.mask create mode 100644 profiles/default/linux/m68k/10.0/package.mask delete mode 100644 profiles/default/linux/m68k/10.0/packages create mode 100644 profiles/default/linux/m68k/2008.0/package.mask delete mode 100644 profiles/default/linux/m68k/2008.0/packages create mode 100644 profiles/releases/10.0/package.mask create mode 100644 profiles/releases/2008.0/package.mask diff --git a/profiles/ChangeLog b/profiles/ChangeLog index d086a2fa1029..5ea7fd81f461 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,21 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5605 2011/08/09 02:18:12 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5606 2011/08/09 03:02:21 zmedico 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! + 09 Aug 2011; Zac Medico +arch/s390/package.mask, + +default/linux/m68k/10.0/package.mask, + +default/linux/m68k/2008.0/package.mask, +releases/10.0/package.mask, + +releases/2008.0/package.mask, -default/linux/m68k/10.0/packages, + -default/linux/m68k/2008.0/packages, arch/m68k/package.mask, + arch/m68k/packages, arch/s390/packages, releases/10.0/packages, + releases/2008.0/packages: + Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and + future versions of sys-apps/portage. + 09 Aug 2011; Zac Medico +uclibc/arm/2.4/package.mask, +uclibc/arm/armeb/2.4/package.mask, +uclibc/ppc/2.4/package.mask, +uclibc/ppc/hardened/2.4/package.mask, +uclibc/sh/2.4/package.mask, diff --git a/profiles/arch/m68k/package.mask b/profiles/arch/m68k/package.mask index e505f7145f6e..ea0b87912b72 100644 --- a/profiles/arch/m68k/package.mask +++ b/profiles/arch/m68k/package.mask @@ -1,7 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/m68k/package.mask,v 1.2 2009/07/31 09:01:29 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/m68k/package.mask,v 1.3 2011/08/09 03:02:22 zmedico Exp $ # We currently have the required glibc masked sys-apps/openrc >=sys-apps/baselayout-2 +-=sys-devel/binutils-2.18-r1 diff --git a/profiles/arch/s390/package.mask b/profiles/arch/s390/package.mask new file mode 100644 index 000000000000..935b5638da8b --- /dev/null +++ b/profiles/arch/s390/package.mask @@ -0,0 +1,5 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/package.mask,v 1.6 2011/08/09 03:02:22 zmedico Exp $ + +-=sys-devel/binutils-2.18-r1 -*sys-apps/hdparm diff --git a/profiles/default/linux/m68k/10.0/package.mask b/profiles/default/linux/m68k/10.0/package.mask new file mode 100644 index 000000000000..d3ceca0ad247 --- /dev/null +++ b/profiles/default/linux/m68k/10.0/package.mask @@ -0,0 +1,6 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/m68k/10.0/package.mask,v 1.1 2011/08/09 03:02:22 zmedico Exp $ + +# revert mask from releases/2008.0/package.mask +-=sys-libs/glibc-2.4-r4 diff --git a/profiles/default/linux/m68k/2008.0/package.mask b/profiles/default/linux/m68k/2008.0/package.mask new file mode 100644 index 000000000000..492dd4cd68b9 --- /dev/null +++ b/profiles/default/linux/m68k/2008.0/package.mask @@ -0,0 +1,6 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/m68k/2008.0/package.mask,v 1.1 2011/08/09 03:02:23 zmedico Exp $ + +# revert mask from releases/2008.0/package.mask +-=sys-libs/glibc-2.4-r4 diff --git a/profiles/releases/10.0/package.mask b/profiles/releases/10.0/package.mask new file mode 100644 index 000000000000..fc4a2957ac46 --- /dev/null +++ b/profiles/releases/10.0/package.mask @@ -0,0 +1,6 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/releases/10.0/package.mask,v 1.1 2011/08/09 03:02:23 zmedico Exp $ + +=sys-apps/baselayout-1.12.10-r5 ->=sys-devel/binutils-2.18-r1 ->=sys-libs/glibc-2.4-r4 >=sys-apps/portage-2.1.6.8 diff --git a/profiles/releases/2008.0/package.mask b/profiles/releases/2008.0/package.mask new file mode 100644 index 000000000000..b23e6bf16cf3 --- /dev/null +++ b/profiles/releases/2008.0/package.mask @@ -0,0 +1,6 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/releases/2008.0/package.mask,v 1.5 2011/08/09 03:02:23 zmedico Exp $ + +=sys-apps/baselayout-1.12.10-r5 ->=sys-devel/binutils-2.18-r1 ->=sys-libs/glibc-2.4-r4 >=sys-apps/portage-2.1.4.4 -- 2.26.2