Don't rebuild SQLite in src_install().

Package-Manager: portage-14014-svn/cvs/Linux x86_64

4 files changed, 128 insertions, 6 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 564aac98140c..1896a7baea42 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.265 2009/08/10 18:26:10 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.266 2009/08/12 17:03:43 arfrever Exp $
+
+  12 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  sqlite-3.6.17.ebuild, +files/sqlite-3.6.17-fix_installation.patch:
+  Don't rebuild SQLite in src_install().
 
 *sqlite-3.6.17 (10 Aug 2009)
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index f8b27342046e..1b10a9fa083d 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -4,6 +4,7 @@ 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.14.2-fix_alignment.patch 870 RMD160 754a1c9b00ff204e99e11acbdddcfc49af0a4af6 SHA1 8b4c715831b32d739c05f89fe3069f27ffc3e0e0 SHA256 bc42e667c692a436ba06dbb1c724c757f75cae1272d817fcb8517453c633cf38
 AUX sqlite-3.6.16-tkt3922.test.patch 549 RMD160 711f26307a1df64813035831aad3053794a8bf7b SHA1 0a4a633816c89d119db206a0e78a406ca5bf053b SHA256 8be8c9f765a191366abca0c856f6635ffddaccafad95861646052d99c476c3eb
+AUX sqlite-3.6.17-fix_installation.patch 3635 RMD160 8ab60122e4b1fdc64182d7fc86a7516a8cb36a36 SHA1 b6848c7f5fa1787e8d938a7c2bf450d0deefc166 SHA256 ee5f675fecbb392ca13a9fc7bf8ae489d9497951ebacd28d71205e8eb9fce175
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
 DIST sqlite-3.6.14.2.tar.gz 2896850 RMD160 219833d61a2e0bf5fde136528b9725c0589d2491 SHA1 19206a419e39bb2de01ed12c2d95c928e97e7252 SHA256 94a5b9dcc841baeb000971b15c6b66f50add7bc160030de5aea8622db3e7060e
 DIST sqlite-3.6.16.tar.gz 2822505 RMD160 ad354b48bbb0b46ff59c27708bd0a6e7ebebffbb SHA1 70ef5ab724816cd6c755f21e6e9d8a9c6b517045 SHA256 0c6f3889da54767900bd5d434700ab5a289407ebd831d0f689a30bc44afb4dcd
@@ -14,6 +15,6 @@ DIST sqlite_docs_3_6_17.zip 2418652 RMD160 5552d3eace7817ac760db13a92cd323373674
 EBUILD sqlite-2.8.16-r4.ebuild 2691 RMD160 84aeeda2955daa547583a9d995b1baf0de601ab6 SHA1 e33619ca7b88d29bd37e10f54156fd8b0339b8d3 SHA256 b2474871c4299d3e7c947921adfe74f18302903b7f6c2d193b966b56ee8d0981
 EBUILD sqlite-3.6.14.2.ebuild 2299 RMD160 29d0105f277cfbe7e88b5185eb94b4f8947a40cd SHA1 646c18ad222ac6ce33cf5c4ab84cf7a37e87f295 SHA256 988be9e9ff102866685bb1f00ff67a3243a08445f6744fa55132728dcec39383
 EBUILD sqlite-3.6.16.ebuild 2246 RMD160 c529fc882cd21ab7eb8f58aa612bfcec14115aa4 SHA1 9b5ed1404086cc47d672729235a566bc3072feb8 SHA256 d9b0308bcdc42217a4f6401a36d9ca7b4ef02d3a5338c8eb5408f90ad9484d2d
-EBUILD sqlite-3.6.17.ebuild 2254 RMD160 7eb16f84a7880dc4e5141f677771b0a8b0bb85c2 SHA1 f2b76a352e0820520718b81b948ca93827c765e1 SHA256 06aee1e32d72ab0a26e846007eb89449b7c006047fd1acbf3dc2901d4bee4c46
-MISC ChangeLog 36415 RMD160 b6e553b27ee4d08c28224b89236184b560abff92 SHA1 b04e4beeb50dc9fbdf66ee878fc2a5cbf75a7578 SHA256 e6059f83121e015dad9fd4d68f357ab3db6960b4edb42d41fc4d81948fa3b76e
+EBUILD sqlite-3.6.17.ebuild 2304 RMD160 e37734aab16b398fd2a0d4ac9997b48d6f92dfd2 SHA1 189a149d3065889443f298fdacec369e853aa546 SHA256 712887f70c88d8cf7275407a50c9b5357d58b60d31e6dcb50db3d93f569b283d
+MISC ChangeLog 36599 RMD160 4626b8fb5f794ad2242596e5b1841741d203e2a9 SHA1 2e6ca48feb539fe635e89e74a51c79fd39c83498 SHA256 046cb5f93fba1341d163f54c1a3ec433e9af572377da91227df7e52789b532a5
 MISC metadata.xml 577 RMD160 a745dafa141324b8328d6b154f31f1d01dfadd03 SHA1 bb56f3d690313b6fe5aacd5435cfe43cb98c9c7d SHA256 591c8bef421f7fae9a8a0ad17f23cfc44de90f113c39e143adb17ea84925492f
diff --git a/dev-db/sqlite/files/sqlite-3.6.17-fix_installation.patch b/dev-db/sqlite/files/sqlite-3.6.17-fix_installation.patch
new file mode 100644
index 000000000000..2b6c2ab405af
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.6.17-fix_installation.patch
@@ -0,0 +1,116 @@
+https://www.sqlite.org/cvstrac/tktview?tn=4016
+
+--- Makefile.in
++++ Makefile.in
+@@ -683,8 +683,7 @@
+ 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/status.c
+ 
+ sqlite3.h:	$(TOP)/src/sqlite.h.in 
+-	sed -e s/--VERS--/$(RELEASE)/ $(TOP)/src/sqlite.h.in | \
+-	sed -e s/--VERSION-NUMBER--/$(VERSION_NUMBER)/ >sqlite3.h
++	cat $(TOP)/src/sqlite.h.in | tclsh $(TOP)/tool/mksqlite3h.tcl `cat ${TOP}/VERSION` > sqlite3.h
+ 
+ table.lo:	$(TOP)/src/table.c $(HDR)
+ 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/table.c
+--- main.mk
++++ main.mk
+@@ -389,9 +389,7 @@
+ 	awk -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
+ 
+ sqlite3.h:	$(TOP)/src/sqlite.h.in 
+-	sed -e s/--VERS--/`cat ${TOP}/VERSION`/ \
+-	    -e s/--VERSION-NUMBER--/`cat ${TOP}/VERSION | sed 's/[^0-9]/ /g' | $(NAWK) '{printf "%d%03d%03d",$$1,$$2,$$3}'`/ \
+-                 $(TOP)/src/sqlite.h.in >sqlite3.h
++	cat $(TOP)/src/sqlite.h.in | tclsh $(TOP)/tool/mksqlite3h.tcl `cat ${TOP}/VERSION` > sqlite3.h
+ 
+ keywordhash.h:	$(TOP)/tool/mkkeywordhash.c
+ 	$(BCC) -o mkkeywordhash $(OPTS) $(TOP)/tool/mkkeywordhash.c
+--- tool/mksqlite3c.tcl
++++ tool/mksqlite3c.tcl
+@@ -305,36 +305,3 @@
+ 
+ close $out
+ 
+-# This block overwrites the copy of sqlite3.h in the current directory.
+-#
+-# It copies tsrc/sqlite3.h to ./sqlite3.h, adding SQLITE_API in front of the
+-# API functions and global variables as it goes. 
+-#
+-set fd_in [open tsrc/sqlite3.h r]
+-set fd_out [open sqlite3.h w]
+-while {![eof $fd_in]} {
+-  set varpattern {^[a-zA-Z][a-zA-Z_0-9 *]+sqlite3_[_a-zA-Z0-9]+(\[|;| =)}
+-  set declpattern {^ *[a-zA-Z][a-zA-Z_0-9 ]+ \**sqlite3_[_a-zA-Z0-9]+\(}
+-
+-  set line [gets $fd_in]
+-  if {[regexp {define SQLITE_EXTERN extern} $line]} {
+-    puts $fd_out $line
+-    puts $fd_out [gets $fd_in]
+-    puts $fd_out ""
+-    puts $fd_out "#ifndef SQLITE_API"
+-    puts $fd_out "# define SQLITE_API"
+-    puts $fd_out "#endif"
+-    set line ""
+-  }
+-
+-  if {([regexp $varpattern $line] && ![regexp {^ *typedef} $line])
+-   || ([regexp $declpattern $line])
+-  } {
+-    set line "SQLITE_API $line"
+-  }
+-  puts $fd_out $line
+-}
+-close $fd_out
+-close $fd_in
+-
+-
+--- tool/mksqlite3h.tcl
++++ tool/mksqlite3h.tcl
+@@ -0,0 +1,47 @@
++#!/usr/bin/tclsh
++#
++# This script performs processing on src/sqlite.h.in. It:
++#
++#   1) Adds SQLITE_EXTERN in front of the declaration of global variables,
++#   2) Adds SQLITE_API in front of the declaration of API functions,
++#   3) Replaces the string --VERS-- with the current library version, 
++#      formatted as a string (e.g. "3.6.17"), and
++#   4) Replaces the string --VERSION-NUMBER-- with current library version,
++#      formatted as an integer (e.g. "3006017").
++#
++# This script reads from stdin, and outputs to stdout. The current library
++# version number should be passed as the only argument. Example invocation:
++#
++#   cat sqlite.h.in | mksqlite3h.tcl 3.6.17 > sqlite3.h
++#
++
++set zVersion [lindex $argv 0]
++set nVersion [eval format "%d%03d%03d" [split $zVersion .]]
++
++while {![eof stdin]} {
++  set varpattern {^[a-zA-Z][a-zA-Z_0-9 *]+sqlite3_[_a-zA-Z0-9]+(\[|;| =)}
++  set declpattern {^ *[a-zA-Z][a-zA-Z_0-9 ]+ \**sqlite3_[_a-zA-Z0-9]+\(}
++
++  set line [gets stdin]
++
++  regsub -- --VERS--           $line $zVersion line
++  regsub -- --VERSION-NUMBER-- $line $nVersion line
++
++  if {[regexp {define SQLITE_EXTERN extern} $line]} {
++    puts $line
++    puts [gets stdin]
++    puts ""
++    puts "#ifndef SQLITE_API"
++    puts "# define SQLITE_API"
++    puts "#endif"
++    set line ""
++  }
++
++  if {([regexp $varpattern $line] && ![regexp {^ *typedef} $line])
++   || ([regexp $declpattern $line])
++  } {
++    set line "SQLITE_API $line"
++  }
++  puts $line
++}
++
diff --git a/dev-db/sqlite/sqlite-3.6.17.ebuild b/dev-db/sqlite/sqlite-3.6.17.ebuild
index 778a5054e6d6..b2d9deed3037 100644
--- a/dev-db/sqlite/sqlite-3.6.17.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.17.ebuild,v 1.1 2009/08/10 18:26:10 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.17.ebuild,v 1.2 2009/08/12 17:03:43 arfrever Exp $
 
 EAPI="2"
 
@@ -25,9 +25,10 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# note: this sandbox fix is no longer needed with sandbox-1.3+
-	epatch "${FILESDIR}"/sandbox-fix2.patch
+	epatch "${FILESDIR}/sandbox-fix2.patch"
 
-	epatch "${FILESDIR}"/${PN}-3.6.16-tkt3922.test.patch
+	epatch "${FILESDIR}/${PN}-3.6.16-tkt3922.test.patch"
+	epatch "${FILESDIR}/${P}-fix_installation.patch"
 
 	epunt_cxx
 }