added interix patch which does not have ESTALE. reported and accepted (in vcs) upstream.

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

4 files changed, 33 insertions, 18 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 69848b524723..06a6c59e522a 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.376 2011/07/01 21:44:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.377 2011/07/15 14:04:41 mduft Exp $
+
+  11 Jul 2011; Markus Duft <mduft@gentoo.org> sqlite-3.7.7.1.ebuild,
+  +files/sqlite-3.7.7.1-interix-amalgamation.patch:
+  added build fix for systems missing ESTALE (interix)
 
 *sqlite-3.7.7.1 (01 Jul 2011)
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 542f5462f43e..89b00413206e 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX maketcllib.sh 879 RMD160 6d9a0e79a79d5a2efd6074e6b439d4634600980e SHA1 d5bb6054d3c9a4132c92bd8c172a547bf2cc9d85 SHA256 e101ed11d908bfb7f57519a99674160b0273d6500d191f758f8a0d1e6ed78120
 AUX sqlite-2.8.15-alignement-fix.patch 538 RMD160 12407bbe5f1bcae243d4247b43bf63ce0e8becea SHA1 d67a8bb2de26b1d6b7222175bd7f69d28afffb1e SHA256 f61f2f36fed61438d13dbb09902078ef11f0c3e8c8a119f84030689a2f2add8f
@@ -8,6 +8,7 @@ AUX sqlite-3.6.22-dlopen.patch 452 RMD160 e9c7e77f3a7410e5b05f17bb6dfacf0270c1e0
 AUX sqlite-3.6.22-interix-fixes-amalgamation.patch 717 RMD160 dfae5e2d22cddad5a2d375d4bbce639bc1da805e SHA1 c62fd67d3f32120c86d60299c426199169183107 SHA256 86995c345c3a51e396a4d520031231d7f76384e953829b58f9e9195ccb7a825b
 AUX sqlite-3.7.5-SQLITE_OMIT_WAL.patch 2245 RMD160 76eda21a44ad63f5fab3b9508eda51ed76a1f947 SHA1 4b350d04581f49d72890ddc2db82819383460de6 SHA256 e4647b99b1cfac9576918643e9cb6b66898d02564f4ad832d558f4c46995daa3
 AUX sqlite-3.7.5-utimes.patch 830 RMD160 168a123fedcd50db1141ae32f6bb647349f9e65a SHA1 e6f541f3748a19b8649d4b1e7f496e540128219d SHA256 e25d602aa72c5b607f82900598b61493d556ed202df2c7fe4e15072dd556e6c6
+AUX sqlite-3.7.7.1-interix-amalgamation.patch 564 RMD160 4240fd1db922973a3b196527f5ede63df35afb50 SHA1 59a8863c9194707e2356d94a25e06ca1c08769b1 SHA256 debd37c7f6413c6c1027cd07e5e8a5f3b89c50e15198e3619cdbc266d63ec0dc
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
 DIST sqlite-autoconf-3070500.tar.gz 1551070 RMD160 8bec6a7bfec1c8786dde0586916b0b99e509b2ce SHA1 4e1338497b8da50b84307191bb3418e9ec5715d7 SHA256 cb5b86926ec9f65882b2dddd244f2d620337d911ec73411863f77e48cf6a2f94
 DIST sqlite-autoconf-3070600.tar.gz 1721938 RMD160 81a5f55326c932f8bb9709a305621d54f181cfa7 SHA1 6b17cf7610437706fec6e21f29933c1ffd3a13e0 SHA256 c56417140f32f495827c90565a25c1b1068d1117ae368ea6ab58c01875d78771
@@ -27,23 +28,13 @@ EBUILD sqlite-3.7.5.ebuild 4532 RMD160 18abfd839a28f35c5450dded81bd37b1fff09a65
 EBUILD sqlite-3.7.6.2.ebuild 4607 RMD160 56c04883de1de0745dd52427a6c2dd4de02f7098 SHA1 f6119998a61d78747fdd9fe2bccdb9b37e6adf2e SHA256 2db1cbd014601f9e97641494a596441f0844a2215e8b9017705a566de7c53294
 EBUILD sqlite-3.7.6.3.ebuild 4601 RMD160 beb41a057ca808d80ea3e2637e0fa2d555db6e24 SHA1 dfa22e4f06435cdd1d279f1fd7fc56f45a6e0577 SHA256 84f82201c7c5ae6e3c6e351dcfa8717fa74270cc1e090242f3ead0d81d92134b
 EBUILD sqlite-3.7.6.ebuild 4502 RMD160 c6ea1fd15a58d48778220f0cbab730b7e095de10 SHA1 f772db0f3ced29d2552aaea77a679718847e59fb SHA256 47d0f3b535c95e50b61e2e7a7fe5645f451af84565265556c9a07152c0061bb7
-EBUILD sqlite-3.7.7.1.ebuild 4405 RMD160 a088cd76aeca74cf8e74e6b91fa365c6aae72a65 SHA1 9366460db643fdf87f55bd9a7f7eb1793a99e8ae SHA256 13b27df20d9d73454db424808fd0aa16cd099be71eb7988332e8f6c3832f82fc
-MISC ChangeLog 51859 RMD160 8e9318a233015e7016150c7e935cda700a5b47d5 SHA1 2bf3082f6d6dace407aaf2fcd4a8b9d9bc1856e2 SHA256 d7a1462ed4f9116b226642fd3668be0f9323764b7dfbedda0dea0ded58aac748
+EBUILD sqlite-3.7.7.1.ebuild 4485 RMD160 0ef718089195cea02c17adf8be916980c2671539 SHA1 48f2da0d4284c4b194d3a7929b0937d2cab62a9c SHA256 92d2163b0c1df3335c87b77749d51f626948a06b588f748cc3d7a4ec46119a41
+MISC ChangeLog 52033 RMD160 45c10a06c89b4f53941a2b33671a5924673fcc20 SHA1 11424a9983f3db2fefef6b6f4843cb8f7b8d9029 SHA256 9d3c7a0c8de5920e72c201f28d09298fa7949807b214c747fea132fe1ec9e5e8
 MISC metadata.xml 1011 RMD160 02768455c7a2f2e980fcd51e16105d1a030a69cf SHA1 98ba789e4120f8d0a1e2f49285f6dbf49e0a35d0 SHA256 4b2dc7fa04d3909cac1f4b764daaddb237e5c4f9a05998d7fd04dc42a5775aae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJODj/OAAoJEPqDWhW0r/LCKWEP/RHJ6Bz2H3oKIGZrbMN4IPzW
-cs7ovCmnXNnq5EkLkbEPv10KIJ8Tf0zoeIPSwV0+7T0X3FOW6PzV2Fsy7orfFIYz
-r3xdxbW+Y+whKBgmvtuAOyIVTQaEy6lwIyRkUvtClFTttYB0N/Pj/7FRuxLXSlJ6
-WAMb1iEMQGmsqR2h/SRqg00v21s5mVScslYJIsIT4lXV5OP0XwLzISObAeQNWqTe
-y7nt2vtVK2tR7Wj/57JSST3YnZwPLYRRy1rcYIxMPFjF7AmKF6O6i6qntDjVAQ1l
-bxWDXFLfscOcRUUO7sNvGH2jRXKXTFxa4ECqXn4PPOBFLErGknClnaGmIcAnA7TX
-WRHCGcy3aqLDXGXEbA/WM7T/h0lmcA2oai/aiknDAotB2vdu1lGpxZP1QTb6JzXv
-wi0zmnKn397/2qrJ0zarYi0IgOHWyYAQHmL0SVCNet5isuWe7nhuDg5N+nflYJ/R
-Mrf8YKmu01qllx2MYnL0TGayD4wOVP1IkPE2oQ7aLi/RQuwnOZWiUWh9XsHCjfta
-Vy+jfnwvykS2U9hyUMv+AFvaJ1QZwU4xDXZDVdd8ux0AYq+B6k37m/plNC7S+t18
-pR2SJB8VDUzrZIxpD+05omiUJXRggzU1y71UdTv0uIf+6YQRdZWa0V2OPCs6I/rO
-z7BN5YIzTm/eV14idhUK
-=RS7X
+iEYEARECAAYFAk4gSQMACgkQaBSIl5HlrrKFKgCdEuOBCRkTWjXG6KZNVP8OfQiH
+7/UAnA997zVGCgg30zlnST1d7PouTa9p
+=yK9Z
 -----END PGP SIGNATURE-----
diff --git a/dev-db/sqlite/files/sqlite-3.7.7.1-interix-amalgamation.patch b/dev-db/sqlite/files/sqlite-3.7.7.1-interix-amalgamation.patch
new file mode 100644
index 000000000000..7f90fd6591c8
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.7.7.1-interix-amalgamation.patch
@@ -0,0 +1,16 @@
+reported and accepted upstream: http://sqlite.org:8080/cgi-bin/mailman/private/sqlite-dev/2011-July/001281.html
+(archives are private ... :( )
+
+diff -ru sqlite-autoconf-3070701.orig/sqlite3.c sqlite-autoconf-3070701/sqlite3.c
+--- sqlite-autoconf-3070701.orig/sqlite3.c	2011-07-07 07:49:38 +0200
++++ sqlite-autoconf-3070701/sqlite3.c	2011-07-07 07:50:46 +0200
+@@ -25143,7 +25143,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 --git a/dev-db/sqlite/sqlite-3.7.7.1.ebuild b/dev-db/sqlite/sqlite-3.7.7.1.ebuild
index 9c4c884bb0bd..50f1c43e07d6 100644
--- a/dev-db/sqlite/sqlite-3.7.7.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.7.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.7.1.ebuild,v 1.1 2011/07/01 21:44:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.7.1.ebuild,v 1.2 2011/07/15 14:04:41 mduft Exp $
 
 EAPI="3"
 
@@ -48,6 +48,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	if amalgamation; then
+		epatch "${FILESDIR}"/${P}-interix-amalgamation.patch
+	fi
+
 	epunt_cxx
 }