diff --git a/trinity-apps/amarok/amarok-14.1.0.ebuild b/trinity-apps/amarok/amarok-14.1.0.ebuild
index 0c88fd13..cf0daccc 100644
--- a/trinity-apps/amarok/amarok-14.1.0.ebuild
+++ b/trinity-apps/amarok/amarok-14.1.0.ebuild
@@ -44,7 +44,6 @@ REQUIRED_USE="|| ( xine akode ) mysql? ( !mariadb )"
 
 DEPEND="
 	dev-db/sqlite
-	dev-lang/ruby:*
 	media-libs/taglib
 	akode? ( ~media-libs/akode-${PV} )
 	ifp? ( media-libs/libifp )
@@ -62,16 +61,9 @@ DEPEND="
 	)
 	xine? ( media-libs/xine-lib )
 "
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if use mysql ; then
-		sed -i 's/mariadb_config mysql_config/mysql_config/' "${S}/ConfigureChecks.cmake"
-	elif use mariadb ; then
-		sed -i 's/mariadb_config mysql_config/mariadb_config/' "${S}/ConfigureChecks.cmake"
-	fi
-	trinity-base-2_src_prepare
-}
+RDEPEND="${DEPEND}
+	dev-lang/ruby:*
+"
 
 src_configure() {
 	local mycmakeargs=(
@@ -94,9 +86,9 @@ src_configure() {
 		-DWITH_XINE="$(usex xine)"
 	)
 	if use mysql ; then
-		mycmakeargs+=( -DWITH_MYSQL=ON )
+		mycmakeargs+=( -DWITH_MYSQL=ON -DMYSQL_CONFIG="${ESYSROOT}/usr/bin/mysql_config" )
 	elif use mariadb ; then
-		mycmakeargs+=( -DWITH_MYSQL=ON )
+		mycmakeargs+=( -DWITH_MYSQL=ON -DMYSQL_CONFIG="${ESYSROOT}/usr/bin/mariadb_config" )
 	fi
 
 	trinity-base-2_src_configure
diff --git a/trinity-apps/amarok/amarok-14.1.1.ebuild b/trinity-apps/amarok/amarok-14.1.1.ebuild
index 0c88fd13..cf0daccc 100644
--- a/trinity-apps/amarok/amarok-14.1.1.ebuild
+++ b/trinity-apps/amarok/amarok-14.1.1.ebuild
@@ -44,7 +44,6 @@ REQUIRED_USE="|| ( xine akode ) mysql? ( !mariadb )"
 
 DEPEND="
 	dev-db/sqlite
-	dev-lang/ruby:*
 	media-libs/taglib
 	akode? ( ~media-libs/akode-${PV} )
 	ifp? ( media-libs/libifp )
@@ -62,16 +61,9 @@ DEPEND="
 	)
 	xine? ( media-libs/xine-lib )
 "
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if use mysql ; then
-		sed -i 's/mariadb_config mysql_config/mysql_config/' "${S}/ConfigureChecks.cmake"
-	elif use mariadb ; then
-		sed -i 's/mariadb_config mysql_config/mariadb_config/' "${S}/ConfigureChecks.cmake"
-	fi
-	trinity-base-2_src_prepare
-}
+RDEPEND="${DEPEND}
+	dev-lang/ruby:*
+"
 
 src_configure() {
 	local mycmakeargs=(
@@ -94,9 +86,9 @@ src_configure() {
 		-DWITH_XINE="$(usex xine)"
 	)
 	if use mysql ; then
-		mycmakeargs+=( -DWITH_MYSQL=ON )
+		mycmakeargs+=( -DWITH_MYSQL=ON -DMYSQL_CONFIG="${ESYSROOT}/usr/bin/mysql_config" )
 	elif use mariadb ; then
-		mycmakeargs+=( -DWITH_MYSQL=ON )
+		mycmakeargs+=( -DWITH_MYSQL=ON -DMYSQL_CONFIG="${ESYSROOT}/usr/bin/mariadb_config" )
 	fi
 
 	trinity-base-2_src_configure
diff --git a/trinity-apps/amarok/amarok-9999.ebuild b/trinity-apps/amarok/amarok-9999.ebuild
index 988d12b2..7a018774 100644
--- a/trinity-apps/amarok/amarok-9999.ebuild
+++ b/trinity-apps/amarok/amarok-9999.ebuild
@@ -44,7 +44,6 @@ REQUIRED_USE="|| ( xine akode ) mysql? ( !mariadb )"
 
 DEPEND="
 	dev-db/sqlite
-	dev-lang/ruby:*
 	media-libs/taglib
 	akode? ( ~media-libs/akode-${PV} )
 	ifp? ( media-libs/libifp )
@@ -62,16 +61,9 @@ DEPEND="
 	)
 	xine? ( media-libs/xine-lib )
 "
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if use mysql ; then
-		sed -i 's/mariadb_config mysql_config/mysql_config/' "${S}/ConfigureChecks.cmake"
-	elif use mariadb ; then
-		sed -i 's/mariadb_config mysql_config/mariadb_config/' "${S}/ConfigureChecks.cmake"
-	fi
-	trinity-base-2_src_prepare
-}
+RDEPEND="${DEPEND}
+	dev-lang/ruby:*
+"
 
 src_configure() {
 	local mycmakeargs=(
@@ -94,9 +86,9 @@ src_configure() {
 		-DWITH_XINE="$(usex xine)"
 	)
 	if use mysql ; then
-		mycmakeargs+=( -DWITH_MYSQL=ON )
+		mycmakeargs+=( -DWITH_MYSQL=ON -DMYSQL_CONFIG="${ESYSROOT}/usr/bin/mysql_config" )
 	elif use mariadb ; then
-		mycmakeargs+=( -DWITH_MYSQL=ON )
+		mycmakeargs+=( -DWITH_MYSQL=ON -DMYSQL_CONFIG="${ESYSROOT}/usr/bin/mariadb_config" )
 	fi
 
 	trinity-base-2_src_configure