[gentoo-commits] proj/sci:master commit in: dev-java/jrosetta/, sci-mathematics/slepc/, sci-biology/pysamstats/, ...

[Justin Lecher]

commit:     aef6b7cc29677f3720adb39bebdc124ab6f64aa7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 19:45:04 2018 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 19:45:04 2018 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=aef6b7cc

Sort keywords

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-java/flexdock/flexdock-1.1.1.ebuild                           | 2 +-
 dev-java/flexdock/flexdock-1.2.4.ebuild                           | 2 +-
 dev-java/htsjdk/htsjdk-2.5.1.ebuild                               | 2 +-
 dev-java/htsjdk/htsjdk-9999.ebuild                                | 2 +-
 dev-java/jrosetta/jrosetta-1.0.4.ebuild                           | 2 +-
 dev-python/ffnet/ffnet-0.7.1.ebuild                               | 2 +-
 dev-python/ffnet/ffnet-0.8.3.ebuild                               | 2 +-
 dev-python/ffnetui/ffnetui-0.8.3.2.ebuild                         | 2 +-
 dev-python/python-vxi11/python-vxi11-0.8.ebuild                   | 2 +-
 dev-util/f90cache/f90cache-0.99.ebuild                            | 2 +-
 media-libs/avbin-bin/avbin-bin-8.1.ebuild                         | 2 +-
 sci-biology/MolBioLib/MolBioLib-5.ebuild                          | 2 +-
 sci-biology/bwa/bwa-0.7.17.ebuild                                 | 2 +-
 sci-biology/clover/clover-2011.10.24.ebuild                       | 2 +-
 sci-biology/estscan/estscan-3.0.3.ebuild                          | 2 +-
 sci-biology/gatk/gatk-3.8.1.ebuild                                | 2 +-
 sci-biology/gatk/gatk-9999.ebuild                                 | 2 +-
 sci-biology/graf-bin/graf-bin-20171212.ebuild                     | 2 +-
 sci-biology/igv/igv-2.3.81.ebuild                                 | 2 +-
 sci-biology/igv/igv-2.3.88.ebuild                                 | 2 +-
 sci-biology/igv/igv-2.3.92.ebuild                                 | 2 +-
 sci-biology/jtreeview-bin/jtreeview-bin-1.1.6.4.ebuild            | 2 +-
 sci-biology/jtreeview/jtreeview-1.1.6.4.ebuild                    | 2 +-
 sci-biology/jtreeview/jtreeview-9999.ebuild                       | 2 +-
 sci-biology/libBigWig/libBigWig-0.4.0.ebuild                      | 2 +-
 sci-biology/libBigWig/libBigWig-9999.ebuild                       | 2 +-
 sci-biology/mira/mira-4.9.5.ebuild                                | 2 +-
 sci-biology/mne-python/mne-python-0.7.ebuild                      | 2 +-
 sci-biology/nxtrim/nxtrim-9999.ebuild                             | 2 +-
 sci-biology/oncotator/oncotator-1.9.2.0.ebuild                    | 2 +-
 sci-biology/phusion/phusion-2.1c.ebuild                           | 2 +-
 sci-biology/portrait/portrait-1.1.ebuild                          | 3 ++-
 sci-biology/pysamstats/pysamstats-0.24.2.ebuild                   | 2 +-
 sci-biology/trans-abyss/trans-abyss-1.4.8.ebuild                  | 2 +-
 sci-biology/trinityrnaseq/trinityrnaseq-2.6.6.ebuild              | 2 +-
 sci-biology/wcd/wcd-0.6.3.ebuild                                  | 2 +-
 sci-chemistry/nwchem/nwchem-6.3_p2-r1.ebuild                      | 2 +-
 sci-chemistry/nwchem/nwchem-6.5_p26243-r7.ebuild                  | 2 +-
 sci-chemistry/nwchem/nwchem-6.6_p27746-r2.ebuild                  | 2 +-
 sci-libs/fast5/fast5-0.6.4.ebuild                                 | 2 +-
 sci-libs/libfac/libfac-3.1.1.ebuild                               | 2 +-
 sci-libs/libmatheval/libmatheval-1.1.10.ebuild                    | 2 +-
 sci-libs/modglue/modglue-1.19.ebuild                              | 2 +-
 sci-libs/openblas/openblas-0.2.19-r1.ebuild                       | 2 +-
 sci-libs/openblas/openblas-0.2.20.ebuild                          | 2 +-
 sci-mathematics/cipi/cipi-1.0.ebuild                              | 2 +-
 sci-mathematics/giac/giac-1.1.0.ebuild                            | 2 +-
 sci-mathematics/kash-bin/kash-bin-3.ebuild                        | 2 +-
 sci-mathematics/lattE-macchiato/lattE-macchiato-0.9.3.ebuild      | 2 +-
 sci-mathematics/lie/lie-2.2.2.ebuild                              | 2 +-
 sci-mathematics/mathics/mathics-1.0.ebuild                        | 2 +-
 sci-mathematics/petsc/petsc-3.10.0.ebuild                         | 2 +-
 sci-mathematics/petsc/petsc-3.8.4.ebuild                          | 2 +-
 sci-mathematics/petsc/petsc-3.9.4.ebuild                          | 2 +-
 sci-mathematics/slepc/slepc-3.10.0.ebuild                         | 2 +-
 sci-mathematics/slepc/slepc-3.8.2.ebuild                          | 2 +-
 sci-mathematics/slepc/slepc-3.9.0.ebuild                          | 2 +-
 sci-physics/fullprof-bin/fullprof-bin-20313.04.ebuild             | 2 +-
 sys-cluster/hpl/hpl-2.0-r1.ebuild                                 | 2 +-
 sys-cluster/hpl/hpl-2.1.ebuild                                    | 2 +-
 sys-cluster/modules/modules-3.2.9c-r1.ebuild                      | 2 +-
 sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild                       | 2 +-
 virtual/perl-encoding-warnings/perl-encoding-warnings-0.11.ebuild | 2 +-
 63 files changed, 64 insertions(+), 63 deletions(-)

diff --git a/dev-java/flexdock/flexdock-1.1.1.ebuild b/dev-java/flexdock/flexdock-1.1.1.ebuild
index f52941f30..7b1e9f0b0 100644
--- a/dev-java/flexdock/flexdock-1.1.1.ebuild
+++ b/dev-java/flexdock/flexdock-1.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://forge.scilab.org/index.php/p/flexdock/downloads/get/${P}-src.zip
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4"

diff --git a/dev-java/flexdock/flexdock-1.2.4.ebuild b/dev-java/flexdock/flexdock-1.2.4.ebuild
index fa2b9761e..6eae0b579 100644
--- a/dev-java/flexdock/flexdock-1.2.4.ebuild
+++ b/dev-java/flexdock/flexdock-1.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://forge.scilab.org/index.php/p/flexdock/downloads/get/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 

diff --git a/dev-java/htsjdk/htsjdk-2.5.1.ebuild b/dev-java/htsjdk/htsjdk-2.5.1.ebuild
index f279f8343..755a6fa1f 100644
--- a/dev-java/htsjdk/htsjdk-2.5.1.ebuild
+++ b/dev-java/htsjdk/htsjdk-2.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/samtools/htsjdk/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
-KEYWORDS="" # SANDBOX VIOLATION
+KEYWORDS=""
 
 CDEPEND="dev-java/commons-jexl:2
 	dev-java/commons-compress:0

diff --git a/dev-java/htsjdk/htsjdk-9999.ebuild b/dev-java/htsjdk/htsjdk-9999.ebuild
index 1b49494d4..b4a3c1441 100644
--- a/dev-java/htsjdk/htsjdk-9999.ebuild
+++ b/dev-java/htsjdk/htsjdk-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/samtools/htsjdk.git"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
-KEYWORDS="" # SANDBOX VIOLATION
+KEYWORDS=""
 
 CDEPEND="dev-java/commons-jexl:2
 	dev-java/commons-compress:0

diff --git a/dev-java/jrosetta/jrosetta-1.0.4.ebuild b/dev-java/jrosetta/jrosetta-1.0.4.ebuild
index bc631a44a..dd8a3535e 100644
--- a/dev-java/jrosetta/jrosetta-1.0.4.ebuild
+++ b/dev-java/jrosetta/jrosetta-1.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}/${P}-sources.jar/5c3589d4
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="

diff --git a/dev-python/ffnet/ffnet-0.7.1.ebuild b/dev-python/ffnet/ffnet-0.7.1.ebuild
index 1f5008c60..0cc21ebb0 100644
--- a/dev-python/ffnet/ffnet-0.7.1.ebuild
+++ b/dev-python/ffnet/ffnet-0.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples graphviz matplotlib"
 
 DEPEND="${PYTHON_DEPS}

diff --git a/dev-python/ffnet/ffnet-0.8.3.ebuild b/dev-python/ffnet/ffnet-0.8.3.ebuild
index 00b13333b..5684807e4 100644
--- a/dev-python/ffnet/ffnet-0.8.3.ebuild
+++ b/dev-python/ffnet/ffnet-0.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-3"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples matplotlib"
 
 DEPEND="${PYTHON_DEPS}

diff --git a/dev-python/ffnetui/ffnetui-0.8.3.2.ebuild b/dev-python/ffnetui/ffnetui-0.8.3.2.ebuild
index 77ce6ca3e..605cafd71 100644
--- a/dev-python/ffnetui/ffnetui-0.8.3.2.ebuild
+++ b/dev-python/ffnetui/ffnetui-0.8.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}

diff --git a/dev-python/python-vxi11/python-vxi11-0.8.ebuild b/dev-python/python-vxi11/python-vxi11-0.8.ebuild
index ca091b03f..0c4b25d06 100644
--- a/dev-python/python-vxi11/python-vxi11-0.8.ebuild
+++ b/dev-python/python-vxi11/python-vxi11-0.8.ebuild
@@ -12,4 +12,4 @@ SRC_URI="https://github.com/python-ivi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
\ No newline at end of file
+KEYWORDS="~amd64"

diff --git a/dev-util/f90cache/f90cache-0.99.ebuild b/dev-util/f90cache/f90cache-0.99.ebuild
index fad4d4013..1bc36389a 100644
--- a/dev-util/f90cache/f90cache-0.99.ebuild
+++ b/dev-util/f90cache/f90cache-0.99.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://people.irisa.fr/Edouard.Canot/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""

diff --git a/media-libs/avbin-bin/avbin-bin-8.1.ebuild b/media-libs/avbin-bin/avbin-bin-8.1.ebuild
index 66edbc76c..13eb02661 100644
--- a/media-libs/avbin-bin/avbin-bin-8.1.ebuild
+++ b/media-libs/avbin-bin/avbin-bin-8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 -*"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 pkg_setup(){

diff --git a/sci-biology/MolBioLib/MolBioLib-5.ebuild b/sci-biology/MolBioLib/MolBioLib-5.ebuild
index 681758724..2775e2faf 100644
--- a/sci-biology/MolBioLib/MolBioLib-5.ebuild
+++ b/sci-biology/MolBioLib/MolBioLib-5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://sourceforge.net/projects/molbiolib/files/MolBioLib_public.versi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="" # does not build
+KEYWORDS=""
 IUSE="doc"
 
 # contains bundled samtools-0.1.18 and bamtools (pezmaster31-bamtools-d553a62) which contains jsoncpp

diff --git a/sci-biology/bwa/bwa-0.7.17.ebuild b/sci-biology/bwa/bwa-0.7.17.ebuild
index 429ba43e6..9d4e13e57 100644
--- a/sci-biology/bwa/bwa-0.7.17.ebuild
+++ b/sci-biology/bwa/bwa-0.7.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/bio-bwa/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~x64-macos ~x86"
 
 RDEPEND="dev-lang/perl"
 

diff --git a/sci-biology/clover/clover-2011.10.24.ebuild b/sci-biology/clover/clover-2011.10.24.ebuild
index d8a1f2eb2..b8d395801 100644
--- a/sci-biology/clover/clover-2011.10.24.ebuild
+++ b/sci-biology/clover/clover-2011.10.24.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="freedist"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 

diff --git a/sci-biology/estscan/estscan-3.0.3.ebuild b/sci-biology/estscan/estscan-3.0.3.ebuild
index 8483670c9..e933c59b8 100644
--- a/sci-biology/estscan/estscan-3.0.3.ebuild
+++ b/sci-biology/estscan/estscan-3.0.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="estscan"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="icc ifc"
 
 DEPEND="

diff --git a/sci-biology/gatk/gatk-3.8.1.ebuild b/sci-biology/gatk/gatk-3.8.1.ebuild
index f46c1d322..c5e44747a 100644
--- a/sci-biology/gatk/gatk-3.8.1.ebuild
+++ b/sci-biology/gatk/gatk-3.8.1.ebuild
@@ -18,7 +18,7 @@ EGIT_COMMIT="41147a655594c2aae6e2cad8462bd1648570b32b"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64" # 608.21 MiB git download and 134MB "${W}"/.m2 download
+KEYWORDS=""${W} # 134MB 608.21 MiB and download git ~amd64""
 
 COMMON_DEPS=""
 DEPEND="

diff --git a/sci-biology/gatk/gatk-9999.ebuild b/sci-biology/gatk/gatk-9999.ebuild
index fc9db8986..83149fb0f 100644
--- a/sci-biology/gatk/gatk-9999.ebuild
+++ b/sci-biology/gatk/gatk-9999.ebuild
@@ -21,7 +21,7 @@ EGIT_CLONE_TYPE="mirror"
 LICENSE="BSD-3" # since gatk-4
 SLOT="0"
 IUSE=""
-KEYWORDS="" # 148.19 MB git download and 134MB "${W}"/.m2 download
+KEYWORDS=""${W} # 134MB 148.19 MB and download git"
 
 COMMON_DEPS=""
 # gatk-4 needs java-1.8

diff --git a/sci-biology/graf-bin/graf-bin-20171212.ebuild b/sci-biology/graf-bin/graf-bin-20171212.ebuild
index 93d554892..710eb5595 100644
--- a/sci-biology/graf-bin/graf-bin-20171212.ebuild
+++ b/sci-biology/graf-bin/graf-bin-20171212.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ncbi.nlm.nih.gov/projects/gap/cgi-bin/GetZip.cgi?zip_name=GR
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64" # 64bit exe only
+KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND=""

diff --git a/sci-biology/igv/igv-2.3.81.ebuild b/sci-biology/igv/igv-2.3.81.ebuild
index 5fabefeb3..b870b0e98 100644
--- a/sci-biology/igv/igv-2.3.81.ebuild
+++ b/sci-biology/igv/igv-2.3.81.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.broadinstitute.org/igv/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
-KEYWORDS="" # igv-2.3.81/src/com/iontorrent/views/FlowSignalDistributionPanel.java:222: error: cannot access PublicCloneable
+KEYWORDS=""
 
 # actually more exactly the COMMON_DEPS should contain:
 #   >=dev-java/commons-compress-1.11 # use bundled library until dev-java/commons-compress is bumped, see bug #591696

diff --git a/sci-biology/igv/igv-2.3.88.ebuild b/sci-biology/igv/igv-2.3.88.ebuild
index 8011ea888..b870b0e98 100644
--- a/sci-biology/igv/igv-2.3.88.ebuild
+++ b/sci-biology/igv/igv-2.3.88.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.broadinstitute.org/igv/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
-KEYWORDS="" # see upstream issue #332
+KEYWORDS=""
 
 # actually more exactly the COMMON_DEPS should contain:
 #   >=dev-java/commons-compress-1.11 # use bundled library until dev-java/commons-compress is bumped, see bug #591696

diff --git a/sci-biology/igv/igv-2.3.92.ebuild b/sci-biology/igv/igv-2.3.92.ebuild
index 8011ea888..b870b0e98 100644
--- a/sci-biology/igv/igv-2.3.92.ebuild
+++ b/sci-biology/igv/igv-2.3.92.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.broadinstitute.org/igv/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
-KEYWORDS="" # see upstream issue #332
+KEYWORDS=""
 
 # actually more exactly the COMMON_DEPS should contain:
 #   >=dev-java/commons-compress-1.11 # use bundled library until dev-java/commons-compress is bumped, see bug #591696

diff --git a/sci-biology/jtreeview-bin/jtreeview-bin-1.1.6.4.ebuild b/sci-biology/jtreeview-bin/jtreeview-bin-1.1.6.4.ebuild
index 365c534bf..345c4eaf6 100644
--- a/sci-biology/jtreeview-bin/jtreeview-bin-1.1.6.4.ebuild
+++ b/sci-biology/jtreeview-bin/jtreeview-bin-1.1.6.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="" # src_install is wrong somehow, TreeView.jar does not start
+KEYWORDS=""
 IUSE=""
 
 DEPEND="

diff --git a/sci-biology/jtreeview/jtreeview-1.1.6.4.ebuild b/sci-biology/jtreeview/jtreeview-1.1.6.4.ebuild
index f1e58af01..fab52dbd7 100644
--- a/sci-biology/jtreeview/jtreeview-1.1.6.4.ebuild
+++ b/sci-biology/jtreeview/jtreeview-1.1.6.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="" # resulting java binary does not execute for me
+KEYWORDS=""
 IUSE=""
 
 DEPEND=">virtual/jdk-1.5:*

diff --git a/sci-biology/jtreeview/jtreeview-9999.ebuild b/sci-biology/jtreeview/jtreeview-9999.ebuild
index 0d7a1be51..35d361230 100644
--- a/sci-biology/jtreeview/jtreeview-9999.ebuild
+++ b/sci-biology/jtreeview/jtreeview-9999.ebuild
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://bitbucket.org/TreeView3Dev/treeview3.git"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="" # builds and executes fines
+KEYWORDS=""
 IUSE=""
 
 DEPEND=">virtual/jdk-1.7:*"

diff --git a/sci-biology/libBigWig/libBigWig-0.4.0.ebuild b/sci-biology/libBigWig/libBigWig-0.4.0.ebuild
index bd71899f7..92c7fc505 100644
--- a/sci-biology/libBigWig/libBigWig-0.4.0.ebuild
+++ b/sci-biology/libBigWig/libBigWig-0.4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/dpryan79/libBigWig/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86" # https://github.com/dpryan79/libBigWig/issues/30
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="net-misc/curl"

diff --git a/sci-biology/libBigWig/libBigWig-9999.ebuild b/sci-biology/libBigWig/libBigWig-9999.ebuild
index d470de250..a90395b0e 100644
--- a/sci-biology/libBigWig/libBigWig-9999.ebuild
+++ b/sci-biology/libBigWig/libBigWig-9999.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/dpryan79/libBigWig.git"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="" # https://github.com/dpryan79/libBigWig/issues/30
+KEYWORDS=""
 IUSE=""
 
 DEPEND="net-misc/curl"

diff --git a/sci-biology/mira/mira-4.9.5.ebuild b/sci-biology/mira/mira-4.9.5.ebuild
index 7c888a5e7..5193618bc 100644
--- a/sci-biology/mira/mira-4.9.5.ebuild
+++ b/sci-biology/mira/mira-4.9.5.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"/"${PN}"-"${MY_PV}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~x86-macos ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 CDEPEND="

diff --git a/sci-biology/mne-python/mne-python-0.7.ebuild b/sci-biology/mne-python/mne-python-0.7.ebuild
index 00e24590e..ed1648fca 100644
--- a/sci-biology/mne-python/mne-python-0.7.ebuild
+++ b/sci-biology/mne-python/mne-python-0.7.ebuild
@@ -15,7 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="test"
 #IUSE="cuda test"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]

diff --git a/sci-biology/nxtrim/nxtrim-9999.ebuild b/sci-biology/nxtrim/nxtrim-9999.ebuild
index 9a12a0226..5c9da016c 100644
--- a/sci-biology/nxtrim/nxtrim-9999.ebuild
+++ b/sci-biology/nxtrim/nxtrim-9999.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/sequencing/NxTrim.git"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="" # https://github.com/sequencing/NxTrim/issues/32
+KEYWORDS=""
 IUSE=""
 
 DEPEND=""

diff --git a/sci-biology/oncotator/oncotator-1.9.2.0.ebuild b/sci-biology/oncotator/oncotator-1.9.2.0.ebuild
index 77f439b6d..486c669b2 100644
--- a/sci-biology/oncotator/oncotator-1.9.2.0.ebuild
+++ b/sci-biology/oncotator/oncotator-1.9.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/broadinstitute/oncotator/archive/v${PV}.tar.gz -> ${
 
 LICENSE="oncotator"
 SLOT="0"
-KEYWORDS="~amd64 ~x86" # breaks silently during install because of python syntax errors
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT="fetch"

diff --git a/sci-biology/phusion/phusion-2.1c.ebuild b/sci-biology/phusion/phusion-2.1c.ebuild
index 7c72e31fd..54161ec02 100644
--- a/sci-biology/phusion/phusion-2.1c.ebuild
+++ b/sci-biology/phusion/phusion-2.1c.ebuild
@@ -14,7 +14,7 @@ LICENSE="all-rights-reserved" # temporarily placed value
 # Availability
 # Phusion is undergoing a rewrite of the code to make this a portable package. It will be made available free of charge to academic sites, but requires licensing for commercial use. For more information please contact the authors.
 SLOT="0"
-KEYWORDS="" # compile process does not exit upon errors
+KEYWORDS=""
 # one file does not compile
 # x86_64-pc-linux-gnu-gcc  -O2 -pipe -maes -mpclmul -mpopcnt -mavx -march=native  -o contigoverlap  contigoverlap.o  -lm
 # contigoverlap.o: In function `HashFasta':

diff --git a/sci-biology/portrait/portrait-1.1.ebuild b/sci-biology/portrait/portrait-1.1.ebuild
index 424ccfcd6..fd50849cb 100644
--- a/sci-biology/portrait/portrait-1.1.ebuild
+++ b/sci-biology/portrait/portrait-1.1.ebuild
@@ -22,7 +22,8 @@ RDEPEND="
 # was only tested with sci-libs/libsvm-2.84
 
 src_install(){
-	sed -e 's/
//' -i *.pl || die "Failed to convert from DOS line endings to Unix"
+	sed -e 's/
+//' -i *.pl || die "Failed to convert from DOS line endings to Unix"
 	sed -e 's#/home/rtarrial/prog#/usr/bin#' -i *.pl
 	dobin *.pl
 	dodoc README.txt

diff --git a/sci-biology/pysamstats/pysamstats-0.24.2.ebuild b/sci-biology/pysamstats/pysamstats-0.24.2.ebuild
index d6e1350a4..b81dd558d 100644
--- a/sci-biology/pysamstats/pysamstats-0.24.2.ebuild
+++ b/sci-biology/pysamstats/pysamstats-0.24.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="" # needs working pysam, see bug #645060
+KEYWORDS=""
 IUSE=""
 
 DEPEND="dev-python/cython

diff --git a/sci-biology/trans-abyss/trans-abyss-1.4.8.ebuild b/sci-biology/trans-abyss/trans-abyss-1.4.8.ebuild
index 7ea4f3e3f..dbb2d668f 100644
--- a/sci-biology/trans-abyss/trans-abyss-1.4.8.ebuild
+++ b/sci-biology/trans-abyss/trans-abyss-1.4.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.bcgsc.ca/platform/bioinfo/software/trans-abyss/releases/${PV
 # http://www.bcgsc.ca/platform/bioinfo/license/bcca_2010
 LICENSE="bcca_2010"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # perl and python

diff --git a/sci-biology/trinityrnaseq/trinityrnaseq-2.6.6.ebuild b/sci-biology/trinityrnaseq/trinityrnaseq-2.6.6.ebuild
index 238766eed..49865431b 100644
--- a/sci-biology/trinityrnaseq/trinityrnaseq-2.6.6.ebuild
+++ b/sci-biology/trinityrnaseq/trinityrnaseq-2.6.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/trinityrnaseq/trinityrnaseq/archive/Trinity-v${PV}.t
 
 LICENSE="BSD-BroadInstitute"
 SLOT="0"
-KEYWORDS="" # PERL5INC path is wrong when /usr/bin/Trinity is executed
+KEYWORDS=""
 IUSE=""
 
 DEPEND=""

diff --git a/sci-biology/wcd/wcd-0.6.3.ebuild b/sci-biology/wcd/wcd-0.6.3.ebuild
index f7abf6dc9..d4b797608 100644
--- a/sci-biology/wcd/wcd-0.6.3.ebuild
+++ b/sci-biology/wcd/wcd-0.6.3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/wcd-express-"${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc mpi threads"
 
 # This code (0.4.1 at least) has been tested using LAMMPI (RedHat, Suse,

diff --git a/sci-chemistry/nwchem/nwchem-6.3_p2-r1.ebuild b/sci-chemistry/nwchem/nwchem-6.3_p2-r1.ebuild
index 88cf72d30..980b6f392 100644
--- a/sci-chemistry/nwchem/nwchem-6.3_p2-r1.ebuild
+++ b/sci-chemistry/nwchem/nwchem-6.3_p2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.nwchem-sw.org/images/Nwchem-${PV%_p*}.revision${PV#*_p}-src.
 
 LICENSE="ECL-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="blas mpi doc examples nwchem-tests openmp mrcc python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/sci-chemistry/nwchem/nwchem-6.5_p26243-r7.ebuild b/sci-chemistry/nwchem/nwchem-6.5_p26243-r7.ebuild
index 59af31a84..f11a699df 100644
--- a/sci-chemistry/nwchem/nwchem-6.5_p26243-r7.ebuild
+++ b/sci-chemistry/nwchem/nwchem-6.5_p26243-r7.ebuild
@@ -30,7 +30,7 @@ SRC_URI="http://www.nwchem-sw.org/images/Nwchem-${PV%_p*}.revision${PV#*_p}-src.
 
 LICENSE="ECL-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="blas cuda doc examples infiniband int64 lapack mrcc nwchem-tests openmp python scalapack"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )

diff --git a/sci-chemistry/nwchem/nwchem-6.6_p27746-r2.ebuild b/sci-chemistry/nwchem/nwchem-6.6_p27746-r2.ebuild
index d57af8b29..fc2f110e9 100644
--- a/sci-chemistry/nwchem/nwchem-6.6_p27746-r2.ebuild
+++ b/sci-chemistry/nwchem/nwchem-6.6_p27746-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://www.nwchem-sw.org/images/Nwchem-${PV%_p*}.revision${PV#*_p}-src.
 
 LICENSE="ECL-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="blas cuda doc examples infiniband int64 lapack mrcc nwchem-tests openmp python scalapack"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )

diff --git a/sci-libs/fast5/fast5-0.6.4.ebuild b/sci-libs/fast5/fast5-0.6.4.ebuild
index 181c2e593..bae49ffe0 100644
--- a/sci-libs/fast5/fast5-0.6.4.ebuild
+++ b/sci-libs/fast5/fast5-0.6.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mateidavid/fast5/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="" # the install step is broken (python modules integration, upstream binary code)
+KEYWORDS=""
 IUSE=""
 
 DEPEND="

diff --git a/sci-libs/libfac/libfac-3.1.1.ebuild b/sci-libs/libfac/libfac-3.1.1.ebuild
index 2f14bb0a0..e8f8749fa 100644
--- a/sci-libs/libfac/libfac-3.1.1.ebuild
+++ b/sci-libs/libfac/libfac-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${PN}-${MY_PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="singular"
 
 DEPEND=">=sci-libs/factory-${PV}[singular=]"

diff --git a/sci-libs/libmatheval/libmatheval-1.1.10.ebuild b/sci-libs/libmatheval/libmatheval-1.1.10.ebuild
index 8312a51ab..9b0144249 100644
--- a/sci-libs/libmatheval/libmatheval-1.1.10.ebuild
+++ b/sci-libs/libmatheval/libmatheval-1.1.10.ebuild
@@ -12,5 +12,5 @@ SRC_URI="mirror://gnu/${PN}/${PF}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"

diff --git a/sci-libs/modglue/modglue-1.19.ebuild b/sci-libs/modglue/modglue-1.19.ebuild
index 49024e8f8..9005c3f2b 100644
--- a/sci-libs/modglue/modglue-1.19.ebuild
+++ b/sci-libs/modglue/modglue-1.19.ebuild
@@ -13,7 +13,7 @@ RESTRICT="mirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="dev-libs/libsigc++:2"

diff --git a/sci-libs/openblas/openblas-0.2.19-r1.ebuild b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
index 38378cecd..1bbbc4d8c 100644
--- a/sci-libs/openblas/openblas-0.2.19-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x64-macos ~x86 ~x86-macos ~amd64-linux ~x86-linux"
 IUSE="dynamic openmp static-libs threads"
 
 RDEPEND=""

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild b/sci-libs/openblas/openblas-0.2.20.ebuild
index 838c334d6..4a352163a 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x64-macos ~x86 ~x86-macos ~amd64-linux ~x86-linux"
 IUSE="dynamic openmp static-libs threads"
 
 RDEPEND=""

diff --git a/sci-mathematics/cipi/cipi-1.0.ebuild b/sci-mathematics/cipi/cipi-1.0.ebuild
index 7a9c098f8..03c1afef3 100644
--- a/sci-mathematics/cipi/cipi-1.0.ebuild
+++ b/sci-mathematics/cipi/cipi-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tom111/cipi/archive/1.0.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 DEPEND="

diff --git a/sci-mathematics/giac/giac-1.1.0.ebuild b/sci-mathematics/giac/giac-1.1.0.ebuild
index d599fd75a..520a56151 100644
--- a/sci-mathematics/giac/giac-1.1.0.ebuild
+++ b/sci-mathematics/giac/giac-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www-fourier.ujf-grenoble.fr/~parisse/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples fltk"
 
 AUTOTOOLS_IN_SOURCE_BUILD=true

diff --git a/sci-mathematics/kash-bin/kash-bin-3.ebuild b/sci-mathematics/kash-bin/kash-bin-3.ebuild
index 97a4ebc73..29ddbe0df 100644
--- a/sci-mathematics/kash-bin/kash-bin-3.ebuild
+++ b/sci-mathematics/kash-bin/kash-bin-3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="kash"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~x86-linux ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 MY_P="kash3"

diff --git a/sci-mathematics/lattE-macchiato/lattE-macchiato-0.9.3.ebuild b/sci-mathematics/lattE-macchiato/lattE-macchiato-0.9.3.ebuild
index c78164c26..2b0505090 100644
--- a/sci-mathematics/lattE-macchiato/lattE-macchiato-0.9.3.ebuild
+++ b/sci-mathematics/lattE-macchiato/lattE-macchiato-0.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.math.ucdavis.edu/~mkoeppe/latte/download/latte-for-tea-too-1
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="

diff --git a/sci-mathematics/lie/lie-2.2.2.ebuild b/sci-mathematics/lie/lie-2.2.2.ebuild
index b9fc34648..1e386d356 100644
--- a/sci-mathematics/lie/lie-2.2.2.ebuild
+++ b/sci-mathematics/lie/lie-2.2.2.ebuild
@@ -14,7 +14,7 @@ RESTRICT="mirror"
 LICENSE="LGPL-2.1"
 ##### See http://packages.debian.org/changelogs/pool/main/l/lie/lie_2.2.2+dfsg-1/lie.copyright
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 DEPEND="

diff --git a/sci-mathematics/mathics/mathics-1.0.ebuild b/sci-mathematics/mathics/mathics-1.0.ebuild
index 88726a6a9..622b488f1 100644
--- a/sci-mathematics/mathics/mathics-1.0.ebuild
+++ b/sci-mathematics/mathics/mathics-1.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/Mathics-${PV}"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	~dev-python/sympy-1.0[${PYTHON_USEDEP}]

diff --git a/sci-mathematics/petsc/petsc-3.10.0.ebuild b/sci-mathematics/petsc/petsc-3.10.0.ebuild
index 1755e242a..b67536ef6 100644
--- a/sci-mathematics/petsc/petsc-3.10.0.ebuild
+++ b/sci-mathematics/petsc/petsc-3.10.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="afterimage boost complex-scalars cxx debug doc fftw
 	fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X"
 

diff --git a/sci-mathematics/petsc/petsc-3.8.4.ebuild b/sci-mathematics/petsc/petsc-3.8.4.ebuild
index 17757f6c0..c47619aaf 100644
--- a/sci-mathematics/petsc/petsc-3.8.4.ebuild
+++ b/sci-mathematics/petsc/petsc-3.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="afterimage boost complex-scalars cxx debug doc fftw
 	fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X"
 

diff --git a/sci-mathematics/petsc/petsc-3.9.4.ebuild b/sci-mathematics/petsc/petsc-3.9.4.ebuild
index 1755e242a..b67536ef6 100644
--- a/sci-mathematics/petsc/petsc-3.9.4.ebuild
+++ b/sci-mathematics/petsc/petsc-3.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="afterimage boost complex-scalars cxx debug doc fftw
 	fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X"
 

diff --git a/sci-mathematics/slepc/slepc-3.10.0.ebuild b/sci-mathematics/slepc/slepc-3.10.0.ebuild
index eb250a909..5bd6c4b95 100644
--- a/sci-mathematics/slepc/slepc-3.10.0.ebuild
+++ b/sci-mathematics/slepc/slepc-3.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://slepc.upv.es/download/distrib/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="complex-scalars doc mpi"
 
 PETSC_PV="$(get_version_component_range 1-2 ${PV})"

diff --git a/sci-mathematics/slepc/slepc-3.8.2.ebuild b/sci-mathematics/slepc/slepc-3.8.2.ebuild
index eb250a909..5bd6c4b95 100644
--- a/sci-mathematics/slepc/slepc-3.8.2.ebuild
+++ b/sci-mathematics/slepc/slepc-3.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://slepc.upv.es/download/distrib/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="complex-scalars doc mpi"
 
 PETSC_PV="$(get_version_component_range 1-2 ${PV})"

diff --git a/sci-mathematics/slepc/slepc-3.9.0.ebuild b/sci-mathematics/slepc/slepc-3.9.0.ebuild
index eb250a909..5bd6c4b95 100644
--- a/sci-mathematics/slepc/slepc-3.9.0.ebuild
+++ b/sci-mathematics/slepc/slepc-3.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://slepc.upv.es/download/distrib/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="complex-scalars doc mpi"
 
 PETSC_PV="$(get_version_component_range 1-2 ${PV})"

diff --git a/sci-physics/fullprof-bin/fullprof-bin-20313.04.ebuild b/sci-physics/fullprof-bin/fullprof-bin-20313.04.ebuild
index 085490296..8a4df4509 100644
--- a/sci-physics/fullprof-bin/fullprof-bin-20313.04.ebuild
+++ b/sci-physics/fullprof-bin/fullprof-bin-20313.04.ebuild
@@ -11,7 +11,7 @@ LICENSE="freedist HPND"
 # There is no clear license specified. But according to Docs/Readme_Fp_Suite.txt
 # those two seem to be appropriate.
 SLOT="0"
-KEYWORDS="~x86 ~amd64 -*"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="+doc +examples +X"
 
 RDEPEND="X? ( x11-libs/motif:0 )"

diff --git a/sys-cluster/hpl/hpl-2.0-r1.ebuild b/sys-cluster/hpl/hpl-2.0-r1.ebuild
index ffa15742e..8b80e4c1c 100644
--- a/sys-cluster/hpl/hpl-2.0-r1.ebuild
+++ b/sys-cluster/hpl/hpl-2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/benchmark/hpl/hpl-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="HPL"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="

diff --git a/sys-cluster/hpl/hpl-2.1.ebuild b/sys-cluster/hpl/hpl-2.1.ebuild
index 64d3e3a25..ba91a5d66 100644
--- a/sys-cluster/hpl/hpl-2.1.ebuild
+++ b/sys-cluster/hpl/hpl-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/benchmark/hpl/hpl-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="HPL"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="

diff --git a/sys-cluster/modules/modules-3.2.9c-r1.ebuild b/sys-cluster/modules/modules-3.2.9c-r1.ebuild
index c8823b46e..43f0ab91d 100644
--- a/sys-cluster/modules/modules-3.2.9c-r1.ebuild
+++ b/sys-cluster/modules/modules-3.2.9c-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sourceforge.net/projects/modules/files/Modules/${P%[a-z]}/${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 DEPEND="

diff --git a/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
index d3c665e2c..8ed791509 100644
--- a/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
+++ b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/download/mvapich2/mvapich2-${PV/_/-}.tgz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug fortran large-cluster medium-cluster romio threads"
 
 RDEPEND="

diff --git a/virtual/perl-encoding-warnings/perl-encoding-warnings-0.11.ebuild b/virtual/perl-encoding-warnings/perl-encoding-warnings-0.11.ebuild
index 926c12d1a..d3dfa34a1 100644
--- a/virtual/perl-encoding-warnings/perl-encoding-warnings-0.11.ebuild
+++ b/virtual/perl-encoding-warnings/perl-encoding-warnings-0.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"