diff --git a/dev-embedded/phidget/phidget-2.1.6.20090430.ebuild b/dev-embedded/phidget/phidget-2.1.6.20090430.ebuild
--- a/dev-embedded/phidget/phidget-2.1.6.20090430.ebuild
+++ b/dev-embedded/phidget/phidget-2.1.6.20090430.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="2"
 
 #base must be last to get base_src_prepare()
-inherit versionator multilib java-pkg-opt-2 base
+inherit java-pkg-opt-2 multilib toolchain-funcs versionator base
 
 MY_PV="$(get_major_version)$(get_version_component_range 2)"
 MY_PN="Phidgetlinux"
@@ -13,21 +13,20 @@ MY_PN="Phidgetlinux"
 DESCRIPTION="Phidget USB hardware interface library"
 HOMEPAGE="http://www.phidgets.com"
 SRC_URI="http://www.phidgets.com/downloads/libraries/${MY_PN}_${PV}.tar.gz
-http://www.phidgets.com/downloads/libraries/phidget${MY_PV}jar_${PV}.zip"
+	java? ( http://www.phidgets.com/downloads/libraries/phidget${MY_PV}jar_${PV}.zip )"
 
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="java"
 
-DEPEND="java? ( >=virtual/jdk-1.4 )"
-RDEPEND="java? ( >=virtual/jre-1.4 )"
+DEPEND="java? ( virtual/jdk
+		app-arch/unzip )"
+RDEPEND="java? ( virtual/jre )"
 
 S=${WORKDIR}/${MY_PN}/${PN}${MY_PV}
 
-PATCHES=( "${FILESDIR}"/${PN}${MY_PV}-libdir.patch \
-	"${FILESDIR}"/${PN}${MY_PV}-crosscompile.patch \
-	"${FILESDIR}"/${PN}${MY_PV}-java.patch )
+PATCHES=( "${FILESDIR}"/${PN}${MY_PV}-gentoo.patch )
 
 src_compile() {
 	local javaflags usejava maketarget
@@ -41,19 +40,16 @@ src_compile() {
 		maketarget=all
 	fi
 
-	emake CROSS_COMPILE=${CHOST}- JAVA="${usejava}" JAVAFLAGS="${javaflags}" "${maketarget}" || die "emake failed"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" JAVA="${usejava}" JAVAFLAGS="${javaflags}" ${maketarget} || die
 }
 
 src_install() {
-
 	#phidget's Makefile's install target requires that these dirs exist
-	dodir /usr/$(get_libdir) && \
-		dodir /usr/include || die "mkdir failed to create installation target directories"
+	dodir /usr/{$(get_libdir),include} || die
 
 	local usejava
 	use java && usejava=y || usejava=n
-	emake install INSTALLPREFIX="${D}" PREFIX=usr LIBDIR=$(get_libdir) JAVA=${usejava} \
-		|| die "emake install failed"
+	emake install INSTALLPREFIX="${D}" PREFIX=usr LIBDIR=$(get_libdir) JAVA=${usejava} || die
 
 	if use java; then
 		java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so
@@ -62,5 +58,5 @@ src_install() {
 
 	dodoc ../README udev/99-phidgets.rules || die
 	docinto examples
-	dodoc examples/* || die "failed to install examples"
+	dodoc examples/* || die
 }