From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 25 Sep 2011 12:43:28 +0000 (+0000)
Subject: mysql: don't depend on mysql-init-script in Prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=316f174246a15316194c8e0d7f729aeebe7aa866;p=gentoo.git

mysql: don't depend on mysql-init-script in Prefix
---

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}