--- openclonk-7.0.ebuild	2016-06-03 13:39:20.901597397 -0500
+++ openclonk-7.0-r1.ebuild	2016-07-25 11:48:46.704093209 -0500
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils eutils gnome2-utils python-any-r1 fdo-mime toolchain-funcs games
+inherit cmake-utils eutils gnome2-utils python-any-r1 fdo-mime toolchain-funcs
 
 MY_P=${PN}-release-${PV}-src
 
@@ -33,13 +33,13 @@
 		media-libs/libvorbis
 		media-libs/openal
 		media-libs/sdl-mixer[mp3,vorbis,wav]
+		virtual/glu
 		virtual/jpeg:0=
 		virtual/opengl
-		virtual/glu
 		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:3
-		x11-libs/libXrandr
 		x11-libs/libX11
+		x11-libs/libXrandr
 	)
 	dedicated? ( sys-libs/readline:0= )"
 DEPEND="${RDEPEND}
@@ -58,7 +58,9 @@
 S=${WORKDIR}/${P}-src
 
 pkg_pretend() {
-	if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
+	$(tc-getCC) --version
+	echo $(gcc-version)
+	tc-is-gcc && if [[ $(gcc-version) < 4.9 ]] ; then
 		die 'The active compiler needs to be gcc 4.9 (or newer) or clang'
 	else
 		einfo 'The active compiler should be ok'
@@ -66,7 +68,6 @@
 }
 
 pkg_setup() {
-	games_pkg_setup
 	use doc && python-any-r1_pkg_setup
 }
 
@@ -80,8 +81,8 @@
 			"-DUSE_CONSOLE=ON -DUSE_X11=OFF -DUSE_GTK=OFF -DUSE_GTK3=OFF" \
 			"-DUSE_CONSOLE=OFF -DUSE_X11=ON -DUSE_GTK=ON -DUSE_GTK3=ON")
 		-DWITH_AUTOMATIC_UPDATE=OFF
-		-DINSTALL_GAMES_BINDIR="${GAMES_BINDIR}"
-		-DINSTALL_DATADIR="${GAMES_DATADIR}"
+		-DINSTALL_GAMES_BINDIR=/usr/bin
+		-DINSTALL_DATADIR=/usr/share
 		-DUSE_STATIC_BOOST=OFF
 		-DUSE_SYSTEM_TINYXML=ON
 	)
@@ -98,21 +99,17 @@
 	cmake-utils_src_install
 
 	if ! use dedicated; then
-		mv "${ED%/}${GAMES_BINDIR}/"{openclonk,clonk} || die
-		newgamesbin "${FILESDIR}"/${PN}-wrapper-script.sh ${PN}
+		mv "${ED%/}/usr/bin/"{openclonk,clonk} || die
+		newbin "${FILESDIR}"/${PN}-wrapper-script.sh ${PN}
 	fi
-	use doc && dohtml -r docs/online/*
-
-	prepgamesdirs
+	use doc && dodoc -r docs/online/*
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 }