Explicitly call einstalldocs in multilib_src_install_all() to accomodate bug #483304.

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

4 files changed, 30 insertions, 13 deletions

diff --git a/media-libs/libsidplay/ChangeLog b/media-libs/libsidplay/ChangeLog
index 4569f5815eb0..8aa6fc3141b7 100644
--- a/media-libs/libsidplay/ChangeLog
+++ b/media-libs/libsidplay/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsidplay
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.58 2013/07/31 17:34:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.59 2013/10/14 17:44:02 mgorny Exp $
+
+  14 Oct 2013; Michał Górny <mgorny@gentoo.org> libsidplay-1.36.59-r1.ebuild,
+  libsidplay-2.1.1-r4.ebuild:
+  Explicitly call einstalldocs in multilib_src_install_all() to accomodate bug
+  #483304.
 
 *libsidplay-2.1.1-r4 (31 Jul 2013)
 *libsidplay-1.36.59-r1 (31 Jul 2013)
@@ -219,4 +224,3 @@
   libsidplay is a multi-platform C64 music player and SID chip emulator.
 
   Initial import.
-
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index fdc8f6c68980..cf97277ea907 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -10,17 +10,29 @@ AUX libsidplay-gcc34.patch 745 SHA256 63d96b88deb3b9c8bdb0fa627b4d905ea72cfd4dba
 AUX libsidplay2-gcc41.patch 1055 SHA256 d6730f1fd652799801dd66f3a253d38f96d40baca3d5c50a0efe8077d70a19d5 SHA512 8edb0d9b4a86a01acd25baac1afd9bde0e5e09385847217d3e5b183d0a107814469169c5be5e2d77aa9b4f9ce06966dab69cec81c8710bfbd45a05eda06d8dab WHIRLPOOL e1d2eed60b093073f08da6d37d85290e98e852fb7cf6628276f4276c350d3ff90e15c575e517dc9a300b0016c60cbfba45ea9a083071bdcb27aa37af7490d141
 DIST libsidplay-1.36.59.tgz 390097 SHA256 3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024 SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410 WHIRLPOOL 121e985c861454c8755c4c6fe8066936bc0149c89ca9197ee23d03657f4e87b48e8f1e2c9e26202b04a1291746782be62cff86f16384ce9a9a50f885af9f4279
 DIST sidplay-libs-2.1.1.tar.gz 1900252 SHA256 e9a24ada48215a46d2c232a70c5601bc9505e997f120e8f2ba3713e09e28d1f9 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3 WHIRLPOOL 53b4bd66bbac0bfc29514981f34e19fac41bae356d06e727f3a0f2ad2bedcb1cd815d22656bcf06460e9d908a91433bbdea029805af43b1cd97310f230f1c89c
-EBUILD libsidplay-1.36.59-r1.ebuild 955 SHA256 c2a614dadf3d56e9e0bf68df4fc34c9741aa8d74024611f7450d8cd6904f1007 SHA512 09b99e12cf851d8e2bc01897b8a29507422106bb49fe149bef5694403e0b8514cb69b7740552fef6faf8ced7ee86af41e23d7e4821558a5c7d3a48da03f66ab1 WHIRLPOOL 18b115b98cc3faf5f25c4c493f6c5edd73d6296b192bfa750a0903de45d42b0f7124b586ddbeaf18fd7ca0d476db1f31db56e8d0d154815b6e98cd41be66ac0e
+EBUILD libsidplay-1.36.59-r1.ebuild 961 SHA256 41a84d55ec7dfcdf2e402fcc8450b585361f0ead7bcc74d2d6b861519ca6a5e9 SHA512 4a832a6c334ad4377c0024090fd5e83adfb30242c3a5241f13049401afb3c6ffdd135e3fede81eea9883bc4299d0d5aed78b854964c989cf7ff0e00b8b7f6568 WHIRLPOOL 916b5498b0b2bf8abf570b0e0b61c012bb465b82fd681c494fd2fa7aced77316ad391c4756c0f17b2131de0a0e638ff3ebb267bdb1f53fbedd9d8e09d1046a0a
 EBUILD libsidplay-1.36.59.ebuild 753 SHA256 49eef159cec14b704ea38744c63e3472e0b34f5de6d37f3f44db3d8a4022893a SHA512 6888bae68039133ff7fee75eaa3e46523ed186735518954ca24112d83f08c080400e908ea552529ad619aaf62354e16da324b64fb386202facf66ca4e25811da WHIRLPOOL ac56333bce75fbcaf3568ecdf4174771701be5f2f772a2b592243e0a8f7fb66e6f8f850bcc198265dff3230a70d9a47ed5ad73fa51a266190b3344d800e69c24
 EBUILD libsidplay-2.1.1-r2.ebuild 1226 SHA256 2677b9dcd2f1e7fda0c36d0a87ece647f369168b3e789b5b0923768814cf1d57 SHA512 5dbd3f03abbdcd982d28beecc9d99745876b5e39be3773f97826204c00595c09c1d4f8e4c37d6587fd2f8a8d3f62c9550795a48e9241b0a3e8954fded92844b6 WHIRLPOOL c455282832133deee147c445ed01f83ec86447a7d1440653db74b3d53968f149fee7066b8e34e6ad3ad3daa5c43bef5079355da4c1b33604558801eb9aaec9da
 EBUILD libsidplay-2.1.1-r3.ebuild 1220 SHA256 59ebfc9f75b8aa778f67286477ea3facd2a4c0846c9b31f1706225b226095fc3 SHA512 61a094a0dc500baeb9fd59b2bddd68af7222cd53ac90942b825b588b30f5db30012c90c884296ec7d6b57a3147f2977bb44ed36aa3fb49fb242c10d8013dd8bc WHIRLPOOL 04cee1b64ad25664049aa81544fcf81ef19d3aa508b06e04adc3a4e505d6ae11f0cbfe821b7376afd16e1fd9fb7526b9fa8f0d578eef1603b634a1aa3bee8484
-EBUILD libsidplay-2.1.1-r4.ebuild 1453 SHA256 d6e13bb1e16d04756335466cfdae62ce4c3f9ec9cbc83c31c0164354b920f23c SHA512 b5640e34f3dbcfb0ee3dc66c654e11a8414db96228ca3ee3cc6fb2ea16b70f7fb3ebf3f84e884f0f80f3a9b8a65e901e58bb661b30922faa61b97bebadee0306 WHIRLPOOL 8b1942a8de3fae00c879a86a20ef27f36af43670d2bf3bd05f03eef3f79e69a4302a07100dca07d817420374993aec2679ab8899c2661546cfe9ce09e75d3133
-MISC ChangeLog 7506 SHA256 6510aae2c89265170af2ec06480b9e56eed5a05d9e215fc9fc6f8ff514dacb11 SHA512 d0042b9edf42c21ec111061d6ce21e57538c44f1af4755628f96f4eaa2748a7addf7810a0a5b72cbc6f650f6bf28b444ba48ff60f71bb87231abc8c936c36ee9 WHIRLPOOL 4b1eb7b7e88e434f46ec369aa00c2aef85cb695f318991c66d35bb9741b34735216d7ccfcfcb8d9acde7f1417b6bc22e3a835f2705c688f5e674c2acb376f8ee
+EBUILD libsidplay-2.1.1-r4.ebuild 1434 SHA256 a8332e40e9f194c85da0576afef74da34e2b977291a56bdfcad6159ce8d630a6 SHA512 468f5313c9e3def38a1bc175e100f865fb6507eebbcca61254fe4daa7e609b2a7bb94d531f046abfa1b787e77be5c764afea435ac07bbc4b30dac0878bf00a95 WHIRLPOOL 337361df4356f261642c037c48eb589e1c60b3a172831ea8878162deeca88012316d425f44557d15471a938ec7261e24ce5868380f203f76b148add39d7c3862
+MISC ChangeLog 7704 SHA256 da7473d4a53aed50b6b1e6ce00577eb62be07793de9e518800d1d17c84f5bdba SHA512 e2fe96337277ab63bdbaf9e1ed28dacfc5bc4ed42262cf686c6f0a566c1ca575ae44e156dca9020a9783e607e2ad712af1663e018450fb5145e429497936cba6 WHIRLPOOL d669cd39fbe1530be97e658fbaca82ea4ede4fdd2829c9f51071db6232a516ef434dd8200d6141f93690fd01ab4e50436f0b4bf21efebe1c5026f9a6c53f1be4
 MISC metadata.xml 196 SHA256 e8ef5daeda229c876fcf81068b64452d16ca1674618ee72fe8c294f6ead29445 SHA512 ba2a04029fc9fd51726e618311fc0d5ca87333acb0c067a353000a5e0cd31a9f4095adc14faae4d1f14409303051f381c66c3a4cd6ac6699a9476193ac7030f4 WHIRLPOOL 002f8951fc98cfd1917aeef67a1ef0fbc7b662f4cce3c4d9735f198ec8fcaa7e258524a80dbdea1eb485db6faae224dfb317af827582c0777faeba8cd2950ccb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlH5SrwACgkQvFcC4BYPU0rSwwCeNw8KtFmd2eAMZReELc37W2eY
-8YIAn2F//lTRMv9gpCmaLM115j9LlAWk
-=su9x
+iQJ8BAEBCABmBQJSXC1vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOzMkP/2ir4MrYPOdYlHYEbRlUV/Yq
+tbCgUpXB27sZV50J+0b12RsjQeBZyBXMEsYMs/rvSQzQfiPlS4K+R0h2NYwhaXq0
+NlaDsst+riQwhQMKiwPhYa+M1zYvvIQHet4sev9Iq9Tjb9QfGCvUKm6EoUB7sM2A
+0+4CxukFjPHf/q5v+F98AzKDFop/4nea1PJtdUTRpLRsxpZufwvP+IDRCHGRdGfo
+WwLEFYNAPpH9hl5gBUjykrSc+rBJBdQnFU4Icy7urn38LnZspw7GhxPkHQj9kjEy
+PF7gV+Ku+KsMD3Xh5ovTUVB7HexZnm5kh4aKDCA1QZ1jY3LheZn8Ou/Qi7H4Vf3T
+VROdgSaOP9M9X46K3lJVVZMysq1JhtpIdpVRfdmJA+n+CC4nM76G+ucMRQt+oIC6
+BFFkH5GP8ZhmoD8/CezSWQpIzQBB5wlpgV2ILNvcJ6cezv9VXt+eDWbEduFp9HUc
+7gdcw/iVDfMD8JqJWbmoPQZOfycpHDYwew6cyPdHRNPs2T4SDZLWaJ6JlY0fz1QP
+6H2YlFXgmZnSIJ3mndeD2nv9D0r224PDzI9vVjY4JR2CaxKHOZtryelQqu2vmCyA
+FkNde73H6pFrx7jV3hkEk8ua5UB/yWh58jdQiQvZC5ghz4YkaoR6DSvyGyrsHear
+C4qn6+hChkp16udFVKfz
+=jv6i
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild
index e6adf0ed48a9..10df9b5daec0 100644
--- a/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59-r1.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/libsidplay/libsidplay-1.36.59-r1.ebuild,v 1.1 2013/07/31 17:34:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild,v 1.2 2013/10/14 17:44:02 mgorny Exp $
 
 EAPI=4
 inherit eutils libtool multilib-minimal
@@ -29,5 +29,6 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	rm -f "${ED}"/usr/lib*/${PN}.la
+	prune_libtool_files --all
+	einstalldocs
 }
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
index 042143fef573..35f2b2857ed3 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r4.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/libsidplay/libsidplay-2.1.1-r4.ebuild,v 1.1 2013/07/31 17:34:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild,v 1.2 2013/10/14 17:44:02 mgorny Exp $
 
 EAPI=4
 inherit eutils libtool multilib-minimal
@@ -54,5 +54,5 @@ multilib_src_install_all() {
 
 	doenvd "${FILESDIR}"/65resid
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --all
 }