qt-4.8.0: version bump, masked.

ebuilds re-based on 4.7.4

keeping them masked because qt-assistant doesn't build
seems related to qt-webkit, same symptoms as upstream bug 20236
https://bugreports.qt.nokia.com/browse/QTBUG-20236

2 files changed, 16 insertions, 27 deletions

diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest
index 7121476f..7e4693ae 100644
--- a/x11-libs/qt-sql/Manifest
+++ b/x11-libs/qt-sql/Manifest
@@ -1,7 +1,7 @@
 AUX qt-4.6-master-nolibx11.patch 1201 RMD160 54cd69c157b4624f687dcd05fa49c659973531c7 SHA1 1a320131804aba3a441d07dff9414a1b0d799125 SHA256 25a7f06997fdc7fc642d945fec279b62a13505764ea15f7bd77518e08825e4a8
-DIST qt-everywhere-opensource-src-4.8.0-rc1.tar.gz 238678355 RMD160 92e9f1ff54edbce3f1e766602f1c41068576b133 SHA1 95812c27e66908e1e649f292609482a54d17c7d2 SHA256 f2364ecb8c657be7728e347ba83ad4c7234e1938b6966bacf6f422cdd782ec5d
+DIST qt-everywhere-opensource-src-4.8.0.tar.gz 238580694 RMD160 7506dce7743215481fd9fe56920b8a47f07a112e SHA1 2ba35adca8fb9c66a58eca61a15b21df6213f22e SHA256 9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e
 EBUILD qt-sql-4.7.9999.ebuild 2244 RMD160 758683177c2cf30dc2a3ebc661de4f133e56a717 SHA1 43148792969a5d4a5a360b28160be7c3bba4b3ad SHA256 2733a401b70e5c8f2909004f17fc6453728bdea14781515a08806a417649bddd
-EBUILD qt-sql-4.8.0_rc1.ebuild 2449 RMD160 443a5a97fa9b0fe0946175091f49a89e3c829aea SHA1 c50d122eb001bdde231f7b9ea11ad5a95bfd926f SHA256 4b4327db1d1fddde070e46712ba917758ff0311558a9b9aaab8483af4fe47d65
+EBUILD qt-sql-4.8.0.ebuild 2494 RMD160 68e1949fb7b7636ad5c594439a913536dd614a8e SHA1 682b455ef8192544923878114e35ca224bf93228 SHA256 386a9c686cc175e0281578754f34123107596ac387188b43b061ee820d58e197
 EBUILD qt-sql-4.8.9999.ebuild 2220 RMD160 c4721ec0b5e418457c4a6bd178135ae6577ae72d SHA1 7646bb79a0cd800ce34c9a4b10922718035ca582 SHA256 5076e8a9c4b955c71d072b150277492baf91051575d94c9bf138d0a973fe0381
 EBUILD qt-sql-4.9999.ebuild 2235 RMD160 fc486df356c98c60bd3b3d938fbc28ad156e4b22 SHA1 d1bbb90a30d5b08989d91d2d637fa499a47686cb SHA256 4da418e4cad99aafea3bf8943dc55f1a8ba5a38734693f90f1acbcf115645a44
 MISC metadata.xml 505 RMD160 c8a09c05b2ac9e644089e0f1646a7806122e728c SHA1 6d8d42dd88275004b99ddea893aa6c6bb8abfe39 SHA256 ba88cdd53713d9956ffe86328b31a1f19d03d91672623cc00ebff7c4fd45b785
diff --git a/x11-libs/qt-sql/qt-sql-4.8.0_rc1.ebuild b/x11-libs/qt-sql/qt-sql-4.8.0.ebuild
index 5c6cc4d0..aac9fb07 100644
--- a/x11-libs/qt-sql/qt-sql-4.8.0_rc1.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.8.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.7.4.ebuild,v 1.1 2011/09/08 09:21:54 wired Exp $
 
 EAPI="3"
 inherit qt4-build
 
 DESCRIPTION="The SQL module for the Qt toolkit"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="firebird freetds iconv mysql odbc postgres qt3support +sqlite"
 
-DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support=]
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
 	firebird? ( dev-db/firebird )
 	freetds? ( dev-db/freetds )
 	mysql? ( virtual/mysql )
@@ -19,18 +19,6 @@ DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support=]
 	sqlite? ( dev-db/sqlite:3 )"
 RDEPEND="${DEPEND}"
 
-QT4_TARGET_DIRECTORIES="src/sql src/plugins/sqldrivers"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-include/Qt/
-include/QtCore/
-include/QtSql/
-include/QtScript/
-src/src.pro
-src/corelib/
-src/plugins
-src/3rdparty
-src/tools"
-
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="src/sql src/plugins/sqldrivers"
 	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
@@ -44,9 +32,10 @@ pkg_setup() {
 		src/3rdparty
 		src/tools"
 
-if ! (use firebird || use freetds || use mysql || use odbc || use postgres || use sqlite ); then
+	if ! ( use firebird || use freetds || use mysql || use odbc || use postgres || use sqlite );
+	then
 		ewarn "You need to enable at least one SQL driver. Enable at least"
-		ewarn "one of these USE flags: \"firebird freetds mysql odbc postgres sqlite \""
+		ewarn "one of these USE flags: \"firebird freetds mysql odbc postgres sqlite tds\"."
 		die "Enable at least one SQL driver."
 	fi
 
@@ -63,20 +52,20 @@ src_prepare() {
 src_configure() {
 	# Don't support sqlite2 anymore
 	myconf="${myconf} -no-sql-sqlite2
-		$(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 mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql ")
+		$(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql ")
 		$(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo '-system-sqlite')
 		$(qt_use odbc sql-odbc plugin)
 		$(qt_use freetds sql-tds plugin)
 		$(qt_use firebird sql-ibase plugin)
 		$(qt_use qt3support)"
 
-	myconf="${myconf} $(qt_use iconv) -no-xkb  -no-fontconfig -no-xrender -no-xrandr
-		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
+	myconf="${myconf} $(qt_use iconv) -no-xkb  -no-fontconfig -no-xrender
+		-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
+		-no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
 		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-xmlpatterns -no-freetype -no-libtiff  -no-accessibility -no-fontconfig
-		-no-glib -no-opengl -no-svg -no-gtkstyle"
+		-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
+		-no-fontconfig -no-glib -no-opengl -no-svg -no-gtkstyle"
 
 	qt4-build_src_configure
 }