diff options
| author |   Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2011-08-21 16:14:56 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2011-08-21 16:14:56 +0000 |
| commit | e0d9d15e7abfef383fbe3404cc0528c619d6c473 (patch) | |
| tree | acff167102786fb96611f44cd936cd7b38bf9a20 /eclass/mysql.eclass | |
| parent | Version bump #379793 by José Romildo Malaquias. (diff) | |
| download | gentoo-2-e0d9d15e7abfef383fbe3404cc0528c619d6c473.tar.gz gentoo-2-e0d9d15e7abfef383fbe3404cc0528c619d6c473.tar.bz2 gentoo-2-e0d9d15e7abfef383fbe3404cc0528c619d6c473.zip | |
[eclass] Move virtual/yacc dependency so that it's not added to RDEPEND. Fixes bug 379937.
Diffstat (limited to 'eclass/mysql.eclass')
| -rw-r--r-- | eclass/mysql.eclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 02f206bf3270..d939aa0fb75e 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.162 2011/08/19 20:06:12 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.163 2011/08/21 16:14:56 jmbsvicetto Exp $ # @ECLASS: mysql.eclass # @MAINTAINER: @@ -130,8 +130,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 - >=sys-libs/zlib-1.2.3 - virtual/yacc" + >=sys-libs/zlib-1.2.3" [[ "${PN}" == "mariadb" ]] \ && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" @@ -146,6 +145,9 @@ RDEPEND="${DEPEND} !minimal? ( dev-db/mysql-init-scripts ) selinux? ( sec-policy/selinux-mysql )" +DEPEND="${DEPEND} + virtual/yacc" + if [ "${EAPI:-0}" = "2" ]; then DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )" fi |