diff --git a/media-video/vlc/vlc-2.1.5-r1.ebuild b/media-video/vlc/vlc-2.1.5-r1.ebuild
index 84af4dfbc1ae8..924d5a93d4e86 100644
--- a/media-video/vlc/vlc-2.1.5-r1.ebuild
+++ b/media-video/vlc/vlc-2.1.5-r1.ebuild
@@ -34,10 +34,8 @@ fi
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-7" # vlc - vlccore
 
-if [ "${PV%9999}" = "${PV}" ] ; then
+if [[ ${PV} != *9999 ]] ; then
 	KEYWORDS="amd64 ~arm ppc ppc64 -sparc x86 ~x86-fbsd"
-else
-	KEYWORDS=""
 fi
 
 IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild
index e003fc02236fc..a6c7b2e15302c 100644
--- a/media-video/vlc/vlc-2.1.9999.ebuild
+++ b/media-video/vlc/vlc-2.1.9999.ebuild
@@ -34,10 +34,8 @@ fi
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-7" # vlc - vlccore
 
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~x86-fbsd"
-else
-	KEYWORDS=""
+if [[ ${PV} != *9999 ]] ; then
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
 fi
 
 IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild
index 13087bf94c94e..1a8b9d39cecb5 100644
--- a/media-video/vlc/vlc-2.2.1-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.1-r1.ebuild
@@ -34,10 +34,8 @@ fi
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-8" # vlc - vlccore
 
-if [ "${PV%9999}" = "${PV}" ] ; then
+if [[ ${PV} != *9999 ]] ; then
 	KEYWORDS="amd64 ~arm ppc ppc64 -sparc x86 ~x86-fbsd"
-else
-	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index f264f1c33f613..bf7818afa1aaa 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -34,10 +34,8 @@ fi
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-8" # vlc - vlccore
 
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~x86-fbsd"
-else
-	KEYWORDS=""
+if [[ ${PV} != *9999 ]] ; then
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
 fi
 
 IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 62de861ba38c6..e4d7563742a65 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -34,10 +34,8 @@ fi
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-8" # vlc - vlccore
 
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~x86-fbsd"
-else
-	KEYWORDS=""
+if [[ ${PV} != *9999 ]] ; then
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
 fi
 
 IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec