Added embedded and static use flags to the virtual/mysql packages - fixes bug 350876.

Package-Manager: portage-2.2.0_alpha13/cvs/Linux x86_64

5 files changed, 29 insertions, 17 deletions

diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index e587119cb631..0f398806a987 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for virtual/mysql
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/ChangeLog,v 1.25 2010/11/13 12:17:01 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/ChangeLog,v 1.26 2011/01/07 01:16:05 jmbsvicetto Exp $
+
+  07 Jan 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.1.ebuild, mysql-5.5.ebuild, metadata.xml:
+  Added embedded and static use flags to the virtual/mysql packages - fixes bug
+  350876.
 
   13 Nov 2010; Raúl Porcel <armin76@gentoo.org> mysql-5.1.ebuild:
   ia64/s390/sh/sparc stable wrt #321791
diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest
index e4708de6246b..48bc8a342419 100644
--- a/virtual/mysql/Manifest
+++ b/virtual/mysql/Manifest
@@ -1,8 +1,8 @@
 EBUILD mysql-4.0.ebuild 429 RMD160 89c9d9e06186f6f8f0fb86e7f3a68494c1ea858d SHA1 c64260b1b362aea5342610a90dc576e6fee14beb SHA256 c6a61e2967d9002097dca7a3102f66cfb22512eeb67a62a72139211a92aef2ca
 EBUILD mysql-4.1.ebuild 431 RMD160 755062ecd58477cce34150b656fe49f3b6fcc7a7 SHA1 e19cbcbd4f7247fd51f38c57a6a0a6c0eec72238 SHA256 98a1c2f29442ea648d19e02ca82054a2d434f64cca67ecf0f3a87b431169ddf4
 EBUILD mysql-5.0.ebuild 570 RMD160 8af5d52e4d2b29f41e2af385be117a933a5f2f9d SHA1 3b19d3237cba69bae57277e25ddf67f56c067456 SHA256 60bf33a152741794c22421b1ae2d936322dbd67981923240b1a56577b0e36a9f
-EBUILD mysql-5.1.ebuild 583 RMD160 93ce77f5199d9f9dc0e7a7182582e8c99bed24b9 SHA1 bafb2b14bf38f002c4a2971cef13bed4c2393a86 SHA256 a971e2fda0cef74860e45b074bda2c91cb221c552de14cfabbc8ff3c4f63225c
+EBUILD mysql-5.1.ebuild 669 RMD160 9a7fb381b13b05498aa81feb2d845d90c8020bc9 SHA1 1156edb047d2381333f1ddbc0e5f04230fd876cf SHA256 344db0175c4662a113cc8b0248bf932cdd7d3781c81d429dddd572b3a8e03fd7
 EBUILD mysql-5.4.ebuild 503 RMD160 8bcdc2b438d7bec9e1a93274615a90f99e2d76b8 SHA1 5aeef7115f10fe4f895aa858583198c7ddad9e2a SHA256 da1fc488c7679fc1e739ff071d06dd88bb8c1f15bf6a4cf527eed4aeecc27157
-EBUILD mysql-5.5.ebuild 503 RMD160 27ebbc09f620c1172a77357d4f1ea80dc007c4c8 SHA1 d984f11363836876ada8b5eb0379c0d4969fdfd1 SHA256 aea047ffc3164dd1fdf9b7e1604c8c799c800102b1f1f3812dbf4244c067bc23
-MISC ChangeLog 3410 RMD160 bcd2749b96afeae288dfe58457257757aec8b0e3 SHA1 bbc1a756e969d7da6b55f6730f8660551c11885e SHA256 e044fc97139e67c8a7e551d7a86e45723efa95d44b8723de9e231847c36f3c15
-MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
+EBUILD mysql-5.5.ebuild 550 RMD160 9218cc96185d19ea1d8294391a2e7d9a3c5aceda SHA1 b45b53222a25a6c7a7de1a7ff56b8f92fd18a4a9 SHA256 226a38d7b669bb6060a5d327db6308fd709ff18029c02f549c57ac9256ad47a6
+MISC ChangeLog 3624 RMD160 cb94b9c513f8bb45c5c78df37f8a937f08675450 SHA1 34b419618e2f9ca744c0aa28a130d41b41a6b125 SHA256 9b013ec2e9fb0f1c43b59320676f750b0edca052beadc1a4834703fa61405ac2
+MISC metadata.xml 244 RMD160 384e61bc054359fbb8220aec93b318811d9328b8 SHA1 6f864883f8672822f2fd2931a8b46a71c9936f9a SHA256 4d47eee187cd72bea30c9ab80aa89d7cf128e8643b8b986e3781fa123f9144aa
diff --git a/virtual/mysql/metadata.xml b/virtual/mysql/metadata.xml
index abf3529deac0..0ea2af646750 100644
--- a/virtual/mysql/metadata.xml
+++ b/virtual/mysql/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mysql</herd>
+  <herd>mysql</herd>
+  <use>
+    <flag name='embedded'>Build embedded server (libmysqld)</flag>
+  </use>
 </pkgmetadata>
diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1.ebuild
index 35c7f91fe855..3865420f7a14 100644
--- a/virtual/mysql/mysql-5.1.ebuild
+++ b/virtual/mysql/mysql-5.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.20 2010/11/13 12:17:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.1.ebuild,v 1.21 2011/01/07 01:16:05 jmbsvicetto Exp $
+
+EAPI="2"
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -9,12 +11,12 @@ SRC_URI=""
 LICENSE=""
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
+IUSE="embedded static"
 
 DEPEND=""
 # TODO: add mysql-cluster here
 RDEPEND="|| (
-	=dev-db/mysql-${PV}*
-	=dev-db/mysql-community-${PV}*
-	=dev-db/mariadb-${PV}*
+	=dev-db/mysql-${PV}*[embedded=,static=]
+	=dev-db/mariadb-${PV}*[embedded=,static=]
+	=dev-db/mysql-community-${PV}*[embedded=,static=]
 )"
diff --git a/virtual/mysql/mysql-5.5.ebuild b/virtual/mysql/mysql-5.5.ebuild
index b631c5b04331..f75e1b84d828 100644
--- a/virtual/mysql/mysql-5.5.ebuild
+++ b/virtual/mysql/mysql-5.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.3 2011/01/07 01:16:05 jmbsvicetto Exp $
+
+EAPI="2"
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -10,10 +12,10 @@ LICENSE=""
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
+IUSE="embedded static"
 
 DEPEND=""
 # TODO: add Drizzle and MariaDB here
 RDEPEND="|| (
-	=dev-db/mysql-${PV}*
+	=dev-db/mysql-${PV}*[embedded=,static=]
 )"