diff options
| author |   Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2014-04-25 01:32:39 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2014-04-25 01:32:39 +0000 |
| commit | 3fe70582a23020a6728675863d790ed7d7eaac9b (patch) | |
| tree | dd31131142a3e81c34bb39a70bfb61c575200848 /virtual/mysql | |
| parent | Stable channel bump. (diff) | |
| download | gentoo-2-3fe70582a23020a6728675863d790ed7d7eaac9b.tar.gz gentoo-2-3fe70582a23020a6728675863d790ed7d7eaac9b.tar.bz2 gentoo-2-3fe70582a23020a6728675863d790ed7d7eaac9b.zip | |
Make mariadb the default provider for mysql - fixes bug 474802.
Sync changes from the overlay.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BB0E6E98)
Diffstat (limited to 'virtual/mysql')
| -rw-r--r-- | virtual/mysql/ChangeLog | 9 | ||||
| -rw-r--r-- | virtual/mysql/mysql-5.5.ebuild | 18 |
2 files changed, 17 insertions, 10 deletions
diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog index c82a95c64222..fbd925f57870 100644 --- a/virtual/mysql/ChangeLog +++ b/virtual/mysql/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for virtual/mysql -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/ChangeLog,v 1.31 2012/12/05 11:24:27 grobian Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/ChangeLog,v 1.32 2014/04/25 01:32:39 jmbsvicetto Exp $ + + 25 Apr 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> + mysql-5.5.ebuild: + Make mariadb the default provider for mysql - fixes bug 474802. Sync changes + from the overlay. 05 Dec 2012; Fabian Groffen <grobian@gentoo.org> mysql-5.5.ebuild: Marked ~x86-linux, bug #444950 diff --git a/virtual/mysql/mysql-5.5.ebuild b/virtual/mysql/mysql-5.5.ebuild index 1b08cf042fb8..2f904d408c14 100644 --- a/virtual/mysql/mysql-5.5.ebuild +++ b/virtual/mysql/mysql-5.5.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.6 2012/12/05 11:24:27 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.7 2014/04/25 01:32:39 jmbsvicetto Exp $ -EAPI="2" +EAPI="4" DESCRIPTION="Virtual for MySQL client or database" HOMEPAGE="" @@ -10,12 +10,14 @@ SRC_URI="" LICENSE="" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" -IUSE="embedded minimal static" +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 and MariaDB here +# TODO: add Drizzle here RDEPEND="|| ( - =dev-db/mysql-${PV}*[embedded=,minimal=,static=] - =dev-db/mariadb-${PV}*[embedded=,minimal=,static=] + =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=] )" |