Replace tds use flag with global freetds

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 15 insertions, 12 deletions

diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index 467b8e61afa3..eeaab48727a8 100644
--- a/x11-libs/qt-sql/ChangeLog
+++ b/x11-libs/qt-sql/ChangeLog
@@ -1,6 +1,10 @@
 # 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.81 2010/06/13 09:51:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.82 2010/06/13 17:18:44 hwoarang Exp $
+
+  13 Jun 2010; Markos Chandras <hwoarang@gentoo.org> qt-sql-4.6.3-r1.ebuild,
+  metadata.xml:
+  Replace tds use flag with global freetds
 
 *qt-sql-4.6.3-r1 (13 Jun 2010)
 
diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest
index c68f598a2054..dfd6896906aa 100644
--- a/x11-libs/qt-sql/Manifest
+++ b/x11-libs/qt-sql/Manifest
@@ -7,7 +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-r1.ebuild 2495 RMD160 714ad8d3d1a94f9e0dbd1421c63011b52a764d00 SHA1 8a213193d73793393075171772d888a1b8650a90 SHA256 70321ff940099ea38d86871a40a9c8f2398c184057ffc7dedb4e10ece4362ee0
 EBUILD qt-sql-4.6.3.ebuild 2395 RMD160 79711a73202ba0c5b306642a695b9664e0fc35e4 SHA1 0299ec66cb2c8b2f995d88f30f8eccf9163731be SHA256 ab414df29a77a61ec8b0ed936a699d5a61587048126d45143645f3a931390b0b
-MISC ChangeLog 10044 RMD160 eec27cc9901d419b6c03027ac93b4e514abf112e SHA1 cadaab389f72e1c9f10937063376e2feca4e3367 SHA256 a19b8aea130147efb4f0220633800ebdd33c03bb8dc9a754652a5132ecce3eca
-MISC metadata.xml 444 RMD160 d3a54bf7cb533171ad500008e90070096a843828 SHA1 eb362543a0e5187347eaf39a11113bd13eeca861 SHA256 ec0532ee774e47d3d9943ac713fbd8d98ea886dcae7f031e5284c5b8edf9428b
+MISC ChangeLog 10181 RMD160 b00a4012ea8f10aa4300b1541d483306b1100651 SHA1 7c86b6447fe25e1b9b327afe2c4ccfa47b2d2fc0 SHA256 fc6f55dbc55cd43c403727bd2a9b3c02228389900c6d2da0b8fdf19848a58258
+MISC metadata.xml 374 RMD160 b7ac160dba2bb16c50bc33127bbdb9e008ca06d1 SHA1 150e4b08e7b2e2df1b24c8f89f884dc011d4576f SHA256 eb90ef78730901ab4775e873645ce764411c44e69517deb33f2130ec202c559f
diff --git a/x11-libs/qt-sql/metadata.xml b/x11-libs/qt-sql/metadata.xml
index 90c827e6848f..753c3c20a9d3 100644
--- a/x11-libs/qt-sql/metadata.xml
+++ b/x11-libs/qt-sql/metadata.xml
@@ -6,6 +6,5 @@
 		<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
index 517c54b90422..6a43a6b11aef 100644
--- a/x11-libs/qt-sql/qt-sql-4.6.3-r1.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.3-r1.ebuild,v 1.2 2010/06/13 17:18:44 hwoarang Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -8,15 +8,15 @@ 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"
+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? ( virtual/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	tds? ( dev-db/freetds )"
+	sqlite? ( dev-db/sqlite:3 )"
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="src/sql src/plugins/sqldrivers"
@@ -36,9 +36,9 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if ! (use firebird || use mysql || use odbc || use postgres || use sqlite || use tds ); 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 mysql odbc postgres sqlite tds\""
+		ewarn "one of these USE flags: \"firebird freetds mysql odbc postgres sqlite \""
 		die "Enable at least one SQL driver."
 	fi
 
@@ -59,7 +59,7 @@ src_configure() {
 		$(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 freetds sql-tds plugin)
 		$(qt_use qt3support)"
 
 	myconf="${myconf} $(qt_use iconv) -no-xkb  -no-fontconfig -no-xrender -no-xrandr