Index: dev-java/icedtea/icedtea-7.1.14-r1.ebuild
===================================================================
--- dev-java/icedtea/icedtea-7.1.14-r1.ebuild	(revision 8742)
+++ dev-java/icedtea/icedtea-7.1.14-r1.ebuild	(working copy)
@@ -135,8 +135,14 @@
 	# to limit supported VM's for building and their preferred order
 	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
 		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
+	#elif has_version >dev-java/icedtea-7.1.14:7; then
+	#	JAVA_PKG_FORCE_VM="icedtea-7"
 	#elif has_version dev-java/icedtea:7; then
 	#	JAVA_PKG_FORCE_VM="icedtea7"
+	#elif has_version dev-java/icedtea-bin:7; then
+	#	JAVA_PKG_FORCE_VM="icedtea-bin-7"
+	elif has_version >dev-java/icedtea-6.1.10.3:6; then
+		JAVA_PKG_FORCE_VM="icedtea-6"
 	elif has_version dev-java/icedtea:6; then
 		JAVA_PKG_FORCE_VM="icedtea6"
 	elif has_version dev-java/icedtea:0; then
@@ -162,8 +168,6 @@
 		java-vm-2_pkg_setup
 		java-pkg-2_pkg_setup
 	fi
-
-	VMHANDLE="icedtea${SLOT}"
 }
 
 src_unpack() {
@@ -187,7 +191,7 @@
 	local config procs rhino_jar
 	local vm=$(java-pkg_get-current-vm)
 
-	if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea" ]] || [[ "${vm}" == "icedtea7" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then
+	if has ${vm} icedtea-7 icedtea-bin-7 icedtea7 icedtea-6 icedtea6 icedtea6-bin icedtea; then
 		# We can't currently bootstrap with a Sun-based JVM :(
 		config="${config} --disable-bootstrap"
 	elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" ]] ; then