A configure patch to ensure usage of system sqlite (bug #156123)

Package-Manager: portage-2.1.2_rc2-r5

4 files changed, 31 insertions, 10 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index dafff49fdbde..836d5ba3c5b1 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.400 2006/12/05 13:13:29 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.401 2006/12/05 13:18:04 caleb Exp $
+
+  05 Dec 2006; Caleb Tennis <caleb@gentoo.org>
+  +files/qt4-sqlite-configure.patch, qt-4.2.2.ebuild:
+  A configure patch to ensure usage of system sqlite (bug #156123)
 
   05 Dec 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.2.ebuild:
   Can just use -confirm-license now instead of saying yes to the prompt
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 8eefc34624b1..bab523ac2761 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -106,6 +106,10 @@ AUX qt4-parisc-linux.diff 1004 RMD160 3fdfdb7cb5acf9a43eae83b8aa549cd2130be3b9 S
 MD5 a0defbda40e1906b6e6dc5c8fe8d9f23 files/qt4-parisc-linux.diff 1004
 RMD160 3fdfdb7cb5acf9a43eae83b8aa549cd2130be3b9 files/qt4-parisc-linux.diff 1004
 SHA256 28ee040bbafd5bf07c47b496ae64ecd76e4ccbaa818e185f7422064db894b2da files/qt4-parisc-linux.diff 1004
+AUX qt4-sqlite-configure.patch 738 RMD160 0797534db076cf47da01f17fe51296300e7db167 SHA1 a4e9df5b17c58d743312abf2d5a57720fa73ba91 SHA256 f7bfbcbe05b44821114eda5d515a2a629d233e8b92e91f4542197d83b8c6e51e
+MD5 341ca0df76ba1dcb9fd0847566055a99 files/qt4-sqlite-configure.patch 738
+RMD160 0797534db076cf47da01f17fe51296300e7db167 files/qt4-sqlite-configure.patch 738
+SHA256 f7bfbcbe05b44821114eda5d515a2a629d233e8b92e91f4542197d83b8c6e51e files/qt4-sqlite-configure.patch 738
 DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a453ea1e SHA1 cb5f452bcdc9d2ed0201481f4b8f152edfda9523 SHA256 4e47251eddb0cef058e1bfd89c3320c03d966eba12760a781c95cf5468bf30b3
 DIST qt-x11-free-3.3.6.tar.bz2 14565843 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 SHA1 bbb075054b8a2923a8a7f5afff1c4c7a8bf5a946 SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae
 DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA1 37b59bb27d62562fcfbf9e32bd74001583060970 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6
@@ -133,14 +137,14 @@ EBUILD qt-4.2.1.ebuild 7901 RMD160 0ca5067fa7e5abc88cf91aa4c662d3dd0b13d056 SHA1
 MD5 0d748095dcbdd4785ae4e10838d3f8bd qt-4.2.1.ebuild 7901
 RMD160 0ca5067fa7e5abc88cf91aa4c662d3dd0b13d056 qt-4.2.1.ebuild 7901
 SHA256 91be57c3a8c1e6376472c5a2aa48bac1845fba83691c0737bd2bdb2294713dab qt-4.2.1.ebuild 7901
-EBUILD qt-4.2.2.ebuild 7294 RMD160 036c17ebd84b7b545981249426649af7541717e1 SHA1 3d3cd472c1958ccf0483b4511247bf2d0d380074 SHA256 a476e38c8b06a23be0bb2a3928e5883619a42f7a8f4a62d6292ffffcdce6e1c6
-MD5 6eac51c48f73c1abc24e7446a1f48393 qt-4.2.2.ebuild 7294
-RMD160 036c17ebd84b7b545981249426649af7541717e1 qt-4.2.2.ebuild 7294
-SHA256 a476e38c8b06a23be0bb2a3928e5883619a42f7a8f4a62d6292ffffcdce6e1c6 qt-4.2.2.ebuild 7294
-MISC ChangeLog 22675 RMD160 1572a3a9297094b7f9fb500b563d80bd65066e07 SHA1 d6988f3d3f186ff0da983b0d01254b9d0e2d23fe SHA256 965bdf21262585921a01a023dd9de7793bbeeed96b6db3c422885099d379be1e
-MD5 e26acb9771f39c3dc543ea82a5c982ff ChangeLog 22675
-RMD160 1572a3a9297094b7f9fb500b563d80bd65066e07 ChangeLog 22675
-SHA256 965bdf21262585921a01a023dd9de7793bbeeed96b6db3c422885099d379be1e ChangeLog 22675
+EBUILD qt-4.2.2.ebuild 7341 RMD160 ef4f991af577e699592518d214c66f3d7d97e76f SHA1 dd4aaa416cb557cf40061faf90759fbf91f19517 SHA256 5dc1ab1924897db3779517378937d9a91a01ad940691f83544fd4cb4b5994c5f
+MD5 97b9b077f89789bdb7101576763d8935 qt-4.2.2.ebuild 7341
+RMD160 ef4f991af577e699592518d214c66f3d7d97e76f qt-4.2.2.ebuild 7341
+SHA256 5dc1ab1924897db3779517378937d9a91a01ad940691f83544fd4cb4b5994c5f qt-4.2.2.ebuild 7341
+MISC ChangeLog 22844 RMD160 310bfe79b814e80c283bc6e464f99266c4c6b119 SHA1 d5f8609118b9a73bf31d200ec91a431ec61a1f3b SHA256 2cefa52c4838a7cdcaeeb0b9feee84faa8da879adb492dd05fd629249cc644c0
+MD5 3a957ad844048de6efcad4d791956d1d ChangeLog 22844
+RMD160 310bfe79b814e80c283bc6e464f99266c4c6b119 ChangeLog 22844
+SHA256 2cefa52c4838a7cdcaeeb0b9feee84faa8da879adb492dd05fd629249cc644c0 ChangeLog 22844
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
diff --git a/x11-libs/qt/files/qt4-sqlite-configure.patch b/x11-libs/qt/files/qt4-sqlite-configure.patch
new file mode 100644
index 000000000000..75b69b624486
--- /dev/null
+++ b/x11-libs/qt/files/qt4-sqlite-configure.patch
@@ -0,0 +1,12 @@
+--- configure.orig	2006-11-26 10:20:41.000000000 +0100
++++ configure	2006-11-26 10:22:49.000000000 +0100
+@@ -3595,8 +3595,8 @@
+                     if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS; then
+                         if [ "$CFG_SQL_sqlite" = "auto" ]; then
+                             CFG_SQL_sqlite=plugin
+-                            QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
+                         fi
++                        QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
+                     else
+                         SQLITE_AUTODETECT_FAILED="yes"
+                         CFG_SQL_sqlite=no
diff --git a/x11-libs/qt/qt-4.2.2.ebuild b/x11-libs/qt/qt-4.2.2.ebuild
index 3b3213944db4..5f8f9534603f 100644
--- a/x11-libs/qt/qt-4.2.2.ebuild
+++ b/x11-libs/qt/qt-4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.5 2006/12/05 13:13:29 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.6 2006/12/05 13:18:04 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -108,6 +108,7 @@ src_unpack() {
 	cd ${S}
 #	epatch ${FILESDIR}/qt4-parisc-linux.diff
 	epatch ${FILESDIR}/qt-4.1.4-sparc.patch
+	epatch ${FILESDIR}/qt4-sqlite-configure.patch
 
 	cd mkspecs/$(qt_mkspecs_dir)
 	# set c/xxflags and ldflags