diff options
| author |   Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2012-07-23 10:57:15 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2012-07-23 10:57:15 +0000 |
| commit | c8e7358ad84dd6bf4cc60f1d1e4357aa3662f6d0 (patch) | |
| tree | 51e8b429b41e5e9a88d34eef0db28b653ab065d0 /eclass/mysql.eclass | |
| parent | Version bump (diff) | |
| download | gentoo-2-c8e7358ad84dd6bf4cc60f1d1e4357aa3662f6d0.tar.gz gentoo-2-c8e7358ad84dd6bf4cc60f1d1e4357aa3662f6d0.tar.bz2 gentoo-2-c8e7358ad84dd6bf4cc60f1d1e4357aa3662f6d0.zip | |
Sync mysql and mysql-v2 eclasses from the mysql overlay.
Simplify ncurses dependency and update inherit to use git-2 eclass.
Diffstat (limited to 'eclass/mysql.eclass')
| -rw-r--r-- | eclass/mysql.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 30b5b01a82f6..00d7a9679b81 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.171 2012/06/02 19:16:31 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.172 2012/07/23 10:57:15 jmbsvicetto Exp $ # @ECLASS: mysql.eclass # @MAINTAINER: @@ -29,7 +29,7 @@ S="${WORKDIR}/mysql" if [[ "${MY_EXTRAS_VER}" == "live" ]]; then EGIT_PROJECT=mysql-extras EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" - inherit git + inherit git-2 fi case "${EAPI:-0}" in @@ -151,7 +151,7 @@ DEPEND="${DEPEND} virtual/yacc" if [ "${EAPI:-0}" = "2" ]; then - DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )" + DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )" fi # compile-time-only |