From 4539ca734274a7e2b24906e5c86451b6bdd0080c Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 9 Aug 2011 13:29:01 +0000 Subject: [PATCH] Remove no-nptl profiles because there is no sys-libs/glibc < 2.6 available. --- profiles/ChangeLog | 8 +++++++- profiles/features/no-nptl/package.mask | 14 -------------- profiles/features/no-nptl/packages | 5 ----- profiles/features/no-nptl/use.mask | 10 ---------- .../hardened/linux/x86/10.0/no-nptl/deprecated | 7 ------- profiles/hardened/linux/x86/10.0/no-nptl/parent | 1 - profiles/hardened/linux/x86/no-nptl/parent | 2 -- 7 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 profiles/features/no-nptl/package.mask delete mode 100644 profiles/features/no-nptl/packages delete mode 100644 profiles/features/no-nptl/use.mask delete mode 100644 profiles/hardened/linux/x86/10.0/no-nptl/deprecated delete mode 100644 profiles/hardened/linux/x86/10.0/no-nptl/parent delete mode 100644 profiles/hardened/linux/x86/no-nptl/parent diff --git a/profiles/ChangeLog b/profiles/ChangeLog index bf0591e31523..78011a01d7dd 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,17 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5611 2011/08/09 13:25:57 dagger Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5612 2011/08/09 13:29:00 ssuominen 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; Samuli Suominen + -features/no-nptl/package.mask, -features/no-nptl/packages, + -features/no-nptl/use.mask, -hardened/linux/x86/10.0/no-nptl/deprecated, + -hardened/linux/x86/10.0/no-nptl/parent, -hardened/linux/x86/no-nptl/parent: + Remove no-nptl profiles because there is no sys-libs/glibc < 2.6 available. + 09 Aug 2011; Robert Piasek package.mask: Updated package mask from RC to final for samba 3.6.0 diff --git a/profiles/features/no-nptl/package.mask b/profiles/features/no-nptl/package.mask deleted file mode 100644 index 6b93ab34b04b..000000000000 --- a/profiles/features/no-nptl/package.mask +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/no-nptl/package.mask,v 1.6 2010/04/10 15:39:13 ssuominen Exp $ - -# this requires a newer release of GNOME ->=gnome-extra/nautilus-open-terminal-0.8 ->=app-crypt/seahorse-1.0 ->=gnome-base/gnome-2.22 - -# Masking this since it requires nptl ->=sys-libs/glibc-2.6 - -# Unknown mask reason -media-sound/banshee diff --git a/profiles/features/no-nptl/packages b/profiles/features/no-nptl/packages deleted file mode 100644 index fd49c4e26641..000000000000 --- a/profiles/features/no-nptl/packages +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2001-2008 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/no-nptl/packages,v 1.1 2008/04/01 17:41:09 wolf31o2 Exp $ - -->=sys-libs/glibc-2.6.1 diff --git a/profiles/features/no-nptl/use.mask b/profiles/features/no-nptl/use.mask deleted file mode 100644 index a4ba3c2df2fd..000000000000 --- a/profiles/features/no-nptl/use.mask +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/no-nptl/use.mask,v 1.1 2008/04/01 17:41:09 wolf31o2 Exp $ - -# 2007/08/11 - Saleem Abdulrasool -# This controls the deskbar-applet functionality in tracker -applet - -nptl -nptlonly diff --git a/profiles/hardened/linux/x86/10.0/no-nptl/deprecated b/profiles/hardened/linux/x86/10.0/no-nptl/deprecated deleted file mode 100644 index 6073d83c4e5a..000000000000 --- a/profiles/hardened/linux/x86/10.0/no-nptl/deprecated +++ /dev/null @@ -1,7 +0,0 @@ -hardened/linux/x86 -# Check 'eselect profile list'. -# Find the number that corresponds with the hardened/linux/x86 profile. -# Use 'eselect profile set ' to set a new /etc/make.profile symlink. -# -# Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml -# See: "General instructions" in Section 3. "Profile updating instructions" diff --git a/profiles/hardened/linux/x86/10.0/no-nptl/parent b/profiles/hardened/linux/x86/10.0/no-nptl/parent deleted file mode 100644 index 67b5c97015c0..000000000000 --- a/profiles/hardened/linux/x86/10.0/no-nptl/parent +++ /dev/null @@ -1 +0,0 @@ -../../no-nptl diff --git a/profiles/hardened/linux/x86/no-nptl/parent b/profiles/hardened/linux/x86/no-nptl/parent deleted file mode 100644 index 0f08e56f3bcc..000000000000 --- a/profiles/hardened/linux/x86/no-nptl/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../features/no-nptl -- 2.26.2