Applied reworked upstream patch by Matěj Laitl to fix a crash on startup related to the lastfm port - fixes bug 451476.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key BB0E6E98)

1 files changed, 16 insertions, 15 deletions

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 52048aec6ebe..54c618f1a3e3 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -4,28 +4,29 @@ Hash: SHA256
 AUX amarok-2.5.0-fix-context-view-on-startup.patch 1217 SHA256 8e9c224ff81a2d39898820a4a219a589fc9dd12c2cdea7d159db5329179fb49c SHA512 5a73ca88ed7503f69d999ca76f952d7681b172de1e12edff872e164db66d24bc92d89f696e69dbaa85ab55c82b776bf1e4876ffb4db4e67d5e80782efe436238 WHIRLPOOL 13e244cc9f645736469cb4fa991af74ee7d389914494fa6886c685dd41b8b7fbf8de5c417a43de8ad1d27e7c8465f59e627e4e27db469da4c847fe99101d479e
 AUX amarok-2.5.0-kde48.patch 2111 SHA256 4ee6b27d79d42e7fbb5469f46c3ebaf69eef73ff83cb0882e44f4d993ba0ce51 SHA512 27dfba494cf2a12db9b2300de3c2b217c1b84945daa32881152f9e9eddea637ace74ff37cf7d3855a405c6618bfeb45929600e0fedbffc255e91c7dbc5663e8e WHIRLPOOL 3f8968ecd3209dd284de1cae6138613a5c3ab2240f8bd3357884032424f3450b93d0c27f8ede70b6bd5f9136a249cd33508ac0c3df325184edc28c5eab389ada
 AUX amarok-2.5.0-qtdebug.patch 2787 SHA256 a2b4ff34c38741979a76b96e0a741e5da7cadecc1a592035e10773b233d38f29 SHA512 5ea1523e16d9889a027866ee5e3f8bf8bb9efe743f55f7b5871aa6ef1a8f5341744b6858547251a9f472f840911cc516f247021659280a28f35eed41e27f5f85 WHIRLPOOL e2b8a58ad15e3d76e0a66befa044dd5b32e3838ddd0a94f767d723288c40854d257e1fe110f5b13c57b1d5842a47a4489c60711f9c8240c67dfc67524a2a24a6
+AUX amarok-2.6.90-fix-crash-lastfm.patch 1038 SHA256 0431b7d2326cfed88f5065e0f37c9a5023ba4bf465ff6b0016c1a99f787b5954 SHA512 a71df1eac05606de2dacd47247c9891e5ec697aa3f28a463a36ba5a2591c3e3dbc88dc8d0116de053925c89095ed133f5e48f89b7dde8733e61203f43465e718 WHIRLPOOL bfdb030d1b5eb28969bd1f835216232ecda4b56733e97ea43ccb4795e24a9dc6de465db88b1b353cb143b67780487a881a95b9d60669694331be0c850531aed5
 DIST amarok-2.5.0.tar.bz2 46607238 SHA256 1ed191db290fdede7c910c322cff2aba8ecfc1c4af891508d9ee410db3768849 SHA512 ac195f627ed0b1daba4b3a2896048d445caa85310b3373b373cabc76c36f424a60f2a3a439012363f3022c0ddb85a6770f2debd5b1a6e009e067bc5329d284c6 WHIRLPOOL e2256ae5dc941016afc9c3798b8f4ee4275dd23085b520067d6f24fa682ce465254d251c3494208a679441058771226668d5b500cb84851ccdd5b48584bb73bc
 DIST amarok-2.6.0.tar.bz2 42331208 SHA256 a91280e588181cf9363d7146f339ef527220fe0c8057f26f010f592b01fdd2c0 SHA512 da67876dfc41dcc3e1f3087698d36dabb43a339cef1669ca0518de191e2d9dd2e3e72122ffe76ecfd763e83547e46c55bba8606c095d35c85058df77bf35fb4a WHIRLPOOL 70fadaff2565fc2e9d8cb628942ec8107c6f4fcea0bd3e898f4ba6a72231ebaca8cb1d924f1413ced7c82940790438c9dcbe2fba7760e356b100eb832d8a2edc
 DIST amarok-2.6.90.tar.bz2 40939963 SHA256 620d315f59e29045f8108073297fdac338c3e516a92154a541d781835a7988cc SHA512 11857221a108628167f4ac435130cac04ba583dbe068f77b2f47a3904829db6ebb59800f6b943f638e0adbc901b8554c64abfe40915581ec375438bd2ab52331 WHIRLPOOL 18e8c70da5967a6878582b8756a8d847eb0051237dd67bcbc60bc4c78c15a4cebdd1c595aaf92bbe5f83d616b40378c17b2075e294315a168a91b42b16964b7f
 EBUILD amarok-2.5.0-r4.ebuild 3809 SHA256 1336e182bc3b03a0085c135ddd3aaa694388595bb2ab0cd9a8378754a01233f3 SHA512 0d1feba480f14eb7cc2ddacc27c34711b79dca2980a8d3315dbd454c3f243553648078d50175c6e49c8da9203a2fd76ace94b6a0712d8f4d8cb5fc3a114bdd7c WHIRLPOOL d84db1a22ea79a574295aa8eda6d3ecc5aa9fa53a4fb703a3db269abfa911736f687e1842c73d87fa10afd5c60bc2c5faf9d4b73832f350ad9292270949ae963
 EBUILD amarok-2.6.0.ebuild 3455 SHA256 1e68c45234ff2b4ce9c5e0603543bd4faf5cce744e5f7fb19621898029115d32 SHA512 1c014adc17afd32bc8359778a7b1396f04d0ad2c541f0f049120bd8749b215ab4c151afab5261ab3259fdea31bc5c63b8e56caf2ee460f8ac60ccebf7c29b12b WHIRLPOOL fa9e3e54546d7e9fe608c045dbc55f692f35abdfa4037fdece227bdea9adf24bc4bec0ee870d7a4452590a56cae0bc79cc5504a36c2467dadeff997d6cc45e9f
-EBUILD amarok-2.6.90.ebuild 3503 SHA256 9893f1042e37be1ee0e7d78ac009d83357c5a8001484232a693e553f2d06e297 SHA512 49d217cfac7c1bc81055efbe064b31afc2bebe6bbff3a2d3b9619bdd684b6bbbaf3c2fc15d650134a419b41fb479fa8067fb4cb71e7f04731e92780ed2a0459a WHIRLPOOL 016cbbc054a455b2e0d875602c5efc33c084b04c31cc2d8f77b0bb6c7510d9233af6e0c8fa098929fea3a0b11221c9d6428ba798ba2ca13d010d20f826a14331
-MISC ChangeLog 75615 SHA256 adc629175bb11e5f51b4c28c1fcd68a04c736c4957c3ca8d8b3ff0e140a99b0d SHA512 8ea12b810783160561a391411ead1cccdd65bf31cbbae7e55fadd8ab03b08ca5c677bfb12b6e565083c36d805722177565d665366e065315d0b9200d68e6c863 WHIRLPOOL 1ecd3725ae7741c99535fa2fb7623daf736ad926b91663f7da5c9ebef6a5884e9788d9a9511016c0d720995431dee6c2762d0c971044ce5645191cb31e89d50a
+EBUILD amarok-2.6.90.ebuild 3688 SHA256 66bad3e623460e7c45edbbf0b6f6b2945b4d48ae7ab698423e030a9e855f009c SHA512 a2093d5f72d2b4f9421825295aaa33dfe09401a7cf1b76ebc64b84743d5c7b6753774d269dde88a22caececd71617b77ae0e668c7129008d1042b3bc8c8eaae5 WHIRLPOOL 68a3175d620f6aa551205a16b864ff9c31a7095cf12470dfe94995830ee57d352e8e1dad75015be6294e82e982cdb1e860afeb99163a85085c04b5e03bb24758
+MISC ChangeLog 75877 SHA256 1f1b44b875fccfa93812be9fa1c32bf021d617fb28082e2378c1904d01e3cf56 SHA512 7aa7d13a5c91eca49820402716b4729c068cd4c3fbddc1c0a6cf5271de0fd3ce4f5af41c3aad4097e644dd4775c2bdb958f447243281938c6eb907b4429d913e WHIRLPOOL 4b517e49fc71980ca5268f01f3de6be9974e49207e71b4bb2429fc5731a27e7c46c4fb5342393cb3add02b933a087721566f3eca04f818992a729ec0d74f91f9
 MISC metadata.xml 1265 SHA256 9684c4d743e651bacb1c5c0775e738bce5d99d5fdee933c0d2f4a62b470417ee SHA512 87e754fa6ad0f2309104ce9d316d30080e7bdfa1b5881b5cf84bd181e03c77e29c128ad9433eb1acaf8eb7c008afd97670e81716e0251b44e1f053d902bf03f8 WHIRLPOOL ad0baa1456718b3820912d94cd8c421177af9103d393a55309776fbff42dfc98d7c2af50d4874cf6b554cbccb4a62f241d3abe190596d5b30d14c9333b02ce33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ6XOcAAoJEC8ZTXQF1qEPsyoP/1arLXKTGA3pAicIcm/q/K6C
-eUxQuOOoglb5VbQG6guGfvX8S7A4fdMJZ/HlcM5jpOsZoDVsD3LigstFJwQk9CZH
-fpZeNJunVaeEMr3JFXEJa/rDqy34SCz/LPOQEww5UO5Nfr+KyZWGEVgD1XvSDaS/
-yf90BTZZgUfGZYliQ/2VaGnfPJMV1+ldwQlb5uxUiRv92jA6G6tga5Oz3Bq05Wap
-RVmVUeA3HsF4VCbIxVkL4E/R2THdZ2Nz+LsAw1cTA8sfXG1sf8tS2Xd0XRUM72gV
-PV4AyUKPcBLjo1wJUWU0yeubUyL5h975p3sOt5tGMHn0X7ctQl0d4lTcWk7bjga8
-cu9SJnUjHJtRJqPh/G38d5oHeWSlU8Kv4reSdsJLfr46baStq/Tj1gHsxLfME9av
-sa6hqB92IXy9U5VuvjilEGEEaN5xmIX8Rc4YwQjyzGK1fvGyaKzhVsJRNyEDTx1Q
-tJEpxzyHX4N4vRSVF+V9YjuaE4dAQktqBErTUcvI1y+k/QSjZxZ9EG02aHkvyV+F
-monn6uZD2gcDQPSk8SYMYgxI26jwVAWN5eOKzvVn3upxFmU3kFOdvS3SMzMEXhUx
-DCnESxbAm8hqN9JGrcmwVKQvC3Anz7J4JdAYil8pV96Fn1/8iShXOuaJbnl7iU0G
-7135Ghn14htj+OCZs55I
-=0Jo5
+iQIcBAEBCAAGBQJQ84j2AAoJEC8ZTXQF1qEPgPYP/1sndoThsN1xaAt9arwCWcNi
+VlmT9d0/9c2TJPyVXSGWbmK1SdOdBagT/UndERzsNxYuiSm+gq/BZQShKLg7g0S6
+AlgG7geiowOMSoPHCcPZoNyE1xIWVFlAYeTa78BnFeVdA6EmSJYffkj/kEDV2zI5
+N9sdkbTbOUzPSByoMNzaomqUIfrDoJ3ePyNhmA3jdaFlBNeVo2sjyzTUdK1+6WuD
+8oTa9hkjLoHmBc85WLab8gSdDhEuEXKjDvS4jJ/vC4NRviM0tIC9Pbk9ktAK9tyN
+mms0s0tRfaUdgAAkE+PCyskq3PxJeAxsL9ZuPMB3H5Jx+SCC2s9+lozQXzpk3GCV
+nbRFLVsseo/Ie/jRXsPx7Yw6By03zKSyB24gh85AOGJZUhRMiftRVlW44333/px4
+N5PS0ONDTGnW4Jf7scc5WdObzTPm6cMWHWn1MEQYWrTIY6CPZ6Tpi/NGkeRB7o6d
+ggV20jXSGNnp/4k7QF9yszBGy9irbMmGfExcKB80jyDRzuXw1/U1FTIQKVHrbRV0
+BDEXmvg+J4+Kz6i2CEHCGQ2aenauBc5QM6dSGqo/WCUBTwF2NOYofRxCNtfDwh8K
+VZKV4eL+7Y256e2iUNur7RNALQuTnjFa4j9rjZiawh9PTzhaz0QSiceVbh2Pm4xz
+5fVP7027FEkj1DrICE5+
+=+b9j
 -----END PGP SIGNATURE-----