Handle NetBSD CHOST and properly check for x86 for other BSDs

Package-Manager: portage-2.1.2_rc4-r6

diff --git a/app-arch/unzip/ChangeLog b/app-arch/unzip/ChangeLog
index afda1b1fc6f7182d418db8ac7ad92d99ad3afcd1..2170f0ba518ccdfd0332e6ff27246346e09c60d4 100644 (file)
--- a/app-arch/unzip/ChangeLog
+++ b/app-arch/unzip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/unzip
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.46 2006/10/24 09:55:15 uberlord Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.47 2007/01/07 11:55:59 truedfx Exp $
+
+  07 Jan 2007; Harald van Dijk <truedfx@gentoo.org> unzip-5.52-r1.ebuild:
+  Handle NetBSD CHOST and properly check for x86 for other BSDs
 
   24 Oct 2006; Roy Marples <uberlord@gentoo.org> unzip-5.52-r1.ebuild:
   Don't assume that freebsd == i386 :)

diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 6f213baa285a1effe03139df7838f3f4ea261875..4658fec1b220185461eb92e4f96cbc0ed53ccbe1 100644 (file)
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -12,18 +12,18 @@ EBUILD unzip-5.50-r2.ebuild 1129 RMD160 29d6063996ebafdffe3771fe5a20a611ee5d022f
 MD5 4c9cca80bd3bde938e8921913622b498 unzip-5.50-r2.ebuild 1129
 RMD160 29d6063996ebafdffe3771fe5a20a611ee5d022f unzip-5.50-r2.ebuild 1129
 SHA256 18e6e03518e47f778585140e5b260befef6bb53ed2e73298f57ee94bd78d7fe7 unzip-5.50-r2.ebuild 1129
-EBUILD unzip-5.52-r1.ebuild 1620 RMD160 2c1b115ef63404f29ba604a2066000025f7ea09d SHA1 c1c70b63bd008d5b7c6a8ddb7ea6b270dc4818ad SHA256 668e019950110b2e061d5ad3189d9f1408ceb0ff6fd4d59ff48395c8d75b90ae
-MD5 2b78eec1a149146b356316ccc09f09b3 unzip-5.52-r1.ebuild 1620
-RMD160 2c1b115ef63404f29ba604a2066000025f7ea09d unzip-5.52-r1.ebuild 1620
-SHA256 668e019950110b2e061d5ad3189d9f1408ceb0ff6fd4d59ff48395c8d75b90ae unzip-5.52-r1.ebuild 1620
+EBUILD unzip-5.52-r1.ebuild 1690 RMD160 93e857f489ff544aaa74f47fd0ac7c874362dc66 SHA1 2bd323272b51a6bd213415df964c81344869e546 SHA256 5ead35b29966a41c2298f0c68d7b2d32d91df5436acb159da24f92691aebe69b
+MD5 84f59be088abb98b48ced734082e1d70 unzip-5.52-r1.ebuild 1690
+RMD160 93e857f489ff544aaa74f47fd0ac7c874362dc66 unzip-5.52-r1.ebuild 1690
+SHA256 5ead35b29966a41c2298f0c68d7b2d32d91df5436acb159da24f92691aebe69b unzip-5.52-r1.ebuild 1690
 EBUILD unzip-5.52.ebuild 1391 RMD160 885022fa91abd1bd4bc32ca6fb2e19b6d849d156 SHA1 c4a060175a2cd2c06d9675ac5385c406bc8e8ec3 SHA256 e40926b4b8ebda47d03de7b7b6255d81af1af069aee0323cc8ca8054f91de104
 MD5 0106beb499a64c740f57f92911eb5ce7 unzip-5.52.ebuild 1391
 RMD160 885022fa91abd1bd4bc32ca6fb2e19b6d849d156 unzip-5.52.ebuild 1391
 SHA256 e40926b4b8ebda47d03de7b7b6255d81af1af069aee0323cc8ca8054f91de104 unzip-5.52.ebuild 1391
-MISC ChangeLog 5246 RMD160 8d2ea118bf45a98bd2fa47a491f8c1a33f578f38 SHA1 88aa15a7ccc7d37d9488045cb1b52af75c374f30 SHA256 8107932dc3ab920f04c4fa0dfefecb910dd529dbd4dbcdfc0efc0a62996fdfb9
-MD5 c96e8ac6bd947223a0da94ac27c2830d ChangeLog 5246
-RMD160 8d2ea118bf45a98bd2fa47a491f8c1a33f578f38 ChangeLog 5246
-SHA256 8107932dc3ab920f04c4fa0dfefecb910dd529dbd4dbcdfc0efc0a62996fdfb9 ChangeLog 5246
+MISC ChangeLog 5384 RMD160 a5a2dd34c4c8477ac933da68418d18b5f6f811ad SHA1 75d936039d1b1fcea1e518070b85df96ebf7683c SHA256 7c528c26bb98692628566e31f25c30ac91f1e8e453e9bfe9fa1def899a8a7d27
+MD5 616513f2666c293aae38690337c78bc1 ChangeLog 5384
+RMD160 a5a2dd34c4c8477ac933da68418d18b5f6f811ad ChangeLog 5384
+SHA256 7c528c26bb98692628566e31f25c30ac91f1e8e453e9bfe9fa1def899a8a7d27 ChangeLog 5384
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164

diff --git a/app-arch/unzip/unzip-5.52-r1.ebuild b/app-arch/unzip/unzip-5.52-r1.ebuild
index 23afa78afc508548da0bca8d4fd60243bc799bbf..fe123cf64e0eda45532a17e890b9d4e4574a962b 100644 (file)
--- a/app-arch/unzip/unzip-5.52-r1.ebuild
+++ b/app-arch/unzip/unzip-5.52-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.52-r1.ebuild,v 1.17 2006/10/24 09:55:15 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.52-r1.ebuild,v 1.18 2007/01/07 11:55:59 truedfx Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -37,9 +37,10 @@ src_compile() {
        case ${CHOST} in
                i?86*-linux*) TARGET=linux_asm ;;
                *-linux*)     TARGET=linux_noasm ;;
-               *-dragonfly*) use x86 && TARGET=freebsd || TARGET=bsd ;;
-               *-freebsd*)   use x86 && TARGET=freebsd || TARGET=bsd ;;
-               *-openbsd*)   TARGET=bsd ;;
+               i?86*-freebsd* | i?86*-dragonfly* | i?86*-openbsd* | i?86*-netbsd*)
+                             TARGET=freebsd ;; # mislabelled bsd with x86 asm
+               *-freebsd* | *-dragonfly* | *-openbsd* | *-netbsd*)
+                             TARGET=bsd ;;
                *-darwin*)    TARGET=macosx ;;
                *)            die "Unknown target, you suck" ;;
        esac