change patches to cope with mysql-4.0

Package-Manager: portage-2.1.1_pre1-r1

5 files changed, 186 insertions, 21 deletions

diff --git a/net-libs/libwww/ChangeLog b/net-libs/libwww/ChangeLog
index 1cdaaa80265b..b72e53a2c96b 100644
--- a/net-libs/libwww/ChangeLog
+++ b/net-libs/libwww/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libwww
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.55 2006/05/14 08:29:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.56 2006/06/25 14:08:10 vivo Exp $
+
+*libwww-5.4.0-r6 (25 Jun 2006)
+
+  25 Jun 2006; Francesco Riosa <vivo@gentoo.org>
+  +files/libwww-5.4.0-mysql-4.0.patch, +libwww-5.4.0-r6.ebuild:
+  Updated patch to apply also in MySQL 4.0.27, thanks to Dan Christensen, for
+  reporting it, bug #56328
 
   14 May 2006; Fabian Groffen <grobian@gentoo.org> libwww-5.4.0-r5.ebuild:
   Removed ppc-macos, it doesn't eautoreconf (bug #117919)
diff --git a/net-libs/libwww/Manifest b/net-libs/libwww/Manifest
index 32d63fa09596..7d649a1344fc 100644
--- a/net-libs/libwww/Manifest
+++ b/net-libs/libwww/Manifest
@@ -1,62 +1,73 @@
-AUX libwww-5.4.0-asneeded.patch 3069 RMD160 2ad4e69a0fe92ee3aa963ab3f0545352c71efc20 SHA1 43654eeb3229ab112d6cb93bcab8394fb57d3c8f SHA256 392f715f76294b8cf5875ddaa8d224cb5133b5ead2f4063f0ac5234db71dd8d1 size 3069
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libwww-5.4.0-asneeded.patch 3069 RMD160 2ad4e69a0fe92ee3aa963ab3f0545352c71efc20 SHA1 43654eeb3229ab112d6cb93bcab8394fb57d3c8f SHA256 392f715f76294b8cf5875ddaa8d224cb5133b5ead2f4063f0ac5234db71dd8d1
 MD5 1a49925f104c658018fc8aa186e019c6 files/libwww-5.4.0-asneeded.patch 3069
 RMD160 2ad4e69a0fe92ee3aa963ab3f0545352c71efc20 files/libwww-5.4.0-asneeded.patch 3069
 SHA256 392f715f76294b8cf5875ddaa8d224cb5133b5ead2f4063f0ac5234db71dd8d1 files/libwww-5.4.0-asneeded.patch 3069
-AUX libwww-5.4.0-autoconf-gentoo.diff 1089 RMD160 aadddad4802da1f5b9f212073df90d171f422e52 SHA1 f04b3753a0c351a2634a1039011f8ef7e904b821 SHA256 630617c79601f664b5752f5331a2abb3eaae70ac3365ba84498475067f6dbcfa size 1089
+AUX libwww-5.4.0-autoconf-gentoo.diff 1089 RMD160 aadddad4802da1f5b9f212073df90d171f422e52 SHA1 f04b3753a0c351a2634a1039011f8ef7e904b821 SHA256 630617c79601f664b5752f5331a2abb3eaae70ac3365ba84498475067f6dbcfa
 MD5 1866b237427a244b9923469b52f54473 files/libwww-5.4.0-autoconf-gentoo.diff 1089
 RMD160 aadddad4802da1f5b9f212073df90d171f422e52 files/libwww-5.4.0-autoconf-gentoo.diff 1089
 SHA256 630617c79601f664b5752f5331a2abb3eaae70ac3365ba84498475067f6dbcfa files/libwww-5.4.0-autoconf-gentoo.diff 1089
-AUX libwww-5.4.0-automake-gentoo.diff 346 RMD160 16b6e244bd0d325d00c0ea6f4185552824cc6b60 SHA1 2bf0471eef168db4f5f9a54ab31007767751ba92 SHA256 e9d7489f5ee2226cdd602939f82a559cefdd9a9cb4b3c98c316bae05c989c8d9 size 346
+AUX libwww-5.4.0-automake-gentoo.diff 346 RMD160 16b6e244bd0d325d00c0ea6f4185552824cc6b60 SHA1 2bf0471eef168db4f5f9a54ab31007767751ba92 SHA256 e9d7489f5ee2226cdd602939f82a559cefdd9a9cb4b3c98c316bae05c989c8d9
 MD5 ee0dd3b8a76bf8b9e6d051663119eb40 files/libwww-5.4.0-automake-gentoo.diff 346
 RMD160 16b6e244bd0d325d00c0ea6f4185552824cc6b60 files/libwww-5.4.0-automake-gentoo.diff 346
 SHA256 e9d7489f5ee2226cdd602939f82a559cefdd9a9cb4b3c98c316bae05c989c8d9 files/libwww-5.4.0-automake-gentoo.diff 346
-AUX libwww-5.4.0-automake-macos.patch 436 RMD160 67b41c599f66813ab25047fdc07ef32e4afbfccf SHA1 aa6218e4c630c3167be2c0cd04241a7ffc8c4bb5 SHA256 c2df9e41390f12c8b454cc5cce2cec851ddfebb39a78125a0090da520fefcb10 size 436
+AUX libwww-5.4.0-automake-macos.patch 436 RMD160 67b41c599f66813ab25047fdc07ef32e4afbfccf SHA1 aa6218e4c630c3167be2c0cd04241a7ffc8c4bb5 SHA256 c2df9e41390f12c8b454cc5cce2cec851ddfebb39a78125a0090da520fefcb10
 MD5 231e5cc6d075b3464a46858f8d2b65e3 files/libwww-5.4.0-automake-macos.patch 436
 RMD160 67b41c599f66813ab25047fdc07ef32e4afbfccf files/libwww-5.4.0-automake-macos.patch 436
 SHA256 c2df9e41390f12c8b454cc5cce2cec851ddfebb39a78125a0090da520fefcb10 files/libwww-5.4.0-automake-macos.patch 436
-AUX libwww-5.4.0-disable-ndebug-gentoo.diff 370 RMD160 8918de13a34d418cd55cb98930640265c48f6571 SHA1 2d4c29c5d2a06975aff2cd3d1b4ce9f6fed0f8d5 SHA256 39bdcca0efc334c9a86a10090fcb2dbfaf9ca427bfd12ac2486b0533287c45f9 size 370
+AUX libwww-5.4.0-disable-ndebug-gentoo.diff 370 RMD160 8918de13a34d418cd55cb98930640265c48f6571 SHA1 2d4c29c5d2a06975aff2cd3d1b4ce9f6fed0f8d5 SHA256 39bdcca0efc334c9a86a10090fcb2dbfaf9ca427bfd12ac2486b0533287c45f9
 MD5 0851f5aef9f0960efcdcabfdfa960341 files/libwww-5.4.0-disable-ndebug-gentoo.diff 370
 RMD160 8918de13a34d418cd55cb98930640265c48f6571 files/libwww-5.4.0-disable-ndebug-gentoo.diff 370
 SHA256 39bdcca0efc334c9a86a10090fcb2dbfaf9ca427bfd12ac2486b0533287c45f9 files/libwww-5.4.0-disable-ndebug-gentoo.diff 370
-AUX libwww-5.4.0-htbound.patch 13279 RMD160 77fe8970180e7bcf79b994f78cb986b2f172d2db SHA1 b9c1460f8a34cef355d836b3d6dcb77bcd1fd351 SHA256 22d94546f706e263b28370b00207d6ad09739c98a6463d4341b94991ac981ad7 size 13279
+AUX libwww-5.4.0-htbound.patch 13279 RMD160 77fe8970180e7bcf79b994f78cb986b2f172d2db SHA1 b9c1460f8a34cef355d836b3d6dcb77bcd1fd351 SHA256 22d94546f706e263b28370b00207d6ad09739c98a6463d4341b94991ac981ad7
 MD5 6853cd848815d9446ef820e3a74878ca files/libwww-5.4.0-htbound.patch 13279
 RMD160 77fe8970180e7bcf79b994f78cb986b2f172d2db files/libwww-5.4.0-htbound.patch 13279
 SHA256 22d94546f706e263b28370b00207d6ad09739c98a6463d4341b94991ac981ad7 files/libwww-5.4.0-htbound.patch 13279
-AUX libwww-5.4.0-mysql-4.1.patch 1674 RMD160 39ca32835af65fa781d3c3465f33fc9743d38c34 SHA1 a54dccfc28a4bf15f1a78aa5a29cdb6314909bb9 SHA256 b99508bf1cccb00ad55538a019d70ff165998701282e00faab2ec1b9df43ed01 size 1674
+AUX libwww-5.4.0-mysql-4.0.patch 1674 RMD160 0f9bdfe400357b947314f50c935bf7fcff5dae88 SHA1 581cb8a719d738499699c76d6a10c2b9cc7a01f1 SHA256 bfbeb72ac10be380febad60c746935a8ce4eb69a73eacf9725d7c51eeca26232
+MD5 e1039d27f9351211d0ba4146ba5bae42 files/libwww-5.4.0-mysql-4.0.patch 1674
+RMD160 0f9bdfe400357b947314f50c935bf7fcff5dae88 files/libwww-5.4.0-mysql-4.0.patch 1674
+SHA256 bfbeb72ac10be380febad60c746935a8ce4eb69a73eacf9725d7c51eeca26232 files/libwww-5.4.0-mysql-4.0.patch 1674
+AUX libwww-5.4.0-mysql-4.1.patch 1674 RMD160 39ca32835af65fa781d3c3465f33fc9743d38c34 SHA1 a54dccfc28a4bf15f1a78aa5a29cdb6314909bb9 SHA256 b99508bf1cccb00ad55538a019d70ff165998701282e00faab2ec1b9df43ed01
 MD5 b0a8e638d02da0d0284e8555866f1f38 files/libwww-5.4.0-mysql-4.1.patch 1674
 RMD160 39ca32835af65fa781d3c3465f33fc9743d38c34 files/libwww-5.4.0-mysql-4.1.patch 1674
 SHA256 b99508bf1cccb00ad55538a019d70ff165998701282e00faab2ec1b9df43ed01 files/libwww-5.4.0-mysql-4.1.patch 1674
-AUX libwww-5.4.0-noexport.patch 402 RMD160 0074a161a985b08fa797dd91decea320a23f1dfd SHA1 30242525c24e97088f3fa122060a1369bebb1877 SHA256 f2fa63b1d94ebdec9b77dd6758222e2e6fb232b467b0c5f3f5efaa8ec2265c55 size 402
+AUX libwww-5.4.0-noexport.patch 402 RMD160 0074a161a985b08fa797dd91decea320a23f1dfd SHA1 30242525c24e97088f3fa122060a1369bebb1877 SHA256 f2fa63b1d94ebdec9b77dd6758222e2e6fb232b467b0c5f3f5efaa8ec2265c55
 MD5 db10aa1f9442be23cfec06ad586d1afa files/libwww-5.4.0-noexport.patch 402
 RMD160 0074a161a985b08fa797dd91decea320a23f1dfd files/libwww-5.4.0-noexport.patch 402
 SHA256 f2fa63b1d94ebdec9b77dd6758222e2e6fb232b467b0c5f3f5efaa8ec2265c55 files/libwww-5.4.0-noexport.patch 402
-AUX libwww-5.4.0-respectflags.patch 1673 RMD160 751551e3d0c104e4b6a6f81fa815100d28200e37 SHA1 d98268d2236bb1c6e57d4e0e60f3d9bf441fd17f SHA256 23e24af3d68ad8c33114440e25c6d0678aa4fec71988280c27a90d166b6f825f size 1673
+AUX libwww-5.4.0-respectflags.patch 1673 RMD160 751551e3d0c104e4b6a6f81fa815100d28200e37 SHA1 d98268d2236bb1c6e57d4e0e60f3d9bf441fd17f SHA256 23e24af3d68ad8c33114440e25c6d0678aa4fec71988280c27a90d166b6f825f
 MD5 b297da007c2b37dbc72492c6a1b566a6 files/libwww-5.4.0-respectflags.patch 1673
 RMD160 751551e3d0c104e4b6a6f81fa815100d28200e37 files/libwww-5.4.0-respectflags.patch 1673
 SHA256 23e24af3d68ad8c33114440e25c6d0678aa4fec71988280c27a90d166b6f825f files/libwww-5.4.0-respectflags.patch 1673
-AUX libwww-config-liborder.patch 776 RMD160 c6b2f017f1c2ecb036aca3e6d497a1e2fc2e2d6f SHA1 93c6ff7912aec6ea085cda65447b0aae0156c125 SHA256 01aa28bd0516ccfff053c07e02a0c323e0403a86be1845d6d5671e776a95d6d2 size 776
+AUX libwww-config-liborder.patch 776 RMD160 c6b2f017f1c2ecb036aca3e6d497a1e2fc2e2d6f SHA1 93c6ff7912aec6ea085cda65447b0aae0156c125 SHA256 01aa28bd0516ccfff053c07e02a0c323e0403a86be1845d6d5671e776a95d6d2
 MD5 e99f48d15e0834666b84203b48805872 files/libwww-config-liborder.patch 776
 RMD160 c6b2f017f1c2ecb036aca3e6d497a1e2fc2e2d6f files/libwww-config-liborder.patch 776
 SHA256 01aa28bd0516ccfff053c07e02a0c323e0403a86be1845d6d5671e776a95d6d2 files/libwww-config-liborder.patch 776
-DIST libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338 RMD160 c15263ce045333f03a6f655ff3aaaf0dd14eac35 SHA256 a2e64a286c691075df952763de38bb5f5ad3611d089d3b8b9c8d7c2d2b7d1bbb size 8338
-DIST w3c-libwww-5.4.0.tgz 1129121 RMD160 12e55ecb2435f9048d627e56f8ae60d4c246648b SHA256 64841cd99a41c84679cfbc777ebfbb78bdc2a499f7f6866ccf5cead391c867ef size 1129121
-EBUILD libwww-5.4.0-r3.ebuild 1943 RMD160 faebfbe9f76a08fc24b4c1718c999725466f8866 SHA1 1b47f52b07de9ec7c20ebabee1e6b153870c71ae SHA256 e28a8afbe7a913a27f39ddddae525fcbc6627feb731cad67dc3bc45434e2cd67 size 1943
+DIST libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338 RMD160 c15263ce045333f03a6f655ff3aaaf0dd14eac35 SHA1 322f9ee1c55792937c1058b81a0c8980b4b3d95c SHA256 a2e64a286c691075df952763de38bb5f5ad3611d089d3b8b9c8d7c2d2b7d1bbb
+DIST w3c-libwww-5.4.0.tgz 1129121 RMD160 12e55ecb2435f9048d627e56f8ae60d4c246648b SHA1 2394cb4e0dc4e2313a9a0ddbf508e4b726e9af63 SHA256 64841cd99a41c84679cfbc777ebfbb78bdc2a499f7f6866ccf5cead391c867ef
+EBUILD libwww-5.4.0-r3.ebuild 1943 RMD160 faebfbe9f76a08fc24b4c1718c999725466f8866 SHA1 1b47f52b07de9ec7c20ebabee1e6b153870c71ae SHA256 e28a8afbe7a913a27f39ddddae525fcbc6627feb731cad67dc3bc45434e2cd67
 MD5 4c70dae7ce4964982b3ebe728633f9f0 libwww-5.4.0-r3.ebuild 1943
 RMD160 faebfbe9f76a08fc24b4c1718c999725466f8866 libwww-5.4.0-r3.ebuild 1943
 SHA256 e28a8afbe7a913a27f39ddddae525fcbc6627feb731cad67dc3bc45434e2cd67 libwww-5.4.0-r3.ebuild 1943
-EBUILD libwww-5.4.0-r4.ebuild 2149 RMD160 d2f4d623d7c64da059ab3e45d6488c4bdc276969 SHA1 f46cdefda6b75e5004c32fc19ee28ae959ba36c9 SHA256 412fa7439036e01f8a6ea6f2117ba1ba8f076d198fa3f39a48e588bf1cd49a15 size 2149
+EBUILD libwww-5.4.0-r4.ebuild 2149 RMD160 d2f4d623d7c64da059ab3e45d6488c4bdc276969 SHA1 f46cdefda6b75e5004c32fc19ee28ae959ba36c9 SHA256 412fa7439036e01f8a6ea6f2117ba1ba8f076d198fa3f39a48e588bf1cd49a15
 MD5 141485bbc1bfd7acd01d7383755352eb libwww-5.4.0-r4.ebuild 2149
 RMD160 d2f4d623d7c64da059ab3e45d6488c4bdc276969 libwww-5.4.0-r4.ebuild 2149
 SHA256 412fa7439036e01f8a6ea6f2117ba1ba8f076d198fa3f39a48e588bf1cd49a15 libwww-5.4.0-r4.ebuild 2149
-EBUILD libwww-5.4.0-r5.ebuild 2278 RMD160 06bb70101a0ed18f2d743af7e0a5abb2b304c634 SHA1 3b8b794fa3285453ead7ccb9d4eab2c28ef369ab SHA256 9f2294898fb0c3e0696589121132e265f88be4e0a5e5e2aab041f91191e6122c size 2278
+EBUILD libwww-5.4.0-r5.ebuild 2278 RMD160 06bb70101a0ed18f2d743af7e0a5abb2b304c634 SHA1 3b8b794fa3285453ead7ccb9d4eab2c28ef369ab SHA256 9f2294898fb0c3e0696589121132e265f88be4e0a5e5e2aab041f91191e6122c
 MD5 6c0a000741ca83d306624f2d2f3e9ada libwww-5.4.0-r5.ebuild 2278
 RMD160 06bb70101a0ed18f2d743af7e0a5abb2b304c634 libwww-5.4.0-r5.ebuild 2278
 SHA256 9f2294898fb0c3e0696589121132e265f88be4e0a5e5e2aab041f91191e6122c libwww-5.4.0-r5.ebuild 2278
-MISC ChangeLog 8097 RMD160 bf76226e145459b695f0d04245f024ea771daa3b SHA1 0357a273fb5f4f54b54a454377e8abfde15f050e SHA256 87b40a5a82d1416699289409210e2c040fa37e8d1b61e2dd6cd9ca98bb1c1471 size 8097
-MD5 a2b79832e67fd035b8151b69facd194a ChangeLog 8097
-RMD160 bf76226e145459b695f0d04245f024ea771daa3b ChangeLog 8097
-SHA256 87b40a5a82d1416699289409210e2c040fa37e8d1b61e2dd6cd9ca98bb1c1471 ChangeLog 8097
-MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f size 164
+EBUILD libwww-5.4.0-r6.ebuild 2275 RMD160 52994b0caa2d2d75eba993ce1ac240dc6bed27fc SHA1 1ddc852ba7e950df933f1bef6ed77931290e4f8e SHA256 a80943221b2c1e4adbf68618e23ea55426afe7debe5e09f095a5a9933eeef834
+MD5 d5e84cd505cd16289ab0913dae45bc3f libwww-5.4.0-r6.ebuild 2275
+RMD160 52994b0caa2d2d75eba993ce1ac240dc6bed27fc libwww-5.4.0-r6.ebuild 2275
+SHA256 a80943221b2c1e4adbf68618e23ea55426afe7debe5e09f095a5a9933eeef834 libwww-5.4.0-r6.ebuild 2275
+MISC ChangeLog 8345 RMD160 244f6b9353340fd2239b77cb5fea78cdd3cb0347 SHA1 d1de97bd693f3c289470533261cbbd790913b8bf SHA256 fc680668c6733735850c99a02b1426f3e2a6b1c79cdf0508d9f94e006be3c180
+MD5 5e90e44af9a4c97508bbb221e083eecf ChangeLog 8345
+RMD160 244f6b9353340fd2239b77cb5fea78cdd3cb0347 ChangeLog 8345
+SHA256 fc680668c6733735850c99a02b1426f3e2a6b1c79cdf0508d9f94e006be3c180 ChangeLog 8345
+MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
@@ -69,3 +80,13 @@ SHA256 d8df772d5553ab12bfb4b755dfcb80574536cd9091c326625493d10040934c78 files/di
 MD5 c07f06c90922520867329bd3a262e0d2 files/digest-libwww-5.4.0-r5 545
 RMD160 4bc82afdba6774f1d3252af59666f05d01bf39ca files/digest-libwww-5.4.0-r5 545
 SHA256 d8df772d5553ab12bfb4b755dfcb80574536cd9091c326625493d10040934c78 files/digest-libwww-5.4.0-r5 545
+MD5 c07f06c90922520867329bd3a262e0d2 files/digest-libwww-5.4.0-r6 545
+RMD160 4bc82afdba6774f1d3252af59666f05d01bf39ca files/digest-libwww-5.4.0-r6 545
+SHA256 d8df772d5553ab12bfb4b755dfcb80574536cd9091c326625493d10040934c78 files/digest-libwww-5.4.0-r6 545
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEnpjvKolR564NvWYRAoDdAJ0SGpN9wfffPq92WRo3ykTrGV0IDACglbB1
+Jr/CTPZzLiEVqW5pH6yLpr4=
+=OSjB
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libwww/files/digest-libwww-5.4.0-r6 b/net-libs/libwww/files/digest-libwww-5.4.0-r6
new file mode 100644
index 000000000000..7a45b56e4053
--- /dev/null
+++ b/net-libs/libwww/files/digest-libwww-5.4.0-r6
@@ -0,0 +1,6 @@
+MD5 dcaddf44692252045090584a7d63082c libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+RMD160 c15263ce045333f03a6f655ff3aaaf0dd14eac35 libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+SHA256 a2e64a286c691075df952763de38bb5f5ad3611d089d3b8b9c8d7c2d2b7d1bbb libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+MD5 c3734ca6caa405707e134cc8c6d7e422 w3c-libwww-5.4.0.tgz 1129121
+RMD160 12e55ecb2435f9048d627e56f8ae60d4c246648b w3c-libwww-5.4.0.tgz 1129121
+SHA256 64841cd99a41c84679cfbc777ebfbb78bdc2a499f7f6866ccf5cead391c867ef w3c-libwww-5.4.0.tgz 1129121
diff --git a/net-libs/libwww/files/libwww-5.4.0-mysql-4.0.patch b/net-libs/libwww/files/libwww-5.4.0-mysql-4.0.patch
new file mode 100644
index 000000000000..ad7d91676bf6
--- /dev/null
+++ b/net-libs/libwww/files/libwww-5.4.0-mysql-4.0.patch
@@ -0,0 +1,51 @@
+--- old/Library/src/HTSQL.c	2005-03-18 15:54:48.170275368 +0100
++++ w3c-libwww-5.4.0/Library/src/HTSQL.c	2005-03-18 17:11:38.895338616 +0100
+@@ -182,11 +182,25 @@
+ {
+     if (me && me->host) {
+ 	HTTRACE(SQL_TRACE, "SQL connect. Open a link to server `%s\'\n" _ me->host);
++#if MYSQL_VERSION_ID>=32200
++	if (!mysql_init(&(me->server))) {
++		return NO;
++	}
++#endif
++
++#if MYSQL_VERSION_ID>=40027
++	if ((me->psvr = mysql_real_connect(&(me->server), me->host,
++				      me->user ? me->user : "",
++				      me->password ? me->password : "",
++				      "", 0 , 0 , 0)) == NULL) {
++#else
++		
+ 	if ((me->psvr = mysql_connect(&(me->server), me->host,
+ 				      me->user ? me->user : "",
+ 				      me->password ? me->password : "")) == NULL) {
+-	    HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _ 
+-			mysql_error(&me->server) _ mysql_errno(&me->server));
++#endif
++	    HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _
++		        mysql_error(&me->server) _ mysql_errno(&me->server));
+ 	    return NO;
+ 	}
+ 	return YES;
+@@ -230,6 +244,7 @@
+ PUBLIC BOOL HTSQL_selectDB (HTSQL * me, const char * db)
+ {
+     BOOL created = NO;
++    char query[1024];
+     if (me && me->psvr && db) {
+ 	HTTRACE(SQL_TRACE, "SQL select.. Database `%s\'\n" _ db);
+ 	me->db = NULL;
+@@ -240,7 +255,12 @@
+ 
+ 	    /* If the database couldn't be found then create a new one */
+ 	    if (err == 1049) {
++#if MYSQL_VERSION_ID>=40027
++		sprintf (query, "CREATE DATABASE %s", db);
++		if (mysql_query(me->psvr, query) != 0) {
++#else
+ 		if (mysql_create_db(me->psvr, db) < 0) {
++#endif
+ 		    HTTRACE(SQL_TRACE, "SQL error... `%s\', errno %d\n" _ 
+ 					   mysql_error(me->psvr) _ err);
+ 		    return NO;
diff --git a/net-libs/libwww/libwww-5.4.0-r6.ebuild b/net-libs/libwww/libwww-5.4.0-r6.ebuild
new file mode 100644
index 000000000000..e7ddfc09415c
--- /dev/null
+++ b/net-libs/libwww/libwww-5.4.0-r6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r6.ebuild,v 1.1 2006/06/25 14:08:10 vivo Exp $
+
+inherit eutils multilib autotools
+
+MY_P=w3c-${P}
+DESCRIPTION="A general-purpose client side WEB API"
+HOMEPAGE="http://www.w3.org/Library/"
+SRC_URI="http://www.w3.org/Library/Distribution/${MY_P}.tgz
+	mirror://gentoo/libwww-5.4.0-debian-autoconf-2.5.patch.bz2"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="mysql ssl"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+
+DEPEND="${RDEPEND}
+	!dev-libs/9libs
+	>=sys-devel/autoconf-2.13
+	dev-lang/perl"
+
+S=${WORKDIR}/${MY_P}
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-config-liborder.patch
+	epatch "${WORKDIR}"/${P}-debian-autoconf-2.5.patch
+	epatch "${FILESDIR}"/${P}-autoconf-gentoo.diff
+	epatch "${FILESDIR}"/${P}-automake-gentoo.diff	# bug #41959
+	epatch "${FILESDIR}"/${P}-disable-ndebug-gentoo.diff	# bug #50483
+	# http://lists.w3.org/Archives/Public/www-lib/2003OctDec/0015.html
+	# http://www.mysql.gr.jp/mysqlml/mysql/msg/8118
+	epatch "${FILESDIR}"/${P}-mysql-4.0.patch
+	# Fix multiple problems, potentially exploitable (bug #109040)
+	epatch "${FILESDIR}"/${P}-htbound.patch
+	# Fix linking while using --as-needed
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	# Drop Externls rebuild after automake
+	epatch "${FILESDIR}/${P}-noexport.patch"
+	# Mac OS X has no automake 1.4, only 1.6.3
+	epatch "${FILESDIR}/${P}-automake-macos.patch"
+	# Respect users LDFLAGS, bug #126863.
+	epatch "${FILESDIR}/${P}-respectflags.patch"
+
+	eautoreconf || die "autoreconf failed"
+}
+
+src_compile() {
+	if use mysql ; then
+		myconf="--with-mysql=/usr/$(get_libdir)/mysql/libmysqlclient.a"
+	else
+		myconf="--without-mysql"
+	fi
+
+	export ac_cv_header_appkit_appkit_h=no
+	econf \
+		--enable-shared \
+		--enable-static \
+		--with-zlib \
+		--with-md5 \
+		--with-expat \
+		$(use_with ssl) \
+		${myconf} || die "./configure failed"
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+	dodoc ChangeLog
+	dohtml -r .
+}