8 files changed, 10 insertions, 11 deletions
diff --git a/app-arch/paq8l/paq8l-20070308.ebuild b/app-arch/paq8l/paq8l-20070308.ebuild
index da18a0d5..2c6d65af 100644
--- a/app-arch/paq8l/paq8l-20070308.ebuild
+++ b/app-arch/paq8l/paq8l-20070308.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mattmahoney.net/dc/${PN}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 BDEPEND="app-arch/unzip"
diff --git a/app-dicts/steak/steak-1.7.3-r3.ebuild b/app-dicts/steak/steak-1.7.3-r3.ebuild
index dcf18c44..83981cfa 100644
--- a/app-dicts/steak/steak-1.7.3-r3.ebuild
+++ b/app-dicts/steak/steak-1.7.3-r3.ebuild
@@ -16,7 +16,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 BDEPEND="app-text/recode"
diff --git a/mail-client/alpine/alpine-2.21.1.ebuild b/mail-client/alpine/alpine-2.21.1.ebuild
index cd126971..fe1521e6 100644
--- a/mail-client/alpine/alpine-2.21.1.ebuild
+++ b/mail-client/alpine/alpine-2.21.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~alpha ~ia64 ~ppc ~sparc"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="debug doc ipv6 kerberos ldap libressl nls onlyalpine pam passfile smime spell ssl threads"
 
 DEPEND="pam? ( virtual/pam )
diff --git a/media-tv/nvtv/nvtv-0.4.7-r3.ebuild b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild
index 9557e8ff..ff42b36f 100644
--- a/media-tv/nvtv/nvtv-0.4.7-r3.ebuild
+++ b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/nv-tv-out/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sys-apps/pciutils[-zlib]
 	gtk? ( x11-libs/gtk+:2 )
diff --git a/net-print/foo2zjs/foo2zjs-20160722.ebuild b/net-print/foo2zjs/foo2zjs-20160722.ebuild
index 7d67cdb5..9587e670 100644
--- a/net-print/foo2zjs/foo2zjs-20160722.ebuild
+++ b/net-print/foo2zjs/foo2zjs-20160722.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://foo2zjs.rkkda.com/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 IUSE_LATER="foomaticdb test"
 # due to those firmwares/icms/etc...
diff --git a/sci-geosciences/googleearth/googleearth-7.1.8.3036-r1.ebuild b/sci-geosciences/googleearth/googleearth-7.1.8.3036-r1.ebuild
index 13f85b5d..919cc830 100644
--- a/sci-geosciences/googleearth/googleearth-7.1.8.3036-r1.ebuild
+++ b/sci-geosciences/googleearth/googleearth-7.1.8.3036-r1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 
-inherit desktop eutils gnome2-utils pax-utils unpacker versionator xdg-utils
+inherit eapi7-ver desktop eutils gnome2-utils pax-utils unpacker xdg-utils
 
 DESCRIPTION="A 3D interface to the planet"
 HOMEPAGE="https://www.google.com/earth/desktop/"
-MY_PV=$(replace_all_version_separators '_' $(get_version_component_range 1-3))
+MY_PV=$(ver_rs 1- _ $(ver_cut 1-3))
 SRC_URI="x86? ( https://dl.google.com/dl/earth/client/GE7/release_${MY_PV}/google-earth-pro-stable_${PV}-r0_i386.deb )
 	amd64? ( https://dl.google.com/dl/earth/client/GE7/release_${MY_PV}/google-earth-pro-stable_${PV}-r0_amd64.deb )"
 LICENSE="googleearth GPL-2"
diff --git a/sci-geosciences/googleearth/googleearth-7.3.0.3832-r1.ebuild b/sci-geosciences/googleearth/googleearth-7.3.0.3832-r1.ebuild
index b9127581..6cc8da7e 100644
--- a/sci-geosciences/googleearth/googleearth-7.3.0.3832-r1.ebuild
+++ b/sci-geosciences/googleearth/googleearth-7.3.0.3832-r1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 
-inherit desktop eutils gnome2-utils pax-utils unpacker versionator xdg-utils
+inherit eapi7-ver desktop eutils gnome2-utils pax-utils unpacker xdg-utils
 
 DESCRIPTION="A 3D interface to the planet"
 HOMEPAGE="https://www.google.com/earth/desktop/"
-MY_PV=$(replace_all_version_separators '_' $(get_version_component_range 1-3))
+MY_PV=$(ver_rs 1- _ $(ver_cut 1-3))
 SRC_URI="x86? ( https://dl.google.com/dl/earth/client/GE7/release_${MY_PV}/google-earth-pro-stable_${PV}-r0_i386.deb )
 	amd64? ( https://dl.google.com/dl/earth/client/GE7/release_${MY_PV}/google-earth-pro-stable_${PV}-r0_amd64.deb )"
 LICENSE="googleearth GPL-2"
diff --git a/sci-geosciences/googleearth/googleearth-7.3.1.ebuild b/sci-geosciences/googleearth/googleearth-7.3.1.ebuild
index 484e3927..4cb0c150 100644
--- a/sci-geosciences/googleearth/googleearth-7.3.1.ebuild
+++ b/sci-geosciences/googleearth/googleearth-7.3.1.ebuild
@@ -3,11 +3,10 @@
 
 EAPI=6
 
-inherit desktop eutils gnome2-utils pax-utils unpacker versionator xdg-utils
+inherit desktop eutils gnome2-utils pax-utils unpacker xdg-utils
 
 DESCRIPTION="A 3D interface to the planet"
 HOMEPAGE="https://www.google.com/earth/desktop/"
-MY_PV=$(replace_all_version_separators '_' $(get_version_component_range 1-3))
 SRC_URI="https://dl.google.com/dl/linux/direct/google-earth-pro-stable_${PV}_amd64.deb"
 LICENSE="googleearth GPL-2"
 SLOT="0"