removed obsolete versions. Fixed bug #174968, thanks to MaratIK <marat.buharov@gmail.com>

(Portage version: 2.1.2.2)

7 files changed, 66 insertions, 45 deletions

diff --git a/sci-libs/fftw/files/digest-fftw-2.1.5-r2 b/sci-libs/fftw/files/digest-fftw-2.1.5-r2
deleted file mode 100644
index 949efaeda653..000000000000
--- a/sci-libs/fftw/files/digest-fftw-2.1.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8d16a84f3ca02a785ef9eb36249ba433 fftw-2.1.5.tar.gz 1256888
-RMD160 723308722d76c12710db6473979adf8d086b0909 fftw-2.1.5.tar.gz 1256888
-SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 fftw-2.1.5.tar.gz 1256888
diff --git a/sci-libs/fftw/files/digest-fftw-3.0.1 b/sci-libs/fftw/files/digest-fftw-3.0.1
deleted file mode 100644
index a837c11d9572..000000000000
--- a/sci-libs/fftw/files/digest-fftw-3.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 76cd21ecc9a7bed6343566c473c36477 fftw-3.0.1.tar.gz 1946361
-RMD160 075bbdf5da67bb29117f9f54864db26acd971034 fftw-3.0.1.tar.gz 1946361
-SHA256 14f2cf295eed74369c622db005fe34f57e74a5efbd3fb66144b8d6d284ce0cb1 fftw-3.0.1.tar.gz 1946361
diff --git a/sci-libs/fftw/files/digest-fftw-3.0.1-r1 b/sci-libs/fftw/files/digest-fftw-3.0.1-r1
deleted file mode 100644
index a837c11d9572..000000000000
--- a/sci-libs/fftw/files/digest-fftw-3.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 76cd21ecc9a7bed6343566c473c36477 fftw-3.0.1.tar.gz 1946361
-RMD160 075bbdf5da67bb29117f9f54864db26acd971034 fftw-3.0.1.tar.gz 1946361
-SHA256 14f2cf295eed74369c622db005fe34f57e74a5efbd3fb66144b8d6d284ce0cb1 fftw-3.0.1.tar.gz 1946361
diff --git a/sci-libs/fftw/files/digest-fftw-3.1 b/sci-libs/fftw/files/digest-fftw-3.1
deleted file mode 100644
index 5fec32e2df5b..000000000000
--- a/sci-libs/fftw/files/digest-fftw-3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 911515569a8abdc7dbb207d53f34e60b fftw-3.1.tar.gz 2692325
-RMD160 af9f8a720daa60597416ca3ed3a54b8a789a6d44 fftw-3.1.tar.gz 2692325
-SHA256 e961dd3f7df9ec11cebf3a9c80752caee22a00fd149b36c7680f8da708e76bf7 fftw-3.1.tar.gz 2692325
diff --git a/sci-libs/fftw/files/digest-fftw-3.1.1 b/sci-libs/fftw/files/digest-fftw-3.1.1
deleted file mode 100644
index 1889f2e3babf..000000000000
--- a/sci-libs/fftw/files/digest-fftw-3.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b35813b88a046e4e74a603017794ddcd fftw-3.1.1.tar.gz 2719997
-RMD160 4236f43159a39e3bd9d34bda1b95ce82609d26b6 fftw-3.1.1.tar.gz 2719997
-SHA256 1d3e90da1aab15928586ef814784e217ac91bbac878906d82392b0d2e64aff0c fftw-3.1.1.tar.gz 2719997
diff --git a/sci-libs/fftw/files/fftw-3.0.1-amd64.patch b/sci-libs/fftw/files/fftw-3.0.1-amd64.patch
new file mode 100644
index 000000000000..d5df07581a92
--- /dev/null
+++ b/sci-libs/fftw/files/fftw-3.0.1-amd64.patch
@@ -0,0 +1,66 @@
+diff -uarN fftw-3.0.1.old/dft/k7/k7.c fftw-3.0.1/dft/k7/k7.c
+--- fftw-3.0.1.old/dft/k7/k7.c	2007-04-18 10:05:40.000000000 +0400
++++ fftw-3.0.1/dft/k7/k7.c	2007-04-18 10:08:57.000000000 +0400
+@@ -28,7 +28,7 @@
+ {
+      int eax, ecx, edx;
+ 
+-     __asm__("push %%ebx\n\tcpuid\n\tpop %%ebx"
++     __asm__("push %%rbx\n\tcpuid\n\tpop %%rbx"
+ 	     : "=a" (eax), "=c" (ecx), "=d" (edx)
+ 	     : "a" (op));
+      return edx;
+@@ -38,7 +38,7 @@
+ {
+      int eax, ecx, edx;
+ 
+-     __asm__("push %%ebx\n\tcpuid\n\tpop %%ebx"
++     __asm__("push %%rbx\n\tcpuid\n\tpop %%rbx"
+ 	     : "=a" (eax), "=c" (ecx), "=d" (edx)
+ 	     : "a" (op));
+      return eax;
+diff -uarN fftw-3.0.1.old/simd/3dnow.c fftw-3.0.1/simd/3dnow.c
+--- fftw-3.0.1.old/simd/3dnow.c	2007-04-18 10:05:41.000000000 +0400
++++ fftw-3.0.1/simd/3dnow.c	2007-04-18 10:08:31.000000000 +0400
+@@ -29,7 +29,7 @@
+ {
+      int eax, ecx, edx;
+ 
+-     __asm__("push %%ebx\n\tcpuid\n\tpop %%ebx"
++     __asm__("push %%rbx\n\tcpuid\n\tpop %%rbx"
+ 	     : "=a" (eax), "=c" (ecx), "=d" (edx)
+ 	     : "a" (op));
+      return edx;
+@@ -39,7 +39,7 @@
+ {
+      int eax, ecx, edx;
+ 
+-     __asm__("push %%ebx\n\tcpuid\n\tpop %%ebx"
++     __asm__("push %%rbx\n\tcpuid\n\tpop %%rbx"
+ 	     : "=a" (eax), "=c" (ecx), "=d" (edx)
+ 	     : "a" (op));
+      return eax;
+diff -uarN fftw-3.0.1.old/simd/sse2.c fftw-3.0.1/simd/sse2.c
+--- fftw-3.0.1.old/simd/sse2.c	2007-04-18 10:05:41.000000000 +0400
++++ fftw-3.0.1/simd/sse2.c	2007-04-18 10:08:14.000000000 +0400
+@@ -43,7 +43,7 @@
+ #else
+      int eax, ecx, edx;
+ 
+-     __asm__("push %%ebx\n\tcpuid\n\tpop %%ebx"
++     __asm__("push %%rbx\n\tcpuid\n\tpop %%rbx"
+ 	     : "=a" (eax), "=c" (ecx), "=d" (edx)
+ 	     : "a" (op));
+      return edx;
+diff -uarN fftw-3.0.1.old/simd/sse.c fftw-3.0.1/simd/sse.c
+--- fftw-3.0.1.old/simd/sse.c	2007-04-18 10:05:41.000000000 +0400
++++ fftw-3.0.1/simd/sse.c	2007-04-18 10:08:04.000000000 +0400
+@@ -43,7 +43,7 @@
+ #else
+      int eax, ecx, edx;
+ 
+-     __asm__("push %%ebx\n\tcpuid\n\tpop %%ebx"
++     __asm__("push %%rbx\n\tcpuid\n\tpop %%rbx"
+ 	     : "=a" (eax), "=c" (ecx), "=d" (edx)
+ 	     : "a" (op));
+      return edx;
diff --git a/sci-libs/fftw/files/fftw-ppc-macos.1.patch b/sci-libs/fftw/files/fftw-ppc-macos.1.patch
deleted file mode 100644
index bb068bdec222..000000000000
--- a/sci-libs/fftw/files/fftw-ppc-macos.1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur fftw-3.1/tests/Makefile.in fftw-3.1-new/tests/Makefile.in
---- fftw-3.1/tests/Makefile.in	2006-01-28 00:19:55.000000000 +0000
-+++ fftw-3.1-new/tests/Makefile.in	2006-02-11 05:39:29.000000000 +0000
-@@ -233,9 +233,9 @@
- @COMBINED_THREADS_FALSE@@THREADS_TRUE@LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_threads.la
- @THREADS_FALSE@LIBFFTWTHREADS = 
- bench_SOURCES = bench.c hook.c
--bench_LDADD = $(LIBFFTWTHREADS)				\
-+bench_LDADD = $(top_builddir)/libbench2/libbench2.a $(LIBFFTWTHREADS) \
- $(top_builddir)/libfftw3@PREC_SUFFIX@.la		\
--$(top_builddir)/libbench2/libbench2.a $(THREADLIBS)
-+$(THREADLIBS)
- 
- all: all-am
- 
-diff -Naur fftw-3.1/tools/Makefile.in fftw-3.1-new/tools/Makefile.in
---- fftw-3.1/tools/Makefile.in	2006-01-28 00:19:56.000000000 +0000
-+++ fftw-3.1-new/tools/Makefile.in	2006-02-11 05:40:41.000000000 +0000
-@@ -246,9 +246,9 @@
- @COMBINED_THREADS_FALSE@@THREADS_TRUE@LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_threads.la
- @THREADS_FALSE@LIBFFTWTHREADS = 
- fftw@PREC_SUFFIX@_wisdom_SOURCES = fftw-wisdom.c
--fftw@PREC_SUFFIX@_wisdom_LDADD = $(top_builddir)/tests/bench.o	\
-+fftw@PREC_SUFFIX@_wisdom_LDADD = $(top_builddir)/tests/bench.o $(top_builddir)/libbench2/libbench2.a \
- $(LIBFFTWTHREADS) $(top_builddir)/libfftw3@PREC_SUFFIX@.la	\
--$(top_builddir)/libbench2/libbench2.a $(THREADLIBS)
-+$(THREADLIBS)
- 
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am