summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Riosa <vivo@gentoo.org>2006-01-24 23:56:01 +0000
committerFrancesco Riosa <vivo@gentoo.org>2006-01-24 23:56:01 +0000
commitd44583b367e8f03ac9a95cef8ede3f4cc1ab1379 (patch)
treede394cefb9c4fb43428470249fbede605164db6e /eclass/mysql.eclass
parentMake modular X friendly. (diff)
downloadgentoo-2-d44583b367e8f03ac9a95cef8ede3f4cc1ab1379.tar.gz
gentoo-2-d44583b367e8f03ac9a95cef8ede3f4cc1ab1379.tar.bz2
gentoo-2-d44583b367e8f03ac9a95cef8ede3f4cc1ab1379.zip
inherit again from mysql_fx, needed for emerge, removed unwanted debug output
Diffstat (limited to 'eclass/mysql.eclass')
-rw-r--r--eclass/mysql.eclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 373b1f132a0a..cdfb6dccbc83 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,11 +1,11 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.9 2006/01/24 23:09:00 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.10 2006/01/24 23:56:01 vivo Exp $
# Author: Francesco Riosa <vivo at gentoo.org>
# Maintainer: Francesco Riosa <vivo at gentoo.org>
-inherit eutils flag-o-matic gnuconfig
+inherit eutils flag-o-matic gnuconfig mysql_fx
#major, minor only in the slot
SLOT=$(( ${MYSQL_VERSION_ID} / 10000 ))
@@ -426,7 +426,6 @@ mysql_src_install() {
-e "s!@DATADIR@!${DATADIR}!g" \
"${FILESDIR}/my.cnf-4.1-r1" \
> "${TMPDIR}/my.cnf.ok"
-ls -l ${TMPDIR} ${FILESDIR}/my.cnf-4.1-r1
newins "${TMPDIR}/my.cnf.ok" my.cnf
insinto "/etc/conf.d"