Default to dev-db/mysql.

Package-Manager: portage-2.1.2_rc1-r7

10 files changed, 43 insertions, 58 deletions

diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index 82689500c15e..98d901e1fea1 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/ChangeLog,v 1.1 2006/11/23 13:40:04 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/ChangeLog,v 1.2 2006/11/23 15:57:58 chtekk Exp $
+
+  23 Nov 2006; Luca Longinotti <chtekk@gentoo.org> mysql-4.0.ebuild,
+  mysql-4.1.ebuild, mysql-5.0.ebuild, mysql-5.1.ebuild:
+  Default to dev-db/mysql for now.
 
 *mysql-5.1 (23 Nov 2006)
 *mysql-5.0 (23 Nov 2006)
diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest
index 0f0df3bcb56f..ac4dc1c62bf0 100644
--- a/virtual/mysql/Manifest
+++ b/virtual/mysql/Manifest
@@ -1,46 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-EBUILD mysql-4.0.ebuild 460 RMD160 3dd9d6c6e152c4242c5ca22ea47bcd696acc72e3 SHA1 31bf2ce547d86b0ed79e68e6e684a2e76f91f3d9 SHA256 c1e7389511aa285aacd13626d536c912ba5ac2a87c8ca53eaf7118b28662a499
-MD5 92307e3575b1787370af862d0e5c4692 mysql-4.0.ebuild 460
-RMD160 3dd9d6c6e152c4242c5ca22ea47bcd696acc72e3 mysql-4.0.ebuild 460
-SHA256 c1e7389511aa285aacd13626d536c912ba5ac2a87c8ca53eaf7118b28662a499 mysql-4.0.ebuild 460
-EBUILD mysql-4.1.ebuild 470 RMD160 549e1ec854795dc2a0046834ea27bb577e69f51d SHA1 df9a5f7f0725253aa35365623143bef795f8a62b SHA256 d7b9680e0f9b3ce8703c39592560b53d3e3b46429e4194742ebcc53e3c28cffc
-MD5 265bb92be6cf9634e4e1a80c46de4c71 mysql-4.1.ebuild 470
-RMD160 549e1ec854795dc2a0046834ea27bb577e69f51d mysql-4.1.ebuild 470
-SHA256 d7b9680e0f9b3ce8703c39592560b53d3e3b46429e4194742ebcc53e3c28cffc mysql-4.1.ebuild 470
-EBUILD mysql-5.0.ebuild 512 RMD160 ffa04656e63a1a58467a4071fe69505d150c9419 SHA1 6e7a261fd09ec13dae42b0e8c9b375a3b5ee2f85 SHA256 e68bf877fa053058c7a4d8d1c4dc6c776dc78f7f37e0cfda64a1f1593b34011b
-MD5 dfaa8fb550c4d8ff63c2f3dd40927f4b mysql-5.0.ebuild 512
-RMD160 ffa04656e63a1a58467a4071fe69505d150c9419 mysql-5.0.ebuild 512
-SHA256 e68bf877fa053058c7a4d8d1c4dc6c776dc78f7f37e0cfda64a1f1593b34011b mysql-5.0.ebuild 512
-EBUILD mysql-5.1.ebuild 521 RMD160 73466b36de6c641ecc8f9ba4c91a3bcab482742d SHA1 fffc2807f156ea67fbb0dcd72c485aee4fc19cdc SHA256 da4409acd8cc7c513874d60a95afc64738a991023c60b86489c0a1bac3f4a78f
-MD5 0881c6219fb3c55f7f8c598e24f66b96 mysql-5.1.ebuild 521
-RMD160 73466b36de6c641ecc8f9ba4c91a3bcab482742d mysql-5.1.ebuild 521
-SHA256 da4409acd8cc7c513874d60a95afc64738a991023c60b86489c0a1bac3f4a78f mysql-5.1.ebuild 521
-MISC ChangeLog 504 RMD160 f6379fd6d5b2bdeb9df82a9c552fe0ae4eee8c65 SHA1 ac9de155022cdda467a3d83f04f10762bbc3a211 SHA256 42baeb29b489e945c7c3f9e5dcf00359647a11e2831ff08bbbe336186acb79e3
-MD5 8ad198c1d61a3f46574b2b132b625721 ChangeLog 504
-RMD160 f6379fd6d5b2bdeb9df82a9c552fe0ae4eee8c65 ChangeLog 504
-SHA256 42baeb29b489e945c7c3f9e5dcf00359647a11e2831ff08bbbe336186acb79e3 ChangeLog 504
+EBUILD mysql-4.0.ebuild 461 RMD160 bb139e20376b32b1f4793d9609f0ebbc297f19ac SHA1 740b184fecae1c1c0ff3e764364aff0e93c7cc5d SHA256 eab27c42dfdeddf8ce5aa071e8177fd127e72b906488d99f65dd5b356dbadb1f
+MD5 0db25650a48746aec56607cc4e173cbd mysql-4.0.ebuild 461
+RMD160 bb139e20376b32b1f4793d9609f0ebbc297f19ac mysql-4.0.ebuild 461
+SHA256 eab27c42dfdeddf8ce5aa071e8177fd127e72b906488d99f65dd5b356dbadb1f mysql-4.0.ebuild 461
+EBUILD mysql-4.1.ebuild 471 RMD160 be855b6b6577165368fdb36b4eb0d559c574439a SHA1 d2d748420573999f07f9ee3bbf2f0a66585102f1 SHA256 eff04ea42a00f4c8aa53f7c7695a33a801b54c3c87e1f8adc2910aafcdbc8fb5
+MD5 d4446f61412533f48620eb8864e3311e mysql-4.1.ebuild 471
+RMD160 be855b6b6577165368fdb36b4eb0d559c574439a mysql-4.1.ebuild 471
+SHA256 eff04ea42a00f4c8aa53f7c7695a33a801b54c3c87e1f8adc2910aafcdbc8fb5 mysql-4.1.ebuild 471
+EBUILD mysql-5.0.ebuild 513 RMD160 4791de784a0762a8a62fa64ae416110ee4a56253 SHA1 21bf8223f388387ba3a729e902de48ee3e38675f SHA256 00bfd086d84de52a5a38a1b008c8d2537f22f7c090aa9b7cd548023b494092da
+MD5 1c0ecf2495748a765f4eacfb6b8cf474 mysql-5.0.ebuild 513
+RMD160 4791de784a0762a8a62fa64ae416110ee4a56253 mysql-5.0.ebuild 513
+SHA256 00bfd086d84de52a5a38a1b008c8d2537f22f7c090aa9b7cd548023b494092da mysql-5.0.ebuild 513
+EBUILD mysql-5.1.ebuild 521 RMD160 a9f7993d525faeda968d521186c5c125d989e65f SHA1 54616fa4b5c1d8be398fd49c122a9ab31eea1415 SHA256 0d70bb05e1deaf56f20a392e62d2445f796e97617c29bd1134527fbc9f5157d8
+MD5 8a0c5c91af63769e2d3dd54bc3f840b5 mysql-5.1.ebuild 521
+RMD160 a9f7993d525faeda968d521186c5c125d989e65f mysql-5.1.ebuild 521
+SHA256 0d70bb05e1deaf56f20a392e62d2445f796e97617c29bd1134527fbc9f5157d8 mysql-5.1.ebuild 521
+MISC ChangeLog 667 RMD160 ba86d2ce70a22a772308dc34ebbad9af20d6606a SHA1 b89a39c5ef34a48690e7022fec1e3f542a770ebc SHA256 bf04449e54e199ee69789418982072f3a38b1a66e7dae717a29efd265518dbdb
+MD5 609c76287bce117383bd5a0f02622c92 ChangeLog 667
+RMD160 ba86d2ce70a22a772308dc34ebbad9af20d6606a ChangeLog 667
+SHA256 bf04449e54e199ee69789418982072f3a38b1a66e7dae717a29efd265518dbdb ChangeLog 667
 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
 MD5 f1c86d989c7ea2451931e7e2c3530f8c metadata.xml 159
 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee metadata.xml 159
 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7 metadata.xml 159
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mysql-4.0 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mysql-4.0 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mysql-4.0 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mysql-4.1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mysql-4.1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mysql-4.1 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mysql-5.0 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mysql-5.0 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mysql-5.0 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mysql-5.1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mysql-5.1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mysql-5.1 1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFZaf1KolR564NvWYRAiENAKCsCio7niXvCqNmtIN7MpNV3dj6TQCcDruM
-5gIrtToVSY1A2vpmhKwZ81M=
-=St0z
------END PGP SIGNATURE-----
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mysql-4.0 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mysql-4.0 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mysql-4.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mysql-4.1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mysql-4.1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mysql-4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mysql-5.0 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mysql-5.0 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mysql-5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mysql-5.1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mysql-5.1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mysql-5.1 0
diff --git a/virtual/mysql/files/digest-mysql-4.0 b/virtual/mysql/files/digest-mysql-4.0
index 8b137891791f..e69de29bb2d1 100644
--- a/virtual/mysql/files/digest-mysql-4.0
+++ b/virtual/mysql/files/digest-mysql-4.0
@@ -1 +0,0 @@
-
diff --git a/virtual/mysql/files/digest-mysql-4.1 b/virtual/mysql/files/digest-mysql-4.1
index 8b137891791f..e69de29bb2d1 100644
--- a/virtual/mysql/files/digest-mysql-4.1
+++ b/virtual/mysql/files/digest-mysql-4.1
@@ -1 +0,0 @@
-
diff --git a/virtual/mysql/files/digest-mysql-5.0 b/virtual/mysql/files/digest-mysql-5.0
index 8b137891791f..e69de29bb2d1 100644
--- a/virtual/mysql/files/digest-mysql-5.0
+++ b/virtual/mysql/files/digest-mysql-5.0
@@ -1 +0,0 @@
-
diff --git a/virtual/mysql/files/digest-mysql-5.1 b/virtual/mysql/files/digest-mysql-5.1
index 8b137891791f..e69de29bb2d1 100644
--- a/virtual/mysql/files/digest-mysql-5.1
+++ b/virtual/mysql/files/digest-mysql-5.1
@@ -1 +0,0 @@
-
diff --git a/virtual/mysql/mysql-4.0.ebuild b/virtual/mysql/mysql-4.0.ebuild
index b86451fadabd..b8db642e1330 100644
--- a/virtual/mysql/mysql-4.0.ebuild
+++ b/virtual/mysql/mysql-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-4.0.ebuild,v 1.1 2006/11/23 13:40:04 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-4.0.ebuild,v 1.2 2006/11/23 15:57:58 chtekk Exp $
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE="http://dev.mysql.com"
@@ -15,4 +15,3 @@ DEPEND=""
 RDEPEND="|| (
 	=dev-db/mysql-${PV}*
 )"
-
diff --git a/virtual/mysql/mysql-4.1.ebuild b/virtual/mysql/mysql-4.1.ebuild
index 661f32c22677..5c7098ad0e86 100644
--- a/virtual/mysql/mysql-4.1.ebuild
+++ b/virtual/mysql/mysql-4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-4.1.ebuild,v 1.1 2006/11/23 13:40:04 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-4.1.ebuild,v 1.2 2006/11/23 15:57:58 chtekk Exp $
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE="http://dev.mysql.com"
@@ -15,4 +15,3 @@ DEPEND=""
 RDEPEND="|| (
 	=dev-db/mysql-${PV}*
 )"
-
diff --git a/virtual/mysql/mysql-5.0.ebuild b/virtual/mysql/mysql-5.0.ebuild
index bb4390514960..85fd479135bb 100644
--- a/virtual/mysql/mysql-5.0.ebuild
+++ b/virtual/mysql/mysql-5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.0.ebuild,v 1.1 2006/11/23 13:40:04 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.0.ebuild,v 1.2 2006/11/23 15:57:58 chtekk Exp $
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE="http://dev.mysql.com"
@@ -13,7 +13,6 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="|| (
-	=dev-db/mysql-community-${PV}*
 	=dev-db/mysql-${PV}*
+	=dev-db/mysql-community-${PV}*
 )"
-
diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1.ebuild
index f7f468266e45..0283ffa0a886 100644
--- a/virtual/mysql/mysql-5.1.ebuild
+++ b/virtual/mysql/mysql-5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.2 2006/11/23 13:41:59 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.1.ebuild,v 1.3 2006/11/23 15:57:58 chtekk Exp $
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE="http://dev.mysql.com"
@@ -13,8 +13,6 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="|| (
-	=dev-db/mysql-community-${PV}*
 	=dev-db/mysql-${PV}*
+	=dev-db/mysql-community-${PV}*
 )"
-
-