diff --git a/dev-embedded/phidget/phidget-2.1.5.20090105.ebuild b/dev-embedded/phidget/phidget-2.1.5.20090105.ebuild
--- a/dev-embedded/phidget/phidget-2.1.5.20090105.ebuild
+++ b/dev-embedded/phidget/phidget-2.1.5.20090105.ebuild
@@ -1,39 +1,36 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
+
 inherit versionator eutils java-pkg-opt-2
 
+MY_PV="$(get_major_version)$(get_version_component_range 2)"
+MY_PN="Phidgetlinux"
+
 DESCRIPTION="Phidget USB hardware interface library"
-MY_PV="$(get_major_version)$(get_version_component_range 2)"
-LONGNAME="Phidgetlinux"
-SRC_URI="http://www.phidgets.com/downloads/libraries/${LONGNAME}_${PV}.tar.gz"
 HOMEPAGE="http://www.phidgets.com"
-
-SLOT="0"
+SRC_URI="http://www.phidgets.com/downloads/libraries/${MY_PN}_${PV}.tar.gz"
 
 LICENSE="LGPL-2"
-KEYWORDS="x86 ~alpha ~ppc ~sparc ~hppa ~amd64"
-
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
 IUSE="java"
 
+DEPEND="java? ( >=virtual/jdk-1.4 )"
 RDEPEND="java? ( >=virtual/jre-1.4 )"
-DEPEND="java? ( >=virtual/jdk-1.4 )"
-
-S=${WORKDIR}/${LONGNAME}/${PN}${MY_PV}
 
-src_unpack() {
-	unpack ${LONGNAME}_${PV}.tar.gz
-	cd "${S}"
+S=${WORKDIR}/${MY_PN}/${PN}${MY_PV}
+DOCS=../README udev/99-phidgets.rules
 
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}${MY_PV}-libdir.patch
-	epatch "${FILESDIR}"/${PN}${MY_PV}-2.1.5.20090105-crosscompile.patch
-	use java && epatch "${FILESDIR}"/${PN}${MY_PV}-java.patch
+	epatch "${FILESDIR}"/${PN}${MY_PV}-crosscompile.patch
+	epatch "${FILESDIR}"/${PN}${MY_PV}-java.patch
 }
 
 src_compile() {
-	echo cd "${S}"
-	cd "${S}"
 	if use java; then
 		emake CROSS_COMPILE=${CHOST}- JAVA=y JAVAFLAGS="$(java-pkg_get-jni-cflags)" jni || die "emake failed"
 	else
@@ -43,13 +40,14 @@ src_compile() {
 
 src_install() {
 
-	#it seems that phidget's install stuff wants these dirs to exist
+	#phidget's Makefile's install target requires that these dirs exist
 	dodir /usr/$(get_libdir) && \
-		dodir /usr/include || die "mkdir failed in creation of destination directories"
-	USEJAVA=n
-	use java && USEJAVA=y
-	emake install INSTALLPREFIX="${D}" PREFIX=usr LIBDIR=$(get_libdir) JAVA=${USEJAVA} || die "emake install failed"
-	if use java; then
-		java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so || die "registering java .so file failed"
-	fi
+		dodir /usr/include || die "mkdir failed to create installation target directories"
+
+	local usejava
+	use java && usejava=y || usejava=n
+	emake install INSTALLPREFIX="${D}" PREFIX=usr LIBDIR=$(get_libdir) JAVA=${usejava} \
+		|| die "emake install failed"
+
+	use java && java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so
 }