mysql*.eclass: remove built_with_use function in pkg_config

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index b787542745d72592cc02520e39b4d43c500f736f..38fcc7c0ecf81a4eb9bad35df9cbac17fb81e330 100644 (file)
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -785,7 +785,7 @@ mysql-multilib-r1_pkg_config() {
        mysql_init_vars
 
        [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-       if ! built_with_use ${CATEGORY}/${PN} server ; then
+       if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
                die "Minimal builds do NOT include the MySQL server"
        fi
 

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index b2e7dffa09ad90b65a7ce9fae65dd1181b4495ca..b19b0fa522e3ba733e678f0377f6e6e52e9d29cd 100644 (file)
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -943,14 +943,8 @@ mysql-multilib_pkg_config() {
        mysql_init_vars
 
        [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-       if [[ ${HAS_TOOLS_PATCH} ]] ; then
-               if ! built_with_use ${CATEGORY}/${PN} server ; then
-                       die "Minimal builds do NOT include the MySQL server"
-               fi
-       else
-               if built_with_use ${CATEGORY}/${PN} minimal ; then
-                       die "Minimal builds do NOT include the MySQL server"
-               fi
+       if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+               die "Minimal builds do NOT include the MySQL server"
        fi
 
        if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 556d37eba6ef7296a49b299398b563d1f118e9c8..ddb28654b49806319d52dfb5c2c9965022578dce 100644 (file)
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -699,7 +699,7 @@ mysql-v2_pkg_config() {
 
        [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
 
-       if built_with_use ${CATEGORY}/${PN} minimal ; then
+       if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
                die "Minimal builds do NOT include the MySQL server"
        fi