- changed upstream upgrade link, Andy Dustman bug #109301, c#10

Package-Manager: portage-2.0.53_rc5

6 files changed, 23 insertions, 26 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 55f856df35ef..851b707984f3 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.248 2005/10/19 05:53:23 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.249 2005/10/20 08:17:44 vivo Exp $
+
+  20 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.13-r1.ebuild,
+  mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild, mysql-5.0.13_rc.ebuild:
+  - changed upstream upgrade link, Andy Dustman bug #109301, c#10 
+  - unmasked MySQL 5.0, temporary removed keywords that don't have a stable 4.1
 
   19 Oct 2005; Mark Loeser <halcy0n@gentoo.org> mysql-4.1.14.ebuild:
   Stable on x86
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index b2adbe32457f..49486dd1fa15 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c1e64dc1b892d99d214f1c315d804968 ChangeLog 44748
+MD5 c48a7a5aee2a6391b735398652b98d1a ChangeLog 45039
 MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
 MD5 631ed23db7ff8777599dee1c45edae0f files/digest-mysql-4.0.22 139
 MD5 631ed23db7ff8777599dee1c45edae0f files/digest-mysql-4.0.22-r2 139
@@ -28,14 +25,7 @@ MD5 b4e651d8ffcb8b7a92b9bf186081d6e3 mysql-4.0.22.ebuild 8941
 MD5 ac74397784bc6979c6cee6319f5be131 mysql-4.0.24.ebuild 9833
 MD5 6ddc57a27bb81cc6417c0ff0f65ccebe mysql-4.0.25-r2.ebuild 13782
 MD5 fb51170ee4c074186668c3cdc838e4d4 mysql-4.0.26.ebuild 14840
-MD5 87324d0d1763454c10561efa44ae1a7b mysql-4.1.13-r1.ebuild 17587
-MD5 3b1c7992aed4eb3190b444f3e1abaaaa mysql-4.1.14.ebuild 18252
-MD5 4be7d98b934e64a7d8daaf6382223377 mysql-5.0.12_beta.ebuild 18210
-MD5 a2fe03addadd10dc1584c0f7bea40122 mysql-5.0.13_rc.ebuild 18366
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDVd9lCRZPokWLroQRAkLBAJ96BGAzpdWmMUZfhmnL705ZNio0zACeMCcq
-kkbhjl0Enalev+Lxn+sqfgA=
-=hvMd
------END PGP SIGNATURE-----
+MD5 c3f09dc9b5a59873d8ebe67b2096789b mysql-4.1.13-r1.ebuild 17592
+MD5 25c98fb473640eb53e4578c8a112e58f mysql-4.1.14.ebuild 18254
+MD5 460847947a093ed7c3ecbffb2ef362c7 mysql-5.0.12_beta.ebuild 18239
+MD5 19e20422eb6870242e5d93255003da3e mysql-5.0.13_rc.ebuild 18395
diff --git a/dev-db/mysql/mysql-4.1.13-r1.ebuild b/dev-db/mysql/mysql-4.1.13-r1.ebuild
index 1f04efe1c986..84fcbe9104ed 100644
--- a/dev-db/mysql/mysql-4.1.13-r1.ebuild
+++ b/dev-db/mysql/mysql-4.1.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.13-r1.ebuild,v 1.12 2005/10/17 13:49:25 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.13-r1.ebuild,v 1.13 2005/10/20 08:17:44 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -40,7 +40,7 @@ mysql_upgrade_error() {
 	mysql_get_datadir
 	ewarn "Sorry plain upgrade from version of MySQL before 4.1.4 is NOT supported."
 	ewarn "Be sure to read \"Upgrading from version 4.0 to 4.1\" section"
-	ewarn "http://dev.mysql.com/doc/mysql/en/upgrading-from-4-0.html"
+	ewarn "http://dev.mysql.com/doc/refman/4.1/en/upgrading-from-4-0.html"
 	ewarn "then unmerge previous version of MySQL with"
 	ewarn "#emerge -C dev-db/mysql"
 	ewarn "move your data out of \"${DATADIR}\""
diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild
index a87c478c6956..d796cd13df76 100644
--- a/dev-db/mysql/mysql-4.1.14.ebuild
+++ b/dev-db/mysql/mysql-4.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.13 2005/10/19 05:53:23 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.14 2005/10/20 08:17:44 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -47,7 +47,7 @@ mysql_upgrade_error() {
 	ewarn "Some gentoo documentation on how to do it:"
 	ewarn "http://www.gentoo.org/doc/en/mysql-upgrading.xml"
 	ewarn "Also on the MySQL website:"
-	ewarn "http://dev.mysql.com/doc/mysql/en/upgrading-from-4-0.html"
+	ewarn "http://dev.mysql.com/doc/refman/4.1/en/upgrading-from-4-0.html"
 	ewarn ""
 	ewarn "You can also choose to preview some new MySQL 4.1 behaviour"
 	ewarn "adding a section \"[mysqld-4.0]\" followed by the word \"new\""
diff --git a/dev-db/mysql/mysql-5.0.12_beta.ebuild b/dev-db/mysql/mysql-5.0.12_beta.ebuild
index 3810a80bda9d..31be79a8ec5e 100644
--- a/dev-db/mysql/mysql-5.0.12_beta.ebuild
+++ b/dev-db/mysql/mysql-5.0.12_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.12_beta.ebuild,v 1.12 2005/10/17 13:49:25 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.12_beta.ebuild,v 1.13 2005/10/20 08:17:44 vivo Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -20,7 +20,8 @@ SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
+#KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
+KEYWORDS="~x86 ~amd64"
 IUSE="big-tables berkdb debug doc minimal perl readline selinux ssl static"
 RESTRICT="primaryuri"
 
@@ -46,7 +47,7 @@ mysql_upgrade_error() {
 	ewarn "Some gentoo documentation on how to do it:"
 	ewarn "http://www.gentoo.org/doc/en/mysql-upgrading.xml"
 	ewarn "Also on the MySQL website:"
-	ewarn "http://dev.mysql.com/doc/mysql/en/upgrading-from-4-0.html"
+	ewarn "http://dev.mysql.com/doc/refman/5.0/en/upgrading-from-4-1.html"
 	ewarn ""
 	ewarn "You can also choose to preview some new MySQL 4.1 behaviour"
 	ewarn "adding a section \"[mysqld-4.0]\" followed by the word \"new\""
diff --git a/dev-db/mysql/mysql-5.0.13_rc.ebuild b/dev-db/mysql/mysql-5.0.13_rc.ebuild
index 877ce1aabfe0..3e6050679d53 100644
--- a/dev-db/mysql/mysql-5.0.13_rc.ebuild
+++ b/dev-db/mysql/mysql-5.0.13_rc.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.13_rc.ebuild,v 1.2 2005/10/17 13:49:25 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.13_rc.ebuild,v 1.3 2005/10/20 08:17:44 vivo Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -21,7 +21,8 @@ SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
+#KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
+KEYWORDS="~x86 ~amd64"
 IUSE="big-tables berkdb debug doc minimal perl readline selinux ssl static"
 RESTRICT="primaryuri"
 
@@ -50,7 +51,7 @@ mysql_upgrade_error() {
 	ewarn "Some gentoo documentation on how to do it:"
 	ewarn "http://www.gentoo.org/doc/en/mysql-upgrading.xml"
 	ewarn "Also on the MySQL website:"
-	ewarn "http://dev.mysql.com/doc/mysql/en/upgrading-from-4-0.html"
+	ewarn "http://dev.mysql.com/doc/refman/5.0/en/upgrading-from-4-1.html"
 	ewarn ""
 	ewarn "You can also choose to preview some new MySQL 4.1 behaviour"
 	ewarn "adding a section \"[mysqld-4.0]\" followed by the word \"new\""