From cf5141c8099636db80ab8d07be13052872b2c856 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 28 Aug 2005 15:34:38 +0000 Subject: [PATCH] Moving collision-protect masked packages from macos profile to 10.4 and 10.3 profiles as the progressive profile inherits from the macos profile --- profiles/default-darwin/macos/10.3/package.mask | 3 ++- profiles/default-darwin/macos/10.4/package.mask | 3 ++- profiles/default-darwin/macos/package.mask | 10 ---------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/profiles/default-darwin/macos/10.3/package.mask b/profiles/default-darwin/macos/10.3/package.mask index 90fa75b6f469..cd1ee9d12b52 100644 --- a/profiles/default-darwin/macos/10.3/package.mask +++ b/profiles/default-darwin/macos/10.3/package.mask @@ -5,6 +5,7 @@ app-arch/zip app-arch/unzip app-editors/nano app-editors/vim-core +>=app-portage/esearch-0.7.1 app-shells/bash app-shells/zsh dev-lang/perl @@ -13,6 +14,7 @@ dev-libs/libprelude dev-libs/libxml2 dev-perl/XML-Parser dev-util/intltool +dev-util/guile media-libs/a52dec net-misc/curl sys-apps/diffutils @@ -33,5 +35,4 @@ x11-libs/gtk+ # end collision-protect ## - app-arch/cpio diff --git a/profiles/default-darwin/macos/10.4/package.mask b/profiles/default-darwin/macos/10.4/package.mask index 5716516e555f..8ad5f838127a 100644 --- a/profiles/default-darwin/macos/10.4/package.mask +++ b/profiles/default-darwin/macos/10.4/package.mask @@ -5,6 +5,7 @@ app-arch/zip app-arch/unzip app-editors/nano app-editors/vim-core +>=app-portage/esearch-0.7.1 app-shells/bash app-shells/zsh dev-lang/perl @@ -12,6 +13,7 @@ dev-lang/python dev-libs/libxml2 dev-perl/XML-Parser dev-util/intltool +dev-util/guile media-libs/a52dec net-misc/curl sys-apps/diffutils @@ -33,5 +35,4 @@ x11-libs/gtk+ # end collision-protect ## - app-arch/cpio diff --git a/profiles/default-darwin/macos/package.mask b/profiles/default-darwin/macos/package.mask index cf6161ab78d5..20db8ac1f398 100644 --- a/profiles/default-darwin/macos/package.mask +++ b/profiles/default-darwin/macos/package.mask @@ -1,12 +1,2 @@ # this version of nano can't save files on Mac OS X - see bug 89040 =app-editors/nano-1.3.4 - -# collision protect issues - -# the newest esearch requires python with readline, which is not what -# OSX supplies by default ->=app-portage/esearch-0.7.1 -# guile depends on readline, which collides with the system -dev-util/guile - -# end collision protect issues -- 2.26.2