--- graphite2-1.2.1.ebuild	2013-10-12 23:53:33.000000000 +0200
+++ graphite2-1.2.1.ebuild	2013-12-30 00:21:22.991060389 +0100
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 
 GENTOO_DEPEND_ON_PERL="no"
-inherit base eutils cmake-utils perl-module python-any-r1
+inherit eutils cmake-multilib perl-module python-any-r1
 
 DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
 HOMEPAGE="http://graphite.sil.org/"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/silgraphit
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="perl test"
 
 RDEPEND="
@@ -44,7 +44,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	base_src_prepare
+	cmake-utils_src_prepare
 
 	# fix perl linking
 	if use perl; then
@@ -70,30 +70,30 @@ src_configure() {
 			echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
 	)
 
-	cmake-utils_src_configure
+	cmake-multilib_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake-multilib_src_compile
 	if use perl; then
-		cd contrib/perl
+		cd contrib/perl || die
 		perl-module_src_prep
 		perl-module_src_compile
 	fi
 }
 
 src_test() {
-	cmake-utils_src_test
+	cmake-multilib_src_test
 	if use perl; then
-		cd contrib/perl
+		cd contrib/perl || die
 		perl-module_src_test
 	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake-multilib_src_install
 	if use perl; then
-		cd contrib/perl
+		cd contrib/perl || die
 		perl-module_src_install
 		fixlocalpod
 	fi