From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 16 Nov 2006 21:58:18 +0000 (+0000)
Subject: move blackfin back to vanilla gcc/binutils and make sure we dont insert dupliate... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a5db766334d37f7d723751b556948173f28d745c;p=gentoo.git

move blackfin back to vanilla gcc/binutils and make sure we dont insert dupliate entries into package.use
Package-Manager: portage-2.1.2_rc1-r7
---

diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 5c3a3a127115..65dcc7b58055 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,7 +1,10 @@
-AUX crossdev 18179 RMD160 a0a6a8c2dce37fe46a58ad810b702200bc2c4a3c SHA1 f10ec0d31b0eb13021ef7c66ab438e41f4bbf04d SHA256 818021d37b4aebc00bfb9fd7be7fdae77d5a3c487839f685762887c0e1425eb7
-MD5 4b36ff517471108fcd7de4d8f483d8b3 files/crossdev 18179
-RMD160 a0a6a8c2dce37fe46a58ad810b702200bc2c4a3c files/crossdev 18179
-SHA256 818021d37b4aebc00bfb9fd7be7fdae77d5a3c487839f685762887c0e1425eb7 files/crossdev 18179
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX crossdev 18144 RMD160 1d6f39b4524ad4d464a678a8d634d4b3ffb8307b SHA1 848c351cb5705bec5f0c4d08f886e72098fe9dd5 SHA256 deb2a3e6d7fceb3eb9b5601f5f4a54ee610bd3c23b5929c761214d5b934c7e92
+MD5 e6f2d29e17fbec18778e277057e0b756 files/crossdev 18144
+RMD160 1d6f39b4524ad4d464a678a8d634d4b3ffb8307b files/crossdev 18144
+SHA256 deb2a3e6d7fceb3eb9b5601f5f4a54ee610bd3c23b5929c761214d5b934c7e92 files/crossdev 18144
 EBUILD crossdev-0.9.17-r2.ebuild 595 RMD160 061f5d75334e7aac79c6895fab52498c7d55cfc6 SHA1 2beda2a242518e57d3d10ef7244306eabdcd7f4e SHA256 f0c560704b2e750735a4e77749fed9e7c4c52c2bbaaea3e28259f98e3de62713
 MD5 e04b71f24a1246372960891d6f91e02d crossdev-0.9.17-r2.ebuild 595
 RMD160 061f5d75334e7aac79c6895fab52498c7d55cfc6 crossdev-0.9.17-r2.ebuild 595
@@ -17,3 +20,10 @@ SHA256 c11360fafdb92d96d343530a7f5869494a27c5cc1fec703094b1221632b6163f metadata
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.17-r2 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-crossdev-0.9.17-r2 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-crossdev-0.9.17-r2 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFXN8eamhnQswr0vIRAnNmAKCyWgJlaRwjPZB7kcnPmZrJNBgLYACgmtRn
+HpHMikSxu6mmBVoLNEGX8oM=
+=Yy3j
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev
index f90aeb945b4b..31c4b4b5f51f 100755
--- a/sys-devel/crossdev/files/crossdev
+++ b/sys-devel/crossdev/files/crossdev
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 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.79 2006/11/14 17:04:06 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.80 2006/11/16 21:58:18 vapier Exp $
 
 cd /
 
@@ -109,8 +109,6 @@ parse_target() {
 
 		bfin*)
 		      TARCH=${HARCH};
-		      BPKG="binutils-bfin";
-		      GPKG="gcc-bfin";
 		      LPKG="uclibc";;
 
 		cris*)
@@ -493,10 +491,10 @@ set_use() {
 	[[ -z ${use} ]] && return 0
 	if [[ -f package.use ]] ; then
 		output="package.use"
-		sed -i -e "/cross-${CTARGET}\/${pkg}/d" ${output}
 	else
 		output="package.use/cross-${CTARGET}"
 	fi
+	[[ -e ${output} ]] && sed -i -e "/cross-${CTARGET}\/${pkg}/d" ${output}
 	echo "cross-${CTARGET}/${pkg} ${use}" >> ${output}
 }
 set_links() {