Introduce tds use flag. Fixes bug #323515

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

4 files changed, 85 insertions, 3 deletions

diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index 9f1a3738b839..467b8e61afa3 100644
--- a/x11-libs/qt-sql/ChangeLog
+++ b/x11-libs/qt-sql/ChangeLog
@@ -1,6 +1,13 @@
 # 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.80 2010/06/08 12:21:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.81 2010/06/13 09:51:26 hwoarang Exp $
+
+*qt-sql-4.6.3-r1 (13 Jun 2010)
+
+  13 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+  +qt-sql-4.6.3-r1.ebuild:
+  Introduce tds use flag. Fixes bug #323515. Thanks to Rion
+  <rion4ik@gmail.com> for the patch
 
 *qt-sql-4.6.3 (08 Jun 2010)
 
diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest
index 6313af02232d..c68f598a2054 100644
--- a/x11-libs/qt-sql/Manifest
+++ b/x11-libs/qt-sql/Manifest
@@ -7,6 +7,7 @@ DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eed
 EBUILD qt-sql-4.5.3.ebuild 2261 RMD160 71c10b31149c3971ff4eef84762b8e68b2607367 SHA1 de7d0c98138d2e426a3220e5a428b43746c8f1c8 SHA256 babc31e8417b89dc683a91b1a13a181ad6399ab3a10636a4e6cb925da2aa0d39
 EBUILD qt-sql-4.6.1.ebuild 2392 RMD160 0b0c8f25bb22b810c9dad5bd11a4a6e79c17bffb SHA1 a541e1bd51009aac43315bac9b3fef8f047cd348 SHA256 9388b7e8fc4dc9d266893e41c4d441ea894c8208c29bd0f501e0d1d1725a80d8
 EBUILD qt-sql-4.6.2.ebuild 2390 RMD160 5acf77be8dba67813113ba6a3cb96fb035dbeb74 SHA1 9599781a92e10c20cfc338f99a06b3c11ecf8b82 SHA256 aad98523dbbde64a62ab30d8eceab840a3fe4dc6ef241a6e8dc26f46df324006
+EBUILD qt-sql-4.6.3-r1.ebuild 2474 RMD160 dae38cc1baae6aeae31db54ce457f9e1ea768f8b SHA1 48c18ba2e8681b49c863314ed3558954724b7a69 SHA256 d93b070648e9041385dcb555a3807b4ec1902ef2629165543e9f0eac840796ef
 EBUILD qt-sql-4.6.3.ebuild 2395 RMD160 79711a73202ba0c5b306642a695b9664e0fc35e4 SHA1 0299ec66cb2c8b2f995d88f30f8eccf9163731be SHA256 ab414df29a77a61ec8b0ed936a699d5a61587048126d45143645f3a931390b0b
-MISC ChangeLog 9835 RMD160 512dd355d1b73af711cd3ab4a17509fd4b4ef53d SHA1 76ce0dd7860dd7ca6a73d64009da43cd1ae0e5a0 SHA256 2289c0b51e5704a317a0631282edef1a9105268012deb4d7d6b9828ce1ef1116
-MISC metadata.xml 374 RMD160 b7ac160dba2bb16c50bc33127bbdb9e008ca06d1 SHA1 150e4b08e7b2e2df1b24c8f89f884dc011d4576f SHA256 eb90ef78730901ab4775e873645ce764411c44e69517deb33f2130ec202c559f
+MISC ChangeLog 10044 RMD160 eec27cc9901d419b6c03027ac93b4e514abf112e SHA1 cadaab389f72e1c9f10937063376e2feca4e3367 SHA256 a19b8aea130147efb4f0220633800ebdd33c03bb8dc9a754652a5132ecce3eca
+MISC metadata.xml 444 RMD160 d3a54bf7cb533171ad500008e90070096a843828 SHA1 eb362543a0e5187347eaf39a11113bd13eeca861 SHA256 ec0532ee774e47d3d9943ac713fbd8d98ea886dcae7f031e5284c5b8edf9428b
diff --git a/x11-libs/qt-sql/metadata.xml b/x11-libs/qt-sql/metadata.xml
index 753c3c20a9d3..90c827e6848f 100644
--- a/x11-libs/qt-sql/metadata.xml
+++ b/x11-libs/qt-sql/metadata.xml
@@ -6,5 +6,6 @@
 		<flag name='exceptions'>Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
 		<flag name='qt3support'>Enable the Qt3Support libraries for Qt4</flag>
+		<flag name='tds'>Enable support for freetds databases driver</flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-libs/qt-sql/qt-sql-4.6.3-r1.ebuild b/x11-libs/qt-sql/qt-sql-4.6.3-r1.ebuild
new file mode 100644
index 000000000000..517c54b90422
--- /dev/null
+++ b/x11-libs/qt-sql/qt-sql-4.6.3-r1.ebuild
@@ -0,0 +1,73 @@
+# 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-r1.ebuild,v 1.1 2010/06/13 09:51:26 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 iconv mysql odbc postgres qt3support +sqlite tds"
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+	firebird? ( dev-db/firebird )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( virtual/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )
+	tds? ( dev-db/freetds )"
+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 mysql || use odbc || use postgres || use sqlite || use tds ); then
+		ewarn "You need to enable at least one SQL driver. Enable at least"
+		ewarn "one of these USE flags: \"firebird mysql odbc postgres sqlite tds\""
+		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 tds sql-tds 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
+}