--- linux-misc-apps-3.1.ebuild	2011-11-01 10:06:05.000000000 +0100
+++ linux-misc-apps-3.2.ebuild	2012-02-03 17:52:56.454752266 +0100
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit versionator eutils toolchain-funcs linux-info
+inherit versionator eutils toolchain-funcs linux-info autotools
 
 DESCRIPTION="Misc tools bundled with kernel sources"
 HOMEPAGE="http://kernel.org/"
@@ -37,7 +37,9 @@
 LINUX_SOURCES=linux-${LINUX_VER}.tar.bz2
 SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
-RDEPEND="sys-apps/pciutils" # pciutils for cpupower
+RDEPEND="sys-apps/pciutils
+	sys-fs/sysfsutils
+	dev-libs/glib" # pciutils for cpupower, sysfsutils and glib for usbip
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/linux-${LINUX_VER}"
@@ -53,13 +55,11 @@
 	Documentation/virtual/lguest/lguest.c
 	Documentation/vm/page-types.c
 	Documentation/watchdog/src/watchdog-simple.c
-	drivers/staging/hv/tools/hv_kvp_daemon.c
 	tools/slub/slabinfo.c
 	usr/gen_init_cpio.c
 )
 # Documentation/networking/ifenslave.c - obsolete
 # Documentation/ptp/testptp.c - pending linux-headers-3.0
-# tools/hv/hv_kvp_daemon.c - pending linux-3.2
 
 # These have a broken make install, no DESTDIR
 TARGET_MAKE_SIMPLE=(
@@ -88,6 +88,11 @@
 	if [[ -n ${LINUX_PATCH} ]]; then
 		epatch "${DISTDIR}"/${LINUX_PATCH}
 	fi
+
+	cd drivers/staging/usbip/userspace &&
+	eautoreconf -i -f -v &&
+	cd - || die "usbip"
+
 	libs="-lcpupower -lrt -lpci"
 	sed -i \
 		-e "/$libs/{ s,${libs},,g; s,\$, ${libs},g;}" \
@@ -120,6 +125,10 @@
 	esac
 }
 
+src_configure() {
+	cd drivers/staging/usbip/userspace && econf
+}
+
 src_compile() {
 	local karch=$(kernel_asm_arch "${ARCH}")
 	# This is the minimal amount needed to start building host binaries.
@@ -140,6 +149,8 @@
 		emake -C $dir ARCH=${karch} $target || die
 	done
 
+	emake -C drivers/staging/usbip/userspace
+
 	# cpupower is special
 	einfo "Buildling cpupower"
 	cd "${S}"/tools/power/cpupower
@@ -158,6 +169,8 @@
 		dosbin ${dir}/${target} || die
 	done
 
+	emake -C drivers/staging/usbip/userspace DESTDIR="${D}" install
+
 	local karch=$(kernel_asm_arch "${ARCH}")
 	cd "${S}"/tools/power/cpupower
 	cpupower_make ARCH=${karch} DESTDIR="${D}" install || die