--- virtualjaguar-2.1.2-r1.ebuild	2016-07-11 14:51:10.550009660 -0500
+++ virtualjaguar-2.1.2-r2.ebuild	2016-07-11 19:08:26.070733239 -0500
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils versionator qt4-r2 gnome2-utils toolchain-funcs games
+EAPI=6
+inherit eutils versionator gnome2-utils qmake-utils toolchain-funcs
 
 DESCRIPTION="an Atari Jaguar emulator"
 HOMEPAGE="http://www.icculus.org/virtualjaguar/"
@@ -11,16 +11,17 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="media-libs/libsdl[joystick,opengl,sound,video]
-	sys-libs/zlib
-	virtual/opengl
+RDEPEND="
+	dev-libs/libcdio
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
 	dev-qt/qtopengl:4[-egl]
-	dev-libs/libcdio"
+	media-libs/libsdl[joystick,opengl,sound,video]
+	sys-libs/zlib
+	virtual/opengl"
 DEPEND="${RDEPEND}
 	>=sys-devel/gcc-4.4"
 
@@ -29,12 +30,13 @@
 pkg_pretend() {
 	local ver=4.4
 
-	if ! version_is_at_least ${ver} $(gcc-version); then
+	if tc-is-gcc && ! version_is_at_least ${ver} $(gcc-version); then
 		die "${PN} needs at least gcc ${ver} selected to compile."
 	fi
 }
 
 src_prepare() {
+	default
 	sed -i \
 		-e '/^Categories/s/$/;/' \
 		virtualjaguar.desktop || die
@@ -50,21 +52,18 @@
 }
 
 src_install() {
-	dogamesbin ${PN}
+	dobin ${PN}
 	dodoc README docs/{TODO,WHATSNEW}
 	doman docs/virtualjaguar.1
 	domenu virtualjaguar.desktop
 	newicon -s 128 res/vj-icon.png ${PN}.png
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "The ${PN} ROM path is no-longer hardcoded, "
 	elog "set it from within, the ${PN} GUI."
 	elog