[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, eclass/

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

commit:     23d882d9665185c9708c033fafcf4c8a78ed95af
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 04:42:10 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 04:42:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=23d882d9

Really add the mysql_fx.eclass update.
Restore the create data dir block in src_install.

---
 dev-db/mysql/Manifest     |    2 +-
 eclass/mysql-cmake.eclass |   32 ++++++++++----------
 eclass/mysql_fx.eclass    |   73 +++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 88 insertions(+), 19 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index bca7e10..be972aa 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -23,7 +23,7 @@ EBUILD mysql-5.1.51-r1.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf804
 EBUILD mysql-5.1.51.ebuild 8535 RMD160 5ba70e7adcd64e12e82eb535626c62e0bfd037d9 SHA1 ff6b3977d1ef7d5478e252a2674f9f9908152fc6 SHA256 ec064ac9c531c81debdebdba0d82e5d9e60658313fd384afc411a11f54bb603b
 EBUILD mysql-5.1.52-r2.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf80441 SHA1 4cf3312866227c0943326d42f17d2c010a71ea92 SHA256 f12785c65871d19a3988283f3a03b8b1b6562e7564d42eeb8c6f213d88205a5d
 EBUILD mysql-5.1.53-r1.ebuild 8605 RMD160 48dc76fceda6b3d78c2eeb615e5b988cb8fb8dd4 SHA1 11546673524f53b852ecd89c768c628c2a7f2c97 SHA256 9cec68559741bf8c40252aae7366f637da863b91f19f21454f07e58f11c48c82
-EBUILD mysql-5.5.10.ebuild 6907 RMD160 3cd815a40143d33e9a939c8d0937d0da550a6f9e SHA1 8ae70da5b59b6ed898fe6a50924d1db08542902e SHA256 24d9f7a4de939177eee9f334c086ba2144c897cb508f93256b6ffee650456be9
+EBUILD mysql-5.5.10.ebuild 6866 RMD160 bfc0e6b14720be2cf70e6291c6e12600fac8dd3a SHA1 06d16abd5266064f67ad745c2263bf90b57715ec SHA256 0bf345406c9ada42dcbb94d94bac566e1b11d11d048dae34d08291687da570f7
 EBUILD mysql-5.5.4_alpha_pre3.ebuild 6903 RMD160 dd85e75069e59ae77f5fccdd9fff994aaeb06899 SHA1 8a0f91a49b63681f428beb589512924d347cc643 SHA256 25cf50e56a99318309cd9f51d86695018d957dec53e7ef5eda7e9d2a3233d086
 MISC ChangeLog 4146 RMD160 4a3dcf64319e002e55d39ed08be555175e1c3302 SHA1 063643af9d2fb5b35377b62a29a5bee7e7ac4fd6 SHA256 45e640d6ae2af796f589c66e0d7841c840c66be06fa7373b36721dbe12374cfe
 MISC metadata.xml 1216 RMD160 02f8b2bd126a9336cddb83f3f9e811d4129688cc SHA1 5adf0187c051f9e9f79e3148cf0a074f5230060d SHA256 1eff466af9a3c635bfe480c6c6fd37c8cc87251285f0a5b3f2b7661a18ee5574

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index d2ef3cc..7063e17 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -389,23 +389,23 @@ mysql-cmake_src_install() {
 	newins "${TMPDIR}/my.cnf.ok" my.cnf
 
 	# Minimal builds don't have the MySQL server
-#	if ! use minimal ; then
-#		einfo "Creating initial directories"
+	if ! use minimal ; then
+		einfo "Creating initial directories"
 		# Empty directories ...
-#		diropts "-m0750"
-#		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-#			dodir "${MY_DATADIR}"
-#			keepdir "${MY_DATADIR}"
-#			chown -R mysql:mysql "${D}/${MY_DATADIR}"
-#		fi
-#
-#		diropts "-m0755"
-#		for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
-#			dodir "${folder}"
-#			keepdir "${folder}"
-#			chown -R mysql:mysql "${D}/${folder}"
-#		done
-#	fi
+		diropts "-m0750"
+		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+			dodir "${MY_DATADIR}"
+			keepdir "${MY_DATADIR}"
+			chown -R mysql:mysql "${D}/${MY_DATADIR}"
+		fi
+
+		diropts "-m0755"
+		for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
+			dodir "${folder}"
+			keepdir "${folder}"
+			chown -R mysql:mysql "${D}/${folder}"
+		done
+	fi
 
 	# Docs
 #	einfo "Installing docs"

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index cb369be..25b7da4 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -3,8 +3,9 @@
 # $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.22 2009/02/12 05:05:14 robbat2 Exp $
 
 # Author: Francesco Riosa (Retired) <vivo@gentoo.org>
-# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
-#		Luca Longinotti <chtekk@gentoo.org>
+# Maintainer:
+#	- MySQL Team <mysql-bugs@gentoo.org>
+#	- Luca Longinotti <chtekk@gentoo.org>
 
 inherit multilib
 
@@ -211,3 +212,71 @@ mysql_lib_symlinks() {
 		done
 	popd &> /dev/null
 }
+
+# @FUNCTION: mysql_init_vars
+# @DESCRIPTION:
+# void mysql_init_vars()
+# Initialize global variables
+# 2005-11-19 <vivo@gentoo.org>
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
+	MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
+	MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1`
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
+		MY_SOURCEDIR=${SERVER_URI##*/}
+		MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
+}