--- /usr/portage/sys-apps/hwloc/hwloc-1.6.2.ebuild	2013-03-21 05:33:07.000000000 +0100
+++ hwloc-1.7.ebuild	2013-05-13 19:44:45.508581307 +0200
@@ -15,16 +15,19 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
-IUSE="cairo debug +numa +pci plugins svg static-libs xml X"
+IUSE="amd cairo cuda debug +numa nvidia +pci plugins svg static-libs xml X"
 
 RDEPEND="sys-libs/ncurses
+	amd? ( x11-drivers/ati-drivers )
 	cairo? ( x11-libs/cairo[X?,svg?] )
+	cuda? ( dev-util/nvidia-cuda-toolkit )
 	pci? (
 			sys-apps/pciutils
 			x11-libs/libpciaccess
 		)
 	plugins? ( sys-devel/libtool )
 	numa? ( sys-process/numactl )
+	nvidia? ( media-video/nvidia-settings )
 	xml? ( dev-libs/libxml2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -36,11 +39,14 @@
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable cairo) \
+		$(use_enable cuda) \
 		$(use_enable debug) \
 		$(use_enable pci) \
 		$(use_enable pci libpci) \
 		$(use_enable plugins) \
 		$(use_enable numa libnuma) \
+		$(use_enable amd opencl) \
+		$(use_enable nvidia gl) \
 		$(use_enable static-libs static) \
 		$(use_enable xml libxml2) \
 		$(use_with X x) \