dev-qt/qtsql: multilib-utize

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

2 files changed, 18 insertions, 17 deletions

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index ef7082c..eafc748 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,4 +1,4 @@
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
-EBUILD qtsql-4.8.5-r1.ebuild 2401 SHA256 9c35c4a098672b69030b0e08875ec7d67dff5a1e0f9899037e59f8ece0e4ce37 SHA512 139e115485e29b1b7a9c6abcae002ba4b0951baf73e9164b736386838b5cb93f1c046a8a333a2f3bd259306278973a23c45c3874020767b6db4ae1cf20d65470 WHIRLPOOL b317b136da4faf92243ff5f3e4a01cb059c0bf58d88753aef0c73594d6b76e66bb449ac07625a1069221cbc7c50f83108a2ccfef4dcfd1ad7326c4f66014abf1
+EBUILD qtsql-4.8.5-r1.ebuild 2571 SHA256 730d7de97404175807d363e43327cedf40a5f142b7b0cc57438177d30db78800 SHA512 bf48720bafcb7059eecd057dee49da221c42d62736eba22aec1bfe746a32cb2e0482ec9b5db1c9fa3942d16d79a679bbdab6ff7fc7a61eac48541c2be4570374 WHIRLPOOL 24cf302e8f19597ea516627c12a1921a4840639747ea02b937c530753e3eb0bcce8e8aa106346beb293a99622877664fe6ee81a8d07ce90468d86069b2edeb11
 MISC ChangeLog 19868 SHA256 89c3176792dfaaa368d8b89ce939c28a69d16a63327c0bfda6fe821aade4ff9a SHA512 9b7bea39e32788bcae8dd7289d14975251349bd57644989060e5d6b50711ae55073fa83ff358136fc4b70a4b56007dfb43649e40bc06699c35b25c8039137862 WHIRLPOOL 1e272e2cd0f90f52b368ceabca9d7c0ffdfbf466eb565c21e32be5f48161ab3be9bcd3d0a3c1f951d91c1cc78ed636e6a9918547fb032efe19752d45c406f6f3
 MISC metadata.xml 557 SHA256 c5a26c7fba2094066fe31576bf73427ff216fd6b7f85421101e5466424dfff4a SHA512 8b78c0325ccf4439d87f9de6e6bb032e20caef10d5cd126d266c928f0deeac2fb9fc77fcce7c763fb3133a8cce907fe8f9462fab74fe8509a85f4edf49769960 WHIRLPOOL 9b15e75ae1e15f7a140e49c85efea8ebbda065cffd09588f391fa2e4d801ca36e965e9fd04f5e91d53f9a88bab5e1cc0153a0319c6fb5cf0483fcd671296b79e
diff --git a/dev-qt/qtsql/qtsql-4.8.5-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.5-r1.ebuild
index de1be72..abee2f8 100644
--- a/dev-qt/qtsql/qtsql-4.8.5-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.5-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-4.8.5.ebuild,v 1.1 2013/07/09 10:52:28 pesa Exp $
 
 EAPI=4
 
-inherit multilib qt4-build
+inherit qt4-build-multilib
 
 DESCRIPTION="The SQL module for the Qt toolkit"
 SLOT="4"
 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"
+	KEYWORDS="~amd64"
 fi
 IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
 
@@ -20,16 +20,17 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,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 )
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+	firebird? ( dev-db/firebird[${MULTILIB_USEDEP}] )
+	freetds? ( dev-db/freetds[${MULTILIB_USEDEP}] )
+	mysql? ( virtual/mysql[${MULTILIB_USEDEP}] )
+	oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc[${MULTILIB_USEDEP}] ) )
+	postgres? ( dev-db/postgresql-base[${MULTILIB_USEDEP}] )
+	sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
+	${DEPEND}"
 
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
@@ -45,15 +46,15 @@ pkg_setup() {
 		src/plugins
 		src/tools/tools.pro"
 
-	qt4-build_pkg_setup
+	qt4-build-multilib_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 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)
@@ -69,5 +70,5 @@ src_configure() {
 		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
 		-no-glib"
 
-	qt4-build_src_configure
+	qt4-build-multilib_src_configure
 }