summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2014-07-30 06:36:00 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2014-07-30 06:36:00 +0000
commiteea794556f6c47ce3d851b331b3cc5ad0b3cfb5a (patch)
tree529f69488e11e90105d69d7bc78a2cb78076d378 /virtual/mysql
parentStabilize for all. (diff)
downloadhistorical-eea794556f6c47ce3d851b331b3cc5ad0b3cfb5a.tar.gz
historical-eea794556f6c47ce3d851b331b3cc5ad0b3cfb5a.tar.bz2
historical-eea794556f6c47ce3d851b331b3cc5ad0b3cfb5a.zip
Restore keywords from overlay, add mysql-cluster-7.2 in the 5.5 series.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Diffstat (limited to 'virtual/mysql')
-rw-r--r--virtual/mysql/ChangeLog6
-rw-r--r--virtual/mysql/Manifest4
-rw-r--r--virtual/mysql/mysql-5.1.ebuild8
3 files changed, 11 insertions, 7 deletions
diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index 8522c76a66d0..9a4fb47ab8eb 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for virtual/mysql
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/ChangeLog,v 1.34 2014/07/30 06:30:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/ChangeLog,v 1.35 2014/07/30 06:35:52 robbat2 Exp $
+
+ 30 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.ebuild,
+ mysql-5.6.ebuild:
+ Restore keywords from overlay, add mysql-cluster-7.2 in the 5.5 series.
30 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-5.6.ebuild:
mariadb-galera in the tree now, and mysql-cluster following soon.
diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest
index 36ff89d87482..71e71d2bffe0 100644
--- a/virtual/mysql/Manifest
+++ b/virtual/mysql/Manifest
@@ -1,10 +1,10 @@
EBUILD mysql-4.0.ebuild 429 SHA256 c6a61e2967d9002097dca7a3102f66cfb22512eeb67a62a72139211a92aef2ca SHA512 640f5d7631f84c2bb1a6539fe8ce4cce12f8909efdd3d78c1b68da056d3fb52de31705b099c1cb5949a21cce912afb530eacf0253bbcdfb839db2782c7572cda WHIRLPOOL e1ab02ed2d4ecb0654f9840173bc238807f466a0e9cd7325b6297de7284e244beee37826c183a1a534af1d20e37f6c52f3de50bfcb3911045b34c9eb62baef6d
EBUILD mysql-4.1.ebuild 431 SHA256 98a1c2f29442ea648d19e02ca82054a2d434f64cca67ecf0f3a87b431169ddf4 SHA512 adfc9b1ff0c21d43c00a16391c6dc57abb38efdb8371d4846f1cd75254e61742e722dba1117ebb5f9e839d498016b79a8bec63c7df9989511069cfe4ecbf3e14 WHIRLPOOL ac1eabb673c0095ad269ac9187cda73a47d4e2da7a745996175957e02460d3af5f0b68db0e58932d479af193482b2b7f1227154721243d52f57e0daff72c97c6
EBUILD mysql-5.0.ebuild 537 SHA256 9ab08bf13b2c8f98e5c6a6a73da4a20296552a02c9638cb5ae534271c68e7b70 SHA512 fef542da081e92b3bdd56ccb215264a9276a1925122409ee6ffe30be59cfddd184155c5456ca62df85b7ffe6e403f7b19cbadf03dac9b6570ed6eedb3a8092d3 WHIRLPOOL 57a70df29797fbf0d0b16b466139a2cee500b6318e41e3d8e8418b939e1ec4a66855f072ca3422ce29fc775d677c7daf1f62277dbdee0dbddfc18418f99a5a23
-EBUILD mysql-5.1.ebuild 644 SHA256 5fbb3e02e861b615a8606da0a31cd283707f6c064bdce11a64076b17d7fb2a11 SHA512 a477349e451b38397f07bd437a72a42a5610be554102b15c81a7cf36c4192aa11b04d83de4b415fc4cb8f0776d2b64e9967c6dae8e34be21d6ee8d3962440e18 WHIRLPOOL 8018c7fcdb860fec22d16574ad4c7e44cd1b8e69ca20676934d4d1758aca8d6df3cd71c01076a571a1d9704f47b05e7754ad3137eea2fc3e21848e02da408e93
+EBUILD mysql-5.1.ebuild 726 SHA256 3fe8e9fcac27e41b8aa3c62802803db0330495482a6291aaaab2d63a0b6a1b9b SHA512 a67a9470ce7e1c651077764c7ad1a1c216c974ce519bbc614045891e0bb63322699c625b881724b09b8a067fd54e8a9e7f5886df61edf48688b640ddeee047d3 WHIRLPOOL 52c99041003cc67e43cbc4de3770a68fc503e25ea06ae3ae45e2cb1674d00dba72e4a40cda1cfc9cd1143b740b566a5fb3aa74cca382c80fe75113a060dcbe39
EBUILD mysql-5.2.ebuild 550 SHA256 5938e89de41bb397a9dd4308322f59318ab27ba9a3175b3dd74d4b53275f93d6 SHA512 de98a0835ebcf179473236b9356503df1e93940ac3e5cbf60379e2cce6d3dfa6b080b96e5a1c7cb0a14ba692055780cb1f93395cb62c9c6910569383e75cee5a WHIRLPOOL 419b6d19cc4268bf39bf5cace4390889c349ee0bcd3297755dbd99ee37aee699d18f672ce0c356f58e9f22f3067311fd491ededb8b1fd04ab383c9a8997db407
EBUILD mysql-5.3.ebuild 550 SHA256 513a66cc6d44cee1409d18a44c168feb9e8aeeaa2a15e8aaaca2600e82d6dead SHA512 21c456ea73bc0fd4fc135d740a0a95fa41bbba6d460f224c31213ffaf53ea028aeaa5dec4a59803ea23bf4460a55a321e992c2321d09b89da38b3a7750f932e0 WHIRLPOOL 4bf67289dd45b9c0b0c2ddee0574cb68daea08cf10f149ca4fa9b5f29100a32cd8448a1338a1bee630e8117df7d17ac60ac5a1ca3934fe117c81d44490094b31
EBUILD mysql-5.5.ebuild 891 SHA256 04039abe1c3b2e30d7837f4c494cb0829791e99e7a05e84e3b1ee7843c7e9d31 SHA512 e1fec8e900f3d958103ce99e6f84846e694e666acbc585874a10fb56b85ac00e1c5bfc6051d9d07f4203c3f525f4da2cef914b1cbf0288d1afcbd9631aeace44 WHIRLPOOL 426eb8385d9a657dc187aa2544d78ddc5e72134fc847f52bc068cea7b5fc458aa78059d6f4efb592e4939ec6f8b5061bb6159021bc9054f6ced6f90c6e7f7271
EBUILD mysql-5.6.ebuild 993 SHA256 b4970059caaa2f2f56737ac15444efcc1a627089319a97055ca21a0c76927242 SHA512 73f34b019aa9663330926395f6c018ef3a9353d9fa4188269b7a88961248daf9c3ab71d1135e2f3d5fdf8169e6ee87b9fdbd753c31fe117fbafd466e003c3933 WHIRLPOOL 7197265d33dfa732cac94e93067f6d3a48325932b7df7a1e96fa0441460efd7e415f187a0c1e15bcf7a8c15378af4840fb9b6f64559b61a1f788aa924bf15896
-MISC ChangeLog 5024 SHA256 4349fb8a55ac4a266fde06ec58bf80d7af2fa135ce524dac93f272518be79f31 SHA512 c00d199bebb71cac5d1c86e6383ca245700dc2cc582ce184fba2f0984af0e6c5c9451ae212273010588de62e190c73ab60405c24fd4722bf11b0ee9c236abe3c WHIRLPOOL be64cec373320b9a01195c31853d1a96dbb815037593c493078609415b9e7b8ae92ced084da45ac7ab283c3bbdf6d65723b254ceefa704b47257051b2c024eaa
+MISC ChangeLog 5190 SHA256 fab78d39aac9a5c6812f96b16fe9e25d3e25e9aa1938a81b183c8396a92c73bd SHA512 c6bd84ac9c6b0f73d7aac2444250320a4dc7cfed43b7496d3ac1b2c60ff376e62dc25f555f7b710a9374b78edf600f8922968e8cb2768760a6df463b4cf6149b WHIRLPOOL 1b70e1c02d050f8e06164bd6dc44a09b406eab42b53f938a19d679ea9cb2ba79fde9616b9127cd68a0e2350bc9e4ec0a7463a31b84266f1de0deda0612672170
MISC metadata.xml 244 SHA256 4d47eee187cd72bea30c9ab80aa89d7cf128e8643b8b986e3781fa123f9144aa SHA512 c9cb9d6bc4e44e18eb54801af8b9cbb698bcb905524e02bfa72a03111955377c4e9b507db52b929a47e740bf1be0d025910f310f334a1c1c6531313231d39289 WHIRLPOOL 369f2a18e230171ecef8d67e7c5d419943e8e026111e2736b4d858760705bfc24e85e16ab8800a1681fae625ce74342b4b01e961c418b242cc2d1229ff67ba0a
diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1.ebuild
index 123fa139f607..9d8bf132b343 100644
--- a/virtual/mysql/mysql-5.1.ebuild
+++ b/virtual/mysql/mysql-5.1.ebuild
@@ -1,6 +1,6 @@
-# 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: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.1.ebuild,v 1.24 2014/07/30 06:35:52 robbat2 Exp $
EAPI="2"
@@ -10,12 +10,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"
+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=""
-# 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.2*[embedded=,minimal=,static=]
)"