/[gentoo-x86]/eclass/mysql-v2.eclass
Gentoo

Diff of /eclass/mysql-v2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.16 Revision 1.18
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.16 2012/05/06 10:42:36 heroxbd Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.18 2012/09/10 02:07:08 ferringb Exp $
4 4
5# @ECLASS: mysql-v2.eclass 5# @ECLASS: mysql-v2.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Maintainers: 7# Maintainers:
8# - MySQL Team <mysql-bugs@gentoo.org> 8# - MySQL Team <mysql-bugs@gentoo.org>
221 221
222DEPEND="${DEPEND} 222DEPEND="${DEPEND}
223 virtual/yacc 223 virtual/yacc
224" 224"
225 225
226DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )" 226DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
227 227
228# compile-time-only 228# compile-time-only
229DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" 229DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
230 230
231# compile-time-only 231# compile-time-only
529 if built_with_use ${CATEGORY}/${PN} minimal ; then 529 if built_with_use ${CATEGORY}/${PN} minimal ; then
530 die "Minimal builds do NOT include the MySQL server" 530 die "Minimal builds do NOT include the MySQL server"
531 fi 531 fi
532 532
533 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then 533 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
534 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})" 534 local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
535 MY_DATADIR_s="${MY_DATADIR_s%%/}"
535 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})" 536 local old_MY_DATADIR_s="${ROOT}/old_MY_DATADIR}"
537 old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
536 538
537 if [[ -d "${old_MY_DATADIR_s}" ]]; then 539 if [[ -d "${old_MY_DATADIR_s}" ]]; then
538 if [[ -d "${MY_DATADIR_s}" ]]; then 540 if [[ -d "${MY_DATADIR_s}" ]]; then
539 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" 541 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
540 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" 542 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"

Legend:
Removed from v.1.16  
changed lines
  Added in v.1.18

  ViewVC Help
Powered by ViewVC 1.1.20