fixed interix patches

Package-Manager: portage-2.1.6.13/cvs/Linux i686

6 files changed, 53 insertions, 20 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 757f38944d79..03858da51554 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.319 2010/01/14 23:14:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.320 2010/01/15 08:16:21 mduft Exp $
+
+  15 Jan 2010; Markus Duft <mduft@gentoo.org> sqlite-3.6.22.ebuild,
+  +files/sqlite-3.6.22-interix-fixes.patch,
+  +files/sqlite-3.6.22-interix-fixes-amalgamation.patch,
+  -files/sqlite-3.6.22-interix-no-estale.patch,
+  -files/sqlite-3.6.22-interix-utime-s.patch:
+  fixed interix patches for non-amalgamation builds - completely missed
+  those before.
 
   14 Jan 2010; Jeremy Olexa <darkside@gentoo.org> sqlite-3.6.22.ebuild:
   Disable interix patches until bug 300940 is resolved. Sorry.
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 4606586256fc..250f2b4dfdac 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -4,8 +4,8 @@ AUX sqlite-2.8.15-alignement-fix.patch 538 RMD160 12407bbe5f1bcae243d4247b43bf63
 AUX sqlite-2.8.16-multilib.patch 4038 RMD160 0e074a3ebac7c188dbbf9b86be87a79e0c23390a SHA1 8d38fd5820fd1037b35194d33666be19dcce9e98 SHA256 4ccbef245ea50f317e34bad5ed07e6917fc08d718c6e57884255799980d6e765
 AUX sqlite-3.6.19-icu.test.patch 421 RMD160 a0eb98660981853c0e46c34935cb75721a712c59 SHA1 a01106d425106a02721c15cf314db825f2bb7ca6 SHA256 532f8bbb0366a3f51975c3d2a719b9e4b101b30da07df75f107f87f42d260c59
 AUX sqlite-3.6.20-fts3.patch 1962 RMD160 2a772fccbbc5ad9f9fef65dbc86b83bb686976a9 SHA1 58818059424bc083e9c6604835990e7e2d1614b9 SHA256 b34f443de69deded1f849f0b74f8cacff74ae173be320f44c0c5b89fcbf445a8
-AUX sqlite-3.6.22-interix-no-estale.patch 322 RMD160 087694ad2fad6db97993e8f6b5fb894d3a02024a SHA1 19a4540df56a0264503f104c9ef52da841bbc023 SHA256 95f52a8d05163bfd5c752af4326e18f6e01bdf1077dda37584a8ddd319f94be6
-AUX sqlite-3.6.22-interix-utime-s.patch 399 RMD160 13d00371f80285480474323ff0e317fa93e078d5 SHA1 69e5f04fca69b287043f85dc20a0681c19c28e52 SHA256 3288fc27fc5e26c14eef386a3a1dee9c7e513975dc493b47cee53bdce2fb865b
+AUX sqlite-3.6.22-interix-fixes-amalgamation.patch 717 RMD160 dfae5e2d22cddad5a2d375d4bbce639bc1da805e SHA1 c62fd67d3f32120c86d60299c426199169183107 SHA256 86995c345c3a51e396a4d520031231d7f76384e953829b58f9e9195ccb7a825b
+AUX sqlite-3.6.22-interix-fixes.patch 614 RMD160 0492235d52c003620a84888c36541bd8f40b44d2 SHA1 48cacb6fcd220cf1875d1fc5c640ee9cd5b3dd2f SHA256 1990fca1660bf0781875dbc699078c9eac54a643e4fece82faf765f7ccf8aaad
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
 DIST sqlite-3.6.19.tar.gz 2942005 RMD160 119db76399eca04f21051c6ff156ccbb0c8d35b5 SHA1 1f85a324edfb42ec00bb6dbbec5a178346c950ee SHA256 7d8649c44fb97b874aa59144faaeb2356ec1fc6a8a7baa1d16e9ff5f1e097003
 DIST sqlite-3.6.20.tar.gz 2965878 RMD160 d08cb8d39526ca3a85d4bc2dba6ba88ac62211c2 SHA1 8e50d1bdab6ab7dbc9c6398cc4ef4d709b114528 SHA256 c172ce97dc7201f38acdff22df467e1514e7225b88c636145e72a66a4ca6d07d
@@ -24,6 +24,6 @@ EBUILD sqlite-3.6.19.ebuild 2968 RMD160 8d6939e082cca47993fa9d0794dcca8ae1271579
 EBUILD sqlite-3.6.20-r1.ebuild 3264 RMD160 5b307fd1d81f02fad1b29aa86b9cd57287a27492 SHA1 9974c58b76e002da9e225db1bffa4d1e61b8f383 SHA256 fa93f73e495b803aff8525db5a2fc7a2b4a0040eaaacd3a1cca7f5ef8679c09e
 EBUILD sqlite-3.6.20.ebuild 2934 RMD160 c9b77defb3974599eb40056dbdc4c4512d943f62 SHA1 3693dbd197e3bdcb28fd8d97b335247200e357ef SHA256 b909bb05a61eff9961a16f0572ff3c607ee2486a48d1bd332effeb24300bc4bb
 EBUILD sqlite-3.6.21.ebuild 2917 RMD160 a53b7637c143336397c584978df85a3aee5510a6 SHA1 e3ed836cf124bc61456736e11158c64e3beb41da SHA256 e0818b7327097126ed8128a2ff756b33301179004237eab7960addb14e4a903a
-EBUILD sqlite-3.6.22.ebuild 3642 RMD160 03aaeb0b76e22ea6aeb00df54e42767a665ab699 SHA1 58b42293041ea55634b47fdeb7b729b3a8b6af92 SHA256 80d4eb2a65b49376307559a725b3b8ed1925e9c10b1f797d6059a620925db620
-MISC ChangeLog 43683 RMD160 7881580e191142af621223d098eb95400aa70273 SHA1 783ed2b050c2d5ec14481d8d3b970d270f1023f2 SHA256 8ddb303b452f4521f39d67e03e5e81f44c673a01dac31ad7727c5cb27ef39c21
+EBUILD sqlite-3.6.22.ebuild 3686 RMD160 6f868fd97e29cec935b18f186ee33784558b2b05 SHA1 0d7446b41d05c5cf3ca51f2f118d5203eb0bf393 SHA256 be716ea0cb98ec713880bc085a7f62d797ef8b02cfc7db7d6568ea2d54e2de6f
+MISC ChangeLog 44032 RMD160 414f352f49dcfc892a1b5d88dd1a34a0f78a92f4 SHA1 1eee9937b907c40bdff3b7f26c07f5913da9acdb SHA256 b8fbce4216db1ab63dc466054ea482db141b4af1b38896a569afb10aeefa107d
 MISC metadata.xml 725 RMD160 cf12436b1fcf3770ae5a98d76375d3e02c689f1e SHA1 28614567476728a406a6c61414971022bfd4862f SHA256 a8e78c25506cdb2136062be0ea3cb8974c3e416b3d1234907d312ce2feb20dbf
diff --git a/dev-db/sqlite/files/sqlite-3.6.22-interix-utime-s.patch b/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes-amalgamation.patch
index 2018c935ee69..cc087a83d100 100644
--- a/dev-db/sqlite/files/sqlite-3.6.22-interix-utime-s.patch
+++ b/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes-amalgamation.patch
@@ -1,3 +1,15 @@
+--- sqlite-3.6.22.orig/sqlite3.c	2010-01-13 22:28:39 -0800
++++ sqlite-3.6.22/sqlite3.c	2010-01-13 22:36:25 -0800
+@@ -21915,7 +21915,9 @@
+   case ENODEV:
+   case ENXIO:
+   case ENOENT:
++#ifdef ESTALE
+   case ESTALE:
++#endif
+   case ENOSYS:
+     /* these should force the client to close the file and reconnect */
+     
 diff -ru sqlite-3.6.22.orig/sqlite3.c sqlite-3.6.22/sqlite3.c
 --- sqlite-3.6.22.orig/sqlite3.c	2010-01-14 15:20:11 +0100
 +++ sqlite-3.6.22/sqlite3.c	2010-01-14 15:21:25 +0100
diff --git a/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes.patch b/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes.patch
new file mode 100644
index 000000000000..dae98fd653a0
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes.patch
@@ -0,0 +1,22 @@
+diff -ru sqlite-3.6.22.orig/src/os_unix.c sqlite-3.6.22/src/os_unix.c
+--- sqlite-3.6.22.orig/src/os_unix.c	2010-01-15 09:00:06 +0100
++++ sqlite-3.6.22/src/os_unix.c	2010-01-15 09:01:42 +0100
+@@ -436,7 +436,9 @@
+   case ENODEV:
+   case ENXIO:
+   case ENOENT:
++#ifdef ESTALE
+   case ESTALE:
++#endif
+   case ENOSYS:
+     /* these should force the client to close the file and reconnect */
+     
+@@ -1862,7 +1864,7 @@
+     pFile->locktype = locktype;
+ #if !OS_VXWORKS
+     /* Always update the timestamp on the old file */
+-    utimes(zLockFile, NULL);
++    utime(zLockFile, NULL);
+ #endif
+     return SQLITE_OK;
+   }
diff --git a/dev-db/sqlite/files/sqlite-3.6.22-interix-no-estale.patch b/dev-db/sqlite/files/sqlite-3.6.22-interix-no-estale.patch
deleted file mode 100644
index 79b06387d245..000000000000
--- a/dev-db/sqlite/files/sqlite-3.6.22-interix-no-estale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- sqlite-3.6.22.orig/sqlite3.c	2010-01-13 22:28:39 -0800
-+++ sqlite-3.6.22/sqlite3.c	2010-01-13 22:36:25 -0800
-@@ -21915,7 +21915,9 @@
-   case ENODEV:
-   case ENXIO:
-   case ENOENT:
-+#ifndef __INTERIX
-   case ESTALE:
-+#endif
-   case ENOSYS:
-     /* these should force the client to close the file and reconnect */
-     
diff --git a/dev-db/sqlite/sqlite-3.6.22.ebuild b/dev-db/sqlite/sqlite-3.6.22.ebuild
index 45fb2d0a689e..f4449b132612 100644
--- a/dev-db/sqlite/sqlite-3.6.22.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.22.ebuild,v 1.8 2010/01/14 23:14:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.22.ebuild,v 1.9 2010/01/15 08:16:21 mduft Exp $
 
 EAPI="2"
 
@@ -36,8 +36,11 @@ src_prepare() {
 		rm -f test/like.test
 	fi
 
-#	epatch "${FILESDIR}"/${P}-interix-no-estale.patch
-#	epatch "${FILESDIR}"/${P}-interix-utime-s.patch
+	if use tcl || use test; then
+		epatch "${FILESDIR}"/${P}-interix-fixes.patch
+	else
+		epatch "${FILESDIR}"/${P}-interix-fixes-amalgamation.patch
+	fi
 
 	epunt_cxx
 	elibtoolize # for MiNT