oops: in dev-qt/qtdbus I had botched the multlib-utization

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

3 files changed, 9 insertions, 63 deletions

diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 93455d3..d671ce4 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,7 +1,6 @@
 AUX qtdbus-4.7-qdbusintegrator-no-const.patch 543 SHA256 a05de8d906be14160e5c951856fae2796b6f6eed91ed4781e8197433e94ce922 SHA512 1967f1b3f1a834eecf140df39c6e4826acf80fc2f8de85770252949910de357a4303d1c1b3202e2df164e8b1cd74b0ab4928a3b333df0a222bdf21e71696824f WHIRLPOOL c5d72b6fc8a9e55cfdacdd2a514e1acbd1c4f864f92596b3c3b9d013a24425619c04048063afb9aef267ade2b5fcf6b3921b90cddb2f9a3ee7d8721ae7d8eeeb
 AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 SHA256 648a06278bd4cbe98c61543475cf75b0251722d0f562e9ff8a3b8a89d3838811 SHA512 b3135450bcd7ab50e5b559b0e8619606053845852159853498756e50777cfbe8b5871bd7b0c178b3de038dc9229f3564c4827b35fcb67b354f0814ca1b2c58e3 WHIRLPOOL c28d79d56c284dc17489c31449b20d774021a0a9dac385c327e6b42997dabc0d92aeca4f5fae3020926f6c16053b30f82913800019e5419e3a82f58481fa30db
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
-EBUILD qtdbus-4.8.5-r1.ebuild 1094 SHA256 865321258ba2f27bad7a90e7af258d6c3f1a9fbcb343f7227d4107a81bd6993f SHA512 d8343de9f38b59559ac5309fbe5f3c6b5ae4215783ab183fae9503389039230726625d63bcd4287273c5ebdaa6c2bcbae16c08c39205f648e11211a9e14c9aaf WHIRLPOOL 441101444b5772cb358eedf30e2f47085d3ecd1816d274f012dd8c6d619018e749d571133f063e13999bf8e162f0524ff5955b374a649b9bf1210aed61689660
+EBUILD qtdbus-4.8.5-r1.ebuild 1064 SHA256 cf5d0a299887777622216243ccaae7031f195b8b6ed1291d0f9c2ba6ab61868c SHA512 aee87308da8c9c1f15d1d8d4f4312ed1ccef3ce5b11b09ef9f57c7109eba5b67f6db2c18414731c32214e5596e87b6cd1a5b0bb48182005fab33ba7fecfdcdd2 WHIRLPOOL 203cc7c68bdc4685229b99d61b7e166772ca1bc587802a964eb6620d8c81afd41bbeb04378738bb6f73be37d415881277855406856d0dca250469b4603b93d12
 MISC ChangeLog 17745 SHA256 9ebb00e7fdc9763bd3035e773ca0d2b85bdb4116c396649a0a2bcca2df8585b9 SHA512 68e7d1ec426c1dd889ccd54420550fe022a18ad75c9150f4887c07d1682d2e5eb20f34d6a954ff6552b8e2bc94531deec3d487b00b157739bbe524c9caf75923 WHIRLPOOL f542bf89506bd66f033a6bec0863e8adcffaf08483aeb3cda584163569cf352953c2539724d92902afc52c44d9a28fb894e5062327df9360343c4d0b2683c128
 MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f
-MISC qtdbus-4.8.5-r1.ebuild.new 1064 SHA256 cf5d0a299887777622216243ccaae7031f195b8b6ed1291d0f9c2ba6ab61868c SHA512 aee87308da8c9c1f15d1d8d4f4312ed1ccef3ce5b11b09ef9f57c7109eba5b67f6db2c18414731c32214e5596e87b6cd1a5b0bb48182005fab33ba7fecfdcdd2 WHIRLPOOL 203cc7c68bdc4685229b99d61b7e166772ca1bc587802a964eb6620d8c81afd41bbeb04378738bb6f73be37d415881277855406856d0dca250469b4603b93d12
diff --git a/dev-qt/qtdbus/qtdbus-4.8.5-r1.ebuild b/dev-qt/qtdbus/qtdbus-4.8.5-r1.ebuild
index aaf9fd5..462109c 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.5-r1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.5-r1.ebuild
@@ -4,22 +4,23 @@
 
 EAPI=4
 
-inherit qt4-build
+inherit qt4-build-multilib
 
 DESCRIPTION="The DBus 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=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	>=sys-apps/dbus-1.2
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
 "
-RDEPEND="${DEPEND}"
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
+	${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
@@ -43,11 +44,11 @@ pkg_setup() {
 	QCONFIG_ADD="dbus dbus-linked"
 	QCONFIG_DEFINE="QT_DBUS"
 
-	qt4-build_pkg_setup
+	qt4-build-multilib_pkg_setup
 }
 
 src_configure() {
 	myconf+=" -dbus-linked"
 
-	qt4-build_src_configure
+	qt4-build-multilib_src_configure
 }
diff --git a/dev-qt/qtdbus/qtdbus-4.8.5-r1.ebuild.new b/dev-qt/qtdbus/qtdbus-4.8.5-r1.ebuild.new
deleted file mode 100644
index 462109c..0000000
--- a/dev-qt/qtdbus/qtdbus-4.8.5-r1.ebuild.new
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-"
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
-	${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
-	"${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/dbus
-		tools/qdbus/qdbus
-		tools/qdbus/qdbusxml2cpp
-		tools/qdbus/qdbuscpp2xml"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/QtCore
-		include/QtDBus
-		include/QtXml
-		src/corelib
-		src/xml"
-
-	QCONFIG_ADD="dbus dbus-linked"
-	QCONFIG_DEFINE="QT_DBUS"
-
-	qt4-build-multilib_pkg_setup
-}
-
-src_configure() {
-	myconf+=" -dbus-linked"
-
-	qt4-build-multilib_src_configure
-}