--- /usr/portage/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild	2014-06-03 02:31:09.000000000 +0200
+++ oracle-jdk-bin-1.7.0.60.ebuild	2014-06-26 13:09:11.425459762 +0200
@@ -125,12 +125,25 @@
 src_unpack() {
 	# Special case for ARM soft VS hard float.
 	if use arm ; then
-		if [[ ${CHOST} == *-hardfloat-* ]] ; then
-			unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
-			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
-		else
+		if [[ ${CHOST} = armv5* ]]; then
 			unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
 			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
+		elif [[ ${CHOST} = armv6* ]]; then
+			if [[ ${CHOST} == *-hardfloat-* ]] ; then
+				unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
+				use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
+			else
+				unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
+				use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
+			fi
+		elif [[ ${CHOST} = armv7* ]]; then
+			if [[ ${CHOST} == *-hardfloat-* ]] ; then
+				unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
+				use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
+			else
+				unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
+				use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
+			fi
 		fi
 		use examples && unpack javafx_samples-${FX_VERSION}-linux.zip
 		use jce && unpack ${JCE_FILE}