diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-09-25 12:43:28 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-09-25 12:43:28 +0000 |
| commit | 316f174246a15316194c8e0d7f729aeebe7aa866 (patch) | |
| tree | 16afc09f30942b2936ea5b7174aa6aa587f76646 /eclass | |
| parent | Drop *-macos keywords, libexplain is a too Linux-specific hell to port (1.16 ... (diff) | |
| download | historical-316f174246a15316194c8e0d7f729aeebe7aa866.tar.gz historical-316f174246a15316194c8e0d7f729aeebe7aa866.tar.bz2 historical-316f174246a15316194c8e0d7f729aeebe7aa866.zip | |
mysql: don't depend on mysql-init-script in Prefix
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/mysql-v2.eclass | 5 | ||||
| -rw-r--r-- | eclass/mysql.eclass | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index c11e6eb86ae4..d50c9c21a4f5 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.7 2011/08/22 04:46:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.8 2011/09/25 12:43:28 grobian Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -251,8 +251,9 @@ for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do DEPEND="${DEPEND} !dev-db/${i}" done +# prefix: first need to implement something for #196294 RDEPEND="${DEPEND} - !minimal? ( dev-db/mysql-init-scripts ) + !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) " diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 8538c846b936..78b482b383f2 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.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.eclass,v 1.165 2011/08/29 01:28:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.166 2011/09/25 12:43:28 grobian Exp $ # @ECLASS: mysql.eclass # @MAINTAINER: @@ -142,8 +142,9 @@ for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do DEPEND="${DEPEND} !dev-db/${i}" done +# prefix: first need to implement something for #196294 RDEPEND="${DEPEND} - !minimal? ( dev-db/mysql-init-scripts ) + !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )" DEPEND="${DEPEND} |