--- /usr/portage/sys-apps/hwloc/hwloc-1.10.0-r1.ebuild	2015-01-05 11:01:18.000000000 -0700
+++ hwloc-1.10.1.ebuild	2015-02-18 13:32:07.258247633 -0700
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit flag-o-matic cuda autotools-utils multilib versionator
+inherit flag-o-matic cuda autotools-multilib multilib versionator
 
 MY_PV=v$(get_version_component_range 1-2)
 
@@ -18,21 +18,22 @@
 IUSE="cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X"
 
 # TODO opencl only works with AMD so no virtual
+# dev-util/nvidia-cuda-toolkit is always multilib
 
-RDEPEND="sys-libs/ncurses
-	cairo? ( x11-libs/cairo[X?,svg?] )
+RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
+	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	gl? ( media-video/nvidia-settings )
-	opencl? ( x11-drivers/ati-drivers )
+	opencl? ( x11-drivers/ati-drivers:* )
 	pci? (
-		sys-apps/pciutils
-		x11-libs/libpciaccess
+		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
 	)
-	plugins? ( dev-libs/libltdl:0 )
-	numa? ( sys-process/numactl )
-	xml? ( dev-libs/libxml2 )"
+	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
+	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
 
 DOCS=( AUTHORS NEWS README VERSION )
 
@@ -43,21 +44,21 @@
 	if use cuda ; then
 		append-cflags -I/opt/cuda/include
 		append-cppflags -I/opt/cuda/include
-		append-ldflags -L/opt/cuda/$(get_libdir)
 	fi
 	autotools-utils_src_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
 	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
+	use cuda && local LDFLAGS="${LDFLAGS} -L/opt/cuda/$(get_libdir)"
 	local myeconfargs=(
 		--disable-silent-rules
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable cairo)
 		$(use_enable cuda)
 		$(use_enable debug)
-		$(use_enable gl)
-		$(use_enable opencl)
+		$(multilib_native_use_enable gl)
+		$(multilib_native_use_enable opencl)
 		$(use_enable pci)
 		$(use_enable plugins)
 		$(use_enable numa libnuma)
@@ -66,7 +67,3 @@
 	)
 	autotools-utils_src_configure
 }
-
-src_install() {
-	autotools-utils_src_install
-}