--- ../../../../../portage/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3.ebuild	2012-05-16 04:01:14.000000000 +0400
+++ ./libgnomecanvas-2.30.3.ebuild	2014-06-29 12:21:33.261782532 +0400
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3.ebuild,v 1.13 2012/05/15 23:32:53 aballier Exp $
 
-EAPI="3"
+EAPI="5"
 GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
 
-inherit gnome2 multilib virtualx
+inherit gnome2 multilib virtualx multilib-minimal
 
 DESCRIPTION="The Gnome 2 Canvas library"
 HOMEPAGE="http://library.gnome.org/devel/libgnomecanvas/stable/"
@@ -15,11 +16,12 @@
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc glade"
 
-RDEPEND=">=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.13:2
-	>=media-libs/libart_lgpl-2.3.8
-	>=x11-libs/pango-1.0.1
-	glade? ( >=gnome-base/libglade-2:2.0 )"
+RDEPEND="
+	>=dev-libs/glib-2.10:2[${MULTILIB_USEDEP}]
+	>=media-libs/libart_lgpl-2.3.8[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.13:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.0.1[${MULTILIB_USEDEP}]
+	glade? ( >=gnome-base/libglade-2:2.0[${MULTILIB_USEDEP}] )"
 
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
@@ -29,7 +31,6 @@
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF} $(use_enable glade) --disable-static"
 }
 
@@ -45,11 +46,20 @@
 		|| die "sed 2 failed"
 }
 
-src_install() {
+multilib_src_configure() {
+	ECONF_SOURCE=${S} gnome2_src_configure
+}
+
+multilib_src_install() {
 	gnome2_src_install
 	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
-src_test() {
+multilib_src_install_all() {
+	local DOCS=( AUTHORS ChangeLog NEWS README )
+	einstalldocs
+}
+
+multilib_src_test() {
 	Xemake check || die "Test phase failed"
 }