Add some initial support for ps2 targets (ee/iop/dvp).

(Portage version: 2.0.51.19)

5 files changed, 34 insertions, 54 deletions

diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog
index 9f459fe3da27..d70c0f2a7105 100644
--- a/sys-devel/crossdev/ChangeLog
+++ b/sys-devel/crossdev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/crossdev
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.15 2005/03/25 13:33:58 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.16 2005/04/18 06:30:28 vapier Exp $
+
+*crossdev-0.9.6 (18 Apr 2005)
+
+  18 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  -files/crossdev-0.4-fixes-one.patch, files/crossdev,
+  -crossdev-0.9.5-r1.ebuild, +crossdev-0.9.6.ebuild:
+  Add some initial support for ps2 targets (ee/iop/dvp).
 
 *crossdev-0.9.5-r1 (25 Mar 2005)
 
diff --git a/sys-devel/crossdev/crossdev-0.9.5-r1.ebuild b/sys-devel/crossdev/crossdev-0.9.6.ebuild
index 6f8bdb7f3716..0d807baf43b1 100644
--- a/sys-devel/crossdev/crossdev-0.9.5-r1.ebuild
+++ b/sys-devel/crossdev/crossdev-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-0.9.5-r1.ebuild,v 1.2 2005/04/05 00:55:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-0.9.6.ebuild,v 1.1 2005/04/18 06:30:28 vapier Exp $
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev
index af3bbaddb832..1b0d83524a63 100755
--- a/sys-devel/crossdev/files/crossdev
+++ b/sys-devel/crossdev/files/crossdev
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.19 2005/04/10 01:04:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.20 2005/04/18 06:30:28 vapier Exp $
 
 if [[ ${ROOT:-/} != "/" ]] ; then
 	echo "Sorry, but crossdev does not support ROOT."
@@ -84,6 +84,22 @@ parse_target() {
 		      LCAT="dev-embedded"; LPKG="avr-libc";
 		      GUSE="-fortran -gtk nocxx -gcj -objc";;
 
+		ps2*) einfo "The ps2 target is really an alias for the ee/iop/dvp targets"
+		      ${CROSSDEV} -t ee  || exit 1
+		      ${CROSSDEV} -t iop || exit 1
+		      ${CROSSDEV} -t dvp || exit 1
+		      exit 0;;
+		ee*)  TARCH=${HARCH}; CPOST="";
+		      KPKG="[none]"; BVER="2.14";
+		      GUSE="-fortran -gtk -gcj -objc";;
+		iop*) TARCH=${HARCH}; CPOST="";
+		      BVER="2.14";
+		      STAGE="1";
+		      GUSE="-fortran -gtk -gcj -objc";;
+		dvp*) TARCH=${HARCH}; CPOST="";
+		      BVER="2.14";
+		      STAGE="0";;
+
 		#######################
 		### unknown targets ###
 		*) usage 1;;
@@ -157,6 +173,7 @@ hr() {
 
 ##################
 ### setup vars ###
+CROSSDEV=$0
 EOPTS=
 UOPTS=
 TARCH=
@@ -223,11 +240,14 @@ einfo "Target System:         ${CTARGET}"
 einfo "Stage:                 ${STAGE} (${STAGE_DISP[${STAGE}]})"
 echo
 einfo "binutils:              ${BPKG}-${BVER}"
-is_s1 && \
+is_s1 && {
 einfo "gcc:                   ${GPKG}-${GVER}"
-is_s2 && \
-einfo "headers:               ${KPKG}-${KVER}" && \
+}
+is_s2 && {
+[[ ${KPKG} != "[none]" ]] && \
+einfo "headers:               ${KPKG}-${KVER}"
 einfo "libc:                  ${LPKG}-${LVER}"
+}
 echo
 einfo "PORTDIR_OVERLAY:       ${PORTDIR_OVERLAY}"
 einfo "PORT_LOGDIR:           ${PORT_LOGDIR}"
diff --git a/sys-devel/crossdev/files/crossdev-0.4-fixes-one.patch b/sys-devel/crossdev/files/crossdev-0.4-fixes-one.patch
deleted file mode 100644
index f14b43493d15..000000000000
--- a/sys-devel/crossdev/files/crossdev-0.4-fixes-one.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: crossdev
-===================================================================
-RCS file: /home/cvsroot/gentoo/users/kumba/crossdev/crossdev,v
-retrieving revision 1.1
-retrieving revision 1.3
-diff -u -p -r1.1 -r1.3
---- crossdev.sh		19 Feb 2004 09:35:37 -0000	1.1
-+++ crossdev.sh		26 Feb 2004 08:03:52 -0000	1.3
-@@ -281,7 +282,7 @@ CheckSandbox() {
- 					;;
- 				best_visible)
- 					export ACCEPT_KEYWORDS="$4"
--					eval "$1=$(${PORTAGEQ_LOC} $2 $3)"
-+					eval "$1=$(${PORTAGEQ_LOC} $2 $3 | tail -n 1)"
- 					unset ACCEPT_KEYWORDS
- 					;;
- 			esac
-@@ -338,7 +339,7 @@ CheckSandbox() {
- 					;;
- 				best_visible)
- 					export ACCEPT_KEYWORDS="$4"
--					eval "$1=$(${PORTAGEQ_LOC} $2 $3)"
-+					eval "$1=$(${PORTAGEQ_LOC} $2 $3 | tail -n 1)"
- 					unset ACCEPT_KEYWORDS
- 					;;
- 			esac
-@@ -1355,6 +1356,9 @@ InstallGccBootstrap() {
- 
- 	#// if .installed exists, skip, otherwise install
- 	if [ ! -f ".installed" ]; then
-+		#// Because we use /usr/headers for gcc, we sometimes get garbage headers we don't want.
-+		#// So we remove them.
-+		find gcc/include -type l -exec rm -f '{}' \;
- 		showInfo "Installing ${GCC_VER} (bootstrap)..."
- 		make install || showError "${func_name}: Failed to run 'make install'!"
- 		touch .installed
-@@ -1585,6 +1589,10 @@ InstallGccFull() {
- 
- 	#// if .installed exists, skip, otherwise install
- 	if [ ! -f ".installed" ]; then
-+		#// Because we use /usr/headers for gcc, we sometimes get garbage headers we don't want.
-+		#// So we remove them.
-+		find gcc/include -type l -exec rm -f '{}' \;
-+
- 		showInfo "Installing ${GCC_VER} (full)..."
- 		make install || showError "${func_name}: Failed to run 'make install'!"
- 		touch .installed
diff --git a/sys-devel/crossdev/files/digest-crossdev-0.9.5-r1 b/sys-devel/crossdev/files/digest-crossdev-0.9.6
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/crossdev/files/digest-crossdev-0.9.5-r1
+++ b/sys-devel/crossdev/files/digest-crossdev-0.9.6