--- qt-4.3.1-r2.ebuild	2007-09-17 11:50:35.000000000 +0300
+++ qt-4.3.1-r1.ebuild	2007-09-17 12:05:08.000000000 +0300
@@ -17,7 +17,7 @@
 
 IUSE_INPUT_DEVICES="input_devices_wacom"
 
-IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis nosqlplugins odbc opengl pch png postgres qt3support sqlite sqlite3 ssl tiff 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 qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}"
 
 RDEPEND="x11-libs/libXrandr
 	x11-libs/libXcursor
@@ -193,15 +193,12 @@
 
 	use debug	&& myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
 
-	sqlenable=""
-	use nosqlplugins	&& sqlenable="-qt-sql" || sqlenable="-plugin-sql"
-
-	use mysql	&& myconf="${myconf} ${sqlenable}-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
-	use postgres	&& myconf="${myconf} ${sqlenable}-psql -I/usr/include/postgresql/pgsql" || myconf="${myconf} -no-sql-psql"
-	use firebird	&& myconf="${myconf} ${sqlenable}-ibase -I/opt/firebird/include" || myconf="${myconf} -no-sql-ibase"
-	use sqlite3	&& myconf="${myconf} ${sqlenable}-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use sqlite	&& myconf="${myconf} ${sqlenable}-sqlite2" || myconf="${myconf} -no-sql-sqlite2"
-	use odbc	&& myconf="${myconf} ${sqlenable}-odbc" || myconf="${myconf} -no-sql-odbc"
+	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 -I/opt/firebird/include" || myconf="${myconf} -no-sql-ibase"
+	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"
 	use glib	&& myconf="${myconf} -glib" || myconf="${myconf} -no-glib"