Fix build with gentoo-multilib thanks to Darragh Bailey <felix@compsoc.nuigalway.ie>, wrt bug #455456.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 23 insertions, 24 deletions

diff --git a/media-libs/phonon-gstreamer/ChangeLog b/media-libs/phonon-gstreamer/ChangeLog
index e2ef20af6b53..5d54f2ee7ea1 100644
--- a/media-libs/phonon-gstreamer/ChangeLog
+++ b/media-libs/phonon-gstreamer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/phonon-gstreamer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/ChangeLog,v 1.36 2013/03/02 21:47:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/ChangeLog,v 1.37 2013/03/10 10:12:23 kensington Exp $
+
+  10 Mar 2013; Michael Palimaka <kensington@gentoo.org>
+  phonon-gstreamer-4.6.3.ebuild, phonon-gstreamer-9999.ebuild:
+  Fix build with gentoo-multilib thanks to Darragh Bailey
+  <felix@compsoc.nuigalway.ie>, wrt bug #455456.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
   phonon-gstreamer-4.6.2-r1.ebuild, phonon-gstreamer-4.6.3.ebuild,
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 7763b9da46cb..1e8773c0591f 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -5,26 +5,18 @@ AUX phonon-gstreamer-4.6.2-desktop.patch 2279 SHA256 d3f5f730c550ef2788a2eb2b3b5
 DIST phonon-backend-gstreamer-4.6.2.tar.xz 71672 SHA256 d563a8d04e59203f5a5f8cae7de78ca0206057691e264cff813e2d34bc982516 SHA512 55701ff2a8a2bb137e2ffe42b8b95695fe96de34fd2e40438a81487619568bc23963f4cdbe2a6341cffbfdd1eeef86cd1fbb053bc9336cf176b44d250b74b071 WHIRLPOOL 790c50aae82cf97a0fc36bcbdfb0ddd00a424701a32b2f67ad5c6fadccc8ebc6ae5482aa8f2abd5f30b43771f79573c76278b70c6250503293f8dcc1909d7639
 DIST phonon-backend-gstreamer-4.6.3.tar.xz 72364 SHA256 55e273f113e309f2fc3f316baf4b220562cc8fb37b25193ac257ff1eae7aaf58 SHA512 819b4ac7b2193f4d32f160ffb1fb22f702e66ed9de3d6bdf818e238dfcdf88fbf974abc85f9d65c5da589bf413a525a1cd8131097b49354ebc255e90a813dbbc WHIRLPOOL 4b0fa8d99776bee3876c59d97af5143adc4bbe9ed3abb0b206d6dc7df7d728e24c389feee2ea9511524320a2195c834a4ae2a96d897562336c1310429d8e745e
 EBUILD phonon-gstreamer-4.6.2-r1.ebuild 1342 SHA256 57b5e6ccad70532f8e68a128df4b2b60a64f9f98fc933e727af64d32b0d86836 SHA512 7e00b5dd9356dec23140dfe396d496ee618c6c6730435fef716e07d244dc37408522d7faa01399024626768c10da308a139986a2ea5244dd06e34cee2536bc18 WHIRLPOOL a98ec75ebfa032ede6c856d3db720f28aa14163991c6abd8af299e6b954c508d373eb73a73b1b2cbc331055fff0cfffb58f17559a17ec9c2886b99a9d6baf8b2
-EBUILD phonon-gstreamer-4.6.3.ebuild 1298 SHA256 a3e9f9defc133452c9022b6b9e3602545b6d2f5d1611ca4c34207bf9db997408 SHA512 64a8fd2b99cf0d75d93292f9c16992a1fc01c6adc34ed95c0de4f8695d1979c584852fa828f2cc742c457741e0e7e7a313cb01cf4cc826e1f4ad68f40f8774f3 WHIRLPOOL c3dd2638d0372233f218bff928a66c7df3a11047637ccd8b5e2980d83b14b48d00519dbd9ecd05cf719b6ff82a74ded1d5aeac0621440b4b7b119da3ef1de2e1
-EBUILD phonon-gstreamer-9999.ebuild 1254 SHA256 d1163c5ca7b2fceaa0d7b834d0a0e5f98ffa254fdf030d2a2b2271e4e883c04a SHA512 a5313ec0d8a919633c4a60a40ed06b902cce192b0d99506dd347304d53ea6c3a15356786e960d9744c91a81f3438cd3b667cf601ce55a59f04321d3b76e675d0 WHIRLPOOL d931daa14301f50825971f8185e643f90549f365259ff450b4cd844a3c3b55cb122a7e06c957fbbde264e9a46c032de2ef5d092b35bd74749c7f3f10e0691092
-MISC ChangeLog 6707 SHA256 376037efdf5e34ec65a2eac32a7612b5dfca504aadcbd8935fb117a4c1baa681 SHA512 29be414ca5d636795acef3b40a8e65ca6b44ec26fa343f00b3e8f78ba0369ae5545498820afd930daa748f45a1cbb1ad1568a6c51b6c5783f9371a363a296248 WHIRLPOOL 5c976f2ae1cc523a823ae08d9c40ffcc6f373c023d309526be3067b5dd9ce66571c461882d264e29e46e33ec9ca5df5eb950318950561e6b5b07d38ef8ff2659
+EBUILD phonon-gstreamer-4.6.3.ebuild 1357 SHA256 f8d0f9dc0ea81ac9f0c47df6b49f99b7f6df913470111e563d8c4d5288648c37 SHA512 ef4485db58adb585f5189470c922819aa50a699a6230afc9472757c30fda407bc59b248fa029746541f29364e4d498ff290b26453500b00397ebd3a79298b049 WHIRLPOOL 3ff6c4bb0a6e2ea75a5f7f7e707df6f7a0c3d448251027b7bff3e40a632aa61263d83292c5840b88779a3e92911c5466c55978695eec40eabbc033b28dda0e55
+EBUILD phonon-gstreamer-9999.ebuild 1357 SHA256 c1e58fce50f3c0aba247f7f9977b75454d421b9c1df8eef7d5038814b154e005 SHA512 1991fcd2d13036aa8786aa4c352df93069252e9e490293a10498159bf32f71168c90d136980b76b819293ea8d87672d9355e80b6ca785d5787af239421462b11 WHIRLPOOL 537eb9090191eb8f4d85b782d408148501b170eacc0bf2956d90e6b7b1987e4f0f5cafa8c41ae325be99c09d70a929ad2c878311df72afbd8b7ff9d929db074e
+MISC ChangeLog 6936 SHA256 167316d005f6e057e0752d9f4ac6242ab0b85d25de2d56ff59c0790452779b0e SHA512 6f3d15ec9020a084c87b535b8725cf8bfe024d86561f4d7e28091405a00acd68cdd5054dfc62e13eaba564a4dbf2e42b4c4ae055a3ecccca5ef189e9b851e830 WHIRLPOOL 881f79b6be3e5a373cecfb44f8eb2e9c36a2c5fc88eb472a156849221e89f43593bcdb776b8dd516106dcc9de8a4b234c129046a808b25cc731aa22b6f4e5d32
 MISC metadata.xml 244 SHA256 4e62785c5651e1802026dce1b7fe721cbd9bc2f24bd59ec5f839e47af0ac8c58 SHA512 dcce9ee0215b078568f17854200c539f12e1225b42411c088d002e5089e9c5e0e324673e155fe396fd71e480576c1ef1bbe662edf333f82fa623cf3eefd86702 WHIRLPOOL 5e9f0369159fa7b195aca60aa622ec8248fb0fd8a9cf08b5abe4e54a72eba8d666ad9a8820915e79daefe347ecb1766cb4a6716777e04b214f85dd6584e39334
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMnN7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88PiwQAMNyphD51hcuhc5e1RYZyH/5
-aEDXrjjg/d2jJj+Dr+xCk6m2ifQFRGkKKFPRMNC88LskW7aAq1C3vmpZJEBz921g
-+0iW068Dr0guDG8BIWtF8rs6D+/oHiZ1y/CsWvqLm+jklvkitQNTCXNsq7FkZYBz
-eb/3eIBof0vbVB4bGU9ATGt1ZfTdU4GRuKSweUWujaTusJXCQWBFF9cphzjYxoR7
-q2JDEtNCuPnwXYNGPiV+Xa2LXyI63g6fKQ4PNQRtMm3/u1uqNjw4mfQIHECJHFhP
-HmBr2Imks/FceTQfXaaxsDik9evmR2aJA9w46JQLAt8aBNFIsahlkWqBEzJ2QDpG
-h9MIrLJNq1ExM01mT1tdF8nhq4Dt5jbj6uXQ75n8xiwJBksxd1b+YW1MiXDWG/Xr
-FGYcXUbwA9cxkxWKze6ItWI3Bv5MSteNBdaY+T7T2bqA689r9F8VIIYpBzlfAvxS
-4EhRl93rki2+WnWu4fAuFF85FUJpD2WVnncDLEJnRiR/6GD94aeZcYlw5lWoLesa
-FqjvJBTd6Z4NBdn+jz2eT6Z5UkZ47bBOJ2YwC67yCPQPA1fzOvw+V4gS1YlusgGi
-hZqrWtwNNWBniNDdn52/NWxhQfbadsP1nHB32iHyF1P8NhyF8oM1+Nbc2JTPRu5s
-t5qaN90yez9GvsNB6MLq
-=WeLn
+iQEcBAEBCAAGBQJRPFx0AAoJEMbwO6tnXQ0shhcIAKobvHzXseQJqXUaYoN863ON
+ecEOsmmsGVIMbcakMqzxQtF6+3rO1ROAhfaWpO+74a2/pEGGQfRuNZzulZIys7Sn
+a7KQpAZ77mKM67UbEuPZ76T189qpQyN6Ne2YHRmKB+opJJNBi1mM+OuR88JMt+OQ
+E5k6NWXrPU48neJ8eBMdr4rfIJ7S7SWW/zCq2LHba5FZJAAhtqKb2uHIIyurGuiY
+jrZweA2MEytcxO8cBBoZLnFJiRacT3zVVCQsfTfOrZtMhhY1cha86+bfAVVwPCCl
+ecJzC0h6T3FD1g8Fy0k62WE9+r1bScC/kGpIdisvYCf5luVJPIEMy+UNzSZfWCU=
+=vHIS
 -----END PGP SIGNATURE-----
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.3.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.3.ebuild
index c3c9e56af57d..7e12e783921c 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.3.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.3.ebuild,v 1.2 2013/03/02 21:47:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.3.ebuild,v 1.3 2013/03/10 10:12:23 kensington Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.kde.org/${PN}"
 MY_PN="phonon-backend-gstreamer"
 MY_P=${MY_PN}-${PV}
 
-inherit cmake-utils ${git_eclass}
+inherit cmake-utils multilib ${git_eclass}
 
 DESCRIPTION="Phonon GStreamer backend"
 HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
@@ -45,6 +45,7 @@ S="${WORKDIR}/${MY_P}"
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with alsa)
+		-DPhonon_DIR=/usr/$(get_libdir)/cmake/phonon/
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index 85d74b4c1d69..2fea6f1dac18 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild,v 1.14 2013/03/02 21:47:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild,v 1.15 2013/03/10 10:12:23 kensington Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.kde.org/${PN}"
 MY_PN="phonon-backend-gstreamer"
 MY_P=${MY_PN}-${PV}
 
-inherit cmake-utils ${git_eclass}
+inherit cmake-utils multilib ${git_eclass}
 
 DESCRIPTION="Phonon GStreamer backend"
 HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
@@ -20,7 +20,7 @@ LICENSE="LGPL-2.1"
 if [[ ${PV} == *9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 fi
 SLOT="0"
 IUSE="alsa debug +network"
@@ -45,6 +45,7 @@ S="${WORKDIR}/${MY_P}"
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with alsa)
+		-DPhonon_DIR=/usr/$(get_libdir)/cmake/phonon/
 	)
 	cmake-utils_src_configure
 }