Fix SQL plugin handling, bug 212471.

Package-Manager: portage-2.1.4.4

diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index c7230eb13d449d6caef314609e49648db9ae5aec..e293eda56efd2bbb67fb10442afce346bad58c45 100644 (file)
--- a/x11-libs/qt-sql/ChangeLog
+++ b/x11-libs/qt-sql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-sql
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.3 2008/03/05 23:25:52 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.4 2008/03/09 15:31:29 ingmar Exp $
+
+  09 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  qt-sql-4.4.0_beta1.ebuild:
+  Fix SQL plugin handling, bug 212471.
 
   05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -qt-sql-4.4.0_rc1.ebuild:

diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest
index a927d2f578b4fb03c5109276f5c2d38886467e0c..56db8b425cd949dde67d8cd6e8e01ffb1db45cad 100644 (file)
--- a/x11-libs/qt-sql/Manifest
+++ b/x11-libs/qt-sql/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST qt-x11-opensource-src-4.4.0-beta1.tar.bz2 95157168 RMD160 fa4105d34e4295e47a76890f6739cf27f99e86a6 SHA1 9e0e2a8902ea0977024c7a64d59a2155386cf7d6 SHA256 3cc2c33956bf10a5019b1d275f4cc2c93326d3c1dfd992d5b4460858f929c38c
-EBUILD qt-sql-4.4.0_beta1.ebuild 1970 RMD160 46f69dc6207ee76db27f0052032213662009220f SHA1 4de8470420fe5454536566334e91c3209dde5aff SHA256 442b02304eef9daecb509b9c65e3369efef71ad7669550df7216daecdc70fa93
-MISC ChangeLog 713 RMD160 f7119de3cf5e315d0194a7a71d971a63c57b0b90 SHA1 dd725ecd09ca7736f13d627f318b1948e42efab8 SHA256 e5f661061a11692ee6db6c1b559a86cace494c9586f5f1014a2b677443087e7f
+EBUILD qt-sql-4.4.0_beta1.ebuild 1998 RMD160 0d74890806484ed6d28473ce165bc507bf423e84 SHA1 6603e52cfe80cda24b899ef94187de459c91e26b SHA256 917018cf6a72a1086716a89dd3002471d8bcad3bd72f424888af38e7d45006c0
+MISC ChangeLog 834 RMD160 76dd6d4a3841b397c48dbe0881180b47c5959380 SHA1 4484326c8087cadf9b06d23249d47f60549b474b SHA256 e346e63fcef805f9babb9cec1cc701999d30a941fdd575df708834ab6cb68b68
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHzyuqB18eXLOpYdkRAoJaAJ4ylHiKKb1MkAzAF8eAlaPUCYiiEQCfZ0o2
-aAmeBZBOHXBBz/RyQLEeFJQ=
-=orDB
+iD8DBQFH1AKrB18eXLOpYdkRAm9XAJ9IVzZ55JOyA2mClyAtGIzNQqdxYQCgmqcS
+i4eoy6j8kvpAsQ3EDlzQjqQ=
+=BINB
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/qt-sql/qt-sql-4.4.0_beta1.ebuild b/x11-libs/qt-sql/qt-sql-4.4.0_beta1.ebuild
index 7e64b1575ac4c65a2dcefbf5cc1c503bc69f0f62..cd30235818e3395698d6ffacee296af755f14a6a 100644 (file)
--- a/x11-libs/qt-sql/qt-sql-4.4.0_beta1.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.4.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.4.0_beta1.ebuild,v 1.1 2008/03/05 23:09:33 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.4.0_beta1.ebuild,v 1.2 2008/03/09 15:31:29 ingmar Exp $
 
 EAPI="1"
 inherit qt4-build
@@ -43,10 +43,10 @@ src_compile() {
        local myconf
        # Don't support sqlite2 anymore
        myconf="${myconf} -no-sql-sqlite2
-               $(qt_use mysql sql-mysql) $(use mysql && echo "-I/usr/include/mysql -L/usr/$(get_libdir)/mysql ")
-               $(qt_use postgres sql-psql) $(use postgres && echo "-I/usr/include/postgresql/pgsql ")
-               $(qt_use sqlite sql-sqlite) $(qt_use sqlite system-sqlite)
-               $(qt_use odbc sql-odbc)
+               $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I/usr/include/mysql -L/usr/$(get_libdir)/mysql ")
+               $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I/usr/include/postgresql/pgsql ")
+               $(qt_use sqlite sql-sqlite plugin) $(qt_use sqlite system-sqlite)
+               $(qt_use odbc sql-odbc plugin)
                $(qt_use qt3support)"
 
        myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr