Depend on virtual/mysql, not dev-db/mysql. This allows the use of mariadb. As pointed out by Simon Cadman in bug #406481.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

8 files changed, 21 insertions, 15 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index c5f5de3d5153..f38d48027b20 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.372 2012/02/28 15:19:34 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.373 2012/03/02 17:48:28 chainsaw Exp $
+
+  02 Mar 2012; Tony Vroon <chainsaw@gentoo.org> asterisk-1.8.8.2.ebuild,
+  asterisk-1.8.9.2.ebuild, asterisk-1.8.9.3.ebuild, asterisk-10.0.1.ebuild,
+  asterisk-10.1.0.ebuild, asterisk-10.1.2.ebuild, asterisk-10.1.3.ebuild:
+  Depend on virtual/mysql, not dev-db/mysql. This allows the use of mariadb. As
+  pointed out by Simon Cadman in bug #406481.
 
 *asterisk-10.1.3 (28 Feb 2012)
 *asterisk-1.8.9.3 (28 Feb 2012)
diff --git a/net-misc/asterisk/asterisk-1.8.8.2.ebuild b/net-misc/asterisk/asterisk-1.8.8.2.ebuild
index 9aa1ad699c84..84ff6ce72a88 100644
--- a/net-misc/asterisk/asterisk-1.8.8.2.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.8.2.ebuild,v 1.3 2012/01/23 15:02:05 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.8.2.ebuild,v 1.4 2012/03/02 17:48:28 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -41,7 +41,7 @@ RDEPEND="dev-libs/popt
 	jingle? ( dev-libs/iksemel )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
-	mysql? ( dev-db/mysql )
+	mysql? ( virtual/mysql )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
 	osplookup? ( net-libs/osptoolkit )
diff --git a/net-misc/asterisk/asterisk-1.8.9.2.ebuild b/net-misc/asterisk/asterisk-1.8.9.2.ebuild
index 3d1bb169ad67..42a4d2f30588 100644
--- a/net-misc/asterisk/asterisk-1.8.9.2.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.9.2.ebuild,v 1.1 2012/02/20 16:22:15 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.9.2.ebuild,v 1.2 2012/03/02 17:48:28 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -42,7 +42,7 @@ RDEPEND="dev-libs/popt
 	jingle? ( dev-libs/iksemel )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
-	mysql? ( dev-db/mysql )
+	mysql? ( virtual/mysql )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
 	osplookup? ( net-libs/osptoolkit )
diff --git a/net-misc/asterisk/asterisk-1.8.9.3.ebuild b/net-misc/asterisk/asterisk-1.8.9.3.ebuild
index 5585da277d34..e30481b3cb76 100644
--- a/net-misc/asterisk/asterisk-1.8.9.3.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.9.3.ebuild,v 1.1 2012/02/28 15:19:34 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.9.3.ebuild,v 1.2 2012/03/02 17:48:28 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -42,7 +42,7 @@ RDEPEND="dev-libs/popt
 	jingle? ( dev-libs/iksemel )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
-	mysql? ( dev-db/mysql )
+	mysql? ( virtual/mysql )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
 	osplookup? ( net-libs/osptoolkit )
diff --git a/net-misc/asterisk/asterisk-10.0.1.ebuild b/net-misc/asterisk/asterisk-10.0.1.ebuild
index 876d4c88dbcb..bf8f657647f1 100644
--- a/net-misc/asterisk/asterisk-10.0.1.ebuild
+++ b/net-misc/asterisk/asterisk-10.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.0.1.ebuild,v 1.1 2012/01/20 18:06:14 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.0.1.ebuild,v 1.2 2012/03/02 17:48:28 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -42,7 +42,7 @@ RDEPEND="dev-db/sqlite:3
 	jingle? ( dev-libs/iksemel )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
-	mysql? ( dev-db/mysql )
+	mysql? ( virtual/mysql )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
 	osplookup? ( net-libs/osptoolkit )
diff --git a/net-misc/asterisk/asterisk-10.1.0.ebuild b/net-misc/asterisk/asterisk-10.1.0.ebuild
index ae497954a409..713f22e934f4 100644
--- a/net-misc/asterisk/asterisk-10.1.0.ebuild
+++ b/net-misc/asterisk/asterisk-10.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.1.0.ebuild,v 1.1 2012/02/03 10:49:47 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.1.0.ebuild,v 1.2 2012/03/02 17:48:28 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -42,7 +42,7 @@ RDEPEND="dev-db/sqlite:3
 	jingle? ( dev-libs/iksemel )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
-	mysql? ( dev-db/mysql )
+	mysql? ( virtual/mysql )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
 	osplookup? ( net-libs/osptoolkit )
diff --git a/net-misc/asterisk/asterisk-10.1.2.ebuild b/net-misc/asterisk/asterisk-10.1.2.ebuild
index 459d3dafab45..972f213a13a8 100644
--- a/net-misc/asterisk/asterisk-10.1.2.ebuild
+++ b/net-misc/asterisk/asterisk-10.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.1.2.ebuild,v 1.1 2012/02/20 15:51:46 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.1.2.ebuild,v 1.2 2012/03/02 17:48:28 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -42,7 +42,7 @@ RDEPEND="dev-db/sqlite:3
 	jingle? ( dev-libs/iksemel )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
-	mysql? ( dev-db/mysql )
+	mysql? ( virtual/mysql )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
 	osplookup? ( net-libs/osptoolkit )
diff --git a/net-misc/asterisk/asterisk-10.1.3.ebuild b/net-misc/asterisk/asterisk-10.1.3.ebuild
index dcb9abb1d7cc..71934bc3e955 100644
--- a/net-misc/asterisk/asterisk-10.1.3.ebuild
+++ b/net-misc/asterisk/asterisk-10.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.1.3.ebuild,v 1.1 2012/02/28 15:19:34 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.1.3.ebuild,v 1.2 2012/03/02 17:48:28 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -42,7 +42,7 @@ RDEPEND="dev-db/sqlite:3
 	jingle? ( dev-libs/iksemel )
 	ldap? ( net-nds/openldap )
 	lua? ( dev-lang/lua )
-	mysql? ( dev-db/mysql )
+	mysql? ( virtual/mysql )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
 	osplookup? ( net-libs/osptoolkit )