Enable multilib support and sync the live ebuild. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/114 by MJDSys with some minor changes.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 214 insertions, 42 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 636844d937ff..1b254dfedc54 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.74 2015/05/31 13:17:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.75 2015/06/02 07:41:48 mgorny Exp $
+
+*phonon-4.8.3-r1 (02 Jun 2015)
+
+  02 Jun 2015; Michał Górny <mgorny@gentoo.org> +phonon-4.8.3-r1.ebuild,
+  phonon-9999.ebuild:
+  Enable multilib support and sync the live ebuild. https://github.com/gentoo
+  /gentoo-portage-rsync-mirror/pull/114 by MJDSys with some minor changes.
 
   31 May 2015; Johannes Huber <johu@gentoo.org> phonon-4.7.2.ebuild,
   phonon-4.8.3.ebuild, phonon-9999.ebuild:
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 6492ffe07683..6902da348371 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -5,24 +5,27 @@ AUX phonon-4.7.0-plugin-install.patch 1252 SHA256 a56f24ac961ab9c422d1a06adb602f
 DIST phonon-4.7.2.tar.xz 330244 SHA256 819e9734d20e254b4599d8ab45f15a68d95444c4e2088c7eb5769b58976a11be SHA512 b576b8f69ea2db58303dab3b6e64df4e3238a86610b4f549634a067ba680bd66a6df53285303a8e46df458e6da0b8e9c9112c917b054304397abb556de3a6bb5 WHIRLPOOL 2cc9a6a58d3449cc595a36c3742c03060c73a1efb10eceebf5554e504858f8d73c92c679babdc1d145d326c6024958868ee0e15fdd5eaafffcdbba98aba6f188
 DIST phonon-4.8.3.tar.xz 322012 SHA256 a1149c961ca1570968d070bbd23671e614aa506f847ca93748960e309f85da16 SHA512 368014e808fe9ac84cdb4caf99dec93470907ca959e9a900fd6a8d86b3a44603b91be06b64b0f484d199663647bf82e84f643900edcf6a0c90ea55c53f767701 WHIRLPOOL 12de8d3de919575f23b9acd8bddb8e594f755062e560617371f8614cb51fba7fb08c62549c28670cbde60b5f962a1953e5ae1bb9b64b166aa58c9b820c241868
 EBUILD phonon-4.7.2.ebuild 2437 SHA256 5a93430fb0a31b8b0d23bf54cd73fd5812f0de8d6fb559ce8d32649f1e6ae49e SHA512 e4fb6e16b3c32ae6968fd68735e0e67a14d13225b73b38d08008dc61f9bf70c25f25887d92fecd723c915e70ac48933370613a8669de60374bd69502174c35c0 WHIRLPOOL d62c3194c39baa2d65c0643535f95e1473708dbaa4ab1842df6c51c1422b049f18c0189bb6f1be6f913842159edf8aab4296909dab521bbcf0080fb56c5b7ddc
+EBUILD phonon-4.8.3-r1.ebuild 3355 SHA256 8e974455c3bb4a8791953b7a73fabf33d8a84b0d6e83add2445835d3075eeca1 SHA512 78bf47fb24291c93ee3f19dafed00c067efd13aff62c05e87ca995785f0672ad928d89503e5d8f10d9f4a5b2438ab8301bbecc8f2ca8955ba42188d6f5683c26 WHIRLPOOL c453c9ef0d5df5ece795176e4a91cd100406ba52674ffd7bbf7346e16bc768217b6a6eab01f587d47d63d0cd4f6061720ea53217a541a2f7d2a9ad127955069d
 EBUILD phonon-4.8.3.ebuild 2372 SHA256 d9b8bbbf1e9d7c86cdfa1c0e3269bbecc7db2119b89672541d27f4477db44b70 SHA512 cbe12c3f5bad6864280fe08899288a668d8165c0b779f9b5296f222bd5920e760f37270cb065e8308b0bb6ef4cb769863af22e97a2aaa63442670a8e45bd2781 WHIRLPOOL 82fc65a7b3521985b7e77903e17788b876e8c86861fc11435d44edd4cd92d648cc1bfe5bde835ffaaa0382275acec5e7bd42c23eaa2cebe54c8352ab8b97c7d0
-EBUILD phonon-9999.ebuild 2368 SHA256 0fbf9df82152d8498857ecc31981fcce96b8924e122dae2174182b11e7cb729c SHA512 4a60b3f0390d4003f3313166708c5c40f7c4a5b44b4354d3df965c86c099486ec204c33c745f39151cbc46ccf3125fc6a0990124a35e1006cf15dfa71201d32b WHIRLPOOL 80d9dbf01a73fcce01e40aa888086137d855ab8b237a182a1a0e7522fca828bb780d94bfe869b630ad90d40b4186eee78302c3f7abc9303a5444537443f9a753
-MISC ChangeLog 20216 SHA256 5418becd389e4c82eadc8f63cc08ae79f1ef14475a26bb4fc497b4289a792afa SHA512 5289636ce0eb5ef5821c004084a8ab478e63a5b7c6d5077ae7ff9d9b324b6cbe35326f0d23db932531e858534e3b8c221f16fead4ff509e9e32ea7606c642a77 WHIRLPOOL 427bfd21c02456657ed8dd9cba4dacddfb764a2c9f513e753c7f5adb8f33af2efc842f444c960f6bb2499e331ed3d0d142208f97c13268e50b1112ef03228066
+EBUILD phonon-9999.ebuild 3352 SHA256 4771e8934eb84971f69f9843228711d76f5e1a5dbd021ab7cbf112887e4b5c9b SHA512 4d250e87ff20bb4b7934e8a597dce24fe80c47e36f58cb320c664268ba872d03d1afb6313799d5b35248e80b81f8237bee49adfcc80693d8e1331959360c76cc WHIRLPOOL 2cfd913b3e78ff8a06231d9d8fd8078387f427e9a82a6951e8cffcef34b0d44d25aedaf7bfd9534a987aca6e213a6902ffb47a5030c9dba2f108de54d5350bc2
+MISC ChangeLog 20501 SHA256 878921076bd593907b04ffb477469ec252cdd8064a268b04de435620bc1225cc SHA512 b6e5583ea83def0588460d940b537d308b0c0f91cffb21303b0a91b3b7a5e1a9798f6cf93154cc69be1a1564510a4314307a43c5350d732f0154dd447c1fa481 WHIRLPOOL 2e2997ca3d63b52c0987c7852c1c9989144aa663e444f98bb006f348dfee25cb3f36b757df65626d9f99901442eda1d0f54ec8a1aed8bc531899f356b9cd62ae
 MISC metadata.xml 382 SHA256 6758869ff5c1d28cbfabfb7ad27e23038a688afcbfbc8f880c742ab9be908f06 SHA512 41f9e7123fc4069d8bc6258113de25b8de23c7a396ae4285507ebac62dfe0fa93f939940533ccb39c1e1d5419f7f0bb65db2517a0789b7242bd36cb3dc612f57 WHIRLPOOL ad1713d849565ad3a1f85ee59cbbdf857877b308d093061d6db7bffa829a1daf3b94213b6d007d9832ba4e9091d8c9b0bb7b25bdd2e41628c1786cab799b707a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVawnbAAoJEGVpnaTzz9K9ixMP/0L+45R+yyo3aSfNQU+mmd0v
-HNvjjnHxkwft3odqci5gUqpCNopgKoTbkRyjSWLGN6CbzxGLge3+5RnrJebeiCOA
-pXxJC043vlx1aaKjDBeHYwdHNP6gsaoDxAXNz7/nSogbaFzOl9VYooV2ntNZgjbA
-RWq+AMRHDyrUz4cDjbYQNJrgyGSwghGxW1fagKq1aJtbeNz+lVfWe5WSVWaXkuhZ
-HMSJe9bq0tVBFNlCkpFb3LgH3RPScBCteUw0upvs2WfKgOXCHx9kq5+BcInrvj8R
-HsLePRS7UNSW6D3c9f7cUMKx2M3j77V7z/meD4UZhp/8zvnU2g3HIUzsfuq9bxeD
-0JTSiRSh9b/J5r3F/VC4DJeZQrrWQu0tKhltIi8OsEvfpf8QoDDHO7J4rqpJnMSs
-UhHrhPBeG/dA5cLmV9NlJ9ETy0McIHrZdU/DBR04Q6uBhuDGniaYjtQSsAKtiIOC
-XfnqyhpeS2+C6+i08XxThYtKS1foWK/uubmnC+znyHZ2EXse8QSDAujoB3Et6fC/
-uDg5A7cGHttRGRrGEG64dj0Z8yeQUnnA1c6C+4JBhfm0Z+LeyVN2Vt3sZgs//wT9
-Y5HMNo90U76GReTGaCu3HWb1jnx8eBWEaau2hGz3guRvIJfssAh+sOeDr5cZalHi
-uES92l7TpulCALZ+HTAK
-=U4rF
+iQJ8BAEBCABmBQJVbV4+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgLcQAL9wtp/4kSCgPPvfp6H1quJR
+WXWmlQaUvMrZHE1+dkjCHUBy5eP3pbBCijS0zyNCCpOWcilLAGZk+XTt/LA2YInb
+xwxdICRxp5LqYN4fdPeQ05VsN1DkJCXE1UZKjNQiNY3BJ2ZkYml/fs5IO58cJ68M
+gloCYfuWLQ0WXW3Ijm3cg8o+DucWUGPIb2WZlIh0SHm0Hs5Qn3JPA1i7Br2PMJyc
+eooOsdxRnUGK7AngiTli83sTM/ObhSgZSx5jOx7dzmhLHDQD/OE1vh9fodD5WZj/
+DI6Yo7SymTRht8DMzCmRr+FAELe9/kCQnoG2DWdFXd3fxd/2gv14u4UKIrWmS2Pj
+EzqR6B4qDoAYAUTD5gCPXQQzvRUjzi0n342bZYKCMas+jnntseBI/+iaCj26ozpc
+x6CjLp9lhb2maxgIca/Adjgkj+2gxPPHBnV4etJ8hbN1Z4etSxtgsnKIRpSdxo2i
+xT+/rQ04LYzMo4m+3JAxnYAMf/F89t/Fz/AeT+56KSedoUNUFtXqs6YJcUNMeSWD
+iCK+BoyHcyuQL+VjZj2y9OP7BwNuyAtIUoF1QB4skC7i3mb0K5pBxHdGVnAlqUEt
+RtjVsPug/kztlhPHCzd4ibu5lAJ/t4Y42lWusL68iXgEN1aAgx2LoKC1bZ42nhPi
+DmnplQybwGpaLe7sH8wF
+=uRa3
 -----END PGP SIGNATURE-----
diff --git a/media-libs/phonon/phonon-4.8.3-r1.ebuild b/media-libs/phonon/phonon-4.8.3-r1.ebuild
new file mode 100644
index 000000000000..c98482fdca88
--- /dev/null
+++ b/media-libs/phonon/phonon-4.8.3-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v 1.1 2015/06/02 07:41:48 mgorny Exp $
+
+EAPI=5
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+else
+	SCM_ECLASS="git-r3"
+	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+	KEYWORDS=""
+fi
+
+inherit multibuild qmake-utils cmake-multilib ${SCM_ECLASS}
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"
+
+REQUIRED_USE="
+	|| ( aqua gstreamer vlc )
+	|| ( qt4 qt5 )
+	zeitgeist? ( qt4 )
+"
+
+RDEPEND="
+	!!dev-qt/qtphonon:4
+	qt4? (
+		dev-qt/qtcore:4[${MULTILIB_USEDEP}]
+		dev-qt/qtdbus:4[${MULTILIB_USEDEP}]
+		dev-qt/qtgui:4[${MULTILIB_USEDEP}]
+		designer? ( dev-qt/designer:4[${MULTILIB_USEDEP}] )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+	)
+	pulseaudio? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		>=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}]
+	)
+	zeitgeist? ( dev-libs/libqzeitgeist )
+"
+DEPEND="${RDEPEND}
+	qt4? ( >=dev-util/automoc-0.9.87 )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+PDEPEND="
+	aqua? ( media-libs/phonon-qt7 )
+	gstreamer? ( >=media-libs/phonon-gstreamer-4.8.0[qt4?,qt5?] )
+	vlc? ( >=media-libs/phonon-vlc-0.8.0[qt4?,qt5?] )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+		$(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
+		$(cmake-utils_use_with pulseaudio GLIB2)
+		$(cmake-utils_use_with pulseaudio PulseAudio)
+		$(multilib_is_native_abi && cmake-utils_use_with zeitgeist QZeitgeist)
+		-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
+	)
+	if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
+		mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)
+	fi
+	if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
+		mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON)
+	fi
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	myconfigure() {
+		local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
+		if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
+			cmake-multilib_src_configure
+		elif [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
+			multilib_src_configure
+		fi
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	mycompile() {
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			cmake-multilib_src_compile
+		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			cmake-utils_src_compile
+		fi
+	}
+	multibuild_foreach_variant mycompile
+}
+
+src_test() {
+	mytest() {
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			cmake-multilib_src_test
+		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			cmake-utils_src_test
+		fi
+	}
+	multibuild_foreach_variant mytest
+}
+
+src_install() {
+	myinstall() {
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			cmake-multilib_src_install
+		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			cmake-utils_src_install
+		fi
+	}
+	multibuild_foreach_variant myinstall
+}
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index 5ad18ea6977f..04013fdeabf1 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.27 2015/05/31 13:17:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.28 2015/06/02 07:41:48 mgorny Exp $
 
 EAPI=5
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
+	SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 else
 	SCM_ECLASS="git-r3"
@@ -13,7 +13,7 @@ else
 	KEYWORDS=""
 fi
 
-inherit cmake-utils multibuild ${SCM_ECLASS}
+inherit multibuild qmake-utils cmake-multilib ${SCM_ECLASS}
 
 DESCRIPTION="KDE multimedia API"
 HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
@@ -23,6 +23,7 @@ SLOT="0"
 IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"
 
 REQUIRED_USE="
+	|| ( aqua gstreamer vlc )
 	|| ( qt4 qt5 )
 	zeitgeist? ( qt4 )
 "
@@ -30,10 +31,10 @@ REQUIRED_USE="
 RDEPEND="
 	!!dev-qt/qtphonon:4
 	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		designer? ( dev-qt/designer:4 )
+		dev-qt/qtcore:4[${MULTILIB_USEDEP}]
+		dev-qt/qtdbus:4[${MULTILIB_USEDEP}]
+		dev-qt/qtgui:4[${MULTILIB_USEDEP}]
+		designer? ( dev-qt/designer:4[${MULTILIB_USEDEP}] )
 	)
 	qt5? (
 		dev-qt/qtcore:5
@@ -43,14 +44,14 @@ RDEPEND="
 		designer? ( dev-qt/designer:5 )
 	)
 	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		>=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}]
 	)
 	zeitgeist? ( dev-libs/libqzeitgeist )
 "
 DEPEND="${RDEPEND}
 	qt4? ( >=dev-util/automoc-0.9.87 )
-	virtual/pkgconfig
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
 PDEPEND="
 	aqua? ( media-libs/phonon-qt7 )
@@ -64,35 +65,66 @@ pkg_setup() {
 	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+		$(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
+		$(cmake-utils_use_with pulseaudio GLIB2)
+		$(cmake-utils_use_with pulseaudio PulseAudio)
+		$(multilib_is_native_abi && cmake-utils_use_with zeitgeist QZeitgeist)
+		-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
+	)
+	if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
+		mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)
+	fi
+	if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
+		mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON)
+	fi
+	cmake-utils_src_configure
+}
+
 src_configure() {
 	myconfigure() {
-		local mycmakeargs=(
-			-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-			$(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
-			$(cmake-utils_use_with pulseaudio GLIB2)
-			$(cmake-utils_use_with pulseaudio PulseAudio)
-			$(cmake-utils_use_with zeitgeist QZeitgeist)
-		)
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)
+		local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
+		if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
+			cmake-multilib_src_configure
+		elif [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
+			multilib_src_configure
 		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON)
-		fi
-		cmake-utils_src_configure
 	}
 
 	multibuild_foreach_variant myconfigure
 }
 
 src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
+	mycompile() {
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			cmake-multilib_src_compile
+		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			cmake-utils_src_compile
+		fi
+	}
+	multibuild_foreach_variant mycompile
 }
 
 src_test() {
-	multibuild_foreach_variant cmake-utils_src_test
+	mytest() {
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			cmake-multilib_src_test
+		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			cmake-utils_src_test
+		fi
+	}
+	multibuild_foreach_variant mytest
 }
 
 src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	myinstall() {
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			cmake-multilib_src_install
+		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			cmake-utils_src_install
+		fi
+	}
+	multibuild_foreach_variant myinstall
 }