--- eclass/java-utils-2.eclass	2011-07-08 14:01:13.000000000 +0200
+++ eclass/java-utils-2.eclass	2011-07-09 14:09:46.458336614 +0200
@@ -918,7 +918,7 @@
 
 	[[ -z ${target_pkg} ]] && die "Must specify a package"
 
-	if [[ "${EAPI}" == "1" ]]; then
+	if ! [[ "${EAPI:-0}" == "0" ]]; then
 		target_pkg="${target_pkg//:/-}"
 	fi
 
@@ -1056,7 +1056,7 @@
 
 	local pkgs="${1}"
 
-	if [[ "${EAPI}" == "1" ]]; then
+	if ! [[ "${EAPI:-0}" == "0" ]]; then
 		pkgs="${pkgs//:/-}"
 	fi
 
@@ -1124,7 +1124,7 @@
 
 	local pkg="${1}" target_jar="${2}" jar
 
-	if [[ "${EAPI}" == "1" ]]; then
+	if ! [[ "${EAPI:-0}" == "0" ]]; then
 		pkg="${pkg//:/-}"
 	fi
 
@@ -1209,7 +1209,7 @@
 
 	[[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
 
-	if [[ "${EAPI}" == "1" ]]; then
+	if ! [[ "${EAPI:-0}" == "0" ]]; then
 		pkgs="${pkgs//:/-}"
 	fi
 
@@ -1264,7 +1264,7 @@
 
 	[[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
 
-	if [[ "${EAPI}" == "1" ]]; then
+	if ! [[ "${EAPI:-0}" == "0" ]]; then
 		pkgs="${pkgs//:/-}"
 	fi