Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/
Date: Tue, 01 Jul 2014 16:32:12
Message-Id: 1404232281.570166eb1297564a8986ae4d91c4364a5c4f3483.pesa@gentoo
1 commit: 570166eb1297564a8986ae4d91c4364a5c4f3483
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 1 16:31:21 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 1 16:31:21 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=570166eb
7
8 [dev-qt/qtsql] Remove firebird USE flag.
9
10 dev-db/firebird has been masked for removal.
11
12 Package-Manager: portage-2.2.10
13
14 ---
15 dev-qt/qtsql/qtsql-4.8.6.ebuild | 7 +++----
16 dev-qt/qtsql/qtsql-4.8.9999.ebuild | 7 +++----
17 dev-qt/qtsql/qtsql-5.3.1.ebuild | 6 ++----
18 dev-qt/qtsql/qtsql-5.3.9999.ebuild | 6 ++----
19 dev-qt/qtsql/qtsql-5.9999.ebuild | 6 ++----
20 5 files changed, 12 insertions(+), 20 deletions(-)
21
22 diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
23 index 6ee8d7a..803a39a 100644
24 --- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
25 +++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
26 @@ -14,15 +14,14 @@ else
27 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"
28 fi
29
30 -IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
31 +IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
32
33 REQUIRED_USE="
34 - || ( firebird freetds mysql oci8 odbc postgres sqlite )
35 + || ( freetds mysql oci8 odbc postgres sqlite )
36 "
37
38 DEPEND="
39 ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
40 - firebird? ( dev-db/firebird )
41 freetds? ( dev-db/freetds )
42 mysql? ( virtual/mysql )
43 oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
44 @@ -38,7 +37,6 @@ QT4_TARGET_DIRECTORIES="
45
46 src_configure() {
47 myconf+="
48 - $(qt_native_use firebird sql-ibase plugin)
49 $(qt_native_use freetds sql-tds plugin)
50 $(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")
51 $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
52 @@ -46,6 +44,7 @@ src_configure() {
53 $(qt_native_use postgres sql-psql plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
54 $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
55 -no-sql-db2
56 + -no-sql-ibase
57 -no-sql-sqlite2
58 -no-sql-symsql
59 $(qt_use qt3support)
60
61 diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
62 index 6ee8d7a..803a39a 100644
63 --- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
64 +++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
65 @@ -14,15 +14,14 @@ else
66 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"
67 fi
68
69 -IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
70 +IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
71
72 REQUIRED_USE="
73 - || ( firebird freetds mysql oci8 odbc postgres sqlite )
74 + || ( freetds mysql oci8 odbc postgres sqlite )
75 "
76
77 DEPEND="
78 ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
79 - firebird? ( dev-db/firebird )
80 freetds? ( dev-db/freetds )
81 mysql? ( virtual/mysql )
82 oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
83 @@ -38,7 +37,6 @@ QT4_TARGET_DIRECTORIES="
84
85 src_configure() {
86 myconf+="
87 - $(qt_native_use firebird sql-ibase plugin)
88 $(qt_native_use freetds sql-tds plugin)
89 $(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")
90 $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
91 @@ -46,6 +44,7 @@ src_configure() {
92 $(qt_native_use postgres sql-psql plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
93 $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
94 -no-sql-db2
95 + -no-sql-ibase
96 -no-sql-sqlite2
97 -no-sql-symsql
98 $(qt_use qt3support)
99
100 diff --git a/dev-qt/qtsql/qtsql-5.3.1.ebuild b/dev-qt/qtsql/qtsql-5.3.1.ebuild
101 index 8db3a2e..392cd48 100644
102 --- a/dev-qt/qtsql/qtsql-5.3.1.ebuild
103 +++ b/dev-qt/qtsql/qtsql-5.3.1.ebuild
104 @@ -16,15 +16,14 @@ else
105 KEYWORDS="~amd64 ~x86"
106 fi
107
108 -IUSE="firebird freetds mysql oci8 odbc postgres +sqlite"
109 +IUSE="freetds mysql oci8 odbc postgres +sqlite"
110
111 REQUIRED_USE="
112 - || ( firebird freetds mysql oci8 odbc postgres sqlite )
113 + || ( freetds mysql oci8 odbc postgres sqlite )
114 "
115
116 DEPEND="
117 ~dev-qt/qtcore-${PV}[debug=]
118 - firebird? ( dev-db/firebird )
119 freetds? ( dev-db/freetds )
120 mysql? ( virtual/mysql )
121 oci8? ( dev-db/oracle-instantclient-basic )
122 @@ -41,7 +40,6 @@ QT5_TARGET_SUBDIRS=(
123
124 src_configure() {
125 local myconf=(
126 - $(qt_use firebird sql-ibase plugin)
127 $(qt_use freetds sql-tds plugin)
128 $(qt_use mysql sql-mysql plugin)
129 $(qt_use oci8 sql-oci plugin)
130
131 diff --git a/dev-qt/qtsql/qtsql-5.3.9999.ebuild b/dev-qt/qtsql/qtsql-5.3.9999.ebuild
132 index 8db3a2e..392cd48 100644
133 --- a/dev-qt/qtsql/qtsql-5.3.9999.ebuild
134 +++ b/dev-qt/qtsql/qtsql-5.3.9999.ebuild
135 @@ -16,15 +16,14 @@ else
136 KEYWORDS="~amd64 ~x86"
137 fi
138
139 -IUSE="firebird freetds mysql oci8 odbc postgres +sqlite"
140 +IUSE="freetds mysql oci8 odbc postgres +sqlite"
141
142 REQUIRED_USE="
143 - || ( firebird freetds mysql oci8 odbc postgres sqlite )
144 + || ( freetds mysql oci8 odbc postgres sqlite )
145 "
146
147 DEPEND="
148 ~dev-qt/qtcore-${PV}[debug=]
149 - firebird? ( dev-db/firebird )
150 freetds? ( dev-db/freetds )
151 mysql? ( virtual/mysql )
152 oci8? ( dev-db/oracle-instantclient-basic )
153 @@ -41,7 +40,6 @@ QT5_TARGET_SUBDIRS=(
154
155 src_configure() {
156 local myconf=(
157 - $(qt_use firebird sql-ibase plugin)
158 $(qt_use freetds sql-tds plugin)
159 $(qt_use mysql sql-mysql plugin)
160 $(qt_use oci8 sql-oci plugin)
161
162 diff --git a/dev-qt/qtsql/qtsql-5.9999.ebuild b/dev-qt/qtsql/qtsql-5.9999.ebuild
163 index 8db3a2e..392cd48 100644
164 --- a/dev-qt/qtsql/qtsql-5.9999.ebuild
165 +++ b/dev-qt/qtsql/qtsql-5.9999.ebuild
166 @@ -16,15 +16,14 @@ else
167 KEYWORDS="~amd64 ~x86"
168 fi
169
170 -IUSE="firebird freetds mysql oci8 odbc postgres +sqlite"
171 +IUSE="freetds mysql oci8 odbc postgres +sqlite"
172
173 REQUIRED_USE="
174 - || ( firebird freetds mysql oci8 odbc postgres sqlite )
175 + || ( freetds mysql oci8 odbc postgres sqlite )
176 "
177
178 DEPEND="
179 ~dev-qt/qtcore-${PV}[debug=]
180 - firebird? ( dev-db/firebird )
181 freetds? ( dev-db/freetds )
182 mysql? ( virtual/mysql )
183 oci8? ( dev-db/oracle-instantclient-basic )
184 @@ -41,7 +40,6 @@ QT5_TARGET_SUBDIRS=(
185
186 src_configure() {
187 local myconf=(
188 - $(qt_use firebird sql-ibase plugin)
189 $(qt_use freetds sql-tds plugin)
190 $(qt_use mysql sql-mysql plugin)
191 $(qt_use oci8 sql-oci plugin)