--- yajl-2.0.4.ebuild	2013-01-09 07:38:42.849000000 +0100
+++ yajl-2.0.4-r1.ebuild	2013-04-22 17:41:13.455000000 +0200
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/yajl-2.0.4.ebuild,v 1.5 2013/01/06 09:28:04 ago Exp $
 
-EAPI=4
+EAPI=5
 
-inherit base cmake-utils
+inherit base cmake-multilib
 
 DESCRIPTION="Small event-driven (SAX-style) JSON parser"
 HOMEPAGE="http://lloyd.github.com/yajl/"
@@ -25,9 +25,5 @@
 }
 
 src_test() {
-	emake -C "${CMAKE_BUILD_DIR}" test
-}
-
-src_install() {
-	cmake-utils_src_install
+	emake -C ${CMAKE_BUILD_DIR} test
 }