Fixed athlon64 (again), bug#152575

(Portage version: 2.1.1)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 122 deletions

diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 09de5cb3809c..c8def2390eff 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -10,18 +10,14 @@ AUX beecrypt-3.1.0-python2.3.patch 769 RMD160 28cc17cbb871689df4f18acc2702e4acbb
 MD5 a1ec8219f4c2e7e3185f2cd869ddae33 files/beecrypt-3.1.0-python2.3.patch 769
 RMD160 28cc17cbb871689df4f18acc2702e4acbbb79bd7 files/beecrypt-3.1.0-python2.3.patch 769
 SHA256 322410d9a2e6777fce554deeddb1e34011143918a8da306269440c9a06b9ae0f files/beecrypt-3.1.0-python2.3.patch 769
-AUX beecrypt-4.1.2-asm.patch 447 RMD160 a3de8e8dd2cae7ca5c2943f809c9598af6654709 SHA1 7eaa9ab3410526c9438b424239711c7b39abbe39 SHA256 d01108c6106a7b01e34bf452b749955a61e2a3193f2b682709c2838718637a29
-MD5 bcf77f14d904ce6accab1cb9dbad289c files/beecrypt-4.1.2-asm.patch 447
-RMD160 a3de8e8dd2cae7ca5c2943f809c9598af6654709 files/beecrypt-4.1.2-asm.patch 447
-SHA256 d01108c6106a7b01e34bf452b749955a61e2a3193f2b682709c2838718637a29 files/beecrypt-4.1.2-asm.patch 447
 AUX beecrypt-4.1.2-athlon.patch 700 RMD160 f5026638df29a94f5a77ca42d29a5d9dd3d7e103 SHA1 7faca3ef443441629fad21751ba176108012088a SHA256 cc3eacd51054126b101c43592f75ed755161b680bdf5ab0c1b7ffef8f076534f
 MD5 1790137c0aa51e5978f813f06f74f9f5 files/beecrypt-4.1.2-athlon.patch 700
 RMD160 f5026638df29a94f5a77ca42d29a5d9dd3d7e103 files/beecrypt-4.1.2-athlon.patch 700
 SHA256 cc3eacd51054126b101c43592f75ed755161b680bdf5ab0c1b7ffef8f076534f files/beecrypt-4.1.2-athlon.patch 700
-AUX beecrypt-4.1.2-configure-ac.patch 2539 RMD160 304af60e7d5dfb2100961be442cb4619929ccc52 SHA1 7a467a36be18ae90eb75798fd3f3a957e9d07649 SHA256 4d822901b8c817db28bb908ba8aa1830288ac2d09c70dfdf7711403b384d8a4f
-MD5 cee5a97ebb84116161de104388cb3c03 files/beecrypt-4.1.2-configure-ac.patch 2539
-RMD160 304af60e7d5dfb2100961be442cb4619929ccc52 files/beecrypt-4.1.2-configure-ac.patch 2539
-SHA256 4d822901b8c817db28bb908ba8aa1830288ac2d09c70dfdf7711403b384d8a4f files/beecrypt-4.1.2-configure-ac.patch 2539
+AUX beecrypt-4.1.2-build.patch 4298 RMD160 be50da6af750cbc0afeb953cc439f3092c279615 SHA1 4b7299f1b576758c440a2ab59bfc637dcbc46deb SHA256 eb90355e7d8e6fde072c42f15bb75fb4cc545eedc14207656167d4a92ecdfc72
+MD5 3f65f75cb2d263e73657932705bd4eb3 files/beecrypt-4.1.2-build.patch 4298
+RMD160 be50da6af750cbc0afeb953cc439f3092c279615 files/beecrypt-4.1.2-build.patch 4298
+SHA256 eb90355e7d8e6fde072c42f15bb75fb4cc545eedc14207656167d4a92ecdfc72 files/beecrypt-4.1.2-build.patch 4298
 AUX beecrypt-4.1.2-custom-cflags.patch 1923 RMD160 29270a2fd07996a2362ff3344a95929385b119d7 SHA1 9a1a5e5f4efdc35d967207e2420e8723749b2ad5 SHA256 474b2c61885e68af31e489adadb0130c47437022b05050c9a2c7fe98e4444cb3
 MD5 d9df55b27ad44b732ee01ee84bca5919 files/beecrypt-4.1.2-custom-cflags.patch 1923
 RMD160 29270a2fd07996a2362ff3344a95929385b119d7 files/beecrypt-4.1.2-custom-cflags.patch 1923
@@ -52,18 +48,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 2184 RMD160 74e45ded0c153f57ac327e08565305dc09bd3fac SHA1 02c39d65ece78d4f0563311af44b5b58cd18b7ff SHA256 28134f9389e5402abc4f313248dfc405356b919ee17d7b21b1cbb0a38a02dcf2
-MD5 3e948b2ddf57148bacd8dd626c2f56cc beecrypt-4.1.2-r1.ebuild 2184
-RMD160 74e45ded0c153f57ac327e08565305dc09bd3fac beecrypt-4.1.2-r1.ebuild 2184
-SHA256 28134f9389e5402abc4f313248dfc405356b919ee17d7b21b1cbb0a38a02dcf2 beecrypt-4.1.2-r1.ebuild 2184
+EBUILD beecrypt-4.1.2-r1.ebuild 2140 RMD160 f414d2ae77f685bc4c3bd7269db6f98daff1b1f3 SHA1 eb4793c2c47f9ab8734778cabf4ec24f5a470387 SHA256 a6ecb0d2fe53301e8aa1af1a43f3d799f9ebd3754011c4e9a1b28f86643b3f81
+MD5 7f5dfdfd28971fe7fc0d44e9a7c7a2dd beecrypt-4.1.2-r1.ebuild 2140
+RMD160 f414d2ae77f685bc4c3bd7269db6f98daff1b1f3 beecrypt-4.1.2-r1.ebuild 2140
+SHA256 a6ecb0d2fe53301e8aa1af1a43f3d799f9ebd3754011c4e9a1b28f86643b3f81 beecrypt-4.1.2-r1.ebuild 2140
 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 5609 RMD160 e3d156865724014a9d0cf90e0ee5826598295912 SHA1 c39c9a4e049b994e043ead2cb0e00f98c13104a3 SHA256 e81ac7e13bedc4a2e15c6e8567d4f57890f24db75765051deb67d1ba39b1e1b9
-MD5 6c7aaee703fda557acaf4a40062c9b81 ChangeLog 5609
-RMD160 e3d156865724014a9d0cf90e0ee5826598295912 ChangeLog 5609
-SHA256 e81ac7e13bedc4a2e15c6e8567d4f57890f24db75765051deb67d1ba39b1e1b9 ChangeLog 5609
+MISC ChangeLog 5835 RMD160 485e9dedd451269c1ccf140a8c94b44aeda9a72e SHA1 ea9d334fbcfd2e2e27aa82e3383560a76d1af1ee SHA256 64b0adaaba91e170587f38cc2c26da9d26fc5a1008a57fca3b84ef6f3f6a790c
+MD5 76db40297b69acf453d09f9f12768255 ChangeLog 5835
+RMD160 485e9dedd451269c1ccf140a8c94b44aeda9a72e ChangeLog 5835
+SHA256 64b0adaaba91e170587f38cc2c26da9d26fc5a1008a57fca3b84ef6f3f6a790c ChangeLog 5835
 MISC metadata.xml 441 RMD160 78ec9e33fd6ae832d800ba544f5474e36cafd48c SHA1 0061a112b5252de7a4803ecb7b201e48be7dc5b7 SHA256 5675e81fe2ef6bb6949439f5c88e041c614a2ad8c554c685e745a457c116279d
 MD5 ca48fb502dfc8284bdf1dad98f1f1f93 metadata.xml 441
 RMD160 78ec9e33fd6ae832d800ba544f5474e36cafd48c metadata.xml 441
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-asm.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-asm.patch
deleted file mode 100644
index 7606c967174b..000000000000
--- a/dev-libs/beecrypt/files/beecrypt-4.1.2-asm.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./gas/x86.m4.org	2006-10-23 10:31:02.000000000 +0200
-+++ ./gas/x86.m4	2006-10-23 10:31:13.000000000 +0200
-@@ -48,3 +48,17 @@ define(USE_MMX)
- define(USE_SSE)
- define(USE_SSE2)
- ')
-+ifelse(ASM_ARCH,pentium-m,`
-+undefine(`ALIGN')
-+define(ALIGN,`.p2align 4')
-+define(USE_MMX)
-+define(USE_SSE)
-+define(USE_SSE2)
-+')
-+ifelse(ASM_ARCH,athlon64,`
-+undefine(`ALIGN')
-+define(ALIGN,`.p2align 4')
-+define(USE_MMX)
-+define(USE_SSE)
-+define(USE_SSE2)
-+')
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-configure-ac.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-configure-ac.patch
deleted file mode 100644
index 4ac8ceb9e76d..000000000000
--- a/dev-libs/beecrypt/files/beecrypt-4.1.2-configure-ac.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Some updates from upstream to handle more/newer cpu types
-
---- beecrypt-4.1.2/acinclude.m4
-+++ beecrypt-4.1.2/acinclude.m4
-@@ -16,7 +16,7 @@
-   i[[3456]]86)
-     case $withval in
-     i[[3456]]86 | \
--    pentium | pentium-mmx | pentiumpro | pentium[[234]] | \
-+    pentium | pentium-m | pentium-mmx | pentiumpro | pentium[[234]] | \
-     athlon | athlon-tbird | athlon-4 | athlon-xp | athlon-mp)
-       ;;
-     *)
-@@ -80,9 +80,10 @@
-   case $target_cpu in
-   i[[3456]]86)
-     case $withval in
-+    em64t | \
-     i[[3456]]86 | \
--    pentium | pentium-mmx | pentiumpro | pentium[[234]] | \
--    athlon | athlon-tbird | athlon-4 | athlon-xp | athlon-mp)
-+    pentium | pentium-m | pentium-mmx | pentiumpro | pentium[[234]] | \
-+    athlon | athlon-tbird | athlon-4 | athlon-xp | athlon-mp | athlon64 | k8)
-       if test "$ac_with_cpu" != yes; then
-         bc_target_cpu=$withval
-       fi
---- beecrypt-4.1.2/configure.ac
-+++ beecrypt-4.1.2/configure.ac
-@@ -502,9 +513,11 @@
-   arm*)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM"
-     ;;
-+  x86_64 | athlon64 | athlon-fx | em64t | k8)
-+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X86_64"
-+    ;;
-   athlon*)
--    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386 -DOPTIMIZE_MMX"
--    CFLAGS="$CFLAGS -mmmx"
-+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
-     ;;
-   i386)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386"
-@@ -526,24 +536,23 @@
-   pentium)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586"
-     ;;
-+  pentium-m)
-+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE -DOPTIMIZE_SSE2"
-+    ;;
-   pentium-mmx)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586 -DOPTIMIZE_MMX"
--    CFLAGS="$CFLAGS -mmmx"
-     ;;
-   pentiumpro)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
-     ;;
-   pentium2)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
--    CFLAGS="$CFLAGS -mmmx"
-     ;;
-   pentium3)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE"
--    CFLAGS="$CFLAGS -msse"
-     ;;
-   pentium4)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE -DOPTIMIZE_SSE2"
--    CFLAGS="$CFLAGS -msse2"
-     ;;
-   powerpc)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_POWERPC"
-@@ -556,15 +565,12 @@
-     ;;
-   sparcv8)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8"
--    CFLAGS="$CFLAGS -Wa,-xarch=v8"
-     ;;
-   sparcv8plus*)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8PLUS"
--    CFLAGS="$CFLAGS -Wa,-xarch=v8plus"
-     ;;
-   sparcv9*)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV9"
--    CFLAGS="$CFLAGS -Wa,-xarch=v9"
-     ;;
-   x86_64)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X86_64"