From: Jorge Manuel B. S. Vicetto Date: Sun, 21 Aug 2011 16:14:56 +0000 (+0000) Subject: [eclass] Move virtual/yacc dependency so that it's not added to RDEPEND. Fixes bug... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=168da6d86677cecaaf0a7d548dd64deb73636ca9;p=gentoo.git [eclass] Move virtual/yacc dependency so that it's not added to RDEPEND. Fixes bug 379937. --- diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index c9ff1ca2a4b7..e011c226b378 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.5 2011/08/19 20:06:12 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.6 2011/08/21 16:14:56 jmbsvicetto Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -239,7 +239,6 @@ DEPEND=" >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 - virtual/yacc " [[ ${PN} == mariadb ]] \ @@ -256,6 +255,10 @@ RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql ) " +DEPEND="${DEPEND} + virtual/yacc +" + DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )" # compile-time-only 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