Fix up sqlite and sqlite3 use flags to pull in proper dependencies and use proper config options to build proper plugins (from bug #156123)

Package-Manager: portage-2.1.2_rc2-r5

3 files changed, 19 insertions, 12 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index be0f0ab7e6d4..12363a71b2f7 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.396 2006/12/04 17:51:27 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.397 2006/12/04 18:18:50 caleb Exp $
+
+  04 Dec 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.2.ebuild:
+  Fix up sqlite and sqlite3 use flags to pull in proper dependencies and use
+  proper config options to build proper plugins (from bug #156123)
 
   04 Dec 2006; Caleb Tennis <caleb@gentoo.org> -qt-3.3.6-r1.ebuild,
   -qt-3.3.6-r2.ebuild, -qt-3.3.6-r3.ebuild:
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index d727944e3648..6e91dbff0cf0 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -137,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 7122 RMD160 09ce4ff84505f79aa24f20cddd41be592fbfa702 SHA1 99f681f713efc86c4a2c1929b9d4701db9da29cd SHA256 16cf86918f888e046f90956cf4102988020148d95ad8f73ce9b13b474d183e5c
-MD5 d9c0e43cfecf9e8b9e6b31ad4c889dc5 qt-4.2.2.ebuild 7122
-RMD160 09ce4ff84505f79aa24f20cddd41be592fbfa702 qt-4.2.2.ebuild 7122
-SHA256 16cf86918f888e046f90956cf4102988020148d95ad8f73ce9b13b474d183e5c qt-4.2.2.ebuild 7122
-MISC ChangeLog 22067 RMD160 3ced828f9fc34561b2d511a676a46afc0b1e28a0 SHA1 2079f283df6bc7d1becaa01176b08f2654d3b5bc SHA256 c0f116f62dc07946da275cbaebc0d5fe4beff08daf243b8eb077bec9bc0d51f7
-MD5 e2dda33492a8d40505581c3331564d5a ChangeLog 22067
-RMD160 3ced828f9fc34561b2d511a676a46afc0b1e28a0 ChangeLog 22067
-SHA256 c0f116f62dc07946da275cbaebc0d5fe4beff08daf243b8eb077bec9bc0d51f7 ChangeLog 22067
+EBUILD qt-4.2.2.ebuild 7301 RMD160 4531cda1e20e54e56dfa4e56b19d138fb1e3eaa4 SHA1 acfe59c2c7047f23f688d81856ec16317227edf8 SHA256 8f4dda0665d94a87a29ac5511b5e1ad09443d3e8053fbd7a45ffa48bbbd2043e
+MD5 e89cda99c0bc3f7722b9542661abbaae qt-4.2.2.ebuild 7301
+RMD160 4531cda1e20e54e56dfa4e56b19d138fb1e3eaa4 qt-4.2.2.ebuild 7301
+SHA256 8f4dda0665d94a87a29ac5511b5e1ad09443d3e8053fbd7a45ffa48bbbd2043e qt-4.2.2.ebuild 7301
+MISC ChangeLog 22276 RMD160 77ec4f2672c1e2dd254c4d0b2e107c274df7c858 SHA1 ce1d5b02c4f5542ce1e43461c330dc5046f3506f SHA256 28de3f164d2bacfdb4b3d01ac7e97b5c902e6edf2c5698a1e208cae256dd0de4
+MD5 c44fa74998f9f7b4cf72c4cf1f6bc9c3 ChangeLog 22276
+RMD160 77ec4f2672c1e2dd254c4d0b2e107c274df7c858 ChangeLog 22276
+SHA256 28de3f164d2bacfdb4b3d01ac7e97b5c902e6edf2c5698a1e208cae256dd0de4 ChangeLog 22276
 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/qt-4.2.2.ebuild b/x11-libs/qt/qt-4.2.2.ebuild
index 0fa372b78ac0..b2e556ab4c38 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.1 2006/12/04 15:40:24 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.2 2006/12/04 18:18:50 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE_INPUT_DEVICES="input_devices_wacom"
 
-IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3 sqlite xinerama zlib ${IUSE_INPUT_DEVICES}"
+IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3 sqlite sqlite3 xinerama zlib ${IUSE_INPUT_DEVICES}"
 
 DEPEND="x11-libs/libXrandr
 	x11-libs/libXcursor
@@ -36,6 +36,8 @@ DEPEND="x11-libs/libXrandr
 	odbc? ( dev-db/unixODBC )
 	mysql? ( virtual/mysql )
 	firebird? ( dev-db/firebird )
+	sqlite3? ( =dev-db/sqlite-3* )
+	sqlite? ( =dev-db/sqlite-2* )
 	opengl? ( virtual/opengl virtual/glu )
 	postgres? ( dev-db/libpq )
 	cups? ( net-print/cups )
@@ -157,7 +159,8 @@ src_compile() {
 	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
 	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/pgsql" || myconf="${myconf} -no-sql-psql"
 	use firebird	&& myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
-	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
+	use sqlite3	&& myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
+	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2"
 	use odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
 
 	use dbus	&& myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"