Fixed athlon64 (again), bug#152575

(Portage version: 2.1.1)

3 files changed, 145 insertions, 8 deletions

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index 77ca12e1bbc8..1e68f74d3b3f 100644
--- 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.34 2006/10/23 18:26:16 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.35 2006/10/23 20:26:54 alonbl Exp $
+
+  23 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/beecrypt-4.1.2-asm.patch, +files/beecrypt-4.1.2-build.patch,
+  -files/beecrypt-4.1.2-configure-ac.patch, beecrypt-4.1.2-r1.ebuild:
+  Fixed athlon64 (again), bug#152575
 
   23 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org>
   files/beecrypt-4.1.2-asm.patch:
diff --git a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
index 4ab190910628..766e7b33eb21 100644
--- 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.5 2006/10/23 09:48:40 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.6 2006/10/23 20:26:54 alonbl Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -33,12 +33,11 @@ src_unpack() {
 		configure.ac || die "sed failed"
 
 	# upstream patches from CVS
-	epatch "${FILESDIR}"/${P}-python-Makefile-am.patch
-	epatch "${FILESDIR}"/${P}-python-debug-py-c.patch
-	epatch "${FILESDIR}"/${P}-configure-ac.patch
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-asm.patch
-	epatch "${FILESDIR}"/${P}-threads.patch
+	epatch "${FILESDIR}/${P}-python-Makefile-am.patch"
+	epatch "${FILESDIR}/${P}-python-debug-py-c.patch"
+	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-threads.patch"
 	eautoreconf
 }
 
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-build.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-build.patch
new file mode 100644
index 000000000000..08768e2523f1
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.1.2-build.patch
@@ -0,0 +1,133 @@
+diff -urNp beecrypt-4.1.2.org/acinclude.m4 beecrypt-4.1.2/acinclude.m4
+--- beecrypt-4.1.2.org/acinclude.m4	2004-12-19 22:16:35.000000000 +0200
++++ beecrypt-4.1.2/acinclude.m4	2006-10-23 22:04:59.000000000 +0200
+@@ -16,7 +16,7 @@ AC_DEFUN([BEECRYPT_WITH_CPU],[
+   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 @@ AC_DEFUN([BEECRYPT_WITH_ARCH],[
+   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
+@@ -1126,6 +1127,8 @@ AC_DEFUN([BEECRYPT_ASM_SOURCES],[
+         m4 $srcdir/gas/mpopt.alpha.m4 > mpopt.s
+         ])
+       ;;
++    athlon64 | athlon-fx | em64t | k8)
++      ;;
+     athlon* | i[[3456]]86 | pentium*)
+       AC_CONFIG_COMMANDS([aesopt.x86],[
+         m4 $srcdir/gas/aesopt.x86.m4 > aesopt.s
+@@ -1184,6 +1187,8 @@ AC_DEFUN([BEECRYPT_ASM_SOURCES],[
+     if test "$ac_with_arch" = yes; then
+       # Code is i586-specific!
+       case $bc_target_arch in
++      x86_64 | athlon64 | athlon-fx | em64t | k8)
++      ;;
+       athlon* | i[[56]]86 | pentium*)
+         AC_CONFIG_COMMANDS([blowfishopt.i586],[
+           m4 $srcdir/gas/blowfishopt.i586.m4 > blowfishopt.s
+diff -urNp beecrypt-4.1.2.org/configure.ac beecrypt-4.1.2/configure.ac
+--- beecrypt-4.1.2.org/configure.ac	2004-12-21 13:37:56.000000000 +0200
++++ beecrypt-4.1.2/configure.ac	2006-10-23 22:04:30.000000000 +0200
+@@ -501,9 +501,11 @@ if test "$ac_enable_debug" != yes; then
+   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 +528,23 @@ if test "$ac_enable_debug" != yes; then
+   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 +557,12 @@ if test "$ac_enable_debug" != yes; then
+     ;;
+   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"
+diff -urNp beecrypt-4.1.2.org/gas/x86.m4 beecrypt-4.1.2/gas/x86.m4
+--- beecrypt-4.1.2.org/gas/x86.m4	2004-06-13 14:37:28.000000000 +0300
++++ beecrypt-4.1.2/gas/x86.m4	2006-10-23 22:05:14.000000000 +0200
+@@ -48,3 +48,25 @@ 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(`USE_MMX')
++')
++ifelse(ASM_ARCH,x86_64,`
++undefine(`USE_MMX')
++')
++ifelse(ASM_ARCH,athlon-fx,`
++undefine(`USE_MMX')
++')
++ifelse(ASM_ARCH,em64t,`
++undefine(`USE_MMX')
++')
++ifelse(ASM_ARCH,k8,`
++undefine(`USE_MMX')
++')