--- /usr/portage/eclass/mysql-autotools.eclass	2012-01-09 11:42:19.000000000 +0100
+++ /usr/portage/eclass/mysql-autotools.eclass	2012-02-22 09:48:19.000000000 +0100
@@ -358,9 +358,11 @@ 
 	# Clean out old items
 	rm -f "${EPATCH_SOURCE}"/*
 	# Now link in right patches
-	mysql_mv_patches
-	# And apply
-	epatch
+	[ "${MY_EXTRAS_VER}" != "none" ] && {
+		mysql_mv_patches
+		# And apply
+		epatch
+	}
 
 	# last -fPIC fixup, per bug #305873
 	i="${S}"/storage/innodb_plugin/plug.in
--- /usr/portage/eclass/mysql-cmake.eclass	2012-01-09 11:42:19.000000000 +0100
+++ /usr/portage/eclass/mysql-cmake.eclass	2012-02-22 09:47:59.000000000 +0100
@@ -170,9 +170,11 @@ 
 	# Clean out old items
 	rm -f "${EPATCH_SOURCE}"/*
 	# Now link in right patches
-	mysql_mv_patches
-	# And apply
-	epatch
+	[ "${MY_EXTRAS_VER}" != "none" ] && {
+		mysql_mv_patches
+		# And apply
+		epatch
+	}
 
 	# last -fPIC fixup, per bug #305873
 	i="${S}"/storage/innodb_plugin/plug.in
--- /usr/portage/eclass/mysql-v2.eclass	2012-01-09 11:42:19.000000000 +0100
+++ /usr/portage/eclass/mysql-v2.eclass	2012-02-20 20:04:58.000000000 +0100
@@ -84,6 +84,7 @@ 
 if [[ "${PN}" == "mysql-cluster" ]]; then
 	case $PV in
 		6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
+		7.2*) MYSQL_PV_MAJOR=5.5 ;;
 	esac
 fi
 
--- /usr/portage/eclass/mysql.eclass	2012-01-09 11:42:19.000000000 +0100
+++ /usr/portage/eclass/mysql.eclass	2012-02-22 10:27:26.000000000 +0100
@@ -900,10 +900,12 @@ 
 	mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
 	# Clean out old items
 	rm -f "${EPATCH_SOURCE}"/*
-	# Now link in right patches
-	mysql_mv_patches
-	# And apply
-	epatch
+	[ "${MY_EXTRAS_VER}" != "none" ] && {
+		# Now link in right patches
+		mysql_mv_patches
+		# And apply
+		epatch
+	}
 
 	# last -fPIC fixup, per bug #305873
 	i="${S}"/storage/innodb_plugin/plug.in