create separate virtuals per jmbsvicetto's ideavirtual-mysqldb

24 files changed, 199 insertions, 35 deletions

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index a0cb75b..7422365 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -297,7 +297,7 @@ DEPEND="${DEPEND}
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-	 ~virtual/mysql-${MYSQL_PV_MAJOR}"
+	 ~virtual/${PN}-${MYSQL_PV_MAJOR}"
 
 # my_config.h includes ABI specific data
 MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h )
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index f66c2ab..b8a1b5c 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -355,7 +355,7 @@ fi
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 # For other stuff to bring us in
-PDEPEND="${PDEPEND} ~virtual/mysql-${MYSQL_PV_MAJOR}"
+PDEPEND="${PDEPEND} ~virtual/${PN}-${MYSQL_PV_MAJOR}"
 
 #
 # External patches
diff --git a/profiles/package.mask b/profiles/package.mask
index 9f43e7b..f599543 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,3 +1,10 @@
+# Brian Evans <grknight@tuffmail.com> (09 May 2014)
+# Mask new virtuals with higher versions to match gentoo repo
+>=virtual/mariadb-10.0
+>=virtual/percona-server-5.6
+>=virtual/mariadb-galera-10.0
+=virtual/mariadb-5.1
+
 # Brian Evans <grknight@tuffmail.com> (16 Dec 2013)
 # Add percona-server to the mask until the virtual is unmasked
 >=dev-db/percona-server-5.6
diff --git a/virtual/mariadb-galera/mariadb-galera-10.0.ebuild b/virtual/mariadb-galera/mariadb-galera-10.0.ebuild
new file mode 100644
index 0000000..953eaff
--- /dev/null
+++ b/virtual/mariadb-galera/mariadb-galera-10.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="embedded minimal static static-libs"
+
+DEPEND=""
+RDEPEND="=dev-db/mariadb-galera-${PV}*[embedded=,minimal=,static=,static-libs=]"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mariadb-galera/mariadb-galera-5.5.ebuild b/virtual/mariadb-galera/mariadb-galera-5.5.ebuild
new file mode 100644
index 0000000..953eaff
--- /dev/null
+++ b/virtual/mariadb-galera/mariadb-galera-5.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="embedded minimal static static-libs"
+
+DEPEND=""
+RDEPEND="=dev-db/mariadb-galera-${PV}*[embedded=,minimal=,static=,static-libs=]"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mariadb-galera/metadata.xml b/virtual/mariadb-galera/metadata.xml
new file mode 100644
index 0000000..0ea2af6
--- /dev/null
+++ b/virtual/mariadb-galera/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>mysql</herd>
+  <use>
+    <flag name='embedded'>Build embedded server (libmysqld)</flag>
+  </use>
+</pkgmetadata>
diff --git a/virtual/mysql/mysql-10.0.ebuild b/virtual/mariadb/mariadb-10.0.ebuild
index 8e28056..9b3de5b 100644
--- a/virtual/mysql/mysql-10.0.ebuild
+++ b/virtual/mariadb/mariadb-10.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.2 2010/03/23 14:48:06 darkside Exp $
+# $Header: $
 
-EAPI="2"
+EAPI="5"
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -15,6 +15,5 @@ IUSE="embedded minimal static static-libs"
 
 DEPEND=""
 # TODO: add Drizzle here
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]
-)"
+RDEPEND="=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mariadb/mariadb-5.1.ebuild
index a41eabc..667d386 100644
--- a/virtual/mysql/mysql-5.1.ebuild
+++ b/virtual/mariadb/mariadb-5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.1.ebuild,v 1.23 2011/04/20 12:26:25 jmbsvicetto Exp $
+# $Header: $
 
-EAPI="2"
+EAPI="5"
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -14,9 +14,5 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="embedded minimal static"
 
 DEPEND=""
-# TODO: add mysql-cluster here
-RDEPEND="|| (
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=]
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-	=dev-db/mysql-cluster-7*[embedded=,minimal=,static=]
-)"
+RDEPEND="=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.2.ebuild b/virtual/mariadb/mariadb-5.2.ebuild
index ae0e162..2a165fd 100644
--- a/virtual/mysql/mysql-5.2.ebuild
+++ b/virtual/mariadb/mariadb-5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.2.ebuild,v 1.1 2011/07/28 11:45:07 jmbsvicetto Exp $
+# $Header: $
 
-EAPI="2"
+EAPI="5"
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -14,6 +14,5 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~spar
 IUSE="embedded minimal static"
 
 DEPEND=""
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-)"
+RDEPEND="=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.3.ebuild b/virtual/mariadb/mariadb-5.3.ebuild
index 45e3e68..2a165fd 100644
--- a/virtual/mysql/mysql-5.3.ebuild
+++ b/virtual/mariadb/mariadb-5.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.3.ebuild,v 1.1 2011/07/28 11:45:07 jmbsvicetto Exp $
+# $Header: $
 
-EAPI="2"
+EAPI="5"
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -14,6 +14,5 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~spar
 IUSE="embedded minimal static"
 
 DEPEND=""
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-)"
+RDEPEND="=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mariadb/mariadb-5.5.ebuild b/virtual/mariadb/mariadb-5.5.ebuild
new file mode 100644
index 0000000..9b3de5b
--- /dev/null
+++ b/virtual/mariadb/mariadb-5.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="embedded minimal static static-libs"
+
+DEPEND=""
+# TODO: add Drizzle here
+RDEPEND="=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mariadb/metadata.xml b/virtual/mariadb/metadata.xml
new file mode 100644
index 0000000..0ea2af6
--- /dev/null
+++ b/virtual/mariadb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>mysql</herd>
+  <use>
+    <flag name='embedded'>Build embedded server (libmysqld)</flag>
+  </use>
+</pkgmetadata>
diff --git a/virtual/mysql/mysql-4.0.ebuild b/virtual/mysql/mysql-4.0.ebuild
index 9ecbe43..eafdc3a 100644
--- a/virtual/mysql/mysql-4.0.ebuild
+++ b/virtual/mysql/mysql-4.0.ebuild
@@ -15,3 +15,4 @@ DEPEND=""
 RDEPEND="|| (
 	=dev-db/mysql-${PV}*
 )"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-4.1.ebuild b/virtual/mysql/mysql-4.1.ebuild
index d3f2f2c..0fdb7bc 100644
--- a/virtual/mysql/mysql-4.1.ebuild
+++ b/virtual/mysql/mysql-4.1.ebuild
@@ -13,3 +13,4 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="=dev-db/mysql-${PV}*"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.0.ebuild b/virtual/mysql/mysql-5.0.ebuild
index ec5667c..90cbfee 100644
--- a/virtual/mysql/mysql-5.0.ebuild
+++ b/virtual/mysql/mysql-5.0.ebuild
@@ -15,3 +15,4 @@ DEPEND=""
 RDEPEND="|| (
 	=dev-db/mysql-${PV}*
 )"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.1-r1.ebuild b/virtual/mysql/mysql-5.1-r1.ebuild
new file mode 100644
index 0000000..2f40ed1
--- /dev/null
+++ b/virtual/mysql/mysql-5.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="embedded minimal static"
+
+DEPEND=""
+RDEPEND="=dev-db/mysql-${PV}*[embedded=,minimal=,static=]"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.5-r1.ebuild b/virtual/mysql/mysql-5.5-r1.ebuild
new file mode 100644
index 0000000..9517ed1
--- /dev/null
+++ b/virtual/mysql/mysql-5.5-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="embedded minimal static static-libs"
+
+DEPEND=""
+RDEPEND="=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild
index 36f49c1..df4e8dd 100644
--- a/virtual/mysql/mysql-5.6.ebuild
+++ b/virtual/mysql/mysql-5.6.ebuild
@@ -19,3 +19,4 @@ RDEPEND="|| (
 	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
 	=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]
 )"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.7.ebuild b/virtual/mysql/mysql-5.7.ebuild
index eeec7d1..242fcd0 100644
--- a/virtual/mysql/mysql-5.7.ebuild
+++ b/virtual/mysql/mysql-5.7.ebuild
@@ -17,3 +17,4 @@ DEPEND=""
 RDEPEND="|| (
 	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
 )"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysqldb/metadata.xml b/virtual/mysqldb/metadata.xml
new file mode 100644
index 0000000..0ea2af6
--- /dev/null
+++ b/virtual/mysqldb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>mysql</herd>
+  <use>
+    <flag name='embedded'>Build embedded server (libmysqld)</flag>
+  </use>
+</pkgmetadata>
diff --git a/virtual/mysql/mysql-5.5.ebuild b/virtual/mysqldb/mysqldb-1.ebuild
index c2ade9a..8969dc1 100644
--- a/virtual/mysql/mysql-5.5.ebuild
+++ b/virtual/mysqldb/mysqldb-1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.5 2012/04/18 06:12:08 robbat2 Exp $
+# $Header: $
 
-EAPI="2"
+EAPI="5"
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -16,8 +16,8 @@ IUSE="embedded minimal static static-libs"
 DEPEND=""
 # TODO: add Drizzle here
 RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/mariadb-galera-${PV}*[embedded=,minimal=,static=,static-libs=]
+	virtual/mariadb[embedded=,minimal=,static=,static-libs=]
+	virtual/mysql[embedded=,minimal=,static=,static-libs=]
+	virtual/percona-server[embedded=,minimal=,static=,static-libs=]
+	virtual/mariadb-galera[embedded=,minimal=,static=,static-libs=]
 )"
diff --git a/virtual/percona-server/metadata.xml b/virtual/percona-server/metadata.xml
new file mode 100644
index 0000000..0ea2af6
--- /dev/null
+++ b/virtual/percona-server/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>mysql</herd>
+  <use>
+    <flag name='embedded'>Build embedded server (libmysqld)</flag>
+  </use>
+</pkgmetadata>
diff --git a/virtual/percona-server/percona-server-5.5.ebuild b/virtual/percona-server/percona-server-5.5.ebuild
new file mode 100644
index 0000000..c486580
--- /dev/null
+++ b/virtual/percona-server/percona-server-5.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="embedded minimal static static-libs"
+
+DEPEND=""
+RDEPEND="=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/percona-server/percona-server-5.6.ebuild b/virtual/percona-server/percona-server-5.6.ebuild
new file mode 100644
index 0000000..c486580
--- /dev/null
+++ b/virtual/percona-server/percona-server-5.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+DESCRIPTION="Virtual for MySQL client or database"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="embedded minimal static static-libs"
+
+DEPEND=""
+RDEPEND="=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]"
+PDEPEND="virtual/mysqldb"