Fix incorrect behaviour with CHOST!="x86_64-..." and any -march flags related to...

Package-Manager: portage-2.1.2_rc4

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index b9c5dc68008b4e2b08be0064a9806d0fe5d8da4f..2f159d5237cbcfe07fc5495f59cf1407666c4942 100644 (file)
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/beecrypt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.47 2006/12/26 04:11:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.48 2006/12/26 09:32:19 sanchan Exp $
+
+  26 Dec 2006; Sandro Bonazzola <sanchan@gentoo.org>
+  beecrypt-4.1.2-r1.ebuild:
+  Fix incorrect behaviour with CHOST!="x86_64-..." and any -march flags 
+  related to x86_64.
 
   26 Dec 2006; Jeroen Roovers <jer@gentoo.org> beecrypt-4.1.2-r1.ebuild:
   Stable for HPPA (bug #157858).

diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index e5a3abb9fafac13b0c23d76386a610d0ac81374d..e1a377a16a461cc38846d979c5ff64025d40417f 100644 (file)
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX beecrypt-3.1.0-alpha.patch 321 RMD160 d97ac1d5c57cb10adf623947f556d4f0edce7928 SHA1 17b56b54a11366beef462e3d4c5a075d48f57c04 SHA256 da7c655286db874a5b96ae4413bf86d02e14d759a54d68e4de4e22e4adf10027
 MD5 9801ec0e3201addd45f08dea31ac5324 files/beecrypt-3.1.0-alpha.patch 321
 RMD160 d97ac1d5c57cb10adf623947f556d4f0edce7928 files/beecrypt-3.1.0-alpha.patch 321
@@ -48,18 +51,18 @@ EBUILD beecrypt-3.1.0-r2.ebuild 1723 RMD160 8d23c514408cb5447401b94a65b8834c8792
 MD5 b6c457c06f2f7babce8779dc33405e21 beecrypt-3.1.0-r2.ebuild 1723
 RMD160 8d23c514408cb5447401b94a65b8834c87922187 beecrypt-3.1.0-r2.ebuild 1723
 SHA256 ce7a18ed0154803578ba50d9964add3573367af04c1e55905ed43815aa417dc8 beecrypt-3.1.0-r2.ebuild 1723
-EBUILD beecrypt-4.1.2-r1.ebuild 2377 RMD160 a15e92f2fe3f0412a98c0671ab0630dbe802017b SHA1 fcac93f8315874164ac53c174fdf17d7fd47e3b0 SHA256 b8903bbeaead247135d87dee71725f460f7f4ddff007aa715b1d29f7553bf10e
-MD5 ad84cd3512923f95070d7238f5e8d1da beecrypt-4.1.2-r1.ebuild 2377
-RMD160 a15e92f2fe3f0412a98c0671ab0630dbe802017b beecrypt-4.1.2-r1.ebuild 2377
-SHA256 b8903bbeaead247135d87dee71725f460f7f4ddff007aa715b1d29f7553bf10e beecrypt-4.1.2-r1.ebuild 2377
+EBUILD beecrypt-4.1.2-r1.ebuild 2154 RMD160 8e123104c28a41de1db7f266dcbb26e2548edf17 SHA1 f4b27b401c844490a454c810a247243404546ff0 SHA256 4cd9d3ff4379a1f3a47d6a05dc74e525380c480a31d8499680eb5347fb5930b3
+MD5 f96abac54925984fcc7e5590f3693090 beecrypt-4.1.2-r1.ebuild 2154
+RMD160 8e123104c28a41de1db7f266dcbb26e2548edf17 beecrypt-4.1.2-r1.ebuild 2154
+SHA256 4cd9d3ff4379a1f3a47d6a05dc74e525380c480a31d8499680eb5347fb5930b3 beecrypt-4.1.2-r1.ebuild 2154
 EBUILD beecrypt-4.1.2.ebuild 1571 RMD160 a81510f782805e7a69dd3fc21c3b6ad3491ec0c9 SHA1 2b15ccdc2de2fb69d131c85a179f0e3cfa93a941 SHA256 acc9b6321c2dc67140e1a0cdfc6b666779f0580fe5b473fb2a1f7ca9a1baa33e
 MD5 58efa38295c5d97f1bac7465fa9b87de beecrypt-4.1.2.ebuild 1571
 RMD160 a81510f782805e7a69dd3fc21c3b6ad3491ec0c9 beecrypt-4.1.2.ebuild 1571
 SHA256 acc9b6321c2dc67140e1a0cdfc6b666779f0580fe5b473fb2a1f7ca9a1baa33e beecrypt-4.1.2.ebuild 1571
-MISC ChangeLog 7476 RMD160 6002342f6ae9d1a7c9779254c83c6e690074733d SHA1 7823daecac5335321c198dad4d313fbb1ac64f40 SHA256 2a30deed50c94182bc9eaaac5d09460e9d34d267a85cb1f281c808be0119ce1a
-MD5 e788d02ccb848599de25c8c8b16c9ff8 ChangeLog 7476
-RMD160 6002342f6ae9d1a7c9779254c83c6e690074733d ChangeLog 7476
-SHA256 2a30deed50c94182bc9eaaac5d09460e9d34d267a85cb1f281c808be0119ce1a ChangeLog 7476
+MISC ChangeLog 7656 RMD160 4bae6679ae87bb8cb43b1f22393965b0414fd9ca SHA1 1210c9dfddf340a4c87516aea3b8bddfc051c0c2 SHA256 f4d1d878bd861db522317d934fb74fd5a69f5720f8c575a51e698232c7e26345
+MD5 ffd41939076f4b6055eaefab29b5eb59 ChangeLog 7656
+RMD160 4bae6679ae87bb8cb43b1f22393965b0414fd9ca ChangeLog 7656
+SHA256 f4d1d878bd861db522317d934fb74fd5a69f5720f8c575a51e698232c7e26345 ChangeLog 7656
 MISC metadata.xml 222 RMD160 7390d9ee64fc735357d7e6004a05d6319ccb72a4 SHA1 d288b0b582fd0342346e3ab74032b0579badbbf8 SHA256 479499bbcdd1d4d681904e4e4819e56e5e0436fdb23c1c938dcf23ea267988ec
 MD5 4841cdc9416cad66d46c6837e2d8a706 metadata.xml 222
 RMD160 7390d9ee64fc735357d7e6004a05d6319ccb72a4 metadata.xml 222
@@ -76,3 +79,10 @@ SHA256 99d90cfdcd84ee178ff78f76c1a75b7ea12bc89a29cf633a585d884de57413b8 files/di
 MD5 f036930b8f9b568a6d4f0be92dfd660a files/digest-beecrypt-4.1.2-r1 244
 RMD160 95f2cc2b7b670f7e7ebfcdb7b320386305e49ab7 files/digest-beecrypt-4.1.2-r1 244
 SHA256 99d90cfdcd84ee178ff78f76c1a75b7ea12bc89a29cf633a585d884de57413b8 files/digest-beecrypt-4.1.2-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFkOrtwmS/YhfgUiURAllCAJ9vkFsM6X2o+tQ87CMXKbs65memygCdG2cf
+n9m2+Ve06ldI5uRV/GToRJM=
+=60mj
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
index d2b0f0c1f99e3021f58d34b7cdedb0c2a1ef88b8..656e406880dfca71130c6946076d6befe3b19f96 100644 (file)
--- a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.14 2006/12/26 04:11:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.15 2006/12/26 09:32:19 sanchan Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -25,10 +25,6 @@ RDEPEND="${COMMONDEPEND}
        java? ( >=virtual/jre-1.4 )"
 
 pkg_setup() {
-       ewarn "The MMX assembler code presents TEXTREL issues. If you don't want them try using"
-       ewarn "relaxed CFLAGS like -march=i686 instead of -march=pentium3 and so on."
-       ewarn "This ebuild fails on multilib system with multilib-strict on AMD64."
-       ewarn "Feel free to help upstream solving the above bugs."
        java-pkg-opt-2_pkg_setup
 }
 
@@ -51,7 +47,8 @@ src_unpack() {
 src_compile() {
        local myarch=$(get-flag march)
        [[ -z ${myarch} ]] && myarch=${CHOST%%-*}
-       [[ ${myarch} == "athlon64" ]] && [[ ${CHOST%%-*} != "x86_64" ]] && myarch=${CHOST%%-*}
+       [[ ${myarch} == "athlon64" || ${myarch} == "k8" || ${myarch} == "opteron" || ${myarch} == "athlon-fx" ]] && \
+               [[ ${CHOST%%-*} != "x86_64" ]] && myarch=${CHOST%%-*}
        econf \
                $(use_enable threads) \
                $(use_with !nocxx cplusplus) \