--- /var/paludis/repositories/gentoo/media-libs/glfw/glfw-2.7.7.ebuild	2015-08-13 13:52:17.010311612 +0100
+++ /var/paludis/repositories/gentoo/media-libs/glfw/glfw-2.7.7.ebuild	2016-04-23 03:04:28.840069576 +0100
@@ -3,7 +3,7 @@ 
 # $Id$
 
 EAPI=5
-inherit eutils multilib toolchain-funcs
+inherit eutils multilib-minimal toolchain-funcs
 
 DESCRIPTION="The Portable OpenGL FrameWork"
 HOMEPAGE="http://www.glfw.org/"
@@ -14,10 +14,10 @@ 
 KEYWORDS="amd64 x86"
 IUSE="examples static-libs"
 
-DEPEND="x11-libs/libX11
-	x11-libs/libXrandr
-	virtual/glu
-	virtual/opengl"
+DEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -43,26 +43,35 @@ 
 			-e '/^all:/s/libglfw.a//' \
 			lib/x11/Makefile.x11.in || die
 	fi
+
+	multilib_copy_sources
 }
 
-src_configure() {
+multilib_src_configure() {
 	sh ./compile.sh
 }
 
-src_compile() {
-	emake -C lib/x11 AR=$(tc-getAR) CC=$(tc-getCC) PREFIX=/usr LIBDIR=$(get_libdir) -f Makefile.x11 all libglfw.pc
+multilib_src_compile() {
+	emake -C lib/x11 AR="$(tc-getAR)" CC="$(tc-getCC)" PREFIX=/usr LIBDIR=$(get_libdir) -f Makefile.x11 all libglfw.pc
+}
+
+multilib_src_compile_all() {
 	use examples && emake -C examples CC=$(tc-getCC) -f Makefile.x11 all
 }
 
-src_install() {
+multilib_src_install() {
 	use static-libs && dolib.a lib/x11/libglfw.a
 	dolib.so lib/x11/libglfw.so.2.7.7
-	dosym libglfw.so.2.7.7 /usr/$(get_libdir)/libglfw.so
+	dosym libglfw.so.2.7.7 /usr/$(get_libdir)/libglfw.so.2
 
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins lib/x11/libglfw.pc
+}
+
+multilib_src_install_all() {
 	doheader -r include/GL
 	dohtml -r readme.html
+
 	insinto /usr/share/doc/${PF}/pdf
 	doins docs/*.pdf
 	dodoc docs/readme.txt