Drop 32bit/64bit ABI overrides since we already handle these things ourselves #423023 by Robert Trace.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 97 insertions, 3 deletions

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index 7de90b2d29aa..1c662c691925 100644
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/beecrypt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.82 2012/06/07 16:43:17 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.83 2012/09/06 05:41:11 vapier Exp $
+
+  06 Sep 2012; Mike Frysinger <vapier@gentoo.org>
+  files/beecrypt-4.2.1-build-system.patch:
+  Drop 32bit/64bit ABI overrides since we already handle these things ourselves
+  #423023 by Robert Trace.
 
   07 Jun 2012; Michael Palimaka <kensington@gentoo.org>
   +files/beecrypt-4.2.1-gcc-4.7.patch, beecrypt-4.2.1.ebuild:
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index edae6cfcb5ca..79b3ecb7b887 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -1,6 +1,26 @@
-AUX beecrypt-4.2.1-build-system.patch 2188 SHA256 5cf1fc73482f20ca4e937a401c1fb2e93eddc29802dc3a62a2ebddb7bb1689dd SHA512 ebc1a4000f9c0a29e0ce49e6bc6a878c97fe8837e899a595b60b85248ff0f140f211adaf7ba7b2ff257879efd2dc21a4e98517324dff806746d0d743dca8bfae WHIRLPOOL 485770489ad141fb69c6c52f4bd46632da017745415d28138ae4e92d6b260199f981022f0e14b7ee86ade6c65a6dbe6367f2fe72c167025b6ce0c1182f2bbb37
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX beecrypt-4.2.1-build-system.patch 3796 SHA256 98eb6ff5991988563bc33c431379443ac13fde2b23d9cc9e5ee0bd7c470f504b SHA512 6f13707e238cd2602c1482554381fc4ffb59d367fc095453ae05c7bc17438552745b304ce2ad5c071a367a0a90809173682676a392396521e20006f214db0c46 WHIRLPOOL aa8b7b454635b46fb238505a7a2f2e051943ca956fb7093a6b0e45e0fc93b5a0cd22ee16ebcf8d85b198dda4713744c112a5ee64efe70a82970eca5aeef86f13
 AUX beecrypt-4.2.1-gcc-4.7.patch 258 SHA256 03e95b2f5c7340a7ee8e8a11933118a23a335e6f5076f4e7fb08e8bc9249b7a8 SHA512 d0d7dab1b302590d03474132039a98ed1f9b8f2e126300fe917acc0c2207bef8d1e90be14bb01d6278ac79a8f2d46aa81b8e56f3ee76b3c90b2e3ef6b0bbc375 WHIRLPOOL 09f5589ac7fcf2c6684deecd9582d046cec6b17d38cbd00131fdb95bcc63f5702920a01f3a138186e4a7066db66318e055120b1ca6999a88211c12c87f6291dd
 DIST beecrypt-4.2.1.tar.gz 882758 SHA256 286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d SHA512 59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc WHIRLPOOL c4a0371d8e2cf37194800867c58e77d72bb59ab464fdff9c561230ece0f288dabdebfdd0ac13382c9ebe45b455ffbfdd81e6a15969dcb86d3d8c8e6635e294bb
 EBUILD beecrypt-4.2.1.ebuild 2034 SHA256 c0fd94138ebfa2596ff573a76e7f94c9a1116fe31edf71310afb20700f1478a0 SHA512 ea2f9065818ea667bc8207a7c05fbf655b2c8d7ca77818da10ec4f22a0c3d97d67f7a895d8c747da08095412f867e4b43a1b23f2447c9b176d4db9261908685d WHIRLPOOL 63998197832e4d5de88b8f09e6e30184791c06a86daa60fc4fe99c93c79dee10b7d7dae5aa362e39bf75ccbc7a31c1ef7cfcccb321320fe18f58012a119635dc
-MISC ChangeLog 13128 SHA256 90199559c9214b81f6693512fddc67094f12ddecdea6d809438300d4d8ed3a87 SHA512 0be1dcc6a5a5bcae3150c2ff3ea9e3af095cb50bfd910591ef2604b1c3c0620479b046896a4cc2a0eec5b331dfc3c1f079b75177199adafa7ffb2ffb912c88d8 WHIRLPOOL a2ad33f7d6ee2b61e2546b7bdaba34d516d1f0f32c79b5f9452524f6db17b8c8e376e821a07121593ff2d7cba0dc0ee8f62e8b5fb1d0e0adafb6d6db05932e1a
+MISC ChangeLog 13325 SHA256 e942374e5f5c4ed83db320c4515af93a09a81ff83ca8d4362fa9a4a106c71854 SHA512 c487cf4ccc85d5b0c6c62e05ec2c9caaa7b9d5ad72c0c38218cb496fda4205e89abcac4552517537c676858bcc5724599509db34dc4c3ef39321c5b8e58a3fed WHIRLPOOL 97486ab4e8b03652ab04446114deddd44c96480735aa4ef27de5b937c01e9b35540ac3523c4af618526782156689969a9d23832ae8d302c478962c2feb899316
 MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQSDfdAAoJELEHsLL7fEFWTaoP/iSqeUYyeAEElYIdzvUK2UIo
+YWCNz/OuCViPDByutZjJTfSsY7SiYCf9d7MHxXVasvSouABya4yCl8RoMKqb3PLK
+2ni7rDmshk5RpkNevBXLb6fhukeedMgxoYOwL+18IYtzRnljriigYF1hAmXmXeT7
+hSogR4WRgWegyYRPHIw6jXQ/padDHJHVmsCKfStFipZ0OtPpRtakl79iZZp6+1LN
+fKxBMOS30fdR7mfPjjezSfA/dKW3t84gC5wg0Q5jiFH1OWR+Me3vUmDCE6vG4Q2z
+PYanQoPrnjciMitl2MOJnSFmXe2vqbGP6cb9xc3woFAUpPEdpfDHiAVW/9zfXiTX
+v8VhbX9UjwDv/mkWdJU6Lid0JpAwxu5D/xX6aiy40v2oyI6rZIvH49oh5n70Uwte
+lLnIDtTAE+xmKoIw09GR0wERb8MuIYN1SAsqqucMK/kE/1510ns/bTEVEKQ9wxd9
+xnfhiRW5vstlYndWl6RGgMo41dEDpyIZggIjRZl0Nao8fQat0V5PP9da3rh8O2z8
+cfC8eBY/4TI/7dis0dinY+JslB/oWxM4ZVUoz+BPV+8oU6e3jUyUhKek+M3aAKNs
+/cVFMxNj0TepdfASuSDZAEo4nv0yDYXFTwEGyK8ivnWRJ3HeRu8ZBum0EPWu+YZ4
+1FRIA0dsFmYZev2/QUvb
+=2UVn
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch b/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch
index b2bd64aea003..e35095f53b6e 100644
--- a/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch
+++ b/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch
@@ -27,6 +27,75 @@
      ])
    fi
  fi
+--- beecrypt-4.2.1/acinclude.m4
++++ beecrypt-4.2.1/acinclude.m4
+@@ -498,15 +498,6 @@ AC_DEFUN([BEE_GNU_CC],[
+     AC_SUBST(OPENMP_LIBS,"-lgomp")
+   fi
+   case $bc_target_arch in
+-  x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona)
+-    CC="$CC -m64"
+-    ;;
+-  i[[3456]]86 | \
+-  pentium* | \
+-  athlon*)
+-    CC="$CC -m32"
+-    CCAS="$CCAS -m32"
+-    ;;
+   ia64)
+     case $target_os in
+     # HP/UX on Itanium needs to be told that a long is 64-bit!
+@@ -525,17 +516,8 @@ AC_DEFUN([BEE_GNU_CC],[
+     aix*)
+       CC="$CC -maix64"
+       ;;
+-    linux*)
+-      CC="$CC -m64"
+-      ;;
+     esac
+     ;;
+-  sparc | sparcv8*)
+-    CC="$CC -m32"
+-    ;;
+-  sparc64 | sparcv9*)
+-    CC="$CC -m64"
+-    ;;
+   esac
+   # Certain platforms needs special flags for multi-threaded code
+   if test "$ac_enable_threads" = yes; then
+@@ -646,14 +646,6 @@ dnl  BEE_GNU_CXX
+ AC_DEFUN([BEE_GNU_CXX],[
+   AC_REQUIRE([AC_PROG_CXX])
+   case $bc_target_arch in
+-  x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona | core2)
+-    CXX="$CXX -m64"
+-    ;;
+-  i[[3456]]86 | \
+-  pentium* | \
+-  athlon*)
+-    CXX="$CXX -m32"
+-    ;;
+   ia64)
+     case $target_os in
+     # HP/UX on Itanium needs to be told that a long is 64-bit!
+@@ -672,17 +664,8 @@ AC_DEFUN([BEE_GNU_CXX],[
+     aix*)
+       CXX="$CXX -maix64"
+       ;;
+-    linux*)
+-      CXX="$CXX -m64"
+-      ;;
+     esac
+     ;;
+-  sparc | sparcv8*)
+-    CXX="$CXX -m32"
+-    ;;
+-  sparc64 | sparcv9*)
+-    CXX="$CXX -m64"
+-    ;;
+   esac
+   # Certain platforms needs special flags for multi-threaded code
+   if test "$ac_enable_threads" = yes; then
 --- beecrypt-4.2.1/java/Makefile.am
 +++ beecrypt-4.2.1/java/Makefile.am
 @@ -26,7 +26,7 @@