--- /usr/portage/sci-geosciences/grass/grass-6.4.0_rc5.ebuild	2010-02-17 18:10:12.000000000 +0100
+++ sci-geosciences/grass/grass-6.4.0_rc5.ebuild	2010-02-24 16:48:17.000000000 +0100
@@ -19,8 +19,8 @@
 SLOT="6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="X ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png
-	postgres python readline sqlite tiff truetype wxwindows"
+IUSE="X embedded ffmpeg fftw gmath jpeg largefile motif mysql nls odbc
+	opengl png postgres python readline sqlite tiff truetype wxwindows"
 
 RESTRICT="strip"
 
@@ -40,7 +40,10 @@
 		virtual/lapack
 	)
 	jpeg? ( media-libs/jpeg )
-	mysql? ( dev-db/mysql )
+	mysql? (
+		dev-db/mysql[embedded?]
+		embedded? ( <dev-db/mysql-5.1 )
+	)
 	odbc? ( >=dev-db/unixODBC-2.0.6 )
 	opengl? ( virtual/opengl )
 	motif? ( x11-libs/openmotif )
@@ -227,8 +230,9 @@
 }
 
 src_compile() {
-	# looks like we no longer need the vdigit symlink build hack
-	emake -j1 || die "make failed!"
+	local vars=
+	use embedded || vars="${vars} MYSQLDLIB="
+	emake -j1 ${vars} || die "make failed!"
 }
 
 src_install() {