diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-05-28 23:25:28 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-05-28 23:25:28 +0000 |
| commit | 209a5e8e2a31632482f781208b90c35f133832ae (patch) | |
| tree | 59763458696f180f74900c5e0751eb04d4b31778 /app-emulation | |
| parent | Automated update. (diff) | |
| download | historical-209a5e8e2a31632482f781208b90c35f133832ae.tar.gz historical-209a5e8e2a31632482f781208b90c35f133832ae.tar.bz2 historical-209a5e8e2a31632482f781208b90c35f133832ae.zip | |
Fix installation with LIBDIR_X86 != lib32.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'app-emulation')
3 files changed, 12 insertions, 20 deletions
diff --git a/app-emulation/emul-linux-x86-qtlibs/ChangeLog b/app-emulation/emul-linux-x86-qtlibs/ChangeLog index 37697d196bce..4d57469c6450 100644 --- a/app-emulation/emul-linux-x86-qtlibs/ChangeLog +++ b/app-emulation/emul-linux-x86-qtlibs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/emul-linux-x86-qtlibs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.93 2014/05/27 19:06:38 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.94 2014/05/28 23:25:26 floppym Exp $ + + 28 May 2014; Mike Gilbert <floppym@gentoo.org> + emul-linux-x86-qtlibs-20140508-r1.ebuild: + Fix installation with LIBDIR_X86 != lib32. *emul-linux-x86-qtlibs-20140508-r1 (27 May 2014) diff --git a/app-emulation/emul-linux-x86-qtlibs/Manifest b/app-emulation/emul-linux-x86-qtlibs/Manifest index 7eaea02b3064..c7ae9bc5288e 100644 --- a/app-emulation/emul-linux-x86-qtlibs/Manifest +++ b/app-emulation/emul-linux-x86-qtlibs/Manifest @@ -6,26 +6,14 @@ DIST emul-linux-x86-qtlibs-20140406.tar.xz 14458616 SHA256 0ce7be095b10517b44a55 DIST emul-linux-x86-qtlibs-20140508.tar.xz 14462920 SHA256 91317c9f90827d539ac23a7c9046210c4c16eba4175a0a39f2f10684e51ea1ae SHA512 c224a5369cffc1bd36128d5f68ed848b7059e569d8504219b832668557b9357fbdab5a53ec2cd7297c57d34cb67f854d19c5339f8fbec9b0db1b63ff0ba9e1f0 WHIRLPOOL 8ff01c93ef84aeba7cede0dbca71ca0911b2369f3c27b4bec87e3a500cea3dcc220444a7497b061622677aac54a46d6a572d4b43594194fb38cfe02505c70611 EBUILD emul-linux-x86-qtlibs-20131008.ebuild 749 SHA256 1fe6da52d03a4de23361af2de5e043a106661106f748665915b2b284e12b6214 SHA512 39bcf591c6167d40eaab181d18e47183c3254bf24d377633cdb19966c82d47ee001512480f13388f4ecdec663a8c8d83a379751418d2ee4a591f8e251177aa22 WHIRLPOOL db316a6fd742d079901aa9c48ea04e253b8513d837383053496706bc4c7e9af4dc5e8a9a51e9a3190053b26f489c85fc63f83f6a5cde1b01756d27626ce2c003 EBUILD emul-linux-x86-qtlibs-20140406.ebuild 749 SHA256 b20eb8511869e7a72f5b8b32b284bbd30ea6165956766f32229e3f72d6810228 SHA512 a847e55fb182ff3148f3cfa7933edcf7e66b62f18ce275fff48f7e2d3d3d7067a89f2754bdb8a35ce1195c5f6f1c63f01e20f30c5fbee44476a6d716930be93e WHIRLPOOL ab2a8d9fe57869f4af23718ad4579c9f9be5ea02473fddf2ebcbf61f5876f8e8f99426a8541e81631a567385d5faf88a1305de9c42e8f7c11d0aa4de17bba36c -EBUILD emul-linux-x86-qtlibs-20140508-r1.ebuild 1776 SHA256 c5e90d0fab27f100886d81c50825824cc503617c12e436e6882277cc435e95f8 SHA512 2377df2b71b39a05bd6062e6beb497a841a5bc429f691f36cbf014f64eecc22097fd7ead603f760c9fccf168d8bd6c6979d129b8e1a9ad44c4b884d478d9e823 WHIRLPOOL 550f9fc4b66157ec7283ecee04513eff014160539894fab02d8c50bce74a0943e86f64ba4bfb692500abe68f7821d795f8f45acd5de27229e86157df15bc09d2 +EBUILD emul-linux-x86-qtlibs-20140508-r1.ebuild 1795 SHA256 a916b3cbe08ee1790282836dc9087845a6d501cd79c5796feecb3ee14469c957 SHA512 69ea32c70d89e541cba1447d289a5026382e7aa8b382412e2fa6d3e0c51cec65ae6fda813c7343157c3544fa645ec168c9a2cd4e3a762e7c52deae1e420adddd WHIRLPOOL ac1d759361f8029be866f27cbd05f3d8862af0f96c79ddc383916c4ad34d0852dd37ea7c2f6516800cf866d2157a197832b23f589d524e7757542e2e7a7400f3 EBUILD emul-linux-x86-qtlibs-20140508.ebuild 750 SHA256 1894445543cd6c53aa98642c445880063b20b89063507d14c80de5c0ec9ab2c7 SHA512 c8d89d5ffe7127f00b8b4ecbf77b2508fbd0fb00b6df4eab91b2d2f5c5f363f6da4cfb7f011d4c3bb2573089bcc87f84e35965c8a3b157fb83cb92c80967ff7e WHIRLPOOL 70bcc95a41ebea58b76a03c65a16a8e60fea89cf0f2129ffa96fbc4fead53ce2b3830fba9481bb18360e66d1f6ac5cc52188fe0f74228e8bf9df1c66fd3644c2 -MISC ChangeLog 16309 SHA256 1d3e5d23d2976594f721ea434b6984f383cac09e80fb871c16ed103a1c96827e SHA512 5bc6edf5c44b0788a45ed511e8410942ea8df9545eb21a8206ba235e974ef720f270cec0c9f9beb419dbc76af323e19f07e7da975e223fe8d109ab29204b0c23 WHIRLPOOL fada17dfff3fed352985d6235a2e71d49d87d123686b37e483d0a83f72542e3c98202fd8bf228e7b7c719e0c56437373e4a588fa5cb1a7647ac82b797ddc6ce6 +MISC ChangeLog 16449 SHA256 849cf78d2f4da96a9c872895afb25e4c8215003c49cb69a5a7b4b28ea854e9c4 SHA512 2cea6d9f09e97d473a8660f9eb2ad40f3585bd5d179770c80143e5f91bab401f1a37153078312003d27594fb23b5caac335ee8584f891a59060d442d5d5939a2 WHIRLPOOL a04f983277df9a79f7822d19af200650e93575922323fb008da4845df198122ff125450f9b375a18a4c74ba41ffb36e89cbaae927cd6390a950c83a9e480f46d MISC metadata.xml 414 SHA256 1e10b803414e16aa149ea350f10f7ef335e8f78433ba082e54e4a47fb89d8514 SHA512 1b88d5e3c8564ffc02e5dfdd5b11820414d9d8b241fa93f262cab19f33c9bce0c0c574ab7e73ce5f6bb0f497c074196826f56d3d013f56feb8a5b0e03faeb308 WHIRLPOOL a7bc77bebe72d98de35863819bfc2e7204acace709bbc5d184ef971e0e7ad22360b856c5bc54df2dc097d9393d1349aca4a04c12256abaca18336ccb5ba63ff0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJThOI/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJTgQAJyBagDkl4wZGnOtgmGxBNqc -dmwo8PnsxgNM3lyvo9LVnJbcVhLHgVfIrTYmAs68MUng/o4+G4sXX54OoQsX+Sdx -BTKSjfAYqiqyiMGetHTlReUH/PWoSfTQT94LEMseOeQJ0mTMCxLWKErwm2SWWR/v -DvOMHcFdoWd202KNUKHWMaJ2DwHFQ1p3/QMTQqDx4whbKKb915uwwW6juOqLyLxf -7zb0O4NcqbuBxOYJrc2AewfRLFItztaI3rlYTr/XOAZlshTRZbrP6CQy1NEyB6cI -IpG/1JSC6TInqeASlh1jLmVxVT7shzK19m7aNnhYC3wBZTI+gmewPsmS7cAvZE7S -pMLvL/IfeceqmdXf3Js5Dyvwi5ncKcPoJLiz6rdOGXiCUXZBY3EAr1zrI5I8TU3X -hize6iq7NRAkDdKzHfqShrK4bHiwFFef5eilWdnXDdYQify6PW+6II+WRqWLo6Oh -DmH0PeCtZ4o1Fka/fet8+7l8FBoKri7MtBn7bt5ZaP/qRUM8H7mAce751H0V61qq -qR5kN6JMmsEBhPXCt2E8j7cF42uN2ms+ZDjD/Lay5Rfc/wsHMp/Ml1QeDVEqir7U -Hq2hi4qyXs5EDrD3pSZixNxIfq93nE5XaXLrVXbBz0gdPnjkRKFOKMWphVrZCBvi -8YdT5Ae5gwwRrSMBHK92 -=LtPw +iF4EAREIAAYFAlOGcGcACgkQC77qH+pIQ6SLoQD/WxGLp1lidquKSWIDBcUM8UHs +y2i7j97TrvdcVSn3xZ8A/0HLarT+ieMUT4U8b855+R8Zc1F0U0pLMDOHmr+70nwC +=3bGN -----END PGP SIGNATURE----- diff --git a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild index 02a1eb2e6009..56018968e7c3 100644 --- a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild +++ b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild,v 1.1 2014/05/27 19:06:38 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20140508-r1.ebuild,v 1.2 2014/05/28 23:25:26 floppym Exp $ EAPI=5 inherit eutils emul-linux-x86 @@ -59,7 +59,7 @@ src_install() { emul-linux-x86_src_install if ! use mng; then - rm "${D%/}"/usr/lib32/qt4/plugins/imageformats/libqmng.so || die + rm "${D%/}"/usr/"$(get_abi_LIBDIR x86)"/qt4/plugins/imageformats/libqmng.so || die fi # Set LDPATH for not needing dev-qt/qtcore |