--- openyahtzee-1.9.2.ebuild	2016-07-11 12:26:11.877165437 -0500
+++ openyahtzee-1.9.3.ebuild	2016-07-11 13:31:49.302094925 -0500
@@ -1,18 +1,18 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 WX_GTK_VER="3.0"
-inherit eutils wxwidgets toolchain-funcs versionator games
+inherit eutils wxwidgets toolchain-funcs versionator flag-o-matic
 
 DESCRIPTION="A full-featured wxWidgets version of the classic dice game Yahtzee"
 HOMEPAGE="http://openyahtzee.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
@@ -23,24 +23,23 @@
 pkg_pretend() {
 	local ver=4.6
 	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
+	if tc-is-gcc ;
+	then 
+	    if ! version_is_at_least ${ver} $(gcc-version) ; then
+			eerror ${msg}
+			die ${msg}
+		fi
+	else
+		ewarn "Ensure your compiler has C++11 support, otherwise build will fail."
 	fi
 }
 
-src_prepare() {
-	# Debian patch that was upstreamed and accepted
-	# This can be dropped on next version then
-	epatch "${FILESDIR}"/${P}-wx3.0.patch
-}
-
 src_configure() {
+	append-cxxflags -std=c++11
 	need-wxwidgets unicode
-	egamesconf --datadir=/usr/share
+	econf --datadir=/usr/share
 }
 
 src_install() {
 	default
-	prepgamesdirs
 }