summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2011-01-07 01:16:05 +0000
committerJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2011-01-07 01:16:05 +0000
commit9b8dafb0bd3f1068f1424ccb01cf214af78eb90d (patch)
treeae022c33197d96acc07674436effc3b2d1179b4a /virtual/mysql
parent*portage-2.2.0_alpha14 (07 Jan 2011) (diff)
downloadgentoo-2-9b8dafb0bd3f1068f1424ccb01cf214af78eb90d.tar.gz
gentoo-2-9b8dafb0bd3f1068f1424ccb01cf214af78eb90d.tar.bz2
gentoo-2-9b8dafb0bd3f1068f1424ccb01cf214af78eb90d.zip
Added embedded and static use flags to the virtual/mysql packages - fixes bug 350876.
(Portage version: 2.2.0_alpha13/cvs/Linux x86_64)
Diffstat (limited to 'virtual/mysql')
-rw-r--r--virtual/mysql/ChangeLog9
-rw-r--r--virtual/mysql/metadata.xml5
-rw-r--r--virtual/mysql/mysql-5.1.ebuild14
-rw-r--r--virtual/mysql/mysql-5.5.ebuild10
4 files changed, 25 insertions, 13 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/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=]
)"