diff --git a/dev-embedded/phidget/Manifest b/dev-embedded/phidget/Manifest
--- a/dev-embedded/phidget/Manifest
+++ b/dev-embedded/phidget/Manifest
@@ -5,7 +5,7 @@ AUX phidget21-libdir.patch 562 RMD160 b4
 DIST Phidgetlinux_2.1.4.20080924.tar.gz 292176 RMD160 2360bc2ccc14d2afd30de11386eac3f4e3399cf0 SHA1 a296abee3f48d8126b521b10e487cd77fe07051d SHA256 7f60fc29147b45bbe0fa6cca769bf8a940839b13b8786bdfbca18bb54822cb25
 DIST Phidgetlinux_2.1.5.20081023.tar.gz 304986 RMD160 08819880bbf364cbf388c826f2dd8b4c3dba5933 SHA1 3f1e0ad9b610968ee0539093be76ff539cc66210 SHA256 a03c0c46fa2901cc536492933da30711f522cb9776fd15b3e556f3cba2cdd709
 DIST Phidgetlinux_2.1.5.20090105.tar.gz 316490 RMD160 0c0088eee842b7b4b723867c08964557c665b9aa SHA1 484fa7c170e412e9513d5f08e883a5efd9a7c366 SHA256 bfaaaf2aa21c854b2f0305ed6b55605d336b6b890eedf40ead0e17b419b7ac33
-EBUILD phidget-2.1.4.20080924.ebuild 1481 RMD160 a862dccb01a4a757603ab657dc2b9cbf7e6fd611 SHA1 3535c5d1addc20857f529b9eef04a573a3e7d9a7 SHA256 a2e183ff2b62fa1dc901a9158b482cea2a21372531a69e29c985ebb0a959a26b
-EBUILD phidget-2.1.5.20081023.ebuild 1481 RMD160 a862dccb01a4a757603ab657dc2b9cbf7e6fd611 SHA1 3535c5d1addc20857f529b9eef04a573a3e7d9a7 SHA256 a2e183ff2b62fa1dc901a9158b482cea2a21372531a69e29c985ebb0a959a26b
-EBUILD phidget-2.1.5.20090105.ebuild 1546 RMD160 33c0dd9588ab3c5a6fe42354075d80f6f620f5a2 SHA1 320ec5a938b3d859933cb4bc936ac02c7f15185e SHA256 83460a542ec21ef6a492b6d77ce798892e589cb1bc5afb81ca57121a5412cfdd
+EBUILD phidget-2.1.4.20080924.ebuild 1493 RMD160 17f0115cc87bea75d6a9315e5295d0bafa6704d0 SHA1 7fd6b20909c32e0b2856c738412889b0fafff13e SHA256 1b86666fbb4c61671f69b987f693fccaa6b5b23b08d280e0c5ed85a1ac9e6366
+EBUILD phidget-2.1.5.20081023.ebuild 1493 RMD160 17f0115cc87bea75d6a9315e5295d0bafa6704d0 SHA1 7fd6b20909c32e0b2856c738412889b0fafff13e SHA256 1b86666fbb4c61671f69b987f693fccaa6b5b23b08d280e0c5ed85a1ac9e6366
+EBUILD phidget-2.1.5.20090105.ebuild 1558 RMD160 75ee82c1d88190e9a94aef349cf69668320408c5 SHA1 0e05ecb5801d392cc9deb95f150681d069573510 SHA256 429b659b39d593e0db88910db799560761d305708935e844449c0886f335108a
 MISC ChangeLog 1207 RMD160 bd42df7744f01c013804da153c2ddfc10e9afb08 SHA1 3c92e7166b1ec1e6394e2be53fa56687f121e68e SHA256 82893b9acdcdc20261bbad4c465b320773cd15e7d83a866a9fdf836a91f84e58
diff --git a/dev-embedded/phidget/phidget-2.1.4.20080924.ebuild b/dev-embedded/phidget/phidget-2.1.4.20080924.ebuild
--- a/dev-embedded/phidget/phidget-2.1.4.20080924.ebuild
+++ b/dev-embedded/phidget/phidget-2.1.4.20080924.ebuild
@@ -45,5 +45,7 @@ src_install() {
 	dodir /usr/$(get_libdir) && \
 		dodir /usr/include || die "mkdir failed in creation of destination directories"
 	emake install INSTALLPREFIX=${D} PREFIX=usr LIBDIR=$(get_libdir) || die "emake install failed"
-	use java && java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so || die "registering java .so file failed"
+	if use java; then
+		java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so || die "registering java .so file failed"
+	fi
 }
diff --git a/dev-embedded/phidget/phidget-2.1.5.20081023.ebuild b/dev-embedded/phidget/phidget-2.1.5.20081023.ebuild
--- a/dev-embedded/phidget/phidget-2.1.5.20081023.ebuild
+++ b/dev-embedded/phidget/phidget-2.1.5.20081023.ebuild
@@ -45,5 +45,7 @@ src_install() {
 	dodir /usr/$(get_libdir) && \
 		dodir /usr/include || die "mkdir failed in creation of destination directories"
 	emake install INSTALLPREFIX=${D} PREFIX=usr LIBDIR=$(get_libdir) || die "emake install failed"
-	use java && java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so || die "registering java .so file failed"
+	if use java; then
+		java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so || die "registering java .so file failed"
+	fi
 }
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
@@ -47,5 +47,7 @@ src_install() {
 	USEJAVA=n
 	use java && USEJAVA=y
 	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 || die "registering java .so file failed"
+	if use java; then
+		java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so || die "registering java .so file failed"
+	fi
 }