Revbump to fix firebird linking wrt bug #326473

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 83 insertions, 2 deletions

diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index 38e558c83b84..f849657d47ec 100644
--- a/x11-libs/qt-sql/ChangeLog
+++ b/x11-libs/qt-sql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-sql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.84 2010/06/24 17:37:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.85 2010/07/01 21:11:52 hwoarang Exp $
+
+*qt-sql-4.6.3-r2 (01 Jul 2010)
+
+  01 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
+  +qt-sql-4.6.3-r2.ebuild:
+  Revbump to fix firebird linking wrt bug #326473
 
   24 Jun 2010; Markos Chandras <hwoarang@gentoo.org> -qt-sql-4.6.1.ebuild:
   Drop Qt-4.6.1
diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest
index 6b267c22562e..b0bb2d7af2e8 100644
--- a/x11-libs/qt-sql/Manifest
+++ b/x11-libs/qt-sql/Manifest
@@ -6,6 +6,7 @@ DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eed
 EBUILD qt-sql-4.5.3.ebuild 2262 RMD160 a9f674e642babdbb6b05004210d0976241dfadb6 SHA1 0653ec440d496472ded700da69868efd6761d274 SHA256 d16c270e521845b881f4a79ef4c4690dda602208a0b07adfd358909c8604a82b
 EBUILD qt-sql-4.6.2.ebuild 2390 RMD160 17e81e8882adf3963a08aa168094114ba70eea9e SHA1 9bef3ba07593b12ae789a54cdb3fd64b286fc878 SHA256 2a47efe210f5e7054463cd9067ae688e700cefd640cf6327d3d3c8b4ef862dd0
 EBUILD qt-sql-4.6.3-r1.ebuild 2493 RMD160 a2d8a7ed26ac2115a1ec3d564c75d5502c95b632 SHA1 1992a0e2bc0582bdbad8ef3158520866d2728211 SHA256 d39174b82cf5297c9aa0631c76dd012e43fc8c4ced239d7f0b82c7ad5acbaa97
+EBUILD qt-sql-4.6.3-r2.ebuild 2532 RMD160 9a6df7ed56017d6d3d14d4eda08caed378a7943a SHA1 a21dbe63e4061a092006f8f1b727e749e82e8f13 SHA256 581ae3ddea2dc6a7c15fb7199c299c30755253f9b709b2c08cfd749c1a229aba
 EBUILD qt-sql-4.6.3.ebuild 2393 RMD160 1a233d924cd168b8cac082e2bcdb68d9791bdddd SHA1 6351c5ee720bbf835ef4f40b62e2d27e3eaf8634 SHA256 60b89e87fc6bc17eb52216d7f10bbf9c8c904520631d0bc63bb8ba846057c48a
-MISC ChangeLog 10487 RMD160 78aed92e3de9f84368b48d09fb2a44b6d3def44a SHA1 60d24744bdb0fdf45404ef30db64d70d0b2d2fa6 SHA256 2fea677e2860b4110d41348c5e6866b52716b939617167ba908ea97f9558ac18
+MISC ChangeLog 10650 RMD160 73ace7b81635baeea9d758743718ad16c0af0bef SHA1 2f442a906a04d82e96254f45439b4c67df8e992c SHA256 62aa588a3089aa997629322e6bbc4c059d9b11f768bc2a584e330c241309099c
 MISC metadata.xml 374 RMD160 b7ac160dba2bb16c50bc33127bbdb9e008ca06d1 SHA1 150e4b08e7b2e2df1b24c8f89f884dc011d4576f SHA256 eb90ef78730901ab4775e873645ce764411c44e69517deb33f2130ec202c559f
diff --git a/x11-libs/qt-sql/qt-sql-4.6.3-r2.ebuild b/x11-libs/qt-sql/qt-sql-4.6.3-r2.ebuild
new file mode 100644
index 000000000000..218f544b1dba
--- /dev/null
+++ b/x11-libs/qt-sql/qt-sql-4.6.3-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2010 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.6.3-r2.ebuild,v 1.1 2010/07/01 21:11:52 hwoarang Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The SQL module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~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}[aqua=,debug=,qt3support=]
+	firebird? ( dev-db/firebird )
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql-base )
+	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"
+
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
+)
+
+pkg_setup() {
+	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 \""
+		die "Enable at least one SQL driver."
+	fi
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	qt4-build_src_prepare
+
+	sed -e '/pg_config --libs/d' -i "${S}"/configure \
+		|| die "sed to fix postgresql usage in ./configure failed"
+}
+
+src_configure() {
+	# Don't support sqlite2 anymore
+	myconf="${myconf} -no-sql-sqlite2
+		$(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
+		-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"
+
+	qt4-build_src_configure
+}