Index: icedtea-1.12.ebuild
===================================================================
--- icedtea-1.12.ebuild	(revision 8006)
+++ icedtea-1.12.ebuild	(working copy)
@@ -79,7 +79,7 @@
 # sets some environment variables.
 DEPEND="${RDEPEND}
 	|| ( >=virtual/gnu-classpath-jdk-1.5
-		 dev-java/icedtea6
+		 dev-java/icedtea6[-nio2]
 		 dev-java/icedtea6-bin
 	)
 	>=virtual/jdk-1.5
@@ -108,7 +108,9 @@
 
 	# quite a hack since java-config does not provide a way for a package
 	# to limit supported VM's for building and their preferred order
-	if has_version dev-java/icedtea6; then
+	if [[ "${JAVA_PKG_FORCE_VM}" ]] && has_version "dev-java/${JAVA_PKG_FORCE_VM}" ; then
+		ewarn "vm forced by env: ${JAVA_PKG_FORCE_VM}"
+	elif has_version "dev-java/icedtea6[-nio2]"; then
 		JAVA_PKG_FORCE_VM="icedtea6"
 	elif has_version dev-java/icedtea6-bin; then
 		JAVA_PKG_FORCE_VM="icedtea6-bin"
Index: Manifest
===================================================================
--- Manifest	(revision 8006)
+++ Manifest	(working copy)
@@ -12,6 +12,6 @@
 DIST jdk7-jaf-2009_08_28.zip 69593 RMD160 c8a7a8b2663efce6fbd7377b04392be8496affb3 SHA1 8d5607ebf07eb4a57a48e9f4c1738f344e36ac7e SHA256 8c81940b3017c0058367d7e7453123442f2cdd77c2bfe74acd9035f97e4db8e8
 DIST jdk7-jaxp-m5.zip 5898701 RMD160 3262630984c464a5e6eef5d1f76aadbb65b5bcfc SHA1 3caa5ec0687340b04ff0b7f9db454355b18e23f5 SHA256 ebab4c6c4e641a4c95a7b6669e78f9bb1149a11054fc5b423cf292b633d6be53
 DIST jdk7-jaxws-2009_09_28.zip 5446378 RMD160 430b6c8ecf67933fbee23e2622438995062999d4 SHA1 657a69e811dc66bdd09819ce3d8892be35882945 SHA256 272756b999e9ae2435da8d58e259562e61126e1c5b1f9421fe65423217cef8fd
-EBUILD icedtea-1.12.ebuild 8408 RMD160 3a85b7837f41dc3936587addfbc802723d389eac SHA1 1aa448413806ebdc3e87aa8fb9892fdb5e71d8a7 SHA256 9c0d53fdf1e9ac5d5514f9a8192d074048171fca57e09c7058ed6e097aef411a
+EBUILD icedtea-1.12.ebuild 8562 RMD160 8a87991db4027f8aa4d22aabafa418ed23e9b6ec SHA1 ec673e09bea3d96bdc2965b10d0890e9f54f757b SHA256 53a4889d111e4ffcd15809c6711b57923ee33adf7eab396b19e52072a3ce07ee
 MISC ChangeLog 809 RMD160 1967148dd9995e72f37d35b95fb9c41c966b0348 SHA1 3dad2d242dea1e6fae589ad1b8426073bf4cc761 SHA256 7f789699440fa75a8fc9041c691e52bf5a2aad0b20b9bcd6f5769f822b5a5648
 MISC metadata.xml 988 RMD160 ea40109ccf581552f69a4049938fa1cae1e24fc7 SHA1 490ee13e1a07c4d42d2010bb0bad2a4293d0b58f SHA256 ba499a7caa1ca4d44dcf01d6db96c790eff3245ef1bbe0c7cee4a2270aad1fd0