Only build for native ABI to avoid build failure since only ABI-neutral data is installed wrt bug #545142.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 41 insertions, 23 deletions

diff --git a/dev-qt/qttranslations/ChangeLog b/dev-qt/qttranslations/ChangeLog
index 589f9568418e..f9bf9bf484d5 100644
--- a/dev-qt/qttranslations/ChangeLog
+++ b/dev-qt/qttranslations/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qttranslations
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/ChangeLog,v 1.14 2015/03/29 14:31:05 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/ChangeLog,v 1.15 2015/04/07 15:08:37 kensington Exp $
+
+  07 Apr 2015; Michael Palimaka <kensington@gentoo.org>
+  qttranslations-4.8.6-r1.ebuild:
+  Only build for native ABI to avoid build failure since only ABI-neutral data
+  is installed wrt bug #545142.
 
   29 Mar 2015; Davide Pesavento <pesa@gentoo.org> qttranslations-5.4.1.ebuild:
   This package has no RDEPENDs (bug 544938).
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index b7c30338d27d..cb21235735f3 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -3,26 +3,25 @@ Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qttranslations-opensource-src-5.4.1.tar.xz 1071784 SHA256 3c4d045f974bc9ee76bb85d319737cf182b8697c4ba72d2c075d3609cfaf9041 SHA512 901d4d146f97852755806b098331a7893ac5847a95d3a1c6eea518cf8d9b64369a073a5179ce52f61921c443897f2b6eb942312fd834c381b1a5fe1d209c3ccc WHIRLPOOL 875d2e6960e0d2dd4ae2a514f1682e8b941e0901c484b2c93df0cd8564395f6e1930d66ab228c0ba65515da5ec673231d47602357f3f4adea0bef9b1482cad6d
-EBUILD qttranslations-4.8.6-r1.ebuild 792 SHA256 4ee557b689e9c21afd2f3745e655add91133fa362e320c93e43b8c168bd8e4a1 SHA512 0003d11415dc8b23f8caf3881d95fe99e7e96070fdf9a5b3edfa8695666a5c66805b2e70683f4049804eecb55edf98e1d9d55600f4a327a567f164634a9e889b WHIRLPOOL b8365b4be985261540cca0b7e5f07e7c13ab4826e1e28cba0097749205a068fa48ac2152b44a37d6a767acca0f297365bd7dea7314f75ca8986b94287f84f509
+EBUILD qttranslations-4.8.6-r1.ebuild 1026 SHA256 0fb6aaf822eb92fa268fdecd3711101ebb7e5bc684b5e26dd139ad7b19f03230 SHA512 8f5b9f62467b802b0a7feddcc4152f88bd34f1c1594ce449a27a9c09d05c296269c2af96cf218a9dd333452fbf004a41b5f69f4809075c1ce643cff5f3adf5ed WHIRLPOOL c4e989718127b1e7c3aa84a96149edd559bfe9dd3ddf413bed71bf802267d521b7666ea87b5e7a99d2c8d4d31320d7ee60f637ffc75117e93480bc283e3b8335
 EBUILD qttranslations-5.4.1.ebuild 499 SHA256 20461cfbea73321bcfa4c3f6dbc8fcaeacc84a0941f6925cb7d13a89794d2087 SHA512 4a0f97c2d5c39cdf5ffb256931a64ce7d74189fdbe644b63ecc586d28a13710f2cdf956c0ceeaf075b15581c5ab8c56158ef302746cdac7cb7797c026322e339 WHIRLPOOL 5dfdb16c626a884d61e5f7a977ab8349079155457fc7ed40d4964e9401c1eee832019c4856daaefd352c672a81a41a8637784a0a9850429786e02816dc836783
-MISC ChangeLog 1696 SHA256 9ee5e3926567495c5f509181aecd4227c6a40ab9ff8dfc4d36717571896d2280 SHA512 bf9650b9ea5ae391749f31fba13548e8e0ce78399f47f8f75e3d53e5a8a25e110809a41f37b840707bcfdeaee04bef7e0802ba3d2c8c32f1cd17f6f4d05be336 WHIRLPOOL 138eb9096f0adfaa32f0e6b078b47aa023b3b7e03382612c70f128cd1fefad5baa451b19c186114ad2c8c037b51f14eeddc2c30c0125c490728c2dfbcf691288
+MISC ChangeLog 1904 SHA256 ab82a860fef9c9b8e15de475804e65992e0a370efc8570f020266374fc8cf1d9 SHA512 2f4cf95a81e4c6cfbb1625670f424dd7f4dd8b78ce189446fb5c39829c0927191e78fdebc5dadcc07f87ce987d214f0bd840fdfb58cc30d9327fb7725fdda975 WHIRLPOOL 3edf9002345329335f7665d613965a9a6f4ab2f82ffe082f7f24b0dc72303dc82023236cb695117f7f9027dfae951eed3cf8f09942b323a22fb9e4b5f445e8b9
 MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVGAyqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9O8wQAIdJcMwk5nLS4MxIzfOraR+7
-s1faSCHm81qcuGAMbYwj662Wg+0lPF8srVmcFjamii6vAOf4h471jqqss3pbsGf9
-bOyDYdDe8OqOMDxgztgj8uu3D7OcEH1Iv3ihiRbUMIjsmtgLYTCoVzy+9oB2DA1G
-/lxXvWAkOX5uei0BOz0uAYhtq9Vq0h/zN6bOT8w9rZ74RhUVoix+MRHDSwQIZDw8
-9Z3xCCP8Iib27n/Qum3olyusEAOzKW0rPOqNr4UH5Ivyx6DEfP6jGsJC+B0L74o3
-MJUB9QXRjYdafWAR0fuEHX10Ip+QZx+X7DwZbRnxnujHXfIOXw7/knPgLS8YsjHj
-pdPPbLm+VDpKTlvKQ5JMb2ABFp0z58M7f69DIoSJRQ9gdaKzzIo4y/uP++Cz+V0a
-zbhA9Vk4jBxMK0xHTIXwXJ1N3/OkRRdTLQuFdF381SXZRpjA4hfYkb5KTV+r0jf7
-6FVB8uCIVIN+bJL8Q6ed/pEmQ+PuLHsMYYcRVZbb3P9/MUtzlhDcNwv/aCUYricN
-XAhTv4o+ytipemLFuy3IQu3EtrWdZV7MKHGJBudUSEGx6zKHH5oYmkhukYpTpbdo
-iQhbNRc0uiMZc+u1sZ1CiMTZhiihWa8XDsxaphf08Y+pmyQWT0TQa6COOg7gcXBU
-V0R2HR4EvEi7ZAdL6n6H
-=2rWm
+iQJiBAEBCABMBQJVI/L2RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7BSdEACvqdHHNg1rIQHCAUDNxJzzuIEBAmDIJCn9XWPXMIPISOcW0fMlx/h9iCGx
+H/HjHQ6MjDGQ3yMTPVIOUHF/0Jll5ufGmu6fzOED9k121znltp9gE65OAfX+TSmn
+ClwbWOu4n+wuxIYOHihVT5JNBCSvzZZw6SR2MuUUUxCXf3P6+rdYFW5HyS8zHS26
+yQAaP8w1OnLcLUEMxUbcHFA5CNIP8eToUpJycbpO8dzvSnO+nt1ERa6ClquRhCIL
+zY9mo6tVc0JHmOIRtJ3doC+GeRFPwoMy9W1AUULsZ5WiS9njNSvcyXbwOPNLEEFw
+HIqyYzeKA2OH/mcvvn8HdwLcofAIxLI0N/+i4zYHTycaLdkZ0TT0+PRwjFJKCwDI
+5fFu6BZH2mChgXqGhP5QV7KeXdGwiJ8g0+2KGihUOgUtrP/8MlVLrFqKhIvkkg3v
+vZEyn+fSDCCTtFgeHYqray+L37Q0aSOPEliFbKjuDL0JJZZNZSC90Gahfc506CAG
+xM4aJ4N9CVw3IF9YCmAbZvMzg7NpblTKreT1eKfs6+yv1DRZVDhvE48OkK4wecP0
+RcpMiDVXFR/ICiY1R9wuH+/4oc38PHlPAFmQq8/UUSMJZXjBF11gkDU9AU7RaTKL
+eIshPU1mQ7U1qFL5UT0/DALTYx1ZueAZCkMb7Oj0nsCxvPOWWQ==
+=0v7e
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild b/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
index a24ecdc4d0d8..e7d4d4851713 100644
--- a/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:38:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild,v 1.2 2015/04/07 15:08:37 kensington Exp $
 
 EAPI=5
 
@@ -24,7 +24,21 @@ RDEPEND="${DEPEND}"
 QT4_TARGET_DIRECTORIES="translations"
 
 multilib_src_configure() {
-	qt4_prepare_env
-	qt4_symlink_tools_to_build_dir
-	qt4_foreach_target_subdir qt4_qmake
+	if multilib_is_native_abi; then
+		qt4_prepare_env
+		qt4_symlink_tools_to_build_dir
+		qt4_foreach_target_subdir qt4_qmake
+	fi
+}
+
+multilib_src_compile() {
+	multilib_is_native_abi && qt4_multilib_src_compile
+}
+
+multilib_src_test() {
+	:
+}
+
+multilib_src_install() {
+	multilib_is_native_abi && qt4_multilib_src_install
 }