a blind attempt to get from a pull-push confusion

36 files changed, 1005 insertions, 121 deletions

diff --git a/sci-libs/adolc/ChangeLog b/sci-libs/adolc/ChangeLog
new file mode 100644
index 000000000..1ea2f37d9
--- /dev/null
+++ b/sci-libs/adolc/ChangeLog
@@ -0,0 +1,17 @@
+# ChangeLog for sci-libs/adolc
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*adolc-2.3.0 (28 Jun 2012)
+
+  28 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> +adolc-2.3.0.ebuild,
+  +metadata.xml:
+  Version bump and import to the sci overlay
+
+*adolc-2.1.12 (30 Mar 2011)
+
+  30 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> +adolc-2.1.12.ebuild,
+  +files/adolc-2.1.12-autotools.patch, +files/adolc-2.1.12-sparse-openmp.patch,
+  +metadata.xml:
+  Initial import
+
diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
new file mode 100644
index 000000000..d75dcf74b
--- /dev/null
+++ b/sci-libs/adolc/Manifest
@@ -0,0 +1 @@
+DIST ADOL-C-2.3.0.tgz 2135572 RMD160 a815c86de019a00a4d670c76265c125146ed92bf SHA1 d9124ce0b199cb8b841a9a9ec10d1fb31ed11b49 SHA256 c795d5bde1299c90376fc398f8e48b21bb5af8f893895af1958b533d14b0a878 SHA512 2ce45f9fc16f6e2f8a40011d82b38847e391e469c33522b47e24c3b070c69b7a24c2af71e1998bb3842cf2d9004613175fdd90cb039af08ecd3ed3f14419d60b WHIRLPOOL 30b3dfbffa2ae7b075fbd427e50cc4bfb4552adf009848a0e77571a3fce655f4c67d142042c6c431dfdc696930ee33027dc56b73401a34cbf9f867d3d282bcc7
diff --git a/sci-libs/adolc/adolc-2.3.0.ebuild b/sci-libs/adolc/adolc-2.3.0.ebuild
new file mode 100644
index 000000000..07c230cde
--- /dev/null
+++ b/sci-libs/adolc/adolc-2.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+inherit autotools-utils toolchain-funcs
+
+MYPN=ADOL-C
+
+DESCRIPTION="Automatic differentiation system for C/C++"
+HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
+SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
+
+LICENSE="|| ( EPL-1.0 GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="sparse static-libs"
+
+RDEPEND="sparse? ( sci-libs/colpack )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MYPN}-${PV}"
+
+src_configure() {
+	 local myeconfargs+=(
+		 $(use_enable sparse)
+		 $(use_with sparse colpack "${EPREFIX}"/usr)
+	 )
+	 autotools-utils_src_configure
+}
+
+src_test() {
+	emake test
+}
diff --git a/sci-libs/adolc/metadata.xml b/sci-libs/adolc/metadata.xml
new file mode 100644
index 000000000..7c103ede2
--- /dev/null
+++ b/sci-libs/adolc/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang="en">
+  The ADOLC system automatically calculates exact derivatives of a
+  C/C++ function.  It uses C++ overloading to record arithmetic
+  operations, which it plays back later in various ways to calculate
+  the requested values.
+</longdescription>
+<use>
+  <flag name='sparse'>Add support for sparse matrix algebra with <pkg>sci-libs/colpack</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index 19a8577cc..8fcf84386 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -2,6 +2,18 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*atlas-3.9.82 (03 Jul 2012)
+
+  03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> +atlas-3.9.82.ebuild,
+  -atlas-3.9.80.ebuild, -files/3.9.63-leaks.patch:
+  sci-libs/atlas: version bump. Adapt calls to compilers. Inherit multilib
+
+*atlas-3.9.80 (26 Jun 2012)
+
+  26 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org> -atlas-3.9.79.ebuild,
+  +atlas-3.9.80.ebuild:
+  Version bump
+
 *atlas-3.9.79 (18 Jun 2012)
 
   18 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> +atlas-3.9.79.ebuild,
diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index b2b780271..ebddf6137 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -1,4 +1,4 @@
 DIST atlas3.8.4.tar.bz2 2534071 RMD160 fa2828468459213fcf3f1ae4fd26671ba32f4776 SHA1 ef92bcbc4bec096b34ed7a0d29119d84c973df0c SHA256 0f7720fb16fa4b8b8a192ea791e57569546db6f5f016cf3caaee30a9d94583bf
-DIST atlas3.9.79.tar.bz2 6358059 RMD160 b354d95de6073a7304aaf19fc85b512a8bbf9997 SHA1 1a0cba4a048a2796a932856b7d7b18d459a6e0da SHA256 126b35cee4741f15d6643cba49df019a1f8de945d33c1ae02cabea82efc07973 SHA512 7e3c29a7d4f4e4366bcdebf0176c82b50d0973f14c60ceeee1d08517234dc263bfd87f5356d154de171d44f0735e58b25c1a4129024d3351f3f77a08271ae1dc WHIRLPOOL 2656cb5d939efa2024f1430e60b3efa7c616f4e44ef1db8054069aa7c5d6bb9a2afceb2ba9665114e2516292f41f21e1366bec843f61bdb90c9af46369d0caee
+DIST atlas3.9.82.tar.bz2 5009766 RMD160 ccaff0515f3b7bf341b86416d02271cfc0ae2f5c SHA1 54797dba4b9c9c77ac833af5dee7b5dd156ea448 SHA256 7c547a5368f9f1696c79fa108106cee510fd0b369c814e3400ffbf9cea089d91 SHA512 e474e59686d93231c3a83388fe1be421d7f30c700047492b1c8d868b65d836a76bca24edbc6cdb7a492e1aea8b0887e737a444204d236f019dbf5c44190a074f WHIRLPOOL 846c5d72eec6bb3dadec9011e82bd266b3805017fc2c29d88cfde6746918f5f67f4632c0b55258e32962df58a403ba40069423a3e097d7e6e9ff1e5ec498926b
 DIST lapack-3.3.1.tgz 4945204 SHA256 56821ab51c29369a34e5085728f92c549a9aa926f26acf7eeac87b61eed329e4 SHA512 67f6e9e0457101fdf41dd0ce8a692155ab45f26a8d94848c4c99597eab18497faa2c0fbd342d2ad11bc2818693b8decad4f3a63216bdc82901a7a79a8f4d4725 WHIRLPOOL 69c4a780dd396c2c0f22bb3b65be094228abd48877a0488c606a547e9046655bf6623918ae2756121fff244d46fe601599f8898cdc984524e8a80429b2e75414
 DIST lapack-3.4.1.tgz 6147915 RMD160 3b715aff2924b47a45433376cfb9b66ffeeeb46d SHA1 c115223ac1bac9ab971aae865d3e95442bc979bc SHA256 93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f SHA512 8bd6eedd42edac5e19f4101daa785f646feb7c0e24e66975e3a1cdb84d5e13445f79442fcd2cf0f29d6b823a5a778edaa1a52895e8aa15d9241356328eccec3f WHIRLPOOL 8974883990d4a636373c493f6eb55929b7021facf56df1d367a9516d15b3596c9e97e68b091e5d15e5fdcb70a8093dc281e334d7e32aec2567eae30db5b21b77
diff --git a/sci-libs/atlas/atlas-3.9.79.ebuild b/sci-libs/atlas/atlas-3.9.82.ebuild
index 311fef252..fa414ab5c 100644
--- a/sci-libs/atlas/atlas-3.9.79.ebuild
+++ b/sci-libs/atlas/atlas-3.9.82.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=4
-inherit eutils toolchain-funcs fortran-2 versionator alternatives-2
+inherit eutils toolchain-funcs fortran-2 versionator alternatives-2 multilib
 
 LAPACKP=lapack-3.4.1.tgz
 
@@ -48,18 +48,14 @@ pkg_setup() {
 
 src_configure() {
 	atlas_configure() {
-		# hack needed to trick the flaky gcc detection
-		local mycc="$(tc-getCC)"
-		[[ ${mycc} == *gcc* ]] && mycc=gcc
-
 		local myconf=(
-			"--prefix=${ED}/usr"
-			"--libdir=${ED}/usr/$(get_libdir)"
-			"--incdir=${ED}/usr/include"
-			"--cc=${mycc}"
-			"-C ac ${mycc}"
+			--prefix="${ED}/usr"
+			--libdir="${ED}/usr/$(get_libdir)"
+			--incdir="${ED}/usr/include"
+			--cc="$(tc-getCC)"
+			"-C acg '$(type -P $(tc-getCC))'"
 			"-D c -DWALL"
-			"-F ac '${CFLAGS}'"
+			"-F acg '${CFLAGS}'"
 			"-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
 		)
 
@@ -88,7 +84,7 @@ src_configure() {
 		fi
 		if use fortran; then
 			myconf+=(
-				"-C if $(tc-getFC)"
+				"-C if '$(type -P $(tc-getFC))'"
 				"-F if '${FFLAGS}'"
 			)
 			if use lapack; then
diff --git a/sci-libs/atlas/files/3.9.63-leaks.patch b/sci-libs/atlas/files/3.9.63-leaks.patch
deleted file mode 100644
index d87e9c96a..000000000
--- a/sci-libs/atlas/files/3.9.63-leaks.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- CONFIG/src/atlconf_misc.c.orig	2012-01-11 16:00:42.000000000 +0000
-+++ CONFIG/src/atlconf_misc.c	2012-01-23 19:33:37.000000000 +0000
-@@ -439,6 +439,7 @@
-    assert(cmnd);
-    sprintf(cmnd, "%s -m", uname);
-    res = atlsys_1L(targ, cmnd, 0, 0);
-+   free(cmnd);
-    if (res)
-    {
-       if (strstr(res, "ppc") || strstr(res, "Power Macintosh") ||
-@@ -707,6 +708,7 @@
-    assert(cmnd);
-    sprintf(cmnd, "%s --version", comp);
-    res = atlsys_1L(NULL, cmnd, 0, 0);
-+   free(cmnd);
-    if (res)
-    {
- /*
---- CONFIG/src/config.c.orig	2012-01-23 19:41:11.000000000 +0000
-+++ CONFIG/src/config.c	2012-01-24 04:46:25.000000000 +0000
-@@ -1102,7 +1105,7 @@
-          else if (!strcmp(sp0, "kern"))
-             gcc3 = sp;
-          else if (!strcmp(sp0, "pmake"))
--            *pmake = sp;
-+	   *pmake = NewStringCopy(sp);
-         else if (!strcmp(sp0, "flapack"))
-            *flapack = sp;
-         else if (!strcmp(sp0, "f77lib"))
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index b0e101e47..7a43f6b50 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -2,6 +2,7 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+<<<<<<< HEAD
 *bigdft-1.6_pre1-r3 (04 Jul 2012)
 
   04 Jul 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
@@ -10,6 +11,11 @@
   +files/bigdft-1.6-tuto.1-gcc-4.6.patch:
   bigdft-1.6_pre1 from -r2 to -r3: patched to install necessary libraries for
   GPU support and to compile with gcc-4.6
+=======
+  22 Jun 2012; Alexey Shvetsov <alexxy@gentoo.org> bigdft-1.6.0-r2.ebuild,
+  bigdft-1.6_pre1-r2.ebuild:
+  [sci-libs/bigdft] add ~amd64-linux
+>>>>>>> cd00b2db98a3e0ec9013e1d3646e292213071270
 
 *bigdft-1.6.0-r2 (19 Jun 2012)
 *bigdft-1.6_pre1-r2 (19 Jun 2012)
diff --git a/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
index b4e40f540..09350541e 100644
--- a/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="cuda doc etsf_io mpi netcdf opencl test"
 
 RDEPEND="
@@ -66,7 +66,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local modules="/usr/$(get_libdir)/finclude"
+	local modules="${EPREFIX}/usr/$(get_libdir)/finclude"
 	local netcdff_libs="-lnetcdff"
 	filter-flags '-m*' '-O*' "-pipe"
 	local nvcflags="${CFLAGS}"
@@ -90,9 +90,9 @@ src_configure() {
 		$(use_with cuda cuda-path /opt/cuda)
 		$(use_with cuda nvcc-flags "${nvcflags}")
 		$(use_enable opencl)
-		$(use_with opencl ocl-path /usr)
+		$(use_with opencl ocl-path "${EPREFIX}/usr")
 		$(use_with etsf_io etsf-io)
-		$(use_with etsf_io etsf-io-path "/usr")
+		$(use_with etsf_io etsf-io-path "${EPREFIX}/usr")
 		$(use_with etsf_io netcdf-path "$(pkg-config --libs-only-L netcdf)")
 		"$(use etsf_io && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")"
 		FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -I${modules}"
diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild
index 7187becbc..a2cef02de 100644
--- a/sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="cuda doc etsf_io mpi netcdf opencl test"
 
 RDEPEND="
@@ -73,7 +73,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local modules="/usr/$(get_libdir)/finclude"
+	local modules="${EPREFIX}/usr/$(get_libdir)/finclude"
 	local netcdff_libs="-lnetcdff"
 	filter-flags '-m*' '-O*' "-pipe"
 	local nvcflags="${CFLAGS}"
@@ -98,9 +98,9 @@ src_configure() {
 		$(use_with cuda cuda-path /opt/cuda)
 		$(use_with cuda nvcc-flags "${nvcflags}")
 		$(use_enable opencl)
-		$(use_with opencl ocl-path /usr)
+		$(use_with opencl ocl-path "${EPREFIX}/usr")
 		$(use_with etsf_io etsf-io)
-		$(use_with etsf_io etsf-io-path "/usr")
+		$(use_with etsf_io etsf-io-path "${EPREFIX}/usr")
 		$(use_with etsf_io netcdf-path "$(pkg-config --libs-only-L netcdf)")
 		"$(use etsf_io && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")"
 		FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -I${modules}"
diff --git a/sci-libs/fox/ChangeLog b/sci-libs/fox/ChangeLog
index da2ec66b4..1d50ca61b 100644
--- a/sci-libs/fox/ChangeLog
+++ b/sci-libs/fox/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jun 2012; Alexey Shvetsov <alexxy@gentoo.org> fox-4.1.2-r1.ebuild:
+  [sci-libs/fox] make it prefix aware
+
 *fox-4.1.2-r1 (28 Apr 2012)
 
   28 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz> -fox-4.1.2.ebuild,
diff --git a/sci-libs/fox/Manifest b/sci-libs/fox/Manifest
index 4141f2f85..37048651b 100644
--- a/sci-libs/fox/Manifest
+++ b/sci-libs/fox/Manifest
@@ -1,7 +1,7 @@
-DIST FoX-4.1.2-dom.tar.gz 225371 SHA256 12ff57bf6de41d23f06bf8f4f02969118d0fced2feab257dcc7204394cbfcb06 SHA512 de846d40ad442d2fff33dda17793f7334a87065d760920f17605926d4f91624cb134515b6c77392aa77a17532275e256301bdefa157eecbb0c13887bcaa7fe4c WHIRLPOOL 516270138eed8a165955ee8f47e0e5e5f34bcace7d604bc26e00d903494135597d0815bc7262ab500dcf33fe2a1cf6f02e05bf6864bc8a062d222e978b06fba7
+DIST FoX-4.1.2-dom.tar.gz 225371 RMD160 40aa8db24d1494ca48179ea970203196ccd47ec0 SHA1 ef3335cc06d8680e920f86c43f6cd64746b92467 SHA256 12ff57bf6de41d23f06bf8f4f02969118d0fced2feab257dcc7204394cbfcb06 SHA512 de846d40ad442d2fff33dda17793f7334a87065d760920f17605926d4f91624cb134515b6c77392aa77a17532275e256301bdefa157eecbb0c13887bcaa7fe4c WHIRLPOOL 516270138eed8a165955ee8f47e0e5e5f34bcace7d604bc26e00d903494135597d0815bc7262ab500dcf33fe2a1cf6f02e05bf6864bc8a062d222e978b06fba7
 DIST FoX-4.1.2-full.tar.gz 1025375 SHA256 99f660a3d3cf9b9eb50e36d67dac3b80cfac92473462c3d6f3b340ba8d7c9b24 SHA512 bfd994768f4b8067cf2859949d51723c851521c444ba6a342901ae5e6ae86ed2832d59eac5f29048e1c2e5b27af6d1be4e7f026062832d650d894a865f1827c1 WHIRLPOOL 4f665380ae0e3c69efa5b9448d32d866efda6fa6e853bf1016088c45f704cafaa389cf0342041d0e07461ea32622fe967f3626668e153b316f2b162e08f0195d
-DIST FoX-4.1.2-sax.tar.gz 164451 SHA256 7d247b11971b0025973d658c708b56acff8b51d1ff1a8503a9a2c64d4449fe26 SHA512 7391ed23c70b52cd4155da0fbef60fda8a628e682b93b9340478d0a7bef0e9bd0016610fb45141b54063c001a5031baeb8ec66239e5b763cdc226fb5680f3de2 WHIRLPOOL 4cbd518c128c512fdb24f9024420240fbc133c50a82c1cb4cc570186403ec4343652662d3595e57602dfcc1bd477b82b851135524669dfcf7b18fe2df5ce2abf
-DIST FoX-4.1.2-wcml.tar.gz 163504 SHA256 cb98d41ee71cff7581321fb8b35324dd066bfdbf853a1dc83803366766f68d35 SHA512 32a1bea6e52926958ec7ca24256dd824bf97f84ae1ce691d01d607b4f7fc4e1c811ead36a9f1260aa4696aeba964d9b3db1673a011b5a8f1d1b9c96590be8ffb WHIRLPOOL bda5dc3b187d4f52a86ef3d2cb4e2f96aafababaa94ce862747e5fd42d31e67e7e67ba941fdbdaeb02ba2628e156070986451f423f9988817643ef5af604773b
-DIST FoX-4.1.2-wkml.tar.gz 207539 SHA256 920a9996c79886ea8bc872ed445992ee075e64eee7db97989af56e66958046c7 SHA512 1f3e0f2750e8a500e4c8c1d6f03f8a52615cea1448c69d35750ea8bd06bdcb02ac136a34ba1af07a363dfe018cf6bf28e54f7ce19e6d06cc554391219525f1f3 WHIRLPOOL 97a808e4efd44c23dd8063a36ce8c04c7047271a6d49f17c0e9a50da2aa20e7adcb5e00d6d58578a056c7fca51c718022ebefac60a03674c68dcbfb3491753dc
-DIST FoX-4.1.2-wxml.tar.gz 149964 SHA256 37d0d509e092725dddc0488ff4ba77d24b56ea11ed220dccc6d1a3cc8f008194 SHA512 3b69e42dc2e627477b96750d267d24365da69515036c508979b3cde74de63e3567ee1a6335a4113d5c69abb0eb8c248da290270faf01ad42f849016c3c31438d WHIRLPOOL 29f4316e58d0bca02d318371e08af2aa28d6dd7c39e599dac17a9a9116ff4326e035671e6a554bc931ca1140aacd408a71bd1e9c98a7b18c67f2f364cc215cb4
-DIST FoX-4.1.2.tar.gz 296666 SHA256 3b749138229e7808d0009a97e2ac47815ad5278df6879a9cc64351a7921ba06f SHA512 a0ce79599118a04c19e87fc7ed0097520b4acf9e60a63038e8f9da9cb5ba94ba2bddb5c51c967c02037ba9e7ef41924ac173e73d5598a6654717e31c642c9d61 WHIRLPOOL 0abe0da4f0925e74d528ff0925099b6563cdeafe84a8444698a7c041901776cb35c2b2ba1d274455bec0cf3ed6da4e04467a6a009fe8bded7791f9c2085ac953
+DIST FoX-4.1.2-sax.tar.gz 164451 RMD160 a9360ee08e47c7bbc0979175bc98508cb36e9325 SHA1 fabaf4ffc6c071b0049952c4e0aac5851e067b2f SHA256 7d247b11971b0025973d658c708b56acff8b51d1ff1a8503a9a2c64d4449fe26 SHA512 7391ed23c70b52cd4155da0fbef60fda8a628e682b93b9340478d0a7bef0e9bd0016610fb45141b54063c001a5031baeb8ec66239e5b763cdc226fb5680f3de2 WHIRLPOOL 4cbd518c128c512fdb24f9024420240fbc133c50a82c1cb4cc570186403ec4343652662d3595e57602dfcc1bd477b82b851135524669dfcf7b18fe2df5ce2abf
+DIST FoX-4.1.2-wcml.tar.gz 163504 RMD160 c186a76adf725d6c2c1f6ccf317c0c8023f5ab2e SHA1 953dec0852695652547b6ec7324e836239b93d73 SHA256 cb98d41ee71cff7581321fb8b35324dd066bfdbf853a1dc83803366766f68d35 SHA512 32a1bea6e52926958ec7ca24256dd824bf97f84ae1ce691d01d607b4f7fc4e1c811ead36a9f1260aa4696aeba964d9b3db1673a011b5a8f1d1b9c96590be8ffb WHIRLPOOL bda5dc3b187d4f52a86ef3d2cb4e2f96aafababaa94ce862747e5fd42d31e67e7e67ba941fdbdaeb02ba2628e156070986451f423f9988817643ef5af604773b
+DIST FoX-4.1.2-wkml.tar.gz 207539 RMD160 1600eb988dfba33968ecdbff9b36e0735199d5a4 SHA1 51396e04528a2d6829643f1d0fb6e3f5b07cd8fe SHA256 920a9996c79886ea8bc872ed445992ee075e64eee7db97989af56e66958046c7 SHA512 1f3e0f2750e8a500e4c8c1d6f03f8a52615cea1448c69d35750ea8bd06bdcb02ac136a34ba1af07a363dfe018cf6bf28e54f7ce19e6d06cc554391219525f1f3 WHIRLPOOL 97a808e4efd44c23dd8063a36ce8c04c7047271a6d49f17c0e9a50da2aa20e7adcb5e00d6d58578a056c7fca51c718022ebefac60a03674c68dcbfb3491753dc
+DIST FoX-4.1.2-wxml.tar.gz 149964 RMD160 5844508629f122798976cb80f5758c0ec5c99d9b SHA1 4b728f2879e0cacb72b4a6c7c6551bf3be247c43 SHA256 37d0d509e092725dddc0488ff4ba77d24b56ea11ed220dccc6d1a3cc8f008194 SHA512 3b69e42dc2e627477b96750d267d24365da69515036c508979b3cde74de63e3567ee1a6335a4113d5c69abb0eb8c248da290270faf01ad42f849016c3c31438d WHIRLPOOL 29f4316e58d0bca02d318371e08af2aa28d6dd7c39e599dac17a9a9116ff4326e035671e6a554bc931ca1140aacd408a71bd1e9c98a7b18c67f2f364cc215cb4
+DIST FoX-4.1.2.tar.gz 296666 RMD160 dc67eca01fe26583dd369c2027e4dabc8352b326 SHA1 96e5cf1663fbbf3209b22930a110b33c516fd91b SHA256 3b749138229e7808d0009a97e2ac47815ad5278df6879a9cc64351a7921ba06f SHA512 a0ce79599118a04c19e87fc7ed0097520b4acf9e60a63038e8f9da9cb5ba94ba2bddb5c51c967c02037ba9e7ef41924ac173e73d5598a6654717e31c642c9d61 WHIRLPOOL 0abe0da4f0925e74d528ff0925099b6563cdeafe84a8444698a7c041901776cb35c2b2ba1d274455bec0cf3ed6da4e04467a6a009fe8bded7791f9c2085ac953
diff --git a/sci-libs/fox/fox-4.1.2-r1.ebuild b/sci-libs/fox/fox-4.1.2-r1.ebuild
index 631af3676..20856c8da 100644
--- a/sci-libs/fox/fox-4.1.2-r1.ebuild
+++ b/sci-libs/fox/fox-4.1.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www1.gly.bris.ac.uk/~walker/FoX/"
 
 LICENSE="BSD ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug doc +dom +fast +sax +wcml +wkml +wxml"
 
 SRC_URI=" doc? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-full.tar.gz )
@@ -34,7 +34,7 @@ src_prepare() {
 }
 
 src_configure() {
-		econf --prefix=/usr \
+		econf --prefix="${EPREFIX}/usr" \
 		$(use_enable debug) \
 		$(use_enable dom) \
 		$(use_enable fast) \
@@ -55,7 +55,7 @@ src_test() {
 }
 
 src_install() {
-	sed -i -e's%^comp_prefix=.*$%comp_prefix=/usr%' \
+	sed -i -e's%^comp_prefix=.*$%comp_prefix=${EPREFIX}/usr%' \
 		-e's%comp_prefix/finclude%comp_prefix/lib/finclude%' \
 		-e's%\$libdir/lib\([^ ]\+\)\.a\>%-l\1%g' \
 		-e's%\(echo\( -I"$moddir"\)\?\) \$LIBS%\1 -L"$libdir" $LIBS%' \
diff --git a/sci-libs/libxc/ChangeLog b/sci-libs/libxc/ChangeLog
index aa79aef28..291d4ae5f 100644
--- a/sci-libs/libxc/ChangeLog
+++ b/sci-libs/libxc/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jun 2012; Alexey Shvetsov <alexxy@gentoo.org> libxc-1.1.0-r1.ebuild,
+  libxc-1.2.0.ebuild:
+  [sci-libs/libxc] add ~amd64-linux
+
 *libxc-1.2.0 (23 Apr 2012)
 
   23 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz> +libxc-1.2.0.ebuild:
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index fa863cf20..6f2f15d9e 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,2 +1,2 @@
 DIST libxc-1.1.0.tar.gz 543168 SHA256 b75fb2a73a9e2d75e250cc77b71d5485c8e9b11c3b25c91899c366e217283c57 SHA512 a5ed3a4a7a7abaa11321fe877d01ff00132eab976205213e578cd57fbd2073eea00ce3a3afc188e30ebbd31deb32468c4472313df9992e8d9e3148e6f619936b WHIRLPOOL 8ff70acb2ee65b3373942b71e350fe146f1c205aa4c09dbb22adc04227ba6888482ce412b3e843a9402efd51f9cf6f478f9c65b97305b2035185e59b35484d9f
-DIST libxc-1.2.0.tar.gz 895527 SHA256 ee441c3cde2e2bd87828186aa17f6e4438d17b38634c5d29bb12d3b7554461fb SHA512 3ac0fd07e40db4feb0f0a4ebe1358fdd4de0fff21f6dd369895c658a14cd3bafedbbc374b89f68320401dfcfe16a6230e05403fdaccfcbebb98349ca06593125 WHIRLPOOL 66439bf65a656567c0e52a4ee20b206658a9185bdbd3e045daca00bf01ba0199ccbedea3e5034cf90fbc36dbc04d9666cde8bde46e2577ffd160800f1718bd2a
+DIST libxc-1.2.0.tar.gz 895527 RMD160 66d0bd8b2a7b1d5cd6ea7b5ee46741ae5f05cc50 SHA1 ff34f2de4af0ff048eb871b8a48f9ccd6bc4e2cc SHA256 ee441c3cde2e2bd87828186aa17f6e4438d17b38634c5d29bb12d3b7554461fb SHA512 3ac0fd07e40db4feb0f0a4ebe1358fdd4de0fff21f6dd369895c658a14cd3bafedbbc374b89f68320401dfcfe16a6230e05403fdaccfcbebb98349ca06593125 WHIRLPOOL 66439bf65a656567c0e52a4ee20b206658a9185bdbd3e045daca00bf01ba0199ccbedea3e5034cf90fbc36dbc04d9666cde8bde46e2577ffd160800f1718bd2a
diff --git a/sci-libs/libxc/libxc-1.1.0-r1.ebuild b/sci-libs/libxc/libxc-1.1.0-r1.ebuild
index 982be1053..0d9fc78f4 100644
--- a/sci-libs/libxc/libxc-1.1.0-r1.ebuild
+++ b/sci-libs/libxc/libxc-1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="fortran static-libs"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/sci-libs/libxc/libxc-1.2.0.ebuild b/sci-libs/libxc/libxc-1.2.0.ebuild
index 982be1053..0d9fc78f4 100644
--- a/sci-libs/libxc/libxc-1.2.0.ebuild
+++ b/sci-libs/libxc/libxc-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="fortran static-libs"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/sci-libs/magma/ChangeLog b/sci-libs/magma/ChangeLog
new file mode 100644
index 000000000..460bde832
--- /dev/null
+++ b/sci-libs/magma/ChangeLog
@@ -0,0 +1,21 @@
+# ChangeLog for sci-libs/magma
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*magma-1.2.1 (03 Jul 2012)
+
+  03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/magma-1.2.1-duplicate-symbols.patch,
+  +files/magma-1.2.1-no-cuda-driver.patch, +magma-1.2.1.ebuild,
+  -files/magma-1.2.0-cblas-dotc.patch,
+  -files/magma-1.2.0-duplicate-symbols.patch, -magma-1.2.0.ebuild:
+  sci-libs/magma: Version bump. Updated patches
+
+*magma-1.2.0 (25 Jun 2012)
+
+  25 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/magma-1.2.0-cblas-dotc.patch,
+  +files/magma-1.2.0-duplicate-symbols.patch, +magma-1.2.0.ebuild,
+  +metadata.xml:
+  sci-libs/magma: Initial import
+
diff --git a/sci-libs/magma/Manifest b/sci-libs/magma/Manifest
new file mode 100644
index 000000000..9a312f75d
--- /dev/null
+++ b/sci-libs/magma/Manifest
@@ -0,0 +1 @@
+DIST magma-1.2.1.tar.gz 2978267 RMD160 914c1cb21dee07cceb0099ec4c77e6affc6c2e3b SHA1 f843ac1364d1964e6cfd2ee69c57aff7727814c5 SHA256 a1036a9d523c2ec974c743e21a33a1a6aad1a61c8d4cb686ea08249749a0c73d SHA512 1c2045031a3d2df218e0717628ff0c0e1a074020b35b0146ee4c915e0d30ea9fa0b9a198014503a4f35f7ab15dd44d58e79339df17624c52f164b99bd86c6aac WHIRLPOOL 1efebb520cbae1ccf3a3435663d6e304c48948c05590bd866e4a82089bbf4147d37d730cea899471df8a24ded7a804bb86cc237cafbfcc93783578fc33caf975
diff --git a/sci-libs/magma/files/magma-1.2.1-duplicate-symbols.patch b/sci-libs/magma/files/magma-1.2.1-duplicate-symbols.patch
new file mode 100644
index 000000000..8fd2d0dde
--- /dev/null
+++ b/sci-libs/magma/files/magma-1.2.1-duplicate-symbols.patch
@@ -0,0 +1,612 @@
+diff -Nur magma-1.2.1.orig/src/cheevx_gpu.cpp magma-1.2.1/src/cheevx_gpu.cpp
+--- magma-1.2.1.orig/src/cheevx_gpu.cpp	2012-07-03 11:59:28.923659921 -0700
++++ magma-1.2.1/src/cheevx_gpu.cpp	2012-07-03 11:59:45.428746349 -0700
+@@ -12,27 +12,6 @@
+  */
+ #include "common_magma.h"
+ 
+-/* These interfaces are used for TAU profiling */
+-extern"C"{
+-    void Mylapackf77_cstein(magma_int_t *n, float *d, float *e, magma_int_t *m, 
+-                            float *w, magma_int_t *iblock, magma_int_t *isplit,
+-                            cuFloatComplex *z, magma_int_t *ldz, float *work, 
+-                            magma_int_t *iwork, magma_int_t *ifail, magma_int_t *info)
+-    {
+-        lapackf77_cstein(n, d, e, m, w, iblock, isplit, z, ldz, work, iwork, ifail, info);
+-    }
+-
+-    void Mylapackf77_sstebz(char *range, char *order, magma_int_t *n, float *vl,
+-                            float *vu, magma_int_t *il, magma_int_t *iu, float *abstol,
+-                            float *d, float *e, magma_int_t *m, magma_int_t *nsplit, 
+-                            float *w, magma_int_t *iblock, magma_int_t *isplit, 
+-                            float *work, magma_int_t *iwork, magma_int_t *info)
+-    {
+-        lapackf77_sstebz(range, order, n, vl, vu, il, iu, abstol, 
+-                         d, e, m, nsplit, w, iblock, isplit, work, iwork,info);
+-    }
+-}
+-
+ extern "C" magma_int_t 
+ magma_cheevx_gpu(char jobz, char range, char uplo, magma_int_t n, 
+                  cuFloatComplex *da, magma_int_t ldda, float vl, float vu, 
+@@ -404,12 +383,12 @@
+     indisp = indibl + n;
+     indiwk = indisp + n;
+ 
+-    Mylapackf77_sstebz(range_, order, &n, &vl, &vu, &il, &iu, &abstol, &rwork[indd], &rwork[inde], m,
++    lapackf77_sstebz(range_, order, &n, &vl, &vu, &il, &iu, &abstol, &rwork[indd], &rwork[inde], m,
+                      &nsplit, &w[1], &iwork[indibl], &iwork[indisp], &rwork[indrwk], &iwork[indiwk], info);
+     
+     if (wantz) {
+       
+-      Mylapackf77_cstein(&n, &rwork[indd], &rwork[inde], m, &w[1], &iwork[indibl], &iwork[indisp],
++      lapackf77_cstein(&n, &rwork[indd], &rwork[inde], m, &w[1], &iwork[indibl], &iwork[indisp],
+                        wz, &ldwz, &rwork[indrwk], &iwork[indiwk], &ifail[1], info);
+       
+       magma_csetmatrix( n, *m, wz, ldwz, dz, lddz );
+diff -Nur magma-1.2.1.orig/src/chegvd.cpp magma-1.2.1/src/chegvd.cpp
+--- magma-1.2.1.orig/src/chegvd.cpp	2012-07-03 11:59:28.932659966 -0700
++++ magma-1.2.1/src/chegvd.cpp	2012-07-03 11:59:45.428746349 -0700
+@@ -13,26 +13,6 @@
+ */
+ #include "common_magma.h"
+ 
+-/* This ctrmm interface is used for TAU profiling */
+-void Mymagma_ctrmm(char side, char uplo, char trans, char unit,
+-                   magma_int_t n, magma_int_t m,
+-                   cuFloatComplex alpha, cuFloatComplex *db, magma_int_t lddb,
+-                   cuFloatComplex *dz, magma_int_t lddz)
+-{
+-  magma_ctrmm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-  magma_device_sync();
+-}
+-
+-/* This ctrsm interface is used for TAU profiling */
+-void Mymagma_ctrsm(char side, char uplo, char trans, char unit,
+-                   magma_int_t n, magma_int_t m,
+-                   cuFloatComplex alpha, cuFloatComplex *db, magma_int_t lddb,
+-                   cuFloatComplex *dz, magma_int_t lddz)
+-{
+-  magma_ctrsm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-  magma_device_sync();
+-}
+-
+ extern "C" magma_int_t
+ magma_chegvd(magma_int_t itype, char jobz, char uplo, magma_int_t n,
+              cuFloatComplex *a, magma_int_t lda, cuFloatComplex *b, magma_int_t ldb,
+@@ -324,7 +304,7 @@
+                 *(unsigned char *)trans = MagmaNoTrans;
+             }
+ 
+-            Mymagma_ctrsm(MagmaLeft, uplo_[0], *trans, MagmaNonUnit,
++            magma_ctrsm(MagmaLeft, uplo_[0], *trans, MagmaNonUnit,
+                           n, n, c_one, db, lddb, da, ldda);
+ 
+         } else if (itype == 3)
+@@ -337,7 +317,7 @@
+                 *(unsigned char *)trans = MagmaConjTrans;
+             }
+ 
+-            Mymagma_ctrmm(MagmaLeft, uplo_[0], *trans, MagmaNonUnit,
++            magma_ctrmm(MagmaLeft, uplo_[0], *trans, MagmaNonUnit,
+                           n, n, c_one, db, lddb, da, ldda);
+         }
+ 
+diff -Nur magma-1.2.1.orig/src/chegvdx.cpp magma-1.2.1/src/chegvdx.cpp
+--- magma-1.2.1.orig/src/chegvdx.cpp	2012-07-03 11:59:28.921659909 -0700
++++ magma-1.2.1/src/chegvdx.cpp	2012-07-03 11:59:45.428746349 -0700
+@@ -12,22 +12,6 @@
+ */
+ #include "common_magma.h"
+ 
+-void Mymagma_ctrmm(char side, char uplo, char trans, char unit, magma_int_t n, magma_int_t m,
+-                   cuFloatComplex alpha, cuFloatComplex *db, magma_int_t lddb, 
+-                   cuFloatComplex *dz, magma_int_t lddz)
+-{
+-    magma_ctrmm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-    magma_device_sync();
+-}
+-
+-void Mymagma_ctrsm(char side, char uplo, char trans, char unit, magma_int_t n, magma_int_t m,
+-                   cuFloatComplex alpha, cuFloatComplex *db, magma_int_t lddb, 
+-                   cuFloatComplex *dz, magma_int_t lddz)
+-{
+-    magma_ctrsm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-    magma_device_sync();
+-}
+-
+ extern "C" magma_int_t
+ magma_chegvdx(magma_int_t itype, char jobz, char range, char uplo, magma_int_t n,
+               cuFloatComplex *a, magma_int_t lda, cuFloatComplex *b, magma_int_t ldb, 
+@@ -363,7 +347,7 @@
+                 *(unsigned char *)trans = MagmaNoTrans;
+             }
+ 
+-            Mymagma_ctrsm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, da, ldda);
++            magma_ctrsm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, da, ldda);
+ 
+         } else if (itype == 3) {
+ 
+@@ -375,7 +359,7 @@
+                 *(unsigned char *)trans = MagmaConjTrans;
+             }
+ 
+-            Mymagma_ctrmm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, da, ldda);
++            magma_ctrmm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, da, ldda);
+ 
+         }
+ 
+diff -Nur magma-1.2.1.orig/src/chegvr.cpp magma-1.2.1/src/chegvr.cpp
+--- magma-1.2.1.orig/src/chegvr.cpp	2012-07-03 11:59:28.932659966 -0700
++++ magma-1.2.1/src/chegvr.cpp	2012-07-03 11:59:45.429746354 -0700
+@@ -12,24 +12,6 @@
+  */
+ #include "common_magma.h"
+ 
+-void Mymagma_ctrmm(char side, char uplo, char trans, char unit, 
+-                   magma_int_t n, magma_int_t m,
+-                   cuFloatComplex alpha, cuFloatComplex *db, magma_int_t lddb, 
+-                   cuFloatComplex *dz, magma_int_t lddz)
+-{
+-    magma_ctrmm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-    magma_device_sync();
+-}
+-
+-void Mymagma_ctrsm(char side, char uplo, char trans, char unit, 
+-                   magma_int_t n, magma_int_t m,
+-                   cuFloatComplex alpha, cuFloatComplex *db, magma_int_t lddb,
+-                   cuFloatComplex *dz, magma_int_t lddz)
+-{
+-    magma_ctrsm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-    magma_device_sync();
+-}
+-
+ extern "C" magma_int_t
+ magma_chegvr(magma_int_t itype, char jobz, char range, char uplo, magma_int_t n,
+              cuFloatComplex *a, magma_int_t lda, cuFloatComplex *b, magma_int_t ldb, 
+@@ -408,7 +390,7 @@
+                 *(unsigned char *)trans = MagmaNoTrans;
+             }
+             
+-            Mymagma_ctrsm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, 
++            magma_ctrsm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, 
+                           db, lddb, dz, lddz);
+       
+         } else if (itype == 3) {
+@@ -421,7 +403,7 @@
+                 *(unsigned char *)trans = MagmaConjTrans;
+             }
+             
+-            Mymagma_ctrmm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, 
++            magma_ctrmm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, 
+                           db, lddb, dz, lddz);
+         }
+         
+diff -Nur magma-1.2.1.orig/src/chegvx.cpp magma-1.2.1/src/chegvx.cpp
+--- magma-1.2.1.orig/src/chegvx.cpp	2012-07-03 11:59:28.923659921 -0700
++++ magma-1.2.1/src/chegvx.cpp	2012-07-03 11:59:45.429746354 -0700
+@@ -12,22 +12,6 @@
+  */
+ #include "common_magma.h"
+ 
+-void Mymagma_ctrmm(char side, char uplo, char trans, char unit, magma_int_t n, magma_int_t m,
+-                   cuFloatComplex alpha, cuFloatComplex *db, magma_int_t lddb,
+-                   cuFloatComplex *dz, magma_int_t lddz)
+-{
+-    magma_ctrmm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-    magma_device_sync();
+-}
+-
+-void Mymagma_ctrsm(char side, char uplo, char trans, char unit, magma_int_t n, magma_int_t m,
+-                   cuFloatComplex alpha, cuFloatComplex *db, magma_int_t lddb, 
+-                   cuFloatComplex *dz, magma_int_t lddz)
+-{
+-    magma_ctrsm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-    magma_device_sync();
+-}
+-
+ extern "C" magma_int_t
+ magma_chegvx(magma_int_t itype, char jobz, char range, char uplo, magma_int_t n,
+              cuFloatComplex *a, magma_int_t lda, cuFloatComplex *b, magma_int_t ldb, 
+@@ -330,7 +314,7 @@
+         *(unsigned char *)trans = MagmaNoTrans;
+       }
+       
+-      Mymagma_ctrsm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, dz, lddz);
++      magma_ctrsm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, dz, lddz);
+       
+     } else if (itype == 3) {
+       
+@@ -343,7 +327,7 @@
+         *(unsigned char *)trans = MagmaConjTrans;
+       }
+       
+-      Mymagma_ctrmm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, dz, lddz);
++      magma_ctrmm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, dz, lddz);
+       
+     }
+     
+diff -Nur magma-1.2.1.orig/src/cstedx_m.cpp magma-1.2.1/src/cstedx_m.cpp
+--- magma-1.2.1.orig/src/cstedx_m.cpp	2012-07-03 11:59:28.921659909 -0700
++++ magma-1.2.1/src/cstedx_m.cpp	2012-07-03 11:59:45.429746354 -0700
+@@ -16,10 +16,7 @@
+                                float* work, magma_int_t lwork, magma_int_t* iwork, magma_int_t liwork,
+                                magma_int_t* info);
+ 
+-    magma_int_t get_cstedx_smlsize()
+-    {
+-        return 25;
+-    }
++   magma_int_t get_cstedx_smlsize();
+ }
+ 
+ extern "C" magma_int_t
+diff -Nur magma-1.2.1.orig/src/dlaex0_m.cpp magma-1.2.1/src/dlaex0_m.cpp
+--- magma-1.2.1.orig/src/dlaex0_m.cpp	2012-07-03 11:59:28.933659971 -0700
++++ magma-1.2.1/src/dlaex0_m.cpp	2012-07-03 11:59:45.430746359 -0700
+@@ -22,10 +22,7 @@
+ 
+     int magma_get_dlaex3_m_nb();
+ 
+-    magma_int_t get_dlaex0_smlsize()
+-    {
+-        return 25;
+-    }
++    magma_int_t get_dlaex0_smlsize();
+ }
+ 
+ extern "C" magma_int_t
+diff -Nur magma-1.2.1.orig/src/dlaex3_m.cpp magma-1.2.1/src/dlaex3_m.cpp
+--- magma-1.2.1.orig/src/dlaex3_m.cpp	2012-07-03 11:59:28.929659951 -0700
++++ magma-1.2.1/src/dlaex3_m.cpp	2012-07-03 11:59:45.430746359 -0700
+@@ -34,7 +34,7 @@
+ }
+ 
+ extern"C"{
+-    void dvrange(magma_int_t k, double *d, magma_int_t *il, magma_int_t *iu, double vl, double vu)
++    void ddvrange(magma_int_t k, double *d, magma_int_t *il, magma_int_t *iu, double vl, double vu)
+     {
+         magma_int_t i;
+ 
+@@ -51,7 +51,7 @@
+         return;
+     }
+ 
+-    void dirange(magma_int_t k, magma_int_t* indxq, magma_int_t *iil, magma_int_t *iiu, magma_int_t il, magma_int_t iu)
++    void ddirange(magma_int_t k, magma_int_t* indxq, magma_int_t *iil, magma_int_t *iiu, magma_int_t il, magma_int_t iu)
+     {
+         magma_int_t i;
+ 
+@@ -362,9 +362,9 @@
+ 
+     //compute the lower and upper bound of the non-deflated eigenvectors
+     if (valeig)
+-        dvrange(k, d, &iil, &iiu, vl, vu);
++        ddvrange(k, d, &iil, &iiu, vl, vu);
+     else if (indeig)
+-        dirange(k, indxq, &iil, &iiu, il, iu);
++        ddirange(k, indxq, &iil, &iiu, il, iu);
+     else {
+         iil = 1;
+         iiu = k;
+diff -Nur magma-1.2.1.orig/src/dstedx_m.cpp magma-1.2.1/src/dstedx_m.cpp
+--- magma-1.2.1.orig/src/dstedx_m.cpp	2012-07-03 11:59:28.920659903 -0700
++++ magma-1.2.1/src/dstedx_m.cpp	2012-07-03 11:59:45.430746359 -0700
+@@ -26,10 +26,7 @@
+ 
+     double lapackf77_dlanst( char* norm, magma_int_t* n, double* d, double* e);
+ 
+-    magma_int_t get_dstedx_smlsize()
+-    {
+-        return 25;
+-    }
++  magma_int_t get_dstedx_smlsize();
+ }
+ 
+ extern "C" magma_int_t
+diff -Nur magma-1.2.1.orig/src/slaex0_m.cpp magma-1.2.1/src/slaex0_m.cpp
+--- magma-1.2.1.orig/src/slaex0_m.cpp	2012-07-03 11:59:28.931659961 -0700
++++ magma-1.2.1/src/slaex0_m.cpp	2012-07-03 11:59:45.431746364 -0700
+@@ -22,10 +22,7 @@
+ 
+     int magma_get_slaex3_m_nb();
+ 
+-    magma_int_t get_slaex0_smlsize()
+-    {
+-        return 25;
+-    }
++    magma_int_t get_slaex0_smlsize();
+ }
+ 
+ extern "C" magma_int_t
+diff -Nur magma-1.2.1.orig/src/slaex3_m.cpp magma-1.2.1/src/slaex3_m.cpp
+--- magma-1.2.1.orig/src/slaex3_m.cpp	2012-07-03 11:59:28.920659903 -0700
++++ magma-1.2.1/src/slaex3_m.cpp	2012-07-03 11:59:45.431746364 -0700
+@@ -34,7 +34,7 @@
+ }
+ 
+ extern"C"{
+-    void dvrange(magma_int_t k, float *d, magma_int_t *il, magma_int_t *iu, float vl, float vu)
++    void sdvrange(magma_int_t k, float *d, magma_int_t *il, magma_int_t *iu, float vl, float vu)
+     {
+         magma_int_t i;
+ 
+@@ -51,7 +51,7 @@
+         return;
+     }
+ 
+-    void dirange(magma_int_t k, magma_int_t* indxq, magma_int_t *iil, magma_int_t *iiu, magma_int_t il, magma_int_t iu)
++    void sdirange(magma_int_t k, magma_int_t* indxq, magma_int_t *iil, magma_int_t *iiu, magma_int_t il, magma_int_t iu)
+     {
+         magma_int_t i;
+ 
+@@ -362,9 +362,9 @@
+ 
+     //compute the lower and upper bound of the non-deflated eigenvectors
+     if (valeig)
+-        dvrange(k, d, &iil, &iiu, vl, vu);
++        sdvrange(k, d, &iil, &iiu, vl, vu);
+     else if (indeig)
+-        dirange(k, indxq, &iil, &iiu, il, iu);
++        sdirange(k, indxq, &iil, &iiu, il, iu);
+     else {
+         iil = 1;
+         iiu = k;
+diff -Nur magma-1.2.1.orig/src/sstedx_m.cpp magma-1.2.1/src/sstedx_m.cpp
+--- magma-1.2.1.orig/src/sstedx_m.cpp	2012-07-03 11:59:28.932659966 -0700
++++ magma-1.2.1/src/sstedx_m.cpp	2012-07-03 11:59:45.431746364 -0700
+@@ -26,10 +26,7 @@
+ 
+     float lapackf77_slanst( char* norm, magma_int_t* n, float* d, float* e);
+ 
+-    magma_int_t get_sstedx_smlsize()
+-    {
+-        return 25;
+-    }
++    magma_int_t get_sstedx_smlsize();
+ }
+ 
+ extern "C" magma_int_t
+diff -Nur magma-1.2.1.orig/src/zheevx_gpu.cpp magma-1.2.1/src/zheevx_gpu.cpp
+--- magma-1.2.1.orig/src/zheevx_gpu.cpp	2012-07-03 11:59:28.934659976 -0700
++++ magma-1.2.1/src/zheevx_gpu.cpp	2012-07-03 11:59:45.431746364 -0700
+@@ -12,27 +12,6 @@
+  */
+ #include "common_magma.h"
+ 
+-/* These interfaces are used for TAU profiling */
+-extern"C"{
+-    void Mylapackf77_zstein(magma_int_t *n, double *d, double *e, magma_int_t *m, 
+-                            double *w, magma_int_t *iblock, magma_int_t *isplit,
+-                            cuDoubleComplex *z, magma_int_t *ldz, double *work, 
+-                            magma_int_t *iwork, magma_int_t *ifail, magma_int_t *info)
+-    {
+-        lapackf77_zstein(n, d, e, m, w, iblock, isplit, z, ldz, work, iwork, ifail, info);
+-    }
+-
+-    void Mylapackf77_dstebz(char *range, char *order, magma_int_t *n, double *vl,
+-                            double *vu, magma_int_t *il, magma_int_t *iu, double *abstol,
+-                            double *d, double *e, magma_int_t *m, magma_int_t *nsplit, 
+-                            double *w, magma_int_t *iblock, magma_int_t *isplit, 
+-                            double *work, magma_int_t *iwork, magma_int_t *info)
+-    {
+-        lapackf77_dstebz(range, order, n, vl, vu, il, iu, abstol, 
+-                         d, e, m, nsplit, w, iblock, isplit, work, iwork,info);
+-    }
+-}
+-
+ extern "C" magma_int_t 
+ magma_zheevx_gpu(char jobz, char range, char uplo, magma_int_t n, 
+                  cuDoubleComplex *da, magma_int_t ldda, double vl, double vu, 
+@@ -404,12 +383,12 @@
+     indisp = indibl + n;
+     indiwk = indisp + n;
+ 
+-    Mylapackf77_dstebz(range_, order, &n, &vl, &vu, &il, &iu, &abstol, &rwork[indd], &rwork[inde], m,
++    lapackf77_dstebz(range_, order, &n, &vl, &vu, &il, &iu, &abstol, &rwork[indd], &rwork[inde], m,
+                      &nsplit, &w[1], &iwork[indibl], &iwork[indisp], &rwork[indrwk], &iwork[indiwk], info);
+     
+     if (wantz) {
+       
+-      Mylapackf77_zstein(&n, &rwork[indd], &rwork[inde], m, &w[1], &iwork[indibl], &iwork[indisp],
++      lapackf77_zstein(&n, &rwork[indd], &rwork[inde], m, &w[1], &iwork[indibl], &iwork[indisp],
+                        wz, &ldwz, &rwork[indrwk], &iwork[indiwk], &ifail[1], info);
+       
+       magma_zsetmatrix( n, *m, wz, ldwz, dz, lddz );
+diff -Nur magma-1.2.1.orig/src/zhegvd.cpp magma-1.2.1/src/zhegvd.cpp
+--- magma-1.2.1.orig/src/zhegvd.cpp	2012-07-03 11:59:28.920659903 -0700
++++ magma-1.2.1/src/zhegvd.cpp	2012-07-03 11:59:45.432746370 -0700
+@@ -13,26 +13,6 @@
+ */
+ #include "common_magma.h"
+ 
+-/* This ztrmm interface is used for TAU profiling */
+-void Mymagma_ztrmm(char side, char uplo, char trans, char unit,
+-                   magma_int_t n, magma_int_t m,
+-                   cuDoubleComplex alpha, cuDoubleComplex *db, magma_int_t lddb,
+-                   cuDoubleComplex *dz, magma_int_t lddz)
+-{
+-  magma_ztrmm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-  magma_device_sync();
+-}
+-
+-/* This ztrsm interface is used for TAU profiling */
+-void Mymagma_ztrsm(char side, char uplo, char trans, char unit,
+-                   magma_int_t n, magma_int_t m,
+-                   cuDoubleComplex alpha, cuDoubleComplex *db, magma_int_t lddb,
+-                   cuDoubleComplex *dz, magma_int_t lddz)
+-{
+-  magma_ztrsm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-  magma_device_sync();
+-}
+-
+ extern "C" magma_int_t
+ magma_zhegvd(magma_int_t itype, char jobz, char uplo, magma_int_t n,
+              cuDoubleComplex *a, magma_int_t lda, cuDoubleComplex *b, magma_int_t ldb,
+@@ -324,7 +304,7 @@
+                 *(unsigned char *)trans = MagmaNoTrans;
+             }
+ 
+-            Mymagma_ztrsm(MagmaLeft, uplo_[0], *trans, MagmaNonUnit,
++            magma_ztrsm(MagmaLeft, uplo_[0], *trans, MagmaNonUnit,
+                           n, n, c_one, db, lddb, da, ldda);
+ 
+         } else if (itype == 3)
+@@ -337,7 +317,7 @@
+                 *(unsigned char *)trans = MagmaConjTrans;
+             }
+ 
+-            Mymagma_ztrmm(MagmaLeft, uplo_[0], *trans, MagmaNonUnit,
++            magma_ztrmm(MagmaLeft, uplo_[0], *trans, MagmaNonUnit,
+                           n, n, c_one, db, lddb, da, ldda);
+         }
+ 
+diff -Nur magma-1.2.1.orig/src/zhegvdx.cpp magma-1.2.1/src/zhegvdx.cpp
+--- magma-1.2.1.orig/src/zhegvdx.cpp	2012-07-03 11:59:28.922659915 -0700
++++ magma-1.2.1/src/zhegvdx.cpp	2012-07-03 11:59:45.432746370 -0700
+@@ -12,22 +12,6 @@
+ */
+ #include "common_magma.h"
+ 
+-void Mymagma_ztrmm(char side, char uplo, char trans, char unit, magma_int_t n, magma_int_t m,
+-                   cuDoubleComplex alpha, cuDoubleComplex *db, magma_int_t lddb, 
+-                   cuDoubleComplex *dz, magma_int_t lddz)
+-{
+-    magma_ztrmm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-    magma_device_sync();
+-}
+-
+-void Mymagma_ztrsm(char side, char uplo, char trans, char unit, magma_int_t n, magma_int_t m,
+-                   cuDoubleComplex alpha, cuDoubleComplex *db, magma_int_t lddb, 
+-                   cuDoubleComplex *dz, magma_int_t lddz)
+-{
+-    magma_ztrsm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-    magma_device_sync();
+-}
+-
+ extern "C" magma_int_t
+ magma_zhegvdx(magma_int_t itype, char jobz, char range, char uplo, magma_int_t n,
+               cuDoubleComplex *a, magma_int_t lda, cuDoubleComplex *b, magma_int_t ldb, 
+@@ -363,7 +347,7 @@
+                 *(unsigned char *)trans = MagmaNoTrans;
+             }
+ 
+-            Mymagma_ztrsm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, da, ldda);
++            magma_ztrsm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, da, ldda);
+ 
+         } else if (itype == 3) {
+ 
+@@ -375,7 +359,7 @@
+                 *(unsigned char *)trans = MagmaConjTrans;
+             }
+ 
+-            Mymagma_ztrmm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, da, ldda);
++            magma_ztrmm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, da, ldda);
+ 
+         }
+ 
+diff -Nur magma-1.2.1.orig/src/zhegvr.cpp magma-1.2.1/src/zhegvr.cpp
+--- magma-1.2.1.orig/src/zhegvr.cpp	2012-07-03 11:59:28.930659956 -0700
++++ magma-1.2.1/src/zhegvr.cpp	2012-07-03 11:59:45.432746370 -0700
+@@ -12,24 +12,6 @@
+  */
+ #include "common_magma.h"
+ 
+-void Mymagma_ztrmm(char side, char uplo, char trans, char unit, 
+-                   magma_int_t n, magma_int_t m,
+-                   cuDoubleComplex alpha, cuDoubleComplex *db, magma_int_t lddb, 
+-                   cuDoubleComplex *dz, magma_int_t lddz)
+-{
+-    magma_ztrmm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-    magma_device_sync();
+-}
+-
+-void Mymagma_ztrsm(char side, char uplo, char trans, char unit, 
+-                   magma_int_t n, magma_int_t m,
+-                   cuDoubleComplex alpha, cuDoubleComplex *db, magma_int_t lddb,
+-                   cuDoubleComplex *dz, magma_int_t lddz)
+-{
+-    magma_ztrsm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-    magma_device_sync();
+-}
+-
+ extern "C" magma_int_t
+ magma_zhegvr(magma_int_t itype, char jobz, char range, char uplo, magma_int_t n,
+              cuDoubleComplex *a, magma_int_t lda, cuDoubleComplex *b, magma_int_t ldb, 
+@@ -408,7 +390,7 @@
+                 *(unsigned char *)trans = MagmaNoTrans;
+             }
+             
+-            Mymagma_ztrsm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, 
++            magma_ztrsm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, 
+                           db, lddb, dz, lddz);
+       
+         } else if (itype == 3) {
+@@ -421,7 +403,7 @@
+                 *(unsigned char *)trans = MagmaConjTrans;
+             }
+             
+-            Mymagma_ztrmm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, 
++            magma_ztrmm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, 
+                           db, lddb, dz, lddz);
+         }
+         
+diff -Nur magma-1.2.1.orig/src/zhegvx.cpp magma-1.2.1/src/zhegvx.cpp
+--- magma-1.2.1.orig/src/zhegvx.cpp	2012-07-03 11:59:28.914659873 -0700
++++ magma-1.2.1/src/zhegvx.cpp	2012-07-03 11:59:45.433746376 -0700
+@@ -12,22 +12,6 @@
+  */
+ #include "common_magma.h"
+ 
+-void Mymagma_ztrmm(char side, char uplo, char trans, char unit, magma_int_t n, magma_int_t m,
+-                   cuDoubleComplex alpha, cuDoubleComplex *db, magma_int_t lddb,
+-                   cuDoubleComplex *dz, magma_int_t lddz)
+-{
+-    magma_ztrmm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-    magma_device_sync();
+-}
+-
+-void Mymagma_ztrsm(char side, char uplo, char trans, char unit, magma_int_t n, magma_int_t m,
+-                   cuDoubleComplex alpha, cuDoubleComplex *db, magma_int_t lddb, 
+-                   cuDoubleComplex *dz, magma_int_t lddz)
+-{
+-    magma_ztrsm(side, uplo, trans, unit, n, m, alpha, db, lddb, dz, lddz);
+-    magma_device_sync();
+-}
+-
+ extern "C" magma_int_t
+ magma_zhegvx(magma_int_t itype, char jobz, char range, char uplo, magma_int_t n,
+              cuDoubleComplex *a, magma_int_t lda, cuDoubleComplex *b, magma_int_t ldb, 
+@@ -330,7 +314,7 @@
+         *(unsigned char *)trans = MagmaNoTrans;
+       }
+       
+-      Mymagma_ztrsm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, dz, lddz);
++      magma_ztrsm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, dz, lddz);
+       
+     } else if (itype == 3) {
+       
+@@ -343,7 +327,7 @@
+         *(unsigned char *)trans = MagmaConjTrans;
+       }
+       
+-      Mymagma_ztrmm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, dz, lddz);
++      magma_ztrmm(MagmaLeft, uplo, *trans, MagmaNonUnit, n, *m, c_one, db, lddb, dz, lddz);
+       
+     }
+     
+diff -Nur magma-1.2.1.orig/src/zstedx_m.cpp magma-1.2.1/src/zstedx_m.cpp
+--- magma-1.2.1.orig/src/zstedx_m.cpp	2012-07-03 11:59:28.921659909 -0700
++++ magma-1.2.1/src/zstedx_m.cpp	2012-07-03 11:59:45.433746376 -0700
+@@ -16,10 +16,7 @@
+                                double* work, magma_int_t lwork, magma_int_t* iwork, magma_int_t liwork,
+                                magma_int_t* info);
+ 
+-    magma_int_t get_zstedx_smlsize()
+-    {
+-        return 25;
+-    }
++    magma_int_t get_zstedx_smlsize();
+ }
+ 
+ extern "C" magma_int_t
diff --git a/sci-libs/magma/files/magma-1.2.1-no-cuda-driver.patch b/sci-libs/magma/files/magma-1.2.1-no-cuda-driver.patch
new file mode 100644
index 000000000..9dc99a865
--- /dev/null
+++ b/sci-libs/magma/files/magma-1.2.1-no-cuda-driver.patch
@@ -0,0 +1,38 @@
+--- magma-1.2.1.orig/testing/lin/Makefile	2012-07-03 11:59:28.875659669 -0700
++++ magma-1.2.1/testing/lin/Makefile	2012-07-03 12:01:05.546166252 -0700
+@@ -266,7 +266,7 @@
+ 	../matgen/$(TMGLIB) -o xlintsts \
+ 	../fortran.o \
+ 	$(LDOPTS) -L../../lib \
+-	-lcuda -lmagma -lmagmablas \
++	-lmagma -lmagmablas \
+ 	$(LIBDIR) $(LIB) 
+ 
+ xlintstc : $(ALINTST) $(CLINTST) $(SCLNTST) ../fortran.o
+@@ -274,7 +274,7 @@
+ 	../matgen/$(TMGLIB) -o xlintstc \
+ 	../fortran.o \
+ 	$(LDOPTS) -L../../lib \
+-	-lcuda -lmagma -lmagmablas \
++	-lmagma -lmagmablas \
+ 	$(LIBDIR) $(LIB) 
+  
+ xlintstd : $(ALINTST) $(DLINTST) $(DZLNTST) ../fortran.o
+@@ -282,7 +282,7 @@
+ 	../matgen/$(TMGLIB) -o xlintstd \
+ 	../fortran.o \
+ 	$(LDOPTS) -L../../lib \
+-	-lcuda -lmagma -lmagmablas \
++	-lmagma -lmagmablas \
+ 	$(LIBDIR) $(LIB) 
+  
+ xlintstz : $(ALINTST) $(ZLINTST) $(DZLNTST) ../fortran.o
+@@ -290,7 +290,7 @@
+ 	../matgen/$(TMGLIB) -o xlintstz \
+ 	../fortran.o \
+ 	$(LDOPTS) -L../../lib \
+-	-lcuda -lmagma -lmagmablas -lmagma \
++	-lmagma -lmagmablas -lmagma \
+ 	$(LIBDIR) $(LIB) 
+  
+ $(ALINTST): $(FRC)
diff --git a/sci-libs/magma/magma-1.2.1.ebuild b/sci-libs/magma/magma-1.2.1.ebuild
new file mode 100644
index 000000000..65b822c11
--- /dev/null
+++ b/sci-libs/magma/magma-1.2.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+FORTRAN_STANDARD="77 90"
+inherit eutils fortran-2 toolchain-funcs versionator
+
+DESCRIPTION="Matrix Algebra on GPU and Multicore Architectures"
+HOMEPAGE="http://icl.cs.utk.edu/magma/"
+SRC_URI="http://icl.cs.utk.edu/projectsfiles/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="fermi static-libs tesla"
+
+RDEPEND="dev-util/nvidia-cuda-toolkit
+	virtual/cblas
+	virtual/lapack"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+make_shared_lib() {
+	local libstatic=${1}
+	local soname=$(basename "${1%.a}").so.$(get_major_version)
+	shift
+	einfo "Making ${soname}"
+	${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+		-shared -Wl,-soname="${soname}" \
+		-Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
+		"$@" -o $(dirname "${libstatic}")/"${soname}" \
+		|| die "${soname} failed"
+	ln -s "${soname}" $(dirname "${libstatic}")/"${soname%.*}"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-duplicate-symbols.patch \
+		"${FILESDIR}"/${P}-no-cuda-driver.patch
+
+	# distributed pc file not so useful so replace it
+	cat <<-EOF > ${PN}.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include/${PN}
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lmagma -lmagmablas
+		Libs.private: -lm -lpthread -ldl -lcublas -lcudart
+		Cflags: -I\${includedir}
+		Requires: cblas lapack
+	EOF
+}
+
+src_configure() {
+	cat <<-EOF > make.inc
+		ARCH = $(tc-getAR)
+		ARCHFLAGS = cr
+		RANLIB = $(tc-getRANLIB)
+		NVCC = nvcc
+		CC = $(tc-getCXX)
+		FORT = $(tc-getFC)
+		INC = -I${EPREFIX}/opt/cuda/include -DADD_
+		OPTS = ${CFLAGS} -fPIC
+		FOPTS = ${FFLAGS} -fPIC -x f95-cpp-input
+		F77OPTS = ${FFLAGS} -fPIC
+		NVOPTS = -DADD_ --compiler-options '-fPIC ${CFLAGS}' -DUNIX
+		LOADER = $(tc-getFC)
+		LIBBLAS = $(pkg-config --libs cblas)
+		LIBLAPACK = $(pkg-config --libs lapack)
+		CUDADIR = ${EPREFIX}/opt/cuda
+		LIBCUDA = -L\$(CUDADIR)/$(get_libdir) -lcublas -lcudart
+		LIB = -pthread -lm -ldl \$(LIBCUDA) \$(LIBBLAS) \$(LIBLAPACK) -lstdc++
+	EOF
+	if use fermi; then
+		echo >> make.inc "GPU_TARGET = Fermi"
+	elif use tesla; then
+		echo >> make.inc "GPU_TARGET = Tesla"
+	fi
+}
+
+src_compile() {
+	emake lib
+	make_shared_lib lib/libmagma.a
+	make_shared_lib lib/libmagmablas.a
+	if use static-libs; then
+		emake cleanall
+		sed 's/-fPIC//g' make.inc
+		emake lib
+	fi
+}
+
+src_test() {
+	emake test lapacktest
+	cd testing/lin
+	python lapack_testing.py || die
+}
+
+src_install() {
+	dolib.so lib/lib*.so*
+	use static-libs && dolib.a lib/lib*.a
+	insinto /usr/include/${PN}
+	doins include/*.h
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+	dodoc README ReleaseNotes
+}
diff --git a/sci-libs/magma/metadata.xml b/sci-libs/magma/metadata.xml
new file mode 100644
index 000000000..195c0d273
--- /dev/null
+++ b/sci-libs/magma/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang="en">
+  The Matrix Algebra on GPU and Multicore Architectures
+  project aims to develop a dense linear algebra library
+  similar to LAPACK but for heterogeneous/hybrid architectures, starting
+  with current "Multicore+GPU" systems.
+</longdescription>
+<use>
+  <flag name="fermi">Compile for GPU NVIDIA Fermi family (2.x cards)</flag>
+  <flag name="tesla">Compile for GPU NVIDIA Tesla family (1.x cards)></flag>
+</use>
+</pkgmetadata>
diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 0cb3791ef..b31db974e 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org>
+  files/openblas-sharedlibs-0.2.patch:
+  sci-libs/openblas: fixed soname
+
+*openblas-0.2.0 (26 Jun 2012)
+
+  26 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org> -openblas-0.1.ebuild,
+  +openblas-0.2.0.ebuild, +files/openblas-sharedlibs-0.2.patch,
+  openblas-9999.ebuild, -files/openblas-sharedlibs.patch:
+  Version bump. Adapted patch. More prefix keywords
+
   07 May 2012; Andrea Arteaga <andyspiros@gmail.com>
   -openblas-0.1_alpha2.ebuild -openblas-0.1_alpha25.ebuild:
   Cleaned up old versions.
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 0a204833b..d77f90156 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,2 +1,2 @@
 DIST openblas-0.1.1.tbz2 1657574 SHA256 0ab5f5b2ef7f3754977abf38686d8597a1296e91a27553867ece78357c453668 SHA512 834f1a2cfa03bafe484f59d6a7eea845f22210cacac52c605f09a5c939395f153e9213dc8f3abfccd133fb2efaeaf69d5053ad5cd90703a8eefd2877d4288981 WHIRLPOOL 1a2e4fe4616f9af453e1cbfaddfe103c7f73373d831f8a0dfc367c67c8d162ffbe911aa4a4f0ed26b2b44fb1e777ef6bddb1b785b4e8f879b7255a629d00b6c0
-DIST openblas-0.1.tbz2 1638384 SHA256 c20d5cca807d1a47c76bd6ed4d05e4f265584bb7ac5b777245616738c8388097 SHA512 76ee80bb85c066ddd175776cdd6d7a4707d0dad34028cf656a51ffac88289b28ddcfd96aff4915c412a457225ed14ab9c0bfea7cc64c0c80227157a404d20d21 WHIRLPOOL bb3b3fa522ad0e82c9ab4ee1bd4370ab96010537a1b3656c5d7eb87b6ac8aed15cdf4e9f107f47a4bcd6036e6dcb88f4d87318f805c895d5f92cd8a98a5f0cfe
+DIST openblas-0.2.0.tar.gz 3230656 RMD160 8c032874db2daf0d5edd855b626ead86be2bd44a SHA1 76f6fd7463d5972d4a992357e2016212b2696f0f SHA256 5b2fc651e1631322ed2b4fca45af605e571eafda43f7d1fbb28a9805666fdf2e SHA512 6c0b8223e059dc3845dce623dc737b1914e14041c509f711b11d638241d2fc72c4b702b3fca31c2642b2fdd631ebf89ddec72bedac461559ff0e1b49db06c07e WHIRLPOOL f9c7dfdb8f6aea39713521c8494b3cc9809394882d3fdd0c4a5d2b08fbb5088c3f8fe30219b3d27cce3e454243eeb7771bf7bf77e9e4d8cae0d0f0cd5ec5fac8
diff --git a/sci-libs/openblas/files/openblas-sharedlibs-0.2.patch b/sci-libs/openblas/files/openblas-sharedlibs-0.2.patch
new file mode 100644
index 000000000..a66b31457
--- /dev/null
+++ b/sci-libs/openblas/files/openblas-sharedlibs-0.2.patch
@@ -0,0 +1,45 @@
+--- exports/Makefile.orig	2012-06-26 10:24:20.154182394 -0700
++++ exports/Makefile	2012-06-26 10:28:59.894394334 -0700
+@@ -106,9 +106,9 @@
+ so : ../$(LIBSONAME)
+ 
+ ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
+-	$(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \
++	$(CC) $(LDFLAGS) -shared \
+ 	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
+-	-Wl,--retain-symbols-file=linux.def -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
++	-Wl,--retain-symbols-file=linux.def -Wl,-soname,$(LIBSONAME) $(EXTRALIB) -o ../$(LIBSONAME)
+ 	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
+ 	rm -f linktest
+ 
+@@ -119,9 +119,9 @@
+ so : ../$(LIBSONAME)
+ 
+ ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
+-	$(CC) $(CFLAGS)  -shared -o ../$(LIBSONAME) \
++	$(CC) $(LDFLAGS)  -shared \
+ 	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
+-	-Wl,--retain-symbols-file=linux.def $(FEXTRALIB) $(EXTRALIB)
++	-Wl,--soname=$(LIBSONAME) -Wl,--retain-symbols-file=linux.def $(FEXTRALIB) $(EXTRALIB) -o ../$(LIBSONAME)
+ 	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
+ 	rm -f linktest
+ 
+@@ -132,14 +132,15 @@
+ so : ../$(LIBSONAME)
+ 
+ ../$(LIBSONAME) :
+-	$(CC) -shared -o ../$(LIBSONAME) ../$(LIBNAME)
++	$(CC) -shared ../$(LIBNAME) -o ../$(LIBSONAME)
+ endif
+ 
+ ifeq ($(OSNAME), SunOS)
+ 
+ so : ../$(LIBSONAME)
+-	$(CC) $(CFLAGS)  -shared -o ../$(LIBSONAME) \
+-	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB)
++	$(CC) $(LDFLAGS)  -shared  \
++	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive -Wl,--soname=$\(LIBSONAME) $(EXTRALIB) \
++	-o ../$(LIBSONAME)
+ 	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
+ 	rm -f linktest
+ 
diff --git a/sci-libs/openblas/files/openblas-sharedlibs.patch b/sci-libs/openblas/files/openblas-sharedlibs.patch
deleted file mode 100644
index 3ebe3076a..000000000
--- a/sci-libs/openblas/files/openblas-sharedlibs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- exports/Makefile.orig	2010-11-12 05:30:06.000000000 +0000
-+++ exports/Makefile	2010-11-12 06:33:41.000000000 +0000
-@@ -97,10 +97,10 @@
- so : ../$(LIBSONAME)
- 
- ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
--	$(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \
--	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
--	-Wl,--retain-symbols-file=linux.def $(EXTRALIB)
--	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
-+	$(CC) $(LDFLAGS) -shared  \
-+	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive -Wl,--soname=$(LIBSONAME) \
-+	-Wl,--retain-symbols-file=linux.def $(EXTRALIB) -o ../$(LIBSONAME)
-+	$(CC) $(CFLAGS) -w linktest.c ../$(LIBSONAME) $(FEXTRALIB) -o linktest && echo OK.
- 	rm -f linktest
- 
- endif
-@@ -110,10 +110,10 @@
- so : ../$(LIBSONAME)
- 
- ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
--	$(CC) $(CFLAGS)  -shared -o ../$(LIBSONAME) \
--	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
--	-Wl,--retain-symbols-file=linux.def $(EXTRALIB)
--	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
-+	$(CC) $(LDFLAGS)  -shared \
-+	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive -Wl,--soname=$(LIBSONAME) \
-+	-Wl,--retain-symbols-file=linux.def $(EXTRALIB) -o ../$(LIBSONAME)
-+	$(CC) $(CFLAGS) -w linktest.c ../$(LIBSONAME) $(FEXTRALIB) -o linktest && echo OK.
- 	rm -f linktest
- 
- endif
-@@ -129,9 +129,9 @@
- ifeq ($(OSNAME), SunOS)
- 
- so : ../$(LIBSONAME)
--	$(CC) $(CFLAGS)  -shared -o ../$(LIBSONAME) \
--	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB)
--	$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
-+	$(CC) $(LDFLAGS) -shared -Wl,--soname=$(LIBSONAME) \
-+	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB) -o ../$(LIBSONAME) 
-+	$(CC) $(CFLAGS) -w  linktest.c ../$(LIBSONAME) $(FEXTRALIB) -o linktest && echo OK.
- 	rm -f linktest
- 
- endif
diff --git a/sci-libs/openblas/openblas-0.1.ebuild b/sci-libs/openblas/openblas-0.2.0.ebuild
index 09b6092dd..61b59d42d 100644
--- a/sci-libs/openblas/openblas-0.1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.0.ebuild
@@ -6,23 +6,26 @@ EAPI=4
 
 inherit eutils toolchain-funcs alternatives-2 multilib
 
+# commit ID
+CID="23a7062"
+
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="http://soc.dev.gentoo.org/~spiros/repository/${P}.tbz2"
+SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
 
 IUSE="+incblas int64 dynamic openmp static-libs threads"
 
 RDEPEND="virtual/fortran"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${P}"
+S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.1,aliasing}.patch
+	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch
 	# respect LDFLAGS
 	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
 	# respect CFLAGS only if dynamic flag not enabled
@@ -48,6 +51,7 @@ src_configure() {
 		einfo "openmp and threads enabled: using threads"
 	sed -i \
 		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
 		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
 		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
 		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
@@ -90,7 +94,8 @@ src_install() {
 		Description: ${DESCRIPTION}
 		Version: ${PV}
 		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas -lm ${threads}
+		Libs: -L\${libdir} -lopenblas ${threads}
+		Libs.private: -lm
 	EOF
 
 	alternatives_for blas ${profname} 0 \
diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 6484a1e57..393818d9c 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MYPN}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs,aliasing}.patch
+	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch
 	# respect LDFLAGS
 	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
 	# respect CFLAGS only if dynamic flag not enabled
diff --git a/sci-libs/scotch/ChangeLog b/sci-libs/scotch/ChangeLog
index 8c808f0ca..f553f9974 100644
--- a/sci-libs/scotch/ChangeLog
+++ b/sci-libs/scotch/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.5 2011/05/17 10:08:20 xarthisius Exp $
 
+  28 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.12b.ebuild:
+  keyword amd64-linux and x86-linux
+
+  28 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.12b.ebuild:
+  add pthread for as-needed
+
   12 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.12b.ebuild,
   metadata.xml:
   added 64bits integer flag and described the tools flag
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 322beb426..dc9a4d154 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1 +1 @@
-DIST scotch_5.1.12b_esmumps.tar.gz 3989632 SHA256 82654e63398529cd3bcc8eefdd51d3b3161c0429bb11770e31f8eb0c3790db6e SHA512 8d6e085029f1ec13b74bd583b8fb378db9aef8a005b96bfb726b68a4608caeb31bf7ecaf1af27566e2e4a38dfea03a017d5c2e8dd262562b238cfb113b223671 WHIRLPOOL 85679809826ce09df8a05b09026179dcf4a1424f9f9c44ce97ba172fd18b7dc3af669c686d4ea5b169501dcb011ceab419d0391ae378712302977fb55f35abb8
+DIST scotch_5.1.12b_esmumps.tar.gz 3989632 RMD160 38ed5135e401767d0df8ecea6bcf8f7e4a60a464 SHA1 3866deea3199bc364d31ec46c63adcb799a8cf48 SHA256 82654e63398529cd3bcc8eefdd51d3b3161c0429bb11770e31f8eb0c3790db6e SHA512 8d6e085029f1ec13b74bd583b8fb378db9aef8a005b96bfb726b68a4608caeb31bf7ecaf1af27566e2e4a38dfea03a017d5c2e8dd262562b238cfb113b223671 WHIRLPOOL 85679809826ce09df8a05b09026179dcf4a1424f9f9c44ce97ba172fd18b7dc3af669c686d4ea5b169501dcb011ceab419d0391ae378712302977fb55f35abb8
diff --git a/sci-libs/scotch/scotch-5.1.12b.ebuild b/sci-libs/scotch/scotch-5.1.12b.ebuild
index 75f53d0bd..12fd5384a 100644
--- a/sci-libs/scotch/scotch-5.1.12b.ebuild
+++ b/sci-libs/scotch/scotch-5.1.12b.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz"
 
 LICENSE="CeCILL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples int64 mpi static-libs tools"
 
 DEPEND="sys-libs/zlib
@@ -51,7 +51,7 @@ make_shared_lib() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-as-needed.patch
-	sed -e "s/-O3/${CFLAGS}/" \
+	sed -e "s/-O3/${CFLAGS} -pthread/" \
 		-e "s/gcc/$(tc-getCC)/" \
 		-e "s/ ar/ $(tc-getAR)/" \
 		-e "s/ranlib/$(tc-getRANLIB)/" \
diff --git a/sci-libs/wannier90/ChangeLog b/sci-libs/wannier90/ChangeLog
index ee6673415..9209f04d6 100644
--- a/sci-libs/wannier90/ChangeLog
+++ b/sci-libs/wannier90/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-libs/wannier90
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jun 2012; Alexey Shvetsov <alexxy@gentoo.org> wannier90-1.2.ebuild:
+  [sci-libs/wannier90] add ~amd64-linux
+
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> wannier90-1.2.ebuild,
   +metadata.xml:
   Added fortran-2.eclass support
diff --git a/sci-libs/wannier90/Manifest b/sci-libs/wannier90/Manifest
index f5094eac2..fa5533f4e 100644
--- a/sci-libs/wannier90/Manifest
+++ b/sci-libs/wannier90/Manifest
@@ -1 +1 @@
-DIST wannier90-1.2.tar.gz 5643731 RMD160 4a8035ed4faf5256ad66aa9fe23ac32a86b3abf4 SHA1 b4caaddb6e91afe673c122507e92c6b5fbc7689f SHA256 a76f88eef01c5a40aaa2c74ee393ede8a57bd9085f6b7f2ab656b50c1a30ece4
+DIST wannier90-1.2.tar.gz 5643731 RMD160 4a8035ed4faf5256ad66aa9fe23ac32a86b3abf4 SHA1 b4caaddb6e91afe673c122507e92c6b5fbc7689f SHA256 a76f88eef01c5a40aaa2c74ee393ede8a57bd9085f6b7f2ab656b50c1a30ece4 SHA512 323d078d0cdeeb361389600c39501410ca0da2879e8ba7d3262b49a76167e5385c09484eed47607d83feb68c9f16cfb6cdcebe89f7846157e0c71a8598238853 WHIRLPOOL 7e3288a85188d4661467d293d4a57973e926bf5a3b5736f83ed51e16a0fc4155ecc86e4e6dc6638b8a4d6373ca718ffd341cc11bde466d0166c1e591a9ac33c5
diff --git a/sci-libs/wannier90/wannier90-1.2.ebuild b/sci-libs/wannier90/wannier90-1.2.ebuild
index 55e20ac3e..53a77dc1d 100644
--- a/sci-libs/wannier90/wannier90-1.2.ebuild
+++ b/sci-libs/wannier90/wannier90-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,7 +12,7 @@ SRC_URI="http://wannier.org/code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="doc examples perl test"
 
 RDEPEND="