Version bump (bug 510042). Add multilib support (bug 498010).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

3 files changed, 88 insertions, 6 deletions

diff --git a/dev-qt/qtsql/ChangeLog b/dev-qt/qtsql/ChangeLog
index 643bf06160b7..1e2ad3efe489 100644
--- a/dev-qt/qtsql/ChangeLog
+++ b/dev-qt/qtsql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtsql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.19 2014/11/03 12:42:18 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.20 2014/11/15 02:38:04 pesa Exp $
+
+*qtsql-4.8.6-r1 (15 Nov 2014)
+
+  15 Nov 2014; Davide Pesavento <pesa@gentoo.org> +qtsql-4.8.6-r1.ebuild:
+  Version bump (bug 510042). Add multilib support (bug 498010).
 
   03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> qtsql-4.8.5.ebuild,
   qtsql-5.3.2.ebuild:
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 4293d3f0a878..a7d9adf8a3ca 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -3,15 +3,29 @@ Hash: SHA256
 
 AUX qtsql-5.3.1-path-filtering.patch 919 SHA256 54cf01db78e68b20f43a5040679df82774d26132740ae222391c61d32d68ebe2 SHA512 794408389b83b2eef2a106682c3a98db40647c1d4449e957665bfbcd81462ba5744c69dfdcdc74f50fc2870ec5eb49e4738ec472838d26edc01cddb3e9caa8c6 WHIRLPOOL 50534ee0794aa98eba02176fe7dd122e37a84966a1866cca18052df7150aee638363c61420201519e4ffc7a923f398baadc409a1e43af520e649cf5440359e0d
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtbase-opensource-src-5.3.2.tar.xz 46694044 SHA256 9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8 SHA512 c92438ced758557bd3a19aa1ae5b5d1a2c85d8584d7e7279662eda51daf40ec58f1cb4a38d1c98a43c39cb3225a620a9daaec7f89e68a7d8e3e5240bf70210ea WHIRLPOOL b53f71e8980af5e1e176ba9671c6307f7f455bcf73a76f20a777b0e6f6a5e0ba60af1937a3ce9ebc81a60f82ab64f8b3f31ae786653e2213510d0101ec35a210
 EBUILD qtsql-4.8.5.ebuild 2492 SHA256 80809dfdb1d8f6c244e927e6e8a390463ae3de9a9336b9dd2cdc03e8b74d44c5 SHA512 1f02e7f4a13d218daa2fd3243a64b05c2b08f7177961695b376f50a749f5c349e29f01c7686c8bc69a9abb28df2f7926302fdf1b066e6c3810b1b11693bdcc13 WHIRLPOOL b24766131b8afdc021a9f5115df5539c40fce9171d3e85d6244c39a27778d96ab3376e5162fa981a66b1cc22ee7e716a32f7d2e44480b2e0f6e09ac8b818a9d5
+EBUILD qtsql-4.8.6-r1.ebuild 2481 SHA256 cc94233f14ed95d1524ea3a55a27fdb350739f8c2cd1084b4c4139166d987d93 SHA512 953485827616758bd9b2e1c4cbf86f339edf1f27d157b9970b59bc67b77363a0eedb552e6810ce443a7dc68825f47a64b865e927f339920424195caa3ae436ce WHIRLPOOL 823759e50745449a615c9eb232da2f1bca314f599b2250900c24486fb719e407c1bd3e9c4bb2dbf605112b167c231231ea2545d5d33816acc9b58cc0c587520a
 EBUILD qtsql-5.3.2.ebuild 1579 SHA256 55494ddd4e21fc1fe9844487480c3d20d9ec03e3b8ce1ba1b6076d188e605b36 SHA512 b2c2a6f2c8cb3d18452145cbab36aef9e8660b07c6a9af8729ad45865563ca2491449627ce7a232392842a8f84b0eb5badabd493a06940d4d9effb1bfcdec1c9 WHIRLPOOL 1976099edf8ffe08e2c621cfa8df822e334ef7c3ef9d03d4a848fa7db66cd74e20dc1a207b0a0fa9c1663eac1b3c588675307f3af2737e6059e2e8a22d2f1167
-MISC ChangeLog 21742 SHA256 32112bcdcc5f75e8d7a8e012938db1a1777ff88321678ec47ed075258990473a SHA512 0cf547c0b656cab9d7aa2fa28d4a370804b2a1dd2a91773b37c28c99049c05721617a1e2eee6a2946d62ca8802b1d4cb94537424af17c5af677bc11b3b51df35 WHIRLPOOL f22b08914e37cba9bc5a6af10cdefdd220a4a5d05ddef26790ec5a350ae823248986e94503ee790275860abc408e7df7467e0e44d7d14e3fcf035b33eb30606c
+MISC ChangeLog 21906 SHA256 1b00ecbcd1c1934ec095093f9ecebd6f0f32b84792fe49387193a228132983c2 SHA512 5f8c15e388ee1fb7c08f811aed0739320252f8175d275d63cdf07a0a6064cf20562f7104a0415d76b7cc4397777a88f559f47d90a319ff9ae4248766cea0144c WHIRLPOOL 3b02505f390227f1a4239b7be35c655f969ef01cbedb5abfe7b7d549261255a6b4396909340eaf8b353009f4181100f826d2fd4620f066cb9d715b105a28632c
 MISC metadata.xml 497 SHA256 b8656eacac6224eb78d0425604a1be6927f97eee1b6f5202675ed11a53ac5cf3 SHA512 cd76998e07c6d8476506f200947f5c1da97f5b44490ac0c49b7187d135670329b8ff7e3b9c603b90fd22055959592112ae15e8b103b9f0b5594e9acbc7bb9046 WHIRLPOOL a54d06aa9e6970fae53a5be81ca24a1a38a1579e285b775ed4db4dbcc05c6194dc66aaa45152cab82720596f573e8bbe653f3a3a89c7f1b9951b2844527c0656
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlRXeCwACgkQVxOqA9G7/aBnsQD/QHtW2g1vRRbHQ2ll7aMdy126
-JNgQROWYbXIIW2ugpJ8A/i6tvU/Lcv2Bf9L9PYSwCynVVard6Vu62dX63abzdQMK
-=5z8Q
+iQJ8BAEBCABmBQJUZryNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9ZNAP/iaQo+xT+424Mshp3X8ibx4k
+mcuKwjxNZ6PWkSgL+v7n/bEeobD6BxeVmSEHLQmOhC2JSLNSnnwe6KiNIoVRXkdu
+pIcUomCyLqugo+try3NPaAjtHB8MatRPMXq0Rpx8P0SjglYgYS4OiSapTE4Oy6+/
+9mmfW3vLQ1gaCkF94McqIRa9HsAi+BVeDjdPcn77vLPxGZsthe8VY/OSSRC6dSGW
+G2Gdd7QmnQlpikKHk8P9h/SE9ZwwdEhkrWxjffupazYFy6y67RO6i1zgx9k4sbXE
+KZvvDsvUBVjYIp3bmhelgPpzn5HiSICKofnFeAABQiOqVOOjzr5zMOMZe3w0vN/Y
+NClryzstu5bSKQApG+nhgzq25S52vXKRIyhJYDAbBixoFQT8TxPrPbkFYLqsJqgW
+OYFy4yaV/KWLr8CIQR6QdN09Ogxq4GXFt+DO3WSAtemGAwm6/GtKPjLev1F9E352
+CmqSleNs2C4IypxR0OX/ROKYk26pVcQ5wIJl2ETPkR2p8dyqmE5nvLO93b8Lnxvs
+TFMultOKX1Pb8+mNoYfTQ0ZKA9jrXjNO3VgTp5ufL9NIQGTeoZHLcZHbP6Kh48mH
+ym3sxOkXJxqv60yfWN6Iakn6hfyhJ+bUy4HnH8jUqLSXNAKTWygRM28nesCMiklj
+8AYmBGIpvACzdy+V39m4
+=B7Oi
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild
new file mode 100644
index 000000000000..df3d1e879d9d
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:38:04 pesa Exp $
+
+EAPI=5
+
+inherit multilib qt4-build-multilib
+
+DESCRIPTION="The SQL module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+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="freetds mysql oci8 odbc postgres qt3support +sqlite"
+
+REQUIRED_USE="
+	|| ( freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+	freetds? ( dev-db/freetds )
+	mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
+	oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
+	odbc? ( || (
+		>=dev-db/unixODBC-2.3.2[${MULTILIB_USEDEP}]
+		>=dev-db/libiodbc-3.52.8[${MULTILIB_USEDEP}]
+	) )
+	postgres? ( virtual/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	src/sql
+	src/plugins/sqldrivers"
+
+multilib_src_configure() {
+	local myconf=(
+		$(qt_native_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_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)
+		-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_multilib_src_configure
+}