--- games-arcade/performous/performous-0.7.0.ebuild
+++ games-arcade/performous/performous-0.7.0-r1.ebuild
@@ -2,8 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/performous-0.7.0.ebuild,v 1.3 2013/01/13 11:22:47 ago Exp $
 
-EAPI=3
-inherit eutils flag-o-matic base cmake-utils games
+EAPI=5
+
+CMAKE_REMOVE_MODULES="yes"
+CMAKE_REMOVE_MODULES_LIST="FindALSA FindBoost FindGettext FindJpeg FindPng FindTiff FindZ"
+inherit eutils base cmake-utils games
 
 MY_PN=Performous
 MY_P=${MY_PN}-${PV}
@@ -25,13 +28,13 @@
 		CCPL-Attribution-NonCommercial-NoDerivs-2.5
 	)"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="songs tools"
+KEYWORDS="~amd64 ~x86"
+IUSE="midi songs tools webcam"
 
 RDEPEND="dev-cpp/glibmm
 	dev-cpp/libxmlpp
 	media-libs/portaudio
-	>=dev-libs/boost-1.36
+	dev-libs/boost
 	dev-libs/glib
 	dev-libs/libxml2
 	gnome-base/librsvg
@@ -43,18 +46,23 @@
 	virtual/opengl
 	virtual/glu
 	sys-libs/zlib
+	virtual/libintl
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	x11-libs/pango"
+	x11-libs/pango
+	midi? ( media-libs/portmidi )
+	webcam? ( media-libs/opencv )"
 DEPEND="${RDEPEND}
 	media-libs/glew
-	sys-apps/help2man"
+	sys-apps/help2man
+	sys-devel/gettext"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-libav.patch
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-linguas.patch
 	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-cmake.patch
 )
 
 src_prepare() {
@@ -65,26 +73,13 @@
 		|| die
 
 	strip-linguas -u lang
-
-	# how do I hate boost? Let me count the ways...
-	local boost_ver=$(best_version ">=dev-libs/boost-1.36")
-
-	boost_ver=${boost_ver/*boost-/}
-	boost_ver=${boost_ver%.*}
-	boost_ver=${boost_ver/./_}
-
-	einfo "Using boost version ${boost_ver}"
-	append-cxxflags \
-		-I/usr/include/boost-${boost_ver}
-	append-ldflags \
-		-L/usr/$(get_libdir)/boost-${boost_ver}
-	export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}"
-	export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}"
 }
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_enable tools TOOLS)
+		$(usex midi "" "-DNO_PORTMIDI=ON")
+		$(usex webcam "" "-DNO_WEBCAM=ON")
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE
 		-DSHARE_INSTALL="${GAMES_DATADIR}"/${PN}
 	)
@@ -99,7 +94,7 @@
 	cmake-utils_src_install
 	if use songs ; then
 		insinto "${GAMES_DATADIR}"/${PN}
-		doins -r "${WORKDIR}/songs" || die
+		doins -r "${WORKDIR}/songs"
 	fi
 	dodoc docs/{Authors,DeveloperReadme,instruments,TODO}.txt
 	prepgamesdirs