Bug #83431, fix since 4.0.24 seems to be a long time in releasing.

Package-Manager: portage-2.0.51.16

11 files changed, 89 insertions, 20 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 298e8c7dac5d..eda8122e2ef5 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # 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.176 2005/02/21 17:08:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.177 2005/02/27 06:20:29 robbat2 Exp $
+
+  26 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.22-r1.ebuild,
+  mysql-4.0.22-r2.ebuild, mysql-4.0.22.ebuild, mysql-4.0.23-r1.ebuild,
+  mysql-4.0.23-r2.ebuild, mysql-4.0.23.ebuild, mysql-4.1.7.ebuild,
+  mysql-4.1.8-r1.ebuild, mysql-4.1.8.ebuild:
+  Bug #83431, fix since 4.0.24 seems to be a long time in releasing.
 
   20 Feb 2005; Aron Griffis <agriffis@gentoo.org> mysql-4.0.22-r2.ebuild,
   mysql-4.1.8-r1.ebuild:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5c00b64bfe48..31a6710cd69e 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,19 +1,19 @@
 MD5 29b6202420ecb57890ba512e783f2bae mysql-3.23.57-r1.ebuild 6639
 MD5 74cd3a8b999012824860f252b56d854b mysql-3.23.56.ebuild 6682
-MD5 63f29c10c87174368c82f43242a17a88 mysql-4.0.22-r1.ebuild 8996
-MD5 21e6f8343823a521991fa281cfd56f0d mysql-4.1.7.ebuild 8528
+MD5 3bb86a9aaf655bb2d0910e69b1f45a10 mysql-4.0.22-r1.ebuild 9242
+MD5 46efe96f37d50722291baf3d79049dfa mysql-4.1.7.ebuild 8774
 MD5 33a777e1c66e64edf193c3a695e0afa8 mysql-3.23.58.ebuild 6637
-MD5 2a44c634934a8a4dac2bf76b7c6aa69f mysql-4.0.23.ebuild 8767
+MD5 14533cb1b9c4ed1e3bef4a26c42f468e mysql-4.0.23.ebuild 9012
 MD5 0647f8dfca3acb81c9e72b96a6e51b8d mysql-3.23.52-r1.ebuild 5997
-MD5 ced4983a7f44cc8695388409ef076eaf mysql-4.0.23-r2.ebuild 9135
-MD5 aa6ac097b644a9fa0d1335f16190219c mysql-4.1.8-r1.ebuild 8948
+MD5 940251866f7ad82b0b7f0c68ab5e178a mysql-4.0.23-r2.ebuild 9381
+MD5 58557f45852183e63e66a417fad211a9 mysql-4.1.8-r1.ebuild 9193
 MD5 8c5a67b5a29d25a05c3d980e22efcb9e mysql-3.23.57.ebuild 6685
-MD5 4b0f4b83c25272f6a56022e50fc08ae6 mysql-4.0.22.ebuild 8485
-MD5 c9a337cf7694de3b2eb90bc8364b48fc mysql-4.0.22-r2.ebuild 9333
+MD5 79939d681d9ed30628c521a0466a743a mysql-4.0.22.ebuild 8731
+MD5 4b79ff22c0e5a6d6bc91c6303385f339 mysql-4.0.22-r2.ebuild 9578
 MD5 669bb1e03acc651e30716ad7b36f34d2 mysql-3.23.58-r1.ebuild 6756
-MD5 c4d197484d0e2ef30d3c6d782c9f4971 mysql-4.1.8.ebuild 8814
-MD5 48ec4f29be41f74555ef483e67425a47 mysql-4.0.23-r1.ebuild 8887
-MD5 adcc966348f8d5e3e19b2d2e08958d36 ChangeLog 26713
+MD5 b5e3d73b61d182d8cc38b4b415dc0bbd mysql-4.1.8.ebuild 9060
+MD5 201402966d4c32a247a2ec257aaaad22 mysql-4.0.23-r1.ebuild 9133
+MD5 5b6699b4e196864906254daf50713eb4 ChangeLog 27042
 MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
diff --git a/dev-db/mysql/mysql-4.0.22-r1.ebuild b/dev-db/mysql/mysql-4.0.22-r1.ebuild
index 77a5e76ba914..b8c6b7096e78 100644
--- a/dev-db/mysql/mysql-4.0.22-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.22-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.0.22-r1.ebuild,v 1.5 2005/01/30 00:18:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22-r1.ebuild,v 1.6 2005/02/27 06:20:29 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -114,6 +114,13 @@ src_unpack() {
 	# Saving this for a rainy day, in case we need it again
 	#WANT_AUTOMAKE=1.7 automake
 	gnuconfig_update
+	
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	sed -i \
+		-e "s/set_bit/my__set_bit/g" \
+		-e "s/clear_bit/my__clear_bit/g" \
+	    ${S}/extra/replace.c || die "Failed to fix bitops"
 }
 
 src_compile() {
diff --git a/dev-db/mysql/mysql-4.0.22-r2.ebuild b/dev-db/mysql/mysql-4.0.22-r2.ebuild
index 398675b35eb7..66dfc8ed32f0 100644
--- a/dev-db/mysql/mysql-4.0.22-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.22-r2.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.0.22-r2.ebuild,v 1.13 2005/02/21 17:08:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22-r2.ebuild,v 1.14 2005/02/27 06:20:29 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -124,6 +124,13 @@ src_unpack() {
 		#WANT_AUTOMAKE=1.7 automake
 		gnuconfig_update
 	done
+	
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	sed -i \
+		-e "s/set_bit/my__set_bit/g" \
+		-e "s/clear_bit/my__clear_bit/g" \
+	    ${S}/extra/replace.c || die "Failed to fix bitops"
 }
 
 src_compile() {
diff --git a/dev-db/mysql/mysql-4.0.22.ebuild b/dev-db/mysql/mysql-4.0.22.ebuild
index d9dceabd11ee..ceb186e3d136 100644
--- a/dev-db/mysql/mysql-4.0.22.ebuild
+++ b/dev-db/mysql/mysql-4.0.22.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.0.22.ebuild,v 1.13 2005/01/30 00:18:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22.ebuild,v 1.14 2005/02/27 06:20:29 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -96,6 +96,13 @@ src_unpack() {
 	# Saving this for a rainy day, in case we need it again
 	#WANT_AUTOMAKE=1.7 automake
 	gnuconfig_update
+	
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	sed -i \
+		-e "s/set_bit/my__set_bit/g" \
+		-e "s/clear_bit/my__clear_bit/g" \
+	    ${S}/extra/replace.c || die "Failed to fix bitops"
 }
 
 src_compile() {
diff --git a/dev-db/mysql/mysql-4.0.23-r1.ebuild b/dev-db/mysql/mysql-4.0.23-r1.ebuild
index 7705e826bef3..2e65ca121acd 100644
--- a/dev-db/mysql/mysql-4.0.23-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.23-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.0.23-r1.ebuild,v 1.7 2005/01/30 00:18:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23-r1.ebuild,v 1.8 2005/02/27 06:20:29 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -100,6 +100,13 @@ src_unpack() {
 	# Saving this for a rainy day, in case we need it again
 	#WANT_AUTOMAKE=1.7 automake
 	gnuconfig_update
+	
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	sed -i \
+		-e "s/set_bit/my__set_bit/g" \
+		-e "s/clear_bit/my__clear_bit/g" \
+	    ${S}/extra/replace.c || die "Failed to fix bitops"
 }
 
 src_compile() {
diff --git a/dev-db/mysql/mysql-4.0.23-r2.ebuild b/dev-db/mysql/mysql-4.0.23-r2.ebuild
index 8e5bdc216afc..52d26912962c 100644
--- a/dev-db/mysql/mysql-4.0.23-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.23-r2.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.0.23-r2.ebuild,v 1.4 2005/01/30 00:18:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23-r2.ebuild,v 1.5 2005/02/27 06:20:29 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -119,6 +119,13 @@ src_unpack() {
 		#WANT_AUTOMAKE=1.7 automake
 		gnuconfig_update
 	done
+	
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	sed -i \
+		-e "s/set_bit/my__set_bit/g" \
+		-e "s/clear_bit/my__clear_bit/g" \
+	    ${S}/extra/replace.c || die "Failed to fix bitops"
 }
 
 src_compile() {
diff --git a/dev-db/mysql/mysql-4.0.23.ebuild b/dev-db/mysql/mysql-4.0.23.ebuild
index 6ba413e5c9a6..800d2d72db57 100644
--- a/dev-db/mysql/mysql-4.0.23.ebuild
+++ b/dev-db/mysql/mysql-4.0.23.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.0.23.ebuild,v 1.6 2005/01/30 00:18:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23.ebuild,v 1.7 2005/02/27 06:20:29 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -97,6 +97,13 @@ src_unpack() {
 	# Saving this for a rainy day, in case we need it again
 	#WANT_AUTOMAKE=1.7 automake
 	gnuconfig_update
+
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	sed -i \
+		-e "s/set_bit/my__set_bit/g" \
+		-e "s/clear_bit/my__clear_bit/g" \
+	    ${S}/extra/replace.c || die "Failed to fix bitops"
 }
 
 src_compile() {
diff --git a/dev-db/mysql/mysql-4.1.7.ebuild b/dev-db/mysql/mysql-4.1.7.ebuild
index 40521583e2f0..3bac51e68cb4 100644
--- a/dev-db/mysql/mysql-4.1.7.ebuild
+++ b/dev-db/mysql/mysql-4.1.7.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.7.ebuild,v 1.6 2005/01/30 00:18:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.7.ebuild,v 1.7 2005/02/27 06:20:29 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -95,6 +95,13 @@ src_unpack() {
 	# Saving this for a rainy day, in case we need it again
 	#WANT_AUTOMAKE=1.7 automake
 	gnuconfig_update
+	
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	sed -i \
+		-e "s/set_bit/my__set_bit/g" \
+		-e "s/clear_bit/my__clear_bit/g" \
+	    ${S}/extra/replace.c || die "Failed to fix bitops"
 }
 
 src_compile() {
diff --git a/dev-db/mysql/mysql-4.1.8-r1.ebuild b/dev-db/mysql/mysql-4.1.8-r1.ebuild
index 7c5cb27fe04a..e55df748bc9c 100644
--- a/dev-db/mysql/mysql-4.1.8-r1.ebuild
+++ b/dev-db/mysql/mysql-4.1.8-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.8-r1.ebuild,v 1.5 2005/02/21 17:08:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.8-r1.ebuild,v 1.6 2005/02/27 06:20:29 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -100,6 +100,13 @@ src_unpack() {
 	# Saving this for a rainy day, in case we need it again
 	#WANT_AUTOMAKE=1.7 automake
 	gnuconfig_update
+	
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	sed -i \
+		-e "s/set_bit/my__set_bit/g" \
+		-e "s/clear_bit/my__clear_bit/g" \
+	    ${S}/extra/replace.c || die "Failed to fix bitops"
 }
 
 src_compile() {
diff --git a/dev-db/mysql/mysql-4.1.8.ebuild b/dev-db/mysql/mysql-4.1.8.ebuild
index e9e64952f281..a443c59c30d0 100644
--- a/dev-db/mysql/mysql-4.1.8.ebuild
+++ b/dev-db/mysql/mysql-4.1.8.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.8.ebuild,v 1.5 2005/01/30 00:18:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.8.ebuild,v 1.6 2005/02/27 06:20:29 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -97,6 +97,13 @@ src_unpack() {
 	# Saving this for a rainy day, in case we need it again
 	#WANT_AUTOMAKE=1.7 automake
 	gnuconfig_update
+	
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	sed -i \
+		-e "s/set_bit/my__set_bit/g" \
+		-e "s/clear_bit/my__clear_bit/g" \
+	    ${S}/extra/replace.c || die "Failed to fix bitops"
 }
 
 src_compile() {