Add support for Oracle Instant Client via USE=oci8 (bug 366985 by Victor).

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 102 insertions, 16 deletions

diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index 733162af225a..4377e386d89b 100644
--- a/x11-libs/qt-sql/ChangeLog
+++ b/x11-libs/qt-sql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-sql
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.126 2012/04/29 11:55:49 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.127 2012/05/05 15:36:11 pesa Exp $
+
+*qt-sql-4.8.1-r1 (05 May 2012)
+
+  05 May 2012; Davide Pesavento <pesa@gentoo.org> +qt-sql-4.8.1-r1.ebuild,
+  qt-sql-4.8.1.ebuild:
+  Add support for Oracle Instant Client via USE=oci8 (bug 366985 by Victor).
 
   29 Apr 2012; Fabian Groffen <grobian@gentoo.org> qt-sql-4.8.1.ebuild:
   Marked ~x64-macos
diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest
index 565933bdb875..201f54b1d118 100644
--- a/x11-libs/qt-sql/Manifest
+++ b/x11-libs/qt-sql/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX qt-4.6-nolibx11.patch 1037 RMD160 a32338fa24ca2f99b0f3b679b1fabb88ac9b0ec1 SHA1 b7b2a430147a746a6a52f05a495be6262f2925ef SHA256 2b1d4e7df4918cafa50476e911f4c8e3e79e09fa702d756236ad2308e1c9bc69
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
@@ -9,13 +9,24 @@ DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 RMD160 538e626fae80ca8c
 EBUILD qt-sql-4.6.3-r2.ebuild 2549 RMD160 c6e9ca04c5bec92a68c28869a26bf4f1ae08392e SHA1 07ef43704bf23f728fa3e52ee20474925998db79 SHA256 8111a28494a475f11b945a72f65c2404b5a1fe4dbdc93d276bb23cf83e29543a
 EBUILD qt-sql-4.7.2.ebuild 2494 RMD160 71fb2e974ab1a4238b34e3914d58dd4d5f4109d0 SHA1 1624d536ece5b4ed405fe7fbc5742a6c9e654c94 SHA256 172bfa2b001660d6de2b64393d583d1319949fe47de3d55589adf6ccb772480a
 EBUILD qt-sql-4.7.4.ebuild 2487 RMD160 86779cb4d5c13e0326542bc50f45801041666fae SHA1 4f2d6c048cf912e6a3635a0ed8b0e4ac00a70cb8 SHA256 0a6dd611b93c04e566838bbee74173610b7be288144d27bff82fa71c7b97ee31
-EBUILD qt-sql-4.8.1.ebuild 2245 RMD160 9fcf56985d1186266472be9e0fc8b5270b0a7d7d SHA1 2396af12bb06ce8b1d21961590e28abac05280ab SHA256 c776d7c6332a33242d3efc08bcae89d3d271e81e2ab4d85b1f450e8f8091be32
-MISC ChangeLog 15568 RMD160 dc8d90ad143f5abba5b2e7900f4dd590a3fbcc57 SHA1 d6b8206dd2b51210dcea17f3961b0d17a048addf SHA256 88b46d17f417be8f6e23bbe194266c931f10ab3751b2f43cc8bfd622ac4fe120
+EBUILD qt-sql-4.8.1-r1.ebuild 2431 RMD160 aca6e7422ef4260693d28ddd33b5aa8743a35dbd SHA1 a3b703e28a81862a0c0a48ec068ebd9d92b1afae SHA256 201deb1da045b5b38eeb55430d1bbe2c7c6cd5f14e92b7aa89e7b74cee1ec63a
+EBUILD qt-sql-4.8.1.ebuild 2270 RMD160 d21c7a6d7bd8249e6c7837736c46f062fff0be87 SHA1 8b1a2cb0f5df999a183776d0f43d48db5ab81c85 SHA256 438fdbe475092e35aae883d10d439e0b641be0e6f682c7a87888a7acf28f8251
+MISC ChangeLog 15773 RMD160 cce9627725ef39fef63b0c389e96f8caf72d2f03 SHA1 f11305e76a6d61380bae00d5c7a77ff04de0370f SHA256 5e9e2e3bdc7e82ace7ee28fc417b3df574405bbdeca47f715979f8acbe90971d
 MISC metadata.xml 514 RMD160 21860c4993ebefb7dcf2c0647054d5718aada3a7 SHA1 060a099d9d9f9b57a2822e60a833647e89490104 SHA256 cae6405dee9b4378cc6971c67f8dc284a5b64a732ad94b6e8b9410f1cd6e21e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+dLHQACgkQX3X2B8XHTomR+gCfRoUEeIXf96m4CMIHdLVfi30t
-5kQAni3Id6gJys/9AhM9yGsBFrFB20Q4
-=IOVh
+iQIcBAEBCgAGBQJPpUj/AAoJENXLsxwXqFxyI5UP/jilKseMiHXofFGzpAojLBzP
+hwQRUPsXvQ5semcLqP6JSgpT9IHg8GX8Woz3oUnu/wfhIafMy1I/ah3G1HTL+PQu
+ttd1q1f0Aun8KDkxo8NJjwI+r16s9nfjLgT8EpqOzgVKwi64w1TtWhYE1kIiyro2
+RWtVzSv+0tT7e2LtGmgQX+4DCH/ijl1xIAIh+FT2J+3Nxy1lb0m9l27DRmwMNzLW
+31PYP7bjl4TZPFAxXSU/p0louGnHJUXRx9CQ+C0GOHNYqqGafMg1kHH4FmsazPbf
+R5TUgV7hMT1nenou9YiILifu4WHXJ1eLFdK60BMAcNKYVLDpQm1F54Az2xlpz26E
+nObYZZxQ0ckPfRSZ4QNowMmj+hYTnFr4lsEu0oHquacP1WfI7Ap6n5fAJjupHCHt
+3odsiXcTuguI8dXgd3W71ZtkcsK9Urhra9OiN0glZr5lDg6ZI0f7xAAjnQ/jwnpL
+InOaGjDB+N2f3Wp16dSHpHuiAM76mlicPfT1T4+ENt8Rq54vaNvq1CHDbDHg7Xuy
+hUjq8N6iamBkmVL1V3VTNlSOM5TArmLsm0bb1/ooOTmDSam6VvbHavexn9+jxfyv
+n9Tbvjsn57orDkzky9ilJ3Vyc3QrlBkPCwudG7Z2cB64oF9BQQXv6OdxFNOcniYV
+KIlMItNNwrOfHVNWlBvn
+=QVS4
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-sql/qt-sql-4.8.1-r1.ebuild b/x11-libs/qt-sql/qt-sql-4.8.1-r1.ebuild
new file mode 100644
index 000000000000..e687528db41f
--- /dev/null
+++ b/x11-libs/qt-sql/qt-sql-4.8.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 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.8.1-r1.ebuild,v 1.1 2012/05/05 15:36:11 pesa Exp $
+
+EAPI=4
+
+inherit multilib qt4-build
+
+DESCRIPTION="The SQL module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
+
+REQUIRED_USE="
+	|| ( firebird freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
+	firebird? ( dev-db/firebird )
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/mysql )
+	oci8? ( dev-db/oracle-instantclient-basic )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/sql
+		src/plugins/sqldrivers"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtSql
+		src/src.pro
+		src/corelib
+		src/plugins
+		src/tools/tools.pro"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		$(qt_use firebird sql-ibase  plugin)
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin) $(use mysql && 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)")
+		$(qt_use odbc     sql-odbc   plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
+		$(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)
+		-no-sql-db2
+		-no-sql-sqlite2
+		-no-sql-symsql
+		$(qt_use qt3support)
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+		-no-glib"
+
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-sql/qt-sql-4.8.1.ebuild b/x11-libs/qt-sql/qt-sql-4.8.1.ebuild
index ee6f8b82a46e..a65ebba49a02 100644
--- a/x11-libs/qt-sql/qt-sql-4.8.1.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.8.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 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.8.1.ebuild,v 1.2 2012/04/29 11:55:49 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.8.1.ebuild,v 1.3 2012/05/05 15:36:11 pesa Exp $
 
 EAPI=4
 
-inherit qt4-build
+inherit multilib qt4-build
 
 DESCRIPTION="The SQL module for the Qt toolkit"
 SLOT="4"
@@ -45,12 +45,12 @@ pkg_setup() {
 
 src_configure() {
 	myconf+="
-		$(qt_use firebird sql-ibase plugin)
-		$(qt_use freetds sql-tds plugin)
-		$(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
-		$(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
-		$(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 firebird sql-ibase  plugin)
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
+		$(qt_use odbc     sql-odbc   plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
+		$(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)
 		-no-sql-db2
 		-no-sql-oci
 		-no-sql-sqlite2