commit: 570166eb1297564a8986ae4d91c4364a5c4f3483
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 1 16:31:21 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 1 16:31:21 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=570166eb
[dev-qt/qtsql] Remove firebird USE flag.
dev-db/firebird has been masked for removal.
Package-Manager: portage-2.2.10
---
dev-qt/qtsql/qtsql-4.8.6.ebuild | 7 +++----
dev-qt/qtsql/qtsql-4.8.9999.ebuild | 7 +++----
dev-qt/qtsql/qtsql-5.3.1.ebuild | 6 ++----
dev-qt/qtsql/qtsql-5.3.9999.ebuild | 6 ++----
dev-qt/qtsql/qtsql-5.9999.ebuild | 6 ++----
5 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index 6ee8d7a..803a39a 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -14,15 +14,14 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
-IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
+IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
REQUIRED_USE="
- || ( firebird freetds mysql oci8 odbc postgres sqlite )
+ || ( freetds mysql oci8 odbc postgres sqlite )
"
DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
- firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
@@ -38,7 +37,6 @@ QT4_TARGET_DIRECTORIES="
src_configure() {
myconf+="
- $(qt_native_use firebird sql-ibase plugin)
$(qt_native_use freetds sql-tds plugin)
$(qt_native_use mysql sql-mysql plugin) $(use mysql &&
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql
-L${EPREFIX}/usr/$(get_libdir)/mysql")
$(qt_use oci8 sql-oci plugin) $(use oci8 && echo
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
@@ -46,6 +44,7 @@ src_configure() {
$(qt_native_use postgres sql-psql plugin) $(use postgres &&
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
$(qt_use sqlite sql-sqlite plugin) $(use sqlite &&
echo -system-sqlite)
-no-sql-db2
+ -no-sql-ibase
-no-sql-sqlite2
-no-sql-symsql
$(qt_use qt3support)
diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
index 6ee8d7a..803a39a 100644
--- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
@@ -14,15 +14,14 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
-IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
+IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
REQUIRED_USE="
- || ( firebird freetds mysql oci8 odbc postgres sqlite )
+ || ( freetds mysql oci8 odbc postgres sqlite )
"
DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
- firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
@@ -38,7 +37,6 @@ QT4_TARGET_DIRECTORIES="
src_configure() {
myconf+="
- $(qt_native_use firebird sql-ibase plugin)
$(qt_native_use freetds sql-tds plugin)
$(qt_native_use mysql sql-mysql plugin) $(use mysql &&
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql
-L${EPREFIX}/usr/$(get_libdir)/mysql")
$(qt_use oci8 sql-oci plugin) $(use oci8 && echo
"-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
@@ -46,6 +44,7 @@ src_configure() {
$(qt_native_use postgres sql-psql plugin) $(use postgres &&
multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
$(qt_use sqlite sql-sqlite plugin) $(use sqlite &&
echo -system-sqlite)
-no-sql-db2
+ -no-sql-ibase
-no-sql-sqlite2
-no-sql-symsql
$(qt_use qt3support)
diff --git a/dev-qt/qtsql/qtsql-5.3.1.ebuild b/dev-qt/qtsql/qtsql-5.3.1.ebuild
index 8db3a2e..392cd48 100644
--- a/dev-qt/qtsql/qtsql-5.3.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.3.1.ebuild
@@ -16,15 +16,14 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="firebird freetds mysql oci8 odbc postgres +sqlite"
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
REQUIRED_USE="
- || ( firebird freetds mysql oci8 odbc postgres sqlite )
+ || ( freetds mysql oci8 odbc postgres sqlite )
"
DEPEND="
~dev-qt/qtcore-${PV}[debug=]
- firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic )
@@ -41,7 +40,6 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
- $(qt_use firebird sql-ibase plugin)
$(qt_use freetds sql-tds plugin)
$(qt_use mysql sql-mysql plugin)
$(qt_use oci8 sql-oci plugin)
diff --git a/dev-qt/qtsql/qtsql-5.3.9999.ebuild
b/dev-qt/qtsql/qtsql-5.3.9999.ebuild
index 8db3a2e..392cd48 100644
--- a/dev-qt/qtsql/qtsql-5.3.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-5.3.9999.ebuild
@@ -16,15 +16,14 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="firebird freetds mysql oci8 odbc postgres +sqlite"
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
REQUIRED_USE="
- || ( firebird freetds mysql oci8 odbc postgres sqlite )
+ || ( freetds mysql oci8 odbc postgres sqlite )
"
DEPEND="
~dev-qt/qtcore-${PV}[debug=]
- firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic )
@@ -41,7 +40,6 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
- $(qt_use firebird sql-ibase plugin)
$(qt_use freetds sql-tds plugin)
$(qt_use mysql sql-mysql plugin)
$(qt_use oci8 sql-oci plugin)
diff --git a/dev-qt/qtsql/qtsql-5.9999.ebuild b/dev-qt/qtsql/qtsql-5.9999.ebuild
index 8db3a2e..392cd48 100644
--- a/dev-qt/qtsql/qtsql-5.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-5.9999.ebuild
@@ -16,15 +16,14 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="firebird freetds mysql oci8 odbc postgres +sqlite"
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
REQUIRED_USE="
- || ( firebird freetds mysql oci8 odbc postgres sqlite )
+ || ( freetds mysql oci8 odbc postgres sqlite )
"
DEPEND="
~dev-qt/qtcore-${PV}[debug=]
- firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
oci8? ( dev-db/oracle-instantclient-basic )
@@ -41,7 +40,6 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
- $(qt_use firebird sql-ibase plugin)
$(qt_use freetds sql-tds plugin)
$(qt_use mysql sql-mysql plugin)
$(qt_use oci8 sql-oci plugin)
