summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-03-15 18:52:12 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-03-15 18:52:12 +0000
commit36ba8bd2dbd6d719194108e739b928d7b9fd552e (patch)
tree178a76f02b94182685e2f9d3e35406c019162020 /virtual
parentppc stable #308769 (diff)
downloadhistorical-36ba8bd2dbd6d719194108e739b928d7b9fd552e.tar.gz
historical-36ba8bd2dbd6d719194108e739b928d7b9fd552e.tar.bz2
historical-36ba8bd2dbd6d719194108e739b928d7b9fd552e.zip
Now with MariaDB included.
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64
Diffstat (limited to 'virtual')
-rw-r--r--virtual/mysql/ChangeLog5
-rw-r--r--virtual/mysql/Manifest4
-rw-r--r--virtual/mysql/mysql-5.1.ebuild5
3 files changed, 9 insertions, 5 deletions
diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index 3cd4f04db32a..991ecdc9dc41 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for virtual/mysql
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/ChangeLog,v 1.12 2010/02/02 22:06:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/ChangeLog,v 1.13 2010/03/15 18:52:12 robbat2 Exp $
+
+ 15 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.ebuild:
+ Now with MariaDB included.
*mysql-5.5 (02 Feb 2010)
*mysql-5.4 (02 Feb 2010)
diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest
index 2cc1a46d5da4..f166643ca113 100644
--- a/virtual/mysql/Manifest
+++ b/virtual/mysql/Manifest
@@ -1,8 +1,8 @@
EBUILD mysql-4.0.ebuild 427 RMD160 57148eb836507e01826642843fc0cc745d26b833 SHA1 10a2aa29381943a3348fa89ffe0c3736220f6cd4 SHA256 1f0b98b9b6bbfca1b445c9c84120176a1736834a6708963a010842f31e8650f6
EBUILD mysql-4.1.ebuild 429 RMD160 5a6f66d86ede5577e87d13ab23ea4cc523f218e5 SHA1 3887d4b3f4f7a975dcf1080bd5487c67ceca8a84 SHA256 07d6459f868f77dac7b5833dc0902d1df728926134cbcef3dfc23f1e58668b4d
EBUILD mysql-5.0.ebuild 590 RMD160 b4aceb3fe084c39ef9795e94f9f0b4bca5de20b3 SHA1 ba88fded7dea58af4d41258685a775dcaebb05b3 SHA256 84d34111c5562504a066c2a3391ba168574ae9d8938d009f688e0f7eb6a03dfa
-EBUILD mysql-5.1.ebuild 632 RMD160 c1ae5da56a1186601dc7ef4803325a110886f23b SHA1 8e40ffc6097e0ecee62d386fee47c482b8b2841c SHA256 38aaecd7f2e64827b8f38b7aa63942f23438e68de778a3549effb9f39b86f71c
+EBUILD mysql-5.1.ebuild 650 RMD160 0aa0d2d1a8775e0a7d13c8eac0bd24eed2f665d5 SHA1 3f566e55d8cc4a90f098ae9dc34c7db17da4b4a2 SHA256 16cfb70ae0af9aa9549101db9f57b1c3697a05f5c9e49201325b8eeaa417e703
EBUILD mysql-5.4.ebuild 600 RMD160 1f5aec0aa1f23121c16081ec95e842fd0088348c SHA1 46e86e336addb7f1f3025774a1847bf5150016b1 SHA256 e707d562975d1b4058aa330ed2235ab3255b45c58429f7d551cdce1b5a24bede
EBUILD mysql-5.5.ebuild 600 RMD160 65d0a701c4cf21d510d61b76ff977862310f4176 SHA1 7e57e4b2c214e9576962b22c1d48aec156760efa SHA256 42957c9d97f6c7ea0df1e3be4e105f861097a148be652775358b7c1e869425d4
-MISC ChangeLog 1907 RMD160 6908826712c5d32dc3fbd2d2befcda7c98999d8f SHA1 678828c44b1ea3376cf46ecd022cbaf0f05f8a7b SHA256 db4d9b98b87ae987f1dd934ba28dc8219da8d14bea99be24cd612fc4b866eff8
+MISC ChangeLog 2008 RMD160 7d5ce4b5b32e5b72e08c24d3c7e3256ac1138bc4 SHA1 0d40a5d4ee1207b39e5214799f4e0aead812364c SHA256 4b2d7d7eec3b62f33734e4c548b08673abb83ee7239abd6332411b6cec37e76f
MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1.ebuild
index c373b95cb768..b2d3a6893157 100644
--- a/virtual/mysql/mysql-5.1.ebuild
+++ b/virtual/mysql/mysql-5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.6 2010/02/02 22:06:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.1.ebuild,v 1.7 2010/03/15 18:52:12 robbat2 Exp $
DESCRIPTION="Virtual for MySQL client or database"
HOMEPAGE=""
@@ -12,8 +12,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~spar
IUSE=""
DEPEND=""
-# TODO: add Drizzle and MariaDB here
+# TODO: add mysql-cluster here
RDEPEND="|| (
=dev-db/mysql-${PV}*
=dev-db/mysql-community-${PV}*
+ =dev-db/mariadb-${PV}*
)"