Fix incorrect behaviour with CHOST="i686-..." and CFLAGS="-march=athlon64 ...", bug...

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index 198351c0fb9fcc46fcb68bff4fa9f13d3e3fd115..9c4a6bf8355238b252005a2db876143d7a0a225a 100644 (file)
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2006/12/16 12:59:16 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.45 2006/12/20 20:20:53 sanchan Exp $
+
+  20 Dec 2006; Sandro Bonazzola <sanchan@gentoo.org>
+  beecrypt-4.1.2-r1.ebuild:
+  Fix incorrect behaviour with CHOST="i686-..." and CFLAGS="-march=athlon64
+  ...", bug #158109. Thanks to Robert Golding <robert.golding@gmail.com> for
+  reporting.
 
   16 Dec 2006; nixnut <nixnut@gentoo.org> beecrypt-4.1.2-r1.ebuild:
   Stable on ppc wrt bug 157858

diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index b4b7257499da2ffba3cda3a3e807733018b06da6..3bbaa09689d14017de2e549204701370cdba2ad9 100644 (file)
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -51,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 2295 RMD160 65007bd5a2e84a024de5058a3768aeb427953449 SHA1 f15c20d35a5c3c83526ca6807170b898dc3b847e SHA256 dcb8e187a491ce12199fa33c36645ac7d2844940fc94b5a9f59f4bfbc3d28ea9
-MD5 3177770aa2c0cb005a1ba0a13be1fa5d beecrypt-4.1.2-r1.ebuild 2295
-RMD160 65007bd5a2e84a024de5058a3768aeb427953449 beecrypt-4.1.2-r1.ebuild 2295
-SHA256 dcb8e187a491ce12199fa33c36645ac7d2844940fc94b5a9f59f4bfbc3d28ea9 beecrypt-4.1.2-r1.ebuild 2295
+EBUILD beecrypt-4.1.2-r1.ebuild 2383 RMD160 11a5ae13760f45ca2ae9c0d28a440c67a6fd42e4 SHA1 f4faea679ffc012dee88b109c541ef28c2f3e72e SHA256 f37ded04d8042fd2267bdc16a19be099be0e129dc553e39b24d913884323d1b7
+MD5 065e90d284b7c95fd1802301614f0026 beecrypt-4.1.2-r1.ebuild 2383
+RMD160 11a5ae13760f45ca2ae9c0d28a440c67a6fd42e4 beecrypt-4.1.2-r1.ebuild 2383
+SHA256 f37ded04d8042fd2267bdc16a19be099be0e129dc553e39b24d913884323d1b7 beecrypt-4.1.2-r1.ebuild 2383
 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 7017 RMD160 3f45ef1233a670f4726c46bf1ed0f6c2b017e6bb SHA1 4671f240d05f46f6db30de548a8ca29d9bb2c490 SHA256 a894ae37afeb820a193f4bc28a2363208815fb7a9cef5bfbb4b98880e0c89f70
-MD5 51d0d9135c8ef0f64a30b335e22ec065 ChangeLog 7017
-RMD160 3f45ef1233a670f4726c46bf1ed0f6c2b017e6bb ChangeLog 7017
-SHA256 a894ae37afeb820a193f4bc28a2363208815fb7a9cef5bfbb4b98880e0c89f70 ChangeLog 7017
+MISC ChangeLog 7266 RMD160 56b9fa5a31772877d9cc235242c59b29e56a1e46 SHA1 07d61973ae7b201ef42ebad53c9cf5bfd274e360 SHA256 1cdd9ea82aaa7d24665abe01b844d9e09926289f19662f3af0131f73f5323a1e
+MD5 551d0b5fa443f39f0e2a77c59dcfcb9f ChangeLog 7266
+RMD160 56b9fa5a31772877d9cc235242c59b29e56a1e46 ChangeLog 7266
+SHA256 1cdd9ea82aaa7d24665abe01b844d9e09926289f19662f3af0131f73f5323a1e ChangeLog 7266
 MISC metadata.xml 222 RMD160 7390d9ee64fc735357d7e6004a05d6319ccb72a4 SHA1 d288b0b582fd0342346e3ab74032b0579badbbf8 SHA256 479499bbcdd1d4d681904e4e4819e56e5e0436fdb23c1c938dcf23ea267988ec
 MD5 4841cdc9416cad66d46c6837e2d8a706 metadata.xml 222
 RMD160 7390d9ee64fc735357d7e6004a05d6319ccb72a4 metadata.xml 222
@@ -80,9 +80,9 @@ 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.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFg+2YnrYavmz4OngRAloKAJ0aOh3DTfqdvCj6l6ORmrMbQi2K2ACg97+H
-61nzH+ZIwkd3Nj5z85pjrS4=
-=Ffne
+iD4DBQFFiZpWwmS/YhfgUiURAiyCAJjHAZg2beX95xLlPIh5Iz1XWJkSAKCloguv
+dE18WYSHoYdZ9GIX/7oY9A==
+=tbi5
 -----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 904bf8774568fce5c28d855505f1c0cdb4b8ea8c..4ca2cf4b8e3a52aefe126dd3529f7d990595fa54 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.11 2006/12/16 12:59:16 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.12 2006/12/20 20:20:53 sanchan Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -51,7 +51,7 @@ src_unpack() {
 src_compile() {
        local myarch=$(get-flag march)
        [[ -z ${myarch} ]] && myarch=${CHOST%%-*}
-
+       [[ ${myarch} == "athlon64" ]] && [[ ${CHOST%%-*} != "x86_64" ]] && myarch=${CHOST%%-*}
        econf \
                $(use_enable threads) \
                $(use_with !nocxx cplusplus) \