summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter van den Abeele <pvdabeel@gentoo.org>2004-08-08 12:10:20 +0000
committerPieter van den Abeele <pvdabeel@gentoo.org>2004-08-08 12:10:20 +0000
commitb11bd34ff554213efbb307f403025c460b2e7e7a (patch)
treed237a9cb3cff17b66dc930b086dd6249abca0a53 /scripts
parentAdded to ~ppc (Manifest recommit) (diff)
downloadgentoo-2-b11bd34ff554213efbb307f403025c460b2e7e7a.tar.gz
gentoo-2-b11bd34ff554213efbb307f403025c460b2e7e7a.tar.bz2
gentoo-2-b11bd34ff554213efbb307f403025c460b2e7e7a.zip
No more inject - use package.provided instead
Diffstat (limited to 'scripts')
-rw-r--r--scripts/bootstrap-macos.sh26
1 files changed, 4 insertions, 22 deletions
diff --git a/scripts/bootstrap-macos.sh b/scripts/bootstrap-macos.sh
index 471baba65b10..7e7a1a3eb672 100644
--- a/scripts/bootstrap-macos.sh
+++ b/scripts/bootstrap-macos.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2004 The Gentoo Foundation, Pieter Van den Abeele
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap-macos.sh,v 1.5 2004/07/26 20:42:02 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap-macos.sh,v 1.6 2004/08/08 12:10:20 pvdabeel Exp $
# Make sure sudo passwd is asked for
@@ -9,18 +9,10 @@ sudo true
# Source functions to have colors and nice output
-source /usr/lib/portage/bin/functions.sh
-
-# This is currently a Mac OS only script. But it could easily be reused
-# for Operating systems such as Solaris, ... If your interested in doing
-# such a port, contact Pieter Van den Abeele at pvdabeel@gentoo.org
-
-# Note: for complete darwin bootstraps, we'll reuse the regular portage bootstrap.sh
-
trap 'exit 1' TERM KILL INT QUIT ABRT
echo
-echo -e "${GOOD}Gentoo Mac OS ; \e[34;01mhttp://www.gentoo.org/${NORMAL}"
+echo -e "Gentoo Mac OS ; http://www.gentoo.org/"
echo -e "Copyright 2004 The Gentoo Foundation ; Distributed under the GPL v2"
echo
@@ -46,11 +38,11 @@ esac
sudo ln -sf /usr/portage/profiles/default-macos-${RELEASE} /etc/make.profile
-ebegin "Portage will attempt taming your ${NAME}"
+# ebegin "Portage will attempt taming your ${NAME}"
function missing_devtools {
ewend 1
- echo -e "Please install the ${NAME} developer tools"
+ echo -e "Please install the ${NAME} developer tools (>1.1)"
echo
exit 1
}
@@ -58,14 +50,4 @@ function missing_devtools {
gcc -v 2> /dev/null || missing_devtools
echo
-
-# As of 20040726 the part below is no longer needed, we still do it
-# for backwards compatiblity with older installers.
-
-for package in `cat /usr/portage/profiles/default-macos-${RELEASE}/package.provided`; do
- ebegin " >>> Injecting ${package} " && ewend $?
- sudo emerge inject ${package} > /dev/null 2> /dev/null
-done
-
-echo
echo -e "Portage successfully tamed your ${NAME}"