diff options
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/mysql-v2.eclass | 4 | ||||
| -rw-r--r-- | eclass/mysql.eclass | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8724de940a20..82dc16eb6524 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.347 2012/07/21 11:57:30 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.348 2012/07/23 10:57:15 jmbsvicetto Exp $ + + 23 Jul 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> + mysql.eclass, mysql-v2.eclass: + Sync mysql and mysql-v2 eclasses from the mysql overlay. + Simplify ncurses dependency and update inherit to use git-2 eclass. 21 Jul 2012; Ralph Sennhauser <sera@gentoo.org> java-pkg-2.eclass: Convert documentation to eclass-manpages. diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index fe31ef5a7f66..bfc8f014238e 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.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-v2.eclass,v 1.16 2012/05/06 10:42:36 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.17 2012/07/23 10:57:15 jmbsvicetto Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -223,7 +223,7 @@ DEPEND="${DEPEND} virtual/yacc " -DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )" +DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )" # compile-time-only DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" 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 |