diff options
| -rw-r--r-- | x11-libs/qt-sql/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-sql/metadata.xml | 1 | ||||
| -rw-r--r-- | x11-libs/qt-sql/qt-sql-4.6.3-r1.ebuild | 14 |
3 files changed, 12 insertions, 9 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/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 |