From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QvAeB-0004bY-5B for garchives@archives.gentoo.org; Sun, 21 Aug 2011 16:13:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BA4B21C393; Sun, 21 Aug 2011 16:13:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3B67821C393 for ; Sun, 21 Aug 2011 16:13:07 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB75D1B4035 for ; Sun, 21 Aug 2011 16:13:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 10EC580040 for ; Sun, 21 Aug 2011 16:13:06 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-v2.eclass eclass/mysql.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: bda1868799dad534e702ed8ff007f6b0e92d8376 Date: Sun, 21 Aug 2011 16:13:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 371c32a326bc2a105cc9d7c28896390a commit: bda1868799dad534e702ed8ff007f6b0e92d8376 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Sun Aug 21 16:12:02 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Sun Aug 21 16:12:02 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3Dbda18687 [eclass] Move virtual/yacc dependency so that it's not added to RDEPEND. --- eclass/mysql-v2.eclass | 5 ++++- eclass/mysql.eclass | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 797e819..dadcba7 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -239,7 +239,6 @@ DEPEND=3D" >=3Dsys-apps/texinfo-4.7-r1 >=3Dsys-libs/readline-4.1 >=3Dsys-libs/zlib-1.2.3 - virtual/yacc " =20 [[ ${PN} =3D=3D mariadb ]] \ @@ -256,6 +255,10 @@ RDEPEND=3D"${DEPEND} selinux? ( sec-policy/selinux-mysql ) " =20 +DEPEND=3D"${DEPEND} + virtual/yacc +" + DEPEND=3D"${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=3Dsys= -libs/ncurses-5.7-r3 ) )" =20 # compile-time-only diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 48eadfa..391351b 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -130,8 +130,7 @@ DEPEND=3D"ssl? ( >=3Ddev-libs/openssl-0.9.6d ) >=3Dsys-apps/sed-4 >=3Dsys-apps/texinfo-4.7-r1 >=3Dsys-libs/readline-4.1 - >=3Dsys-libs/zlib-1.2.3 - virtual/yacc" + >=3Dsys-libs/zlib-1.2.3" =20 [[ "${PN}" =3D=3D "mariadb" ]] \ && DEPEND=3D"${DEPEND} libevent? ( >=3Ddev-libs/libevent-1.4 )" @@ -146,6 +145,9 @@ RDEPEND=3D"${DEPEND} !minimal? ( dev-db/mysql-init-scripts ) selinux? ( sec-policy/selinux-mysql )" =20 +DEPEND=3D"${DEPEND} + virtual/yacc" + if [ "${EAPI:-0}" =3D "2" ]; then DEPEND=3D"${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=3Dsy= s-libs/ncurses-5.7-r3 ) )" fi