Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-db/mysql/ChangeLog8
-rw-r--r--dev-db/mysql/Manifest112
-rw-r--r--dev-db/mysql/mysql-4.0.22-r1.ebuild5
-rw-r--r--dev-db/mysql/mysql-4.0.22-r2.ebuild5
-rw-r--r--dev-db/mysql/mysql-4.0.22.ebuild5
-rw-r--r--dev-db/mysql/mysql-4.0.23-r1.ebuild5
-rw-r--r--dev-db/mysql/mysql-4.0.23-r2.ebuild5
-rw-r--r--dev-db/mysql/mysql-4.0.23.ebuild5
-rw-r--r--dev-db/mysql/mysql-4.1.7.ebuild5
-rw-r--r--dev-db/mysql/mysql-4.1.8-r1.ebuild5
-rw-r--r--dev-db/mysql/mysql-4.1.8.ebuild5
11 files changed, 90 insertions, 75 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 4ad09948590a..968db45f8d0b 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.178 2005/02/28 09:51:49 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.179 2005/02/28 11:33:42 robbat2 Exp $
+
+ 28 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:
+ Properly fix bug #83431, we missed something last time...
28 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> mysql-4.1.8-r1.ebuild:
Added to ~ppc.
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 37854e93401c..735d97aa2c86 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,71 +1,71 @@
-MD5 33a777e1c66e64edf193c3a695e0afa8 mysql-3.23.58.ebuild 6637
-MD5 8714383f4edf4411e8998fcc879b7af1 mysql-4.0.23-r1.ebuild 9134
-MD5 8c5a67b5a29d25a05c3d980e22efcb9e mysql-3.23.57.ebuild 6685
-MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
MD5 29b6202420ecb57890ba512e783f2bae mysql-3.23.57-r1.ebuild 6639
-MD5 5a815a21451af71c205e4b0fa5173d63 mysql-4.1.8.ebuild 9061
-MD5 d765563db679f02a91ec5dc29079463d mysql-4.1.8-r1.ebuild 9196
-MD5 bd28c8f0ed963ee43a13fc659a3d90b6 mysql-4.0.23-r2.ebuild 9382
-MD5 3cdae33ef6ec6a1f77fa6fd359525d82 ChangeLog 27136
-MD5 da9e472c6d25ed31da21244d31669d75 mysql-4.0.22-r2.ebuild 9579
MD5 74cd3a8b999012824860f252b56d854b mysql-3.23.56.ebuild 6682
+MD5 0c8cb39c59a4389bbb5996bbfbd3eca6 mysql-4.0.22-r1.ebuild 9285
+MD5 f17bca5e4e9fd8096c042c7ad5193e28 mysql-4.1.7.ebuild 8817
+MD5 33a777e1c66e64edf193c3a695e0afa8 mysql-3.23.58.ebuild 6637
+MD5 41e4e163a7f5e204da70e4bcf1fe8227 mysql-4.0.23.ebuild 9056
MD5 0647f8dfca3acb81c9e72b96a6e51b8d mysql-3.23.52-r1.ebuild 5997
-MD5 14533cb1b9c4ed1e3bef4a26c42f468e mysql-4.0.23.ebuild 9012
-MD5 c5290b019ac480d72e7391a08120cdda mysql-4.0.22.ebuild 8732
+MD5 f4b908c15041e4ce8155a8c41789fe16 mysql-4.0.23-r2.ebuild 9424
+MD5 2fda48beb37372add32768c37b415407 mysql-4.1.8-r1.ebuild 9241
+MD5 8c5a67b5a29d25a05c3d980e22efcb9e mysql-3.23.57.ebuild 6685
+MD5 0de38f38be8254efc84717fd71ff262a mysql-4.0.22.ebuild 8774
+MD5 b6917beb57aeb12d602445cae114816d mysql-4.0.22-r2.ebuild 9621
MD5 669bb1e03acc651e30716ad7b36f34d2 mysql-3.23.58-r1.ebuild 6756
-MD5 1a34c12e9f20922f1e6ccfdf827f23ab mysql-4.0.22-r1.ebuild 9243
-MD5 9c95211c682d64dfa03fbe3648908236 mysql-4.1.7.ebuild 8775
-MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
-MD5 f599e8b3eb4636bb61721525dc15f5f5 files/mysql-4.0.18-thrssl.patch 723
-MD5 3d755bbd0b109ec0397b0ce50b4a554d files/mysql-accesstmp.patch 3393
-MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
-MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
-MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
-MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
-MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394
-MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440
-MD5 5c65bc30646d669193798324a56b002a files/digest-mysql-4.0.23-r1 66
-MD5 6d4fc135a2143e95681416795d1948d9 files/mysql-4.0.23-install-db-sh.diff 1055
-MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
-MD5 e501d0f33d9d0be73b37c310099011d2 files/mysql-4.0.14-security-28394.patch 654
-MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
-MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
-MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
-MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
+MD5 2d4cf887439f79f4e4e29801c9292553 mysql-4.1.8.ebuild 9103
+MD5 dc86929921b9f5310bbc1427ab8dfdf0 mysql-4.0.23-r1.ebuild 9177
+MD5 a7e17a725d5cfab10a23d3ca12fe0048 ChangeLog 27458
+MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
-MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
-MD5 5c65bc30646d669193798324a56b002a files/digest-mysql-4.0.23 66
-MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
-MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
-MD5 ce711c0d8387720dbb85de1d756daa75 files/digest-mysql-4.0.23-r2 67
-MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8 65
-MD5 8af497943e1a29aa0a0c6b17af54b116 files/mysql-4.0.21-thrssl.patch 318
+MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585
-MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 672
-MD5 6f8de46485ea7dcf886e1747fb117427 files/mysql-gentoo-nptl.diff 654
-MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
+MD5 3e399acddc48f209b53e260eec64938c files/mysql-4.0.rc6 933
+MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
+MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57-r1 67
-MD5 f2905bbcc3f148a2ad689792917bd78d files/mysql-4.0.16-install-db-sh.diff 1429
+MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58-r1 67
MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
+MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587
-MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863
-MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
-MD5 3e399acddc48f209b53e260eec64938c files/mysql-4.0.rc6 933
-MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
-MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637
-MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
+MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
+MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394
+MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22 66
+MD5 5c65bc30646d669193798324a56b002a files/digest-mysql-4.0.23 66
+MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
+MD5 f2905bbcc3f148a2ad689792917bd78d files/mysql-4.0.16-install-db-sh.diff 1429
+MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
-MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8-r1 65
+MD5 6d4fc135a2143e95681416795d1948d9 files/mysql-4.0.23-install-db-sh.diff 1055
+MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562
-MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
-MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r1 66
+MD5 85b95c8a74c219d70135c924b541ca20 files/digest-mysql-4.1.7 65
+MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8 65
+MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
+MD5 6f8de46485ea7dcf886e1747fb117427 files/mysql-gentoo-nptl.diff 654
+MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
+MD5 e501d0f33d9d0be73b37c310099011d2 files/mysql-4.0.14-security-28394.patch 654
+MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440
MD5 68cbaa353f522c0a404a4d07693f917d files/mysql-4.0.18-install-db-sh.diff 1473
+MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
-MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
-MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58-r1 67
-MD5 85b95c8a74c219d70135c924b541ca20 files/digest-mysql-4.1.7 65
-MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
+MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
+MD5 3d755bbd0b109ec0397b0ce50b4a554d files/mysql-accesstmp.patch 3393
+MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
+MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8-r1 65
+MD5 8af497943e1a29aa0a0c6b17af54b116 files/mysql-4.0.21-thrssl.patch 318
+MD5 f599e8b3eb4636bb61721525dc15f5f5 files/mysql-4.0.18-thrssl.patch 723
+MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
+MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
+MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 672
+MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
+MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58 67
-MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
-MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22 66
+MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
+MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
+MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
+MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637
+MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r1 66
MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r2 66
+MD5 5c65bc30646d669193798324a56b002a files/digest-mysql-4.0.23-r1 66
+MD5 ce711c0d8387720dbb85de1d756daa75 files/digest-mysql-4.0.23-r2 67
+MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
+MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863
diff --git a/dev-db/mysql/mysql-4.0.22-r1.ebuild b/dev-db/mysql/mysql-4.0.22-r1.ebuild
index 858f61ee37c9..88dafd5d229b 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.7 2005/02/27 17:56:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22-r1.ebuild,v 1.8 2005/02/28 11:33:42 robbat2 Exp $
inherit eutils gnuconfig
#to accomodate -laadeedah releases
@@ -117,10 +117,11 @@ src_unpack() {
# upstream bug http://bugs.mysql.com/bug.php?id=7971
# names conflict with stuff in 2.6.10 kernel headers
+ echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
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"
+ || 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 01304101812b..c6ec4b6f14a9 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.15 2005/02/27 17:56:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22-r2.ebuild,v 1.16 2005/02/28 11:33:42 robbat2 Exp $
inherit eutils gnuconfig
#to accomodate -laadeedah releases
@@ -127,10 +127,11 @@ src_unpack() {
# upstream bug http://bugs.mysql.com/bug.php?id=7971
# names conflict with stuff in 2.6.10 kernel headers
+ echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
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"
+ || 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 0958d075536e..e896715e42a3 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.15 2005/02/27 17:56:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22.ebuild,v 1.16 2005/02/28 11:33:42 robbat2 Exp $
inherit eutils gnuconfig
#to accomodate -laadeedah releases
@@ -99,10 +99,11 @@ src_unpack() {
# upstream bug http://bugs.mysql.com/bug.php?id=7971
# names conflict with stuff in 2.6.10 kernel headers
+ echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
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"
+ || 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 2fdce6727221..374cfbf3639b 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.9 2005/02/27 17:56:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23-r1.ebuild,v 1.10 2005/02/28 11:33:42 robbat2 Exp $
inherit eutils gnuconfig
#to accomodate -laadeedah releases
@@ -103,10 +103,11 @@ src_unpack() {
# upstream bug http://bugs.mysql.com/bug.php?id=7971
# names conflict with stuff in 2.6.10 kernel headers
+ echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
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"
+ || 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 3113b211ef77..d4af7559ad50 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.6 2005/02/27 17:56:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23-r2.ebuild,v 1.7 2005/02/28 11:33:42 robbat2 Exp $
inherit eutils gnuconfig
#to accomodate -laadeedah releases
@@ -122,10 +122,11 @@ src_unpack() {
# upstream bug http://bugs.mysql.com/bug.php?id=7971
# names conflict with stuff in 2.6.10 kernel headers
+ echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
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"
+ || 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 800d2d72db57..9519b38fc728 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.7 2005/02/27 06:20:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23.ebuild,v 1.8 2005/02/28 11:33:42 robbat2 Exp $
inherit eutils gnuconfig
#to accomodate -laadeedah releases
@@ -100,10 +100,11 @@ src_unpack() {
# upstream bug http://bugs.mysql.com/bug.php?id=7971
# names conflict with stuff in 2.6.10 kernel headers
+ echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
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"
+ || 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 b7d2ead80b99..f6c5be2bca66 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.8 2005/02/27 17:56:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.7.ebuild,v 1.9 2005/02/28 11:33:42 robbat2 Exp $
inherit eutils gnuconfig
#to accomodate -laadeedah releases
@@ -98,10 +98,11 @@ src_unpack() {
# upstream bug http://bugs.mysql.com/bug.php?id=7971
# names conflict with stuff in 2.6.10 kernel headers
+ echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
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"
+ || 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 530c47d579b7..f9a4c0ee0748 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.8 2005/02/28 09:51:49 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.8-r1.ebuild,v 1.9 2005/02/28 11:33:42 robbat2 Exp $
inherit eutils gnuconfig
#to accomodate -laadeedah releases
@@ -103,10 +103,11 @@ src_unpack() {
# upstream bug http://bugs.mysql.com/bug.php?id=7971
# names conflict with stuff in 2.6.10 kernel headers
+ echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
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"
+ || 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 bf3dcc3ea2a9..30d79b37211a 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.7 2005/02/27 17:56:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.8.ebuild,v 1.8 2005/02/28 11:33:42 robbat2 Exp $
inherit eutils gnuconfig
#to accomodate -laadeedah releases
@@ -100,10 +100,11 @@ src_unpack() {
# upstream bug http://bugs.mysql.com/bug.php?id=7971
# names conflict with stuff in 2.6.10 kernel headers
+ echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
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"
+ || die "Failed to fix bitops"
}
src_compile() {