1 |
commit: b2221affec76b0c84db28fb93e6d8b51cc0746ef |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 29 14:41:39 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 29 14:41:39 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2221aff |
7 |
|
8 |
profiles: Remove last-rited kde-apps/{kde-l10n,kholidays,kscd} |
9 |
|
10 |
kde-apps/kde4-l10n/Manifest | 55 -- |
11 |
.../kde4-l10n/files/kde4-l10n-17.08.1-remove-dirs | 17 - |
12 |
kde-apps/kde4-l10n/kde4-l10n-17.08.3.ebuild | 192 ------- |
13 |
kde-apps/kde4-l10n/metadata.xml | 8 - |
14 |
kde-apps/kholidays/Manifest | 1 - |
15 |
kde-apps/kholidays/kholidays-17.08.3.ebuild | 26 - |
16 |
kde-apps/kholidays/metadata.xml | 8 - |
17 |
kde-apps/kscd/Manifest | 1 - |
18 |
.../kscd/files/kscd-17.08.3-musicbrainz5.patch | 626 --------------------- |
19 |
kde-apps/kscd/kscd-17.08.3.ebuild | 20 - |
20 |
kde-apps/kscd/metadata.xml | 8 - |
21 |
profiles/package.mask | 10 - |
22 |
12 files changed, 972 deletions(-) |
23 |
|
24 |
diff --git a/kde-apps/kde4-l10n/Manifest b/kde-apps/kde4-l10n/Manifest |
25 |
deleted file mode 100644 |
26 |
index 9be86dd9484..00000000000 |
27 |
--- a/kde-apps/kde4-l10n/Manifest |
28 |
+++ /dev/null |
29 |
@@ -1,55 +0,0 @@ |
30 |
-DIST kde-l10n-ar-17.08.3.tar.xz 554316 BLAKE2B 5f01fe72c6e0dc169cbc1f1731827eef77d693583a06a6a173b9ceb6a6eadec2af19ff3dee89c6d0f171547d8faf37836dd6b712643b51d4ed303b1dc36cee52 SHA512 4caf784833265d30299907cc30b4becb9462d02b1b7df5722e1ec932b7a03ccaf9575ed4e4df1d8d31573a1107a8698ec6ef6c9d9c04f2fbc67be3bf5dad055b |
31 |
-DIST kde-l10n-ast-17.08.3.tar.xz 395500 BLAKE2B b88869003eee9e23e921f13ae509d35f909c47e29a4d5a9f9b2d68ac84c8fcb01ac2571dc44da00182f34dbf8aaad0fe636e2b72a12c601d35551ac913217b4f SHA512 4cc612f41ff52b414ff8efaaae176f1909e3f024f802c39c0626113ae6e48b42871a801df3fb59686217d60d7a52489f5ff3d312389a3e91491f6a33e8ec4600 |
32 |
-DIST kde-l10n-bg-17.08.3.tar.xz 482992 BLAKE2B 0b99c45ceca72293744a329f14fcbeee5ed777e0d152806ef023f4b5471bf5d7791762ed02b6d7a0b8c71be0c2930bae2812764952c5229dcd324a114b4ee28c SHA512 58b63e182dfa0541311876f533ec581dca993ac688241086f5c4b39f8657bb088e33e84a24e88ec20525c7f50b6a1c5e43cc3869b0a73b0512a0ea51a4a20a8f |
33 |
-DIST kde-l10n-bs-17.08.3.tar.xz 562424 BLAKE2B ae745a950aa7bab891d005d3b2610751743c14a507f605e47de98086d05499da934347509f60492e866a000ba6f6682a1de20997dc6c2ad47b48394a8d8a187d SHA512 e3f2098de9882b250a693a6015dcd491d0e3f2eccd574f9f4fdf21c2bc4240b2810d087a7f2aaaf80fbcc4bb286ca3b80a5ff5c4f6d59db19acebbddd1bb8e68 |
34 |
-DIST kde-l10n-ca-17.08.3.tar.xz 4615580 BLAKE2B 50f0a9f2b4b86a3d83d79f1f2cb18d8bd0a83dd544066a3d302acd0376aeba6b36ce8f342348b3a5195e7f08d76c31e8574f0449b7c7936aeb808191f5e27382 SHA512 1b80e8d2435b235abfed523625a17615691ab57c34908380a184e46a482007d40e4e98bdf6735672ffa64f9257fb88f364e81cad78e55171b2bd79cab4ef1eeb |
35 |
-DIST kde-l10n-ca@××××××××××××××××××××.xz 539864 BLAKE2B 4426f4b6a89ec39ed87aaafb769e0c86574808495f47c8bf41a6deae1f3201a4b7a7b2922efc8fc6b074fb92b1edf10b8c31ad34dc82b8b609d76a88a331c581 SHA512 7bf11d578a72d37e0dcf81195ae69bc11632432aa7ebb349d680d0da0ee9c3cc2a49ba86451cbf10693fd697d503fc7b5a05c56eb9d0b35cf87935dbcb253e9f |
36 |
-DIST kde-l10n-cs-17.08.3.tar.xz 548904 BLAKE2B 39be2c4a7f2f49b3b0c8c7922c7f5e8fc954cde09f5656e628402cfadb91cba23fad0e73d7fc0dd02c60f786757497bb0a1b6cb595a590a40d214db7c419f256 SHA512 8e7bea395ccce934f240376fa9cfdc2090fbb7ce0efac188f7da06679a725c937179dde9f4d7bf1ee3b917646496d8f758bf8815d30f37205e5cabeffb5163c9 |
37 |
-DIST kde-l10n-da-17.08.3.tar.xz 902580 BLAKE2B a3ecb8ff3c165a6153353e058ed42b2540f8ab5c1249dd2df74f0770c194ae001b9824e03e51f6212f3c1515df446fdc40aa5a84e637906336c220118ef0a753 SHA512 215013fd83132c5c29c193d25476aa3b570999492a65427aa2e9fefa5c8988e8f670546d82e9190e6042f3fb7ef2f92b01f7f8b3c1010966368f0854dd778d3f |
38 |
-DIST kde-l10n-de-17.08.3.tar.xz 4669256 BLAKE2B 25cdcd7e9adeaaac3db3649cbdbff5a4201cdcba2040d4e45edab2b2809749e46dc1e1ee3cade1c6901b32f3afe8552a8f87253eabde9dca6ca464a9d77b6bc4 SHA512 d7248975274d4a434ac8a349709bdf41c0da5c4e58067564bb7edfe9c4391fd811dabbcbbee582c779d83fe1f124c0e86cdf1cb08f88a50521a2f342f12d9d65 |
39 |
-DIST kde-l10n-el-17.08.3.tar.xz 742064 BLAKE2B fdee118bef85458b9cba11d5e959268aff043b488767210bbcbb0ebd1b2c4f437d00bb3abde6051f2765ba918acf4a2472c78fb2cb9993439be2e434372a2896 SHA512 7043babf0d9598a47e571c55bbe7f74de13c34f039615cfcb5449431712606b5430aa7a30a02b4e761ca873699cf35459cdcbe825dbfc1472573ea68f8deb96d |
40 |
-DIST kde-l10n-en_GB-17.08.3.tar.xz 510828 BLAKE2B f0dc6a5106f5b480216e2027342fd4d5a138050c1b8c7f0fb3967a804af10131af94cade8fdd32638180b438fe299bed9f9295e209ce7002188f1724710c9a2a SHA512 1c52ced5e19ca326142ef8f531b5022018c3a096e13b3a62d1149ce1ef9140fbcc5d931386694e528a18a9b77a08d87816f9a4b408783fe37c7008594295923f |
41 |
-DIST kde-l10n-eo-17.08.3.tar.xz 494496 BLAKE2B 0bff469d04c86c9f8bf2bd831f3f6f3fd8f1be894801f1bdc8c5346b7f4ec70ffeb34b5a43c4b81ba9727b0c783b4b964c20912d29776814d3ffbd05a63ba172 SHA512 3f6a3520a7626b6b3a91f6106e242b53c2b1499f8022df41cc2e2faca154b45f3238ba42875b7f0c18a8d6ec61d3619d93a13c7b47636e88103f4002ba8eb933 |
42 |
-DIST kde-l10n-es-17.08.3.tar.xz 2723540 BLAKE2B 25f8df7ec5ea021116da55258ab01a5925a717399a4eb87833bedb478d7ea1fc1fcfd9a6ea6785b7a0f96aa1e8fe303dd3c59812a5cb0d047d616da192438cff SHA512 ac4518bde6293df13bb1a2a36b62b1127611feac34e78316d421870f93873d202e262d23b79f7e5e00e8f1b63754066666cfd39e236fef9911ebc0f48facd9e3 |
43 |
-DIST kde-l10n-et-17.08.3.tar.xz 840412 BLAKE2B 921edb68a6b1f26ee3618bc942df5ae570dc25b165248096af3dccedb19c5ddfa2cfe59c8c96f487a362c3eb8e590a1715164efe2f2aaa21e8f231b42cb13495 SHA512 f1d8eddfb28dcfc9b6097fa1917a0e4d89c455a4e3645968ee3c2cb41d0db6d0f7fc2c378410ae126c4a7244620b40a97197be65bdc544a14bd4cd95287f8a28 |
44 |
-DIST kde-l10n-eu-17.08.3.tar.xz 554008 BLAKE2B e72417800d89e7ab3ced6113d5f767fcb09723889c6227c1b19e57a7dfb6361dd6e639e1c78892f160a749f0d83e3e9bce7dd5b228e9bc0c4bae75a19a5a2e56 SHA512 27980118ed6c20c982863ebbd2faa4767d53d06acb948db77af73faf0814d9423d6a2d2f10f4e7f3588eb44d1de4212cbc1bff6ce592a4f1db7b93779508f9b3 |
45 |
-DIST kde-l10n-fa-17.08.3.tar.xz 511396 BLAKE2B b18bdf315fca23a947602d9eb11e1243184f4b0936ac9901debc7c9cc8088bcf4848367e9fd2170700a44437a6ab493457eed9bcc430a8a18d2a7f1189101cd7 SHA512 a4c0c53239fde8a1999798070e6881598be2fac6bf25079132497f896a72099117870140c842bc3315fa37b294faa0fa2fda54c220bcd037038c2915ac8b7146 |
46 |
-DIST kde-l10n-fi-17.08.3.tar.xz 617216 BLAKE2B 04636bd74b99f385532156aea6f3836739f66c036370b72b84f0ea7ca7d9aa9c68b1385ea385452d372a3390d2516620fceca8d75664dd149b03ff219c5339c0 SHA512 1c7e3c6110d1037049c8e743a50cf4b5940c26cca41e9664468d44c6763830248a36f3613bcb0e0c0d93ed1a7d2ed50bb6aac6074169b015f9e93eb8724ab6ec |
47 |
-DIST kde-l10n-fr-17.08.3.tar.xz 4380520 BLAKE2B 57a368708e2ffb08534dd048e8e21acd1ebacdc3f1233145dd8c539d5d822345c1346602290fabb525aff4a2e74b812f5068802e3531f2bb0a03624e558c9ba8 SHA512 3af325dc2bddfda262f28750637f28d79450706cc927efcda3d7a37e8417e537aa6d16d8ee66bfe2b18906a92e8d4fb951123bc385459eda7966ea2295e80722 |
48 |
-DIST kde-l10n-ga-17.08.3.tar.xz 541384 BLAKE2B 44a5a32605756bfe49b41cb556794d43e8914040f9b8e75e0d25ab1ce402bd49660dd36c1d156b85acfc3b56c33ba2b7b883ca67d91c63c365176e5ed4962640 SHA512 d3a0714ce26b7098ef537f9a3d5247a560374f6758ecb47d6c3f32cf078cdb9da2c1616d3bed8d247dc21e96f37acfb670efca19e471bda5d87520e1b0b4c330 |
49 |
-DIST kde-l10n-gl-17.08.3.tar.xz 675528 BLAKE2B e10d3e124a82c2b59f7618e4e46ef7b2068d6817cba13a603d5694d8a9c14b46fe52e58a87b3ac950619d2128c422b5acc8ff173397874d0b2688f9622bf2ec3 SHA512 a474363fc762522c1981216af40404185e3602d7f89515240a9d6cf0fb32ab56bbf6c0ca9ff11baa0604054792a9583b8ede70ce325ebd9aa679899bf0b9d021 |
50 |
-DIST kde-l10n-he-17.08.3.tar.xz 493400 BLAKE2B a7da11dcd0e2ba020e399c7fa1dcf419c2fbbc5217f10f40087022380f155cbc771d88c9479d4752ff98d988178759e685662bda5b4ea26af54ce07a302b0cb7 SHA512 8df980aae639fe98c1f90c9ab45864e35950519f586005cff8886ce871dd55d66c396b8a6590a411e3041939ca9a0f6296d40e3d8262b28e1835d5f82ef23975 |
51 |
-DIST kde-l10n-hi-17.08.3.tar.xz 466572 BLAKE2B eeeacab9a1e7986975ba3fa25d65ea2777b6a04e2565848e8ae5bf7a8ec323fb455278048e08f739ac4afb5e1a95d475a4642ef3ce484425874b38ca4c4a5910 SHA512 dd39db9907bec0895f271cac1fffdad09be18f439231b438d40865b74069b4512e61e93aad396346f5221f9d5653f8712ece00ef796ba28c076d59359a97a60b |
52 |
-DIST kde-l10n-hr-17.08.3.tar.xz 484836 BLAKE2B d692351bab41bf57c4e5e424986fec2bd504a2a7dc1c56b33cb0d93c3e9c512bfb641c2358ccb39899c6cbd56e7a9d29371b00a7a8b737b7eac1b13298e2e354 SHA512 5305dce351ca06eb5b228e5b3360f0eff8fbe72299599bfaf0941718253c93f0c321095d9e2577228058d8452e2923f5be1c25cef2639968905f2fff0b6ae520 |
53 |
-DIST kde-l10n-hu-17.08.3.tar.xz 599004 BLAKE2B 099025b67ac7c855efc9130b8ec5bb7263ff838f9fce5035ca964fe89a197aaf50c94837302cf4cfb815a8e955068bcab46a0e7b8d3db8ffe676b26254b74f7a SHA512 3a4ca1c9e8a772bc63c21b64fad523291a4f44bd5f39787f8fe23948226e7c08e35fcfae94cd4220dfa35ee28668c93d1a8affe95c47f569f5c04e2df84008c1 |
54 |
-DIST kde-l10n-ia-17.08.3.tar.xz 479388 BLAKE2B baa386a7f1e0d2dec034a20d407cf4f406398999ed17484ed683dd31c99f05803cac8517a1912116792efa043cf8af1487ce88067f2e0ed33520f4463629a41c SHA512 f6aae2b62ee1572330717f66a58f48b2d7d8b67fc8890ffd8cb3d0f4f044779d5c9b2e59fb15143e10f1df7a367aefc556d1499090c1d3f6043c8cfea34e342c |
55 |
-DIST kde-l10n-id-17.08.3.tar.xz 199168 BLAKE2B d5fe3935fd504b11b0a6733e7a453931ca6ab20c8e7e9e7562bb6a6272a37e11184221d85c47cf20f7a43c9afb76ea7dfd3fd09439bc6a921291fe4b835afd39 SHA512 3b22f038f23f4448154d6c9f1a4db84616cfb9dc17f2a6753c23cc722935a4903576a5f544e2f63b867cb199e2db74dcb3d1c0a174f4de52438cacd87663e92f |
56 |
-DIST kde-l10n-is-17.08.3.tar.xz 479212 BLAKE2B c21ed334650fec7cfb3e257af5b3cab6961974f10fa27e6f9fc3433ed0ff6abe79752fbb4b5c448d59ea5295598fd586656d8d18398fd2bca52490efabe120d2 SHA512 4e3cca5db7a5725b822bef63161a5ed21a8f87f2c0173f3dbe8ccfa2d6e4ca280449611de190f0211b9a60333ac46aabe88db2db4a24047fd8700a687a2a8750 |
57 |
-DIST kde-l10n-it-17.08.3.tar.xz 953496 BLAKE2B 421b875781d8b2d9ea623f5c323e13257a404a096bff62cdd9527f2d0263bd35d7ff7cb44170cf3c4463d5a647a686a1c9a6ea4ba4f0d5f985a80e12c198ecbf SHA512 f7be73d01072291d232634b29be386c738f1b58a2873af193fc0733c609109d562cee46044fa475b8178571b810bd61f6ebbd9c6b4f1a384bbd73827fe915a8f |
58 |
-DIST kde-l10n-ja-17.08.3.tar.xz 521332 BLAKE2B fbf42b63a9f28d7eb4bea8ff6eea7b5cbb35c417bcfc2869832d9655f5007631f3ae73065b74104c742477bf872901afe561409284724c2b4e791b12450206bb SHA512 8e3ce02407944cac98339c3b7f70f3eb20ea7f05f6a19835960d30ee83e756f9b078c643b560545536e2d930e64962633c61a7aee027c84946c8f4d2a59475c8 |
59 |
-DIST kde-l10n-kk-17.08.3.tar.xz 586152 BLAKE2B eff334ab9381a13da413c4f6937174dcffc7e04f93fbc67ed5cc2be0aaeedadf9a027b6a97717a6a5b651ade2188fc0140e96f096535e88944b4310d77b8631a SHA512 10e690c40de223550aaa33487c7b5dd7d4b852630bac9545f39e98b0f8d3ee7873e9a0e95b4757812bbac690b58b6f27add023809f7d9bf33ad71efe1616c8be |
60 |
-DIST kde-l10n-km-17.08.3.tar.xz 521712 BLAKE2B 1dded96e501a28d916f98970f95fb12e574b4dc6ef58a8b4340920722c7f7e3f430a2c7199135b0ef3e9071d4694873c2314d06aebfb1f1554a743266114d35d SHA512 149fadbe1ac1d79e3b5032f87f175a47f28dc6a2676883b9b3d068d3352c65cbfc9c17e284c2769efd6ceedb395dc34160740b83584fca4856f44ea1ee4ba651 |
61 |
-DIST kde-l10n-ko-17.08.3.tar.xz 509724 BLAKE2B 33cde8fa5311b9b61b53612ef92611b5cd9f24f49398daff58a5a8503cca8ebea1908549b4da8a9e594c12699b694ae8820417e8539bdc004e16623890b3335d SHA512 434496d6df1a2039248ff57d99599d5303c2ea4b70f9f5e0914629bea0b67257beab1e0c011a0f309e4553d9a6ac1a1e714a1f8093f3f4602a7c2d7ba692b631 |
62 |
-DIST kde-l10n-lt-17.08.3.tar.xz 533552 BLAKE2B ddedd863b931051f0e1467439b2abb5a47a958f44244c20977afb536a0f7f1fbf78922334979ebfc9576c253bf0f21bd391470c10def94b7be34ea66f93f1a7e SHA512 df82c918e11b9f527dd8de6470252d1b9c3e1d188b650d3a09a694d4ae246800ace2ee589ab56c23fa4e6b6273f4593924d18c8583915ac17aa30c5288fa5ba8 |
63 |
-DIST kde-l10n-lv-17.08.3.tar.xz 542700 BLAKE2B 28335d1c401de67964563623d12c880e9e95683f4910713585b76def1375b8a829525029b937314c76fd4537730dc21f005d1d118232b63ad113c8e1e09c4db8 SHA512 10439e54d36b2f1f7df33c0969c845384801cef455b5a3a4a79da62e15a00871483eb93b4e7897d5f1938621f1435c82dbcebb8723ecd2fb90335b018b23ab07 |
64 |
-DIST kde-l10n-mr-17.08.3.tar.xz 448260 BLAKE2B 467fa1645d140c6c9a4aec199d6826052a426daeb8119699a8fd991c77d641eaf5c4e15ab618652d9f092ba8dd5d7fb1068f426a74b28fda3f947ae44b00fd57 SHA512 1d5020491ed03e975e85e41b48aacbb50a97f48f027789f92ac4d8203e5fee709f5c2d5ebd189963ca42d46c0a2db4338e7c00fe9135fdfdf28952697614a6a8 |
65 |
-DIST kde-l10n-nb-17.08.3.tar.xz 562892 BLAKE2B 5bdd56548fe39588e88447312be457985447547a384f514f2268d236bad88e0643064ea60ab3eb38f57a4428b3a4ddf91360e06eb9ffc4628c80edc1c5b0f06e SHA512 be5e0121d8c5104d4557126b9d4f230867f512477e634fb66a0b24a4dd7d4325121785cccb625056cda1f075dceaa9043cc1d462a1b3ff04b20be5fc13f36ca9 |
66 |
-DIST kde-l10n-nds-17.08.3.tar.xz 619248 BLAKE2B 83613d2e5d6a694594def86f2538f8db1e449146ba51fb0bbd82137758f178ffe7f090d267c4a433bbf53ffd5c1de370510553229d50470d8ce317fac93043c6 SHA512 2a7931b914d38b59c2a0c4e9f4f417278c1576a42da7eac0340ad4d9e4005e739551cf4d1e668b1642b686f05984622b4f5258a8f9667ec8121090705df3aaf3 |
67 |
-DIST kde-l10n-nl-17.08.3.tar.xz 1521876 BLAKE2B 52e54f9281b542577eefe5194e56deae59247143db863630595282fb7fb230489618bd17b0a697dcde455f2be03eee814a79f74a9d3351c97744b8c678366ca1 SHA512 62561e46564f14f6272bfb49afa1b747e1280dc9a81fbae767cd94821b5948909c33259155a990dc872db84a21280cbb472090da68c3a3bc61c16646d488a809 |
68 |
-DIST kde-l10n-nn-17.08.3.tar.xz 534108 BLAKE2B 20d81e832e2f96157730ae2eceea74caec63a49441da1281da650e431ae71ca61a96343b072ff53ad22289e3ff423c6dd7d5e5e8962336037e2ea80b4dbcc37e SHA512 eab020509f3df7346147d49b326766ecc355ebb3361fdac66aca3ebd7602c56cea6bb7b19c9af7a1572acc77324efbb85b9059e4092e30dace1efe2b334924db |
69 |
-DIST kde-l10n-pa-17.08.3.tar.xz 464996 BLAKE2B d946942403be16c9b7a0b0a3cb88b76cd8ee5e59ac64b5fc950a4f1e0bdc0df4eeaceabbad19bf98d093d97f11655fe3ed27bb8095af1ac0de50d168bfb68a86 SHA512 9596eaeebb0bfb9dce2ae84660e66a4f207a3cf1e5cf2dbac115b5f86541872461a7bdb8902e0d0d755f887d1058e93e782d5bf44e272acacb330d8a805e03cd |
70 |
-DIST kde-l10n-pl-17.08.3.tar.xz 1754548 BLAKE2B 8f763546f1b3471008da3b69dd8addbc8199f6800496fa16803533796e2eb90e4123dd3373ffb599d3197dfd603eb0358d1b3950867f837640528a6e8cd02e09 SHA512 c3624316fe609d66883248d9dfc69825cc060e61d768129e93d38885012f6b8cffdde96653725a704dd48b1a0d5af1da0661ce6d178189d79ee6870596dfb533 |
71 |
-DIST kde-l10n-pt-17.08.3.tar.xz 861976 BLAKE2B 2d1a648bc38ab7c632f812904c3de504571feffeacdaa9081f5bbd8800d18a9870dffc458361748bd87fae1dfd84369c16790ca00d496dc219fcb1244e369117 SHA512 b0682e140f09372efdfddea635965e7d15a724605f07a203b8bbf2849cb7fa880ee38d00c1986b8945617828f7bc551196120435f1b3586787041fdd0781a657 |
72 |
-DIST kde-l10n-pt_BR-17.08.3.tar.xz 3820472 BLAKE2B 76b92fc13b2413d5bb1542485866f8b4e5b1f4b0cd38837b04eec454ac1e5f0c0dff8bf1f717aec197cc74f33c136142c6b350dc98143e93764b6b0c432c2df2 SHA512 82bc2ff0ad16e397dd434d140b50eb58f599f44eaca1f521bf7b3bba7be0a0a184a6bed7a88872882e6e80897e34565c47c634e6d2468abb40aa2d219f9a4d1d |
73 |
-DIST kde-l10n-ro-17.08.3.tar.xz 593620 BLAKE2B 90fd9c077d594205fd04d525278277f69826652d35f6063aa067793b31bd612ad34ea7fc8fe9d2c8cd6b45a72b03a6ee9367074ade8c22f4d99b5ed90e73c695 SHA512 c8087d95d824454c948defe1118152974c3544822c442d9dcd5c5366b046871466ba0bbc2625fa65307427d1ac6e68a6e26693183d0aebd2b42fbdc5841d6dd3 |
74 |
-DIST kde-l10n-ru-17.08.3.tar.xz 1445364 BLAKE2B d42091a26f704ace8333c69929d61ca52b804aa8bfb046d652b47a8437226b7864dc21ab3dd9deaa4befc8ba174f3b93b1b1d8aed4b2b599b4387a0e47b6752e SHA512 c003f21317fd102cd4ae84c1abd03b7406a1d1e0b5bc401b571f2fb381fcc3809b97d8f1a5f12bc18dabc1907493377e03d6f4afdc2578a021aa5d3763d09024 |
75 |
-DIST kde-l10n-sk-17.08.3.tar.xz 543052 BLAKE2B a186172d7379929b50dc3ff8b7de4061940ae740cbaf1444b4f24ce9ad013e9af317bbaaa881c1344fd2973632c33b393e79fff3c42634f49685c87e6dd9345b SHA512 0851e82b7cafb6c9eea8dc3eff0e33bb3f45f693d6048e18ccc231b7bbde55c2d73176466c40527bcdbfd77fb9567e1fbc08bab6f507bbbdec58be50538f8c57 |
76 |
-DIST kde-l10n-sl-17.08.3.tar.xz 595948 BLAKE2B 33348d6eb7ed7745e76a76eb9203b7cb3aa5fbaeb8b86dd55350d7ee9299121b1b1123913072a2fef6e9a1eadf346b4ac4250486188ce63643c7f813693ac59d SHA512 1010c2db01f6d02477544c04e9d7e4b6ba366a8643383e9e05a681631e18cbe15fa10ab7da044c80cac5bf07996cba58638235cd8dab37b541911ddbe3ebc651 |
77 |
-DIST kde-l10n-sr-17.08.3.tar.xz 2478244 BLAKE2B f76720fdd3321b0adaf3388d0d165bc72c7ac850e882ffe9b8bffc5f60a6323bd7e0c50d414a101f8791d3f2b72a110fff2caedbaa96d232e5fd57d1f67dafd4 SHA512 9c6a4428667201f18faa48c77ebfce51463c4a7a77904c2499d81b1c3b7717652311994865fddce3a21da18762c126787486c2f3cd5a1dab109898431f1cad27 |
78 |
-DIST kde-l10n-sv-17.08.3.tar.xz 1798312 BLAKE2B daceba39fbe1cc331e1649f9c99965493a6339e9b74f77b216b69908179deb7bfe5de165c69253e42ff01fb2aab7b06482f33c1ca6a84013de2ceef5e44740b5 SHA512 5adeceeb6e881e42ad4cd1c281015593531ce5953a9d516c116f4164c05a93d313d33caed5dfdcffcef80ebacecd91ae01a8b3cd64a1eb7d4326f2d7609dfcaa |
79 |
-DIST kde-l10n-tr-17.08.3.tar.xz 1373272 BLAKE2B 7acb7488a3946e7dd37eb020d275e4e837c6162a9145cbf9363c40d1eaa17cd287f88c43f93ed88f7c2b91c30eeab57ee35ae1e69b097c8896070b1b42fea74a SHA512 b2a8094eaa6d8e8b85d784df8a661dc216fa8ad8555484eb2bafd993ec7a4c0ce609b727445567f8b731477186cf9ede8815d7b31dd6443daa763ac89dd4b36d |
80 |
-DIST kde-l10n-ug-17.08.3.tar.xz 463640 BLAKE2B 7e666df9ee0f474e54b9e2e36026157d19ed919a10e5821e7c6ed92378fe3d6666bbe1f71d6c778ccb99bfdbc065908becbe3ddb6dc789ff78606b1e70b2389f SHA512 e9c5b1f687ecc6b2e013ff2f5f92fbb2db202d1bac566e267565fa9934eabc501a1fcc73f34992c27243c1dfc737d25838afb613fc27c98ca61f65b51dc65178 |
81 |
-DIST kde-l10n-uk-17.08.3.tar.xz 3812000 BLAKE2B f8e20516d0d7741baa5d57fe292b9bf3a5b962da97267019088a8f1555738cdcde5e92bcf40bab02f6f164106324df8a79c3450983d80b2dd741f65e9f8efa57 SHA512 a8355c14a40c9035f44963062076147ed1c682e94c37ea7066c5e7048a48168da122e3ccb417df74e5c729574d4a57d1bac38ace1b8642e8a1c6e0fe2cc38d96 |
82 |
-DIST kde-l10n-wa-17.08.3.tar.xz 413472 BLAKE2B 7645cc605c38a18254130b4f5efbbd96506ca00a1fc22115056f31d578bfcda9e497762da457783524a2b50db4d9c07565887a35ab5fd2be1b5ea89555c01879 SHA512 364759105ab314d4f036554b7fe48315fff2af98eaea5f794e7a56ae05873e6875592f3e5193c3149b0f08f7ad9c7615028b94b505f697954fb3c5b01506bc85 |
83 |
-DIST kde-l10n-zh_CN-17.08.3.tar.xz 564892 BLAKE2B d241acf1b7d7d4c33437aee12353844fe76b52a6299881d2c0b660f314e1a3c7dbde80a59f8709c631455b16cde37d251319b8307604f6004b804ca3936fd6bc SHA512 af933a5fd0c50b8b796492f47b29dd40f9cd6f0662c6c80341906ccc80b0924a9e8d62a61987ec5c2dc087b5b5b557c92a3b45d6b2d409515a27bdcfaa85b557 |
84 |
-DIST kde-l10n-zh_TW-17.08.3.tar.xz 604896 BLAKE2B 1aa59108ba7275d434ce849052cc829a4dbb211410cbe4666d38875511a66e132772884e658e43d3e1c50abd1db5f898c989a84c437e0c696c2c23f7998b7ec3 SHA512 458a442675d2b15e64a41148b1f4e9226ecb4a9cd162ef3e7095dee814fcaa228cd1f80fcc84bc349248f2de84944e2acb3c7ae44980a8e7593e73028afa0937 |
85 |
|
86 |
diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-17.08.1-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-17.08.1-remove-dirs |
87 |
deleted file mode 100644 |
88 |
index 044910d0c7f..00000000000 |
89 |
--- a/kde-apps/kde4-l10n/files/kde4-l10n-17.08.1-remove-dirs |
90 |
+++ /dev/null |
91 |
@@ -1,17 +0,0 @@ |
92 |
-# Disable any subdirectories listed here. Comments are ignored |
93 |
-# First argument: parent directory |
94 |
-# Second argument: which subdirectory to disable in CMakeLists.txt |
95 |
-# kde-l10n 5 |
96 |
-docs/kde-runtime glossary |
97 |
-docs/kde-runtime khelpcenter |
98 |
-docs/kdesdk umbrello |
99 |
-scripts kdeedu |
100 |
-# Plasma 5 |
101 |
-docs/kde-runtime fundamentals |
102 |
-docs/kde-runtime kdesu |
103 |
-docs/kde-runtime khelpcenter |
104 |
-docs/kde-runtime knetattach |
105 |
-docs/kde-runtime onlinehelp |
106 |
-docs/kde-runtime kcontrol |
107 |
-docs/kdelibs kbuildsycoca4 |
108 |
-scripts kdebase |
109 |
|
110 |
diff --git a/kde-apps/kde4-l10n/kde4-l10n-17.08.3.ebuild b/kde-apps/kde4-l10n/kde4-l10n-17.08.3.ebuild |
111 |
deleted file mode 100644 |
112 |
index eda5d85c190..00000000000 |
113 |
--- a/kde-apps/kde4-l10n/kde4-l10n-17.08.3.ebuild |
114 |
+++ /dev/null |
115 |
@@ -1,192 +0,0 @@ |
116 |
-# Copyright 1999-2017 Gentoo Foundation |
117 |
-# Distributed under the terms of the GNU General Public License v2 |
118 |
- |
119 |
-EAPI=6 |
120 |
- |
121 |
-KDE_HANDBOOK="optional" |
122 |
-KDE_L10N=( |
123 |
- ar ast bg bs ca ca-valencia cs da de el en-GB eo es et eu fa fi fr ga gl he |
124 |
- hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt-BR ro ru |
125 |
- sk sl sr sr-ijekavsk sr-Latn sr-Latn-ijekavsk sv tr ug uk wa zh-CN zh-TW |
126 |
-) |
127 |
-inherit kde4-base |
128 |
- |
129 |
-DESCRIPTION="KDE legacy internationalization package" |
130 |
-HOMEPAGE="https://l10n.kde.org" |
131 |
- |
132 |
-kde_l10n2lingua() { |
133 |
- local l |
134 |
- for l; do |
135 |
- case ${l} in |
136 |
- ca-valencia) echo ca@valencia;; |
137 |
- sr-ijekavsk) echo sr@ijekavian;; |
138 |
- sr-Latn-ijekavsk) echo sr@ijekavianlatin;; |
139 |
- sr-Latn) echo sr@latin;; |
140 |
- uz-Cyrl) echo uz@cyrillic;; |
141 |
- *) echo "${l/-/_}";; |
142 |
- esac |
143 |
- done |
144 |
-} |
145 |
- |
146 |
-URI_BASE="${SRC_URI/kde4-l10n-${PV}.tar.xz/}kde-l10n/kde-l10n" |
147 |
-SRC_URI="" |
148 |
-for my_l10n in ${KDE_L10N[@]} ; do |
149 |
- case ${my_l10n} in |
150 |
- sr | sr-ijekavsk | sr-Latn-ijekavsk | sr-Latn) |
151 |
- SRC_URI="${SRC_URI} l10n_${my_l10n}? ( ${URI_BASE}-sr-${PV}.tar.xz )" |
152 |
- ;; |
153 |
- *) |
154 |
- SRC_URI="${SRC_URI} l10n_${my_l10n}? ( ${URI_BASE}-$(kde_l10n2lingua ${my_l10n})-${PV}.tar.xz )" |
155 |
- ;; |
156 |
- esac |
157 |
-done |
158 |
-unset URI_BASE |
159 |
- |
160 |
-KEYWORDS="amd64 ~arm x86" |
161 |
- |
162 |
-DEPEND=" |
163 |
- sys-devel/gettext |
164 |
-" |
165 |
-RDEPEND=" |
166 |
- !<kde-apps/akonadi-search-17.04.1:5 |
167 |
- !kde-apps/kde-l10n:5 |
168 |
- !<kde-apps/khelpcenter-17.04.1:5 |
169 |
- !<kde-apps/kio-extras-17.04.1:5 |
170 |
- !<kde-apps/umbrello-17.08.0:5 |
171 |
- !<kde-frameworks/baloo-5.34.0:5 |
172 |
- !<kde-frameworks/baloo-widgets-5.34.0:5 |
173 |
- !<kde-frameworks/kfilemetadata-5.34.0:5 |
174 |
- !<kde-plasma/kde-cli-tools-5.10.0:5 |
175 |
- !<kde-plasma/plasma-desktop-5.10.0:5 |
176 |
- !<kde-plasma/plasma-workspace-5.10.0:5 |
177 |
-" |
178 |
- |
179 |
-REMOVE_DIRS="${FILESDIR}/${PN}-17.08.1-remove-dirs" |
180 |
- |
181 |
-IUSE="test $(printf 'l10n_%s ' ${KDE_L10N[@]})" |
182 |
- |
183 |
-S="${WORKDIR}" |
184 |
- |
185 |
-pkg_setup() { |
186 |
- if [[ -z ${A} ]]; then |
187 |
- elog |
188 |
- elog "None of the requested L10N are supported by ${P}." |
189 |
- elog |
190 |
- elog "${P} supports these language codes:" |
191 |
- elog "${KDE_L10N[@]}" |
192 |
- elog |
193 |
- fi |
194 |
- [[ -n ${A} ]] && kde4-base_pkg_setup |
195 |
-} |
196 |
- |
197 |
-src_unpack() { |
198 |
- for my_tar in ${A}; do |
199 |
- tar -xpf "${DISTDIR}/${my_tar}" --xz \ |
200 |
- "${my_tar/.tar.xz/}/CMakeLists.txt" "${my_tar/.tar.xz/}/4" 2> /dev/null || |
201 |
- elog "${my_tar}: tar extract command failed at least partially - continuing" |
202 |
- done |
203 |
-} |
204 |
- |
205 |
-src_prepare() { |
206 |
- # move known variant subdirs to root dir, currently sr@* |
207 |
- use_if_iuse l10n_sr-ijekavsk && l10n_variant_subdir2root sr-ijekavsk sr |
208 |
- use_if_iuse l10n_sr-Latn-ijekavsk && l10n_variant_subdir2root sr-Latn-ijekavsk sr |
209 |
- use_if_iuse l10n_sr-Latn && l10n_variant_subdir2root sr-Latn sr |
210 |
- if use_if_iuse l10n_sr; then |
211 |
- rm -rf kde-l10n-sr-${PV}/4/sr/sr@* || die "Failed to cleanup L10N=sr" |
212 |
- l10n_variant_subdir_buster sr |
213 |
- elif [[ -d kde-l10n-sr-${PV} ]]; then |
214 |
- # having any variant selected means parent lingua will be unpacked as well |
215 |
- rm -r kde-l10n-sr-${PV} || die "Failed to remove sr parent lingua" |
216 |
- fi |
217 |
- |
218 |
- cat <<-EOF > CMakeLists.txt || die |
219 |
- project(${PN}) |
220 |
- cmake_minimum_required(VERSION 2.8.12) |
221 |
- EOF |
222 |
- # add all l10n directories to cmake |
223 |
- if [[ -n ${A} ]]; then |
224 |
- cat <<-EOF >> CMakeLists.txt || die |
225 |
- $(printf "add_subdirectory( %s )\n" \ |
226 |
- `find . -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"`) |
227 |
- EOF |
228 |
- fi |
229 |
- |
230 |
- kde4-base_src_prepare |
231 |
- [[ -n ${A} ]] || return |
232 |
- |
233 |
- einfo "Removing file collisions with Plasma 5 and Applications" |
234 |
- [[ -f ${REMOVE_DIRS} ]] || die "Error: ${REMOVE_DIRS} not found!" |
235 |
- |
236 |
- use test && einfo "Tests enabled: Listing LINGUAS causing file collisions" |
237 |
- |
238 |
- einfo "Directories..." |
239 |
- while read path; do |
240 |
- if use test ; then # build a report w/ L10N="*" to submit @upstream |
241 |
- local lngs |
242 |
- for lng in $(kde_l10n2lingua ${KDE_L10N[@]}); do |
243 |
- SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}" |
244 |
- if [[ -d "${SDIR}"/${path%\ *}/${path#*\ } ]] ; then |
245 |
- lngs+=" ${lng}" |
246 |
- fi |
247 |
- done |
248 |
- [[ -n "${lngs}" ]] && einfo "${path%\ *}/${path#*\ }${lngs}" |
249 |
- unset lngs |
250 |
- fi |
251 |
- if ls -U ./*/4/*/${path%\ *}/${path#*\ } > /dev/null 2>&1; then |
252 |
- sed -e "\:add_subdirectory(\s*${path#*\ }\s*): s:^:#:" \ |
253 |
- -i ./*/4/*/${path%\ *}/CMakeLists.txt || \ |
254 |
- die "Failed to comment out ${path}" |
255 |
- else |
256 |
- einfo "F: ${path}" # run with L10N="*" to cut down list |
257 |
- fi |
258 |
- done < <(grep -ve "^$\|^\s*\#" "${REMOVE_DIRS}") |
259 |
-} |
260 |
- |
261 |
-src_configure() { |
262 |
- local mycmakeargs=( |
263 |
- -DBUILD_docs=$(usex handbook) |
264 |
- ) |
265 |
- [[ -n ${A} ]] && kde4-base_src_configure |
266 |
-} |
267 |
- |
268 |
-src_compile() { |
269 |
- [[ -n ${A} ]] && kde4-base_src_compile |
270 |
-} |
271 |
- |
272 |
-src_test() { :; } |
273 |
- |
274 |
-src_install() { |
275 |
- [[ -n ${A} ]] && kde4-base_src_install |
276 |
-} |
277 |
- |
278 |
-l10n_variant_subdir2root() { |
279 |
- local lingua=$(kde_l10n2lingua ${1}) |
280 |
- local src=kde-l10n-${2}-${PV} |
281 |
- local dest=kde-l10n-${lingua}-${PV}/4 |
282 |
- |
283 |
- # create variant rootdir structure from parent lingua and adapt it |
284 |
- mkdir -p ${dest} || die "Failed to create ${dest}" |
285 |
- mv ${src}/4/${2}/${lingua} ${dest}/${lingua} || die "Failed to create ${dest}/${lingua}" |
286 |
- cp -f ${src}/CMakeLists.txt kde-l10n-${lingua}-${PV} || die "Failed to prepare L10N=${1} subdir" |
287 |
- echo "add_subdirectory(${lingua})" > ${dest}/CMakeLists.txt || |
288 |
- die "Failed to prepare ${dest}/CMakeLists.txt" |
289 |
- cp -f ${src}/4/${2}/CMakeLists.txt ${dest}/${lingua} || |
290 |
- die "Failed to create ${dest}/${lingua}/CMakeLists.txt" |
291 |
- sed -e "s/${2}/${lingua}/" -i ${dest}/${lingua}/CMakeLists.txt || |
292 |
- die "Failed to prepare ${dest}/${lingua}/CMakeLists.txt" |
293 |
- |
294 |
- l10n_variant_subdir_buster ${1} |
295 |
-} |
296 |
- |
297 |
-l10n_variant_subdir_buster() { |
298 |
- local dir=kde-l10n-$(kde_l10n2lingua ${1})-${PV}/4/$(kde_l10n2lingua ${1}) |
299 |
- |
300 |
- sed -e "/^macro.*subdirectory(/d" -i ${dir}/CMakeLists.txt || die "Failed to cleanup ${dir} subdir" |
301 |
- |
302 |
- for subdir in $(find ${dir} -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"); do |
303 |
- if [[ ${subdir##*/} != "cmake_modules" ]] ; then |
304 |
- echo "add_subdirectory(${subdir##*/})" >> ${dir}/CMakeLists.txt || die |
305 |
- fi |
306 |
- done |
307 |
-} |
308 |
|
309 |
diff --git a/kde-apps/kde4-l10n/metadata.xml b/kde-apps/kde4-l10n/metadata.xml |
310 |
deleted file mode 100644 |
311 |
index 2fdbf33d963..00000000000 |
312 |
--- a/kde-apps/kde4-l10n/metadata.xml |
313 |
+++ /dev/null |
314 |
@@ -1,8 +0,0 @@ |
315 |
-<?xml version="1.0" encoding="UTF-8"?> |
316 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
317 |
-<pkgmetadata> |
318 |
- <maintainer type="project"> |
319 |
- <email>kde@g.o</email> |
320 |
- <name>Gentoo KDE Project</name> |
321 |
- </maintainer> |
322 |
-</pkgmetadata> |
323 |
|
324 |
diff --git a/kde-apps/kholidays/Manifest b/kde-apps/kholidays/Manifest |
325 |
deleted file mode 100644 |
326 |
index 1538b1abc94..00000000000 |
327 |
--- a/kde-apps/kholidays/Manifest |
328 |
+++ /dev/null |
329 |
@@ -1 +0,0 @@ |
330 |
-DIST kholidays-17.08.3.tar.xz 202580 BLAKE2B 9d98aea2e60039b3dc9f2aaf5c918329a344cfd80ffde18dfa84a7d23ad6dc40c4bf327c7e295dd7da70004744f1cf96ce99bab4cab896680348b137f0dd86dc SHA512 aef4cedf7d621b236cd09b990f9e6e2177d63af1831b17bb5df390a1a182e98f8e9d24a3d8fe7d763d9f7f29bcf6a8e23dd1d6da0bb1e289101aaa50c34fa040 |
331 |
|
332 |
diff --git a/kde-apps/kholidays/kholidays-17.08.3.ebuild b/kde-apps/kholidays/kholidays-17.08.3.ebuild |
333 |
deleted file mode 100644 |
334 |
index 43e0f2c0af1..00000000000 |
335 |
--- a/kde-apps/kholidays/kholidays-17.08.3.ebuild |
336 |
+++ /dev/null |
337 |
@@ -1,26 +0,0 @@ |
338 |
-# Copyright 1999-2017 Gentoo Foundation |
339 |
-# Distributed under the terms of the GNU General Public License v2 |
340 |
- |
341 |
-EAPI=6 |
342 |
- |
343 |
-KDE_TEST="true" |
344 |
-inherit kde5 |
345 |
- |
346 |
-DESCRIPTION="Library to determine holidays and other special events for a geographical region" |
347 |
-LICENSE="LGPL-2.1+" |
348 |
-KEYWORDS="amd64 ~arm ~arm64 x86" |
349 |
-IUSE="nls" |
350 |
- |
351 |
-RDEPEND=" |
352 |
- $(add_qt_dep qtdeclarative) |
353 |
-" |
354 |
-DEPEND="${RDEPEND} |
355 |
- nls? ( $(add_qt_dep linguist-tools) ) |
356 |
-" |
357 |
- |
358 |
-src_test() { |
359 |
- # bug 624214 |
360 |
- mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die |
361 |
- cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die |
362 |
- kde5_src_test |
363 |
-} |
364 |
|
365 |
diff --git a/kde-apps/kholidays/metadata.xml b/kde-apps/kholidays/metadata.xml |
366 |
deleted file mode 100644 |
367 |
index 2fdbf33d963..00000000000 |
368 |
--- a/kde-apps/kholidays/metadata.xml |
369 |
+++ /dev/null |
370 |
@@ -1,8 +0,0 @@ |
371 |
-<?xml version="1.0" encoding="UTF-8"?> |
372 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
373 |
-<pkgmetadata> |
374 |
- <maintainer type="project"> |
375 |
- <email>kde@g.o</email> |
376 |
- <name>Gentoo KDE Project</name> |
377 |
- </maintainer> |
378 |
-</pkgmetadata> |
379 |
|
380 |
diff --git a/kde-apps/kscd/Manifest b/kde-apps/kscd/Manifest |
381 |
deleted file mode 100644 |
382 |
index b2d88f2bfd8..00000000000 |
383 |
--- a/kde-apps/kscd/Manifest |
384 |
+++ /dev/null |
385 |
@@ -1 +0,0 @@ |
386 |
-DIST kscd-17.08.3.tar.xz 92564 BLAKE2B 534c7f9e588218300f8fab5c47cf85b5180c6d7b557161ea7c097d77c2a0108598264b9026e7c8ecce37ca8f7b198583474030d297aea14132601af8a0bf2cac SHA512 96f8d5e0f00c82f40276ba3ddcc6920e2a076d761c88454e9cddb52f62bbcf06ede63c04f9b5315882a3d33aa9f8297bfbd1c8be94ac5f24bf639cf8f9b13bbc |
387 |
|
388 |
diff --git a/kde-apps/kscd/files/kscd-17.08.3-musicbrainz5.patch b/kde-apps/kscd/files/kscd-17.08.3-musicbrainz5.patch |
389 |
deleted file mode 100644 |
390 |
index 645450c3d59..00000000000 |
391 |
--- a/kde-apps/kscd/files/kscd-17.08.3-musicbrainz5.patch |
392 |
+++ /dev/null |
393 |
@@ -1,626 +0,0 @@ |
394 |
-Combining the following upstream commits to migrate to musibrainz5: |
395 |
- |
396 |
- 536b679d8a0e4d3c470366b5bdfe142edb1c9307 |
397 |
- 908815f9fc7a0d7ebeae68c14a02026464b6c935 |
398 |
- 86128bdfef49d241e6aa71f968c614b8b07462de |
399 |
- c3c68d6015f967b07bf6fd66f8fcb5d65b9122e4 |
400 |
- |
401 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
402 |
-index f1a9462..32c7656 100644 |
403 |
---- a/CMakeLists.txt |
404 |
-+++ b/CMakeLists.txt |
405 |
-@@ -8,13 +8,15 @@ include(KDE4Defaults) |
406 |
- include(MacroLibrary) |
407 |
- include_directories(${QT_INCLUDES} ${KDE4_INCLUDES}) |
408 |
- |
409 |
--find_package(MusicBrainz3 REQUIRED) |
410 |
-+find_package(MusicBrainz5 REQUIRED) |
411 |
-+find_package(DiscId REQUIRED) |
412 |
- |
413 |
- include_directories( |
414 |
- ${CMAKE_CURRENT_SOURCE_DIR}/gui |
415 |
- ${CMAKE_CURRENT_SOURCE_DIR} |
416 |
- ${CMAKE_CURRENT_BINARY_DIR} |
417 |
-- ${MUSICBRAINZ3_INCLUDE_DIR} |
418 |
-+ ${MUSICBRAINZ5_INCLUDE_DIR} |
419 |
-+ ${DISCID_INCLUDE_DIR} |
420 |
- ) |
421 |
- add_subdirectory(tests) |
422 |
- ########### next target ############### |
423 |
-@@ -112,7 +114,8 @@ target_link_libraries(kscd |
424 |
- ${KDE4_KIO_LIBS} |
425 |
- ${KDE4_SOLID_LIBS} |
426 |
- ${KDE4_PHONON_LIBS} |
427 |
-- ${MUSICBRAINZ3_LIBRARIES} |
428 |
-+ ${MUSICBRAINZ5_LIBRARIES} |
429 |
-+ ${DISCID_LIBRARIES} |
430 |
- ) |
431 |
- |
432 |
- ########### install files ############### |
433 |
-diff --git a/cmake/FindDiscId.cmake b/cmake/FindDiscId.cmake |
434 |
-new file mode 100644 |
435 |
-index 0000000..6de59f5 |
436 |
---- /dev/null |
437 |
-+++ b/cmake/FindDiscId.cmake |
438 |
-@@ -0,0 +1,20 @@ |
439 |
-+# Module to find the discid library |
440 |
-+# It can be found at http://musicbrainz.org/doc/libdiscid |
441 |
-+# |
442 |
-+# It defines |
443 |
-+# DISCID_INCLUDE_DIR - the include dir |
444 |
-+# DISCID_LIBRARIES - the required libraries |
445 |
-+# DISCID_FOUND - true if both of the above have been found |
446 |
-+ |
447 |
-+# Copyright (c) 2006,2007 Laurent Montel, <montel@×××.org> |
448 |
-+# Copyright (c) 2010 Gerd Fleischer |
449 |
-+# |
450 |
-+# Redistribution and use is allowed according to the terms of the BSD license. |
451 |
-+ |
452 |
-+FIND_PATH(DISCID_INCLUDE_DIR discid/discid.h) |
453 |
-+ |
454 |
-+FIND_LIBRARY(DISCID_LIBRARIES NAMES discid) |
455 |
-+ |
456 |
-+include(FindPackageHandleStandardArgs) |
457 |
-+find_package_handle_standard_args( DiscId DEFAULT_MSG |
458 |
-+ DISCID_INCLUDE_DIR DISCID_LIBRARIES) |
459 |
-diff --git a/cmake/FindMusicBrainz3.cmake b/cmake/FindMusicBrainz3.cmake |
460 |
-deleted file mode 100644 |
461 |
-index 2d11e36..0000000 |
462 |
---- a/cmake/FindMusicBrainz3.cmake |
463 |
-+++ /dev/null |
464 |
-@@ -1,40 +0,0 @@ |
465 |
--# Module to find the musicbrainz-3 library |
466 |
--# |
467 |
--# It defines |
468 |
--# MUSICBRAINZ3_INCLUDE_DIR - the include dir |
469 |
--# MUSICBRAINZ3_LIBRARIES - the required libraries |
470 |
--# MUSICBRAINZ3_FOUND - true if both of the above have been found |
471 |
-- |
472 |
--# Copyright (c) 2006,2007 Laurent Montel, <montel@×××.org> |
473 |
--# |
474 |
--# Redistribution and use is allowed according to the terms of the BSD license. |
475 |
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file. |
476 |
-- |
477 |
--if(MUSICBRAINZ3_INCLUDE_DIR AND MUSICBRAINZ3_LIBRARIES) |
478 |
-- set(MUSICBRAINZ3_FIND_QUIETLY TRUE) |
479 |
--endif(MUSICBRAINZ3_INCLUDE_DIR AND MUSICBRAINZ3_LIBRARIES) |
480 |
-- |
481 |
--# use pkg-config to get the directories and then use these values |
482 |
--# in the FIND_PATH() and FIND_LIBRARY() calls |
483 |
--find_package(PkgConfig) |
484 |
--pkg_check_modules(PC_LIBMUSICBRAINZ3 QUIET libmusicbrainz3) |
485 |
-- |
486 |
--FIND_PATH(MUSICBRAINZ3_INCLUDE_DIR musicbrainz3/musicbrainz.h |
487 |
-- HINTS |
488 |
-- ${PC_LIBMUSICBRAINZ3_INCLUDEDIR} |
489 |
-- ${PC_LIBMUSICBRAINZ3_INCLUDE_DIRS} |
490 |
--) |
491 |
-- |
492 |
--FIND_LIBRARY( MUSICBRAINZ3_LIBRARIES NAMES musicbrainz3 |
493 |
-- HINTS |
494 |
-- ${PC_LIBMUSICBRAINZ3_LIBDIR} |
495 |
-- ${PC_LIBMUSICBRAINZ3_LIB_DIRS} |
496 |
--) |
497 |
-- |
498 |
--include(FindPackageHandleStandardArgs) |
499 |
--find_package_handle_standard_args( MusicBrainz3 DEFAULT_MSG |
500 |
-- MUSICBRAINZ3_INCLUDE_DIR MUSICBRAINZ3_LIBRARIES) |
501 |
-- |
502 |
--MARK_AS_ADVANCED(MUSICBRAINZ3_INCLUDE_DIR MUSICBRAINZ3_LIBRARIES) |
503 |
-- |
504 |
-- |
505 |
-diff --git a/cmake/FindMusicBrainz5.cmake b/cmake/FindMusicBrainz5.cmake |
506 |
-new file mode 100644 |
507 |
-index 0000000..0f78342 |
508 |
---- /dev/null |
509 |
-+++ b/cmake/FindMusicBrainz5.cmake |
510 |
-@@ -0,0 +1,33 @@ |
511 |
-+# Module to find the musicbrainz-5 library |
512 |
-+# |
513 |
-+# It defines |
514 |
-+# MUSICBRAINZ5_INCLUDE_DIR - the include dir |
515 |
-+# MUSICBRAINZ5_LIBRARIES - the required libraries |
516 |
-+# MUSICBRAINZ5_FOUND - true if both of the above have been found |
517 |
-+ |
518 |
-+# Copyright (c) 2006,2007 Laurent Montel, <montel@×××.org> |
519 |
-+# |
520 |
-+# Redistribution and use is allowed according to the terms of the BSD license. |
521 |
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. |
522 |
-+ |
523 |
-+if(MUSICBRAINZ5_INCLUDE_DIR AND MUSICBRAINZ5_LIBRARIES) |
524 |
-+ set(MUSICBRAINZ5_FIND_QUIETLY TRUE) |
525 |
-+endif() |
526 |
-+ |
527 |
-+find_path(MUSICBRAINZ5_INCLUDE_DIR musicbrainz5/Disc.h) |
528 |
-+ |
529 |
-+find_library(MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5cc) |
530 |
-+if (NOT MUSICBRAINZ5_LIBRARIES) |
531 |
-+ find_library(MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5) |
532 |
-+endif() |
533 |
-+ |
534 |
-+include(FindPackageHandleStandardArgs) |
535 |
-+find_package_handle_standard_args(MusicBrainz5 DEFAULT_MSG MUSICBRAINZ5_INCLUDE_DIR MUSICBRAINZ5_LIBRARIES) |
536 |
-+ |
537 |
-+add_library(musicbrainz SHARED IMPORTED) |
538 |
-+set_target_properties(musicbrainz PROPERTIES |
539 |
-+ INTERFACE_INCLUDE_DIRECTORIES "${MUSICBRAINZ5_INCLUDE_DIR}" |
540 |
-+ IMPORTED_LOCATION "${MUSICBRAINZ5_LIBRARIES}" |
541 |
-+) |
542 |
-+ |
543 |
-+mark_as_advanced(MUSICBRAINZ5_INCLUDE_DIR MUSICBRAINZ5_LIBRARIES) |
544 |
-diff --git a/kscd.cpp b/kscd.cpp |
545 |
-index 3bcb8f6..2c6d1a4 100644 |
546 |
---- a/kscd.cpp |
547 |
-+++ b/kscd.cpp |
548 |
-@@ -114,7 +114,7 @@ void KSCD::setupActions() |
549 |
- m_uploadAction = m_actions->addAction( QLatin1String( "Upload Info" )); |
550 |
- m_uploadAction->setText(i18n("Upload Info")); |
551 |
- addAction(m_uploadAction); |
552 |
-- connect(m_uploadAction, SIGNAL(triggered()), m_MBManager, SLOT(discUpload())); |
553 |
-+ connect(m_uploadAction, SIGNAL(triggered()), this, SLOT(discUpload())); |
554 |
- |
555 |
- //play/pause |
556 |
- m_playPauseAction = m_actions->addAction( QLatin1String( "Play/Pause" )); |
557 |
-@@ -248,6 +248,11 @@ void KSCD::discLookup() |
558 |
- m_MBManager->discLookup(devices->getMedia()->currentSource().deviceName()); |
559 |
- } |
560 |
- |
561 |
-+void KSCD::discUpload() |
562 |
-+{ |
563 |
-+ m_MBManager->discUpload(devices->getMedia()->currentSource().deviceName()); |
564 |
-+} |
565 |
-+ |
566 |
- void KSCD::discLookupFinished() |
567 |
- { |
568 |
- // If the track dialog is open, refresh it |
569 |
-diff --git a/kscd.h b/kscd.h |
570 |
-index 43fd653..83f8287 100644 |
571 |
---- a/kscd.h |
572 |
-+++ b/kscd.h |
573 |
-@@ -130,6 +130,7 @@ public slots: |
574 |
- void configureKeys(); |
575 |
- |
576 |
- void discLookup(); |
577 |
-+ void discUpload(); |
578 |
- void discLookupFinished(); |
579 |
- |
580 |
- private: |
581 |
-diff --git a/mbmanager.cpp b/mbmanager.cpp |
582 |
-index 4df3803..f3fd67f 100644 |
583 |
---- a/mbmanager.cpp |
584 |
-+++ b/mbmanager.cpp |
585 |
-@@ -34,86 +34,239 @@ |
586 |
- |
587 |
- #include <ktoolinvocation.h> |
588 |
- |
589 |
--#include <musicbrainz3/musicbrainz.h> |
590 |
--#include <musicbrainz3/query.h> |
591 |
-+#include <musicbrainz5/Query.h> |
592 |
-+#include <musicbrainz5/Artist.h> |
593 |
-+#include <musicbrainz5/ArtistCredit.h> |
594 |
-+#include <musicbrainz5/Disc.h> |
595 |
-+#include <musicbrainz5/HTTPFetch.h> |
596 |
-+#include <musicbrainz5/Medium.h> |
597 |
-+#include <musicbrainz5/NameCredit.h> |
598 |
-+#include <musicbrainz5/NameCreditList.h> |
599 |
-+#include <musicbrainz5/Recording.h> |
600 |
-+#include <musicbrainz5/Release.h> |
601 |
-+#include <musicbrainz5/Track.h> |
602 |
- |
603 |
- MBManager::MBManager():m_validInfo(true) |
604 |
- { |
605 |
-- |
606 |
-+ m_discid = discid_new(); |
607 |
- } |
608 |
- |
609 |
- MBManager::~MBManager() |
610 |
- { |
611 |
-+ discid_free(m_discid); |
612 |
-+} |
613 |
-+ |
614 |
-+static QString getTitle(MusicBrainz5::CRelease *release, MusicBrainz5::CMedium *medium) |
615 |
-+{ |
616 |
-+ QString title; |
617 |
-+ if (!release) |
618 |
-+ { |
619 |
-+ return title; |
620 |
-+ } |
621 |
-+ |
622 |
-+ title = QString::fromUtf8(release->Title().c_str()); |
623 |
-+ if (medium && release->MediumList()->NumItems() > 1) |
624 |
-+ { |
625 |
-+ title = i18n("%1 (disc %2)", title, medium->Position()); |
626 |
-+ } |
627 |
- |
628 |
-+ return title; |
629 |
- } |
630 |
- |
631 |
--void MBManager::discLookup(const QString &device) |
632 |
-+static QString getArtistFromArtistCredit(MusicBrainz5::CArtistCredit *artistCredit) |
633 |
- { |
634 |
-- m_validInfo = true; |
635 |
-+ QString artist; |
636 |
-+ MusicBrainz5::CNameCreditList *artistList = artistCredit->NameCreditList(); |
637 |
-+ |
638 |
-+ if (!artistList) |
639 |
-+ { |
640 |
-+ return artist; |
641 |
-+ } |
642 |
- |
643 |
-- MusicBrainz::WebService* ws = new MusicBrainz::WebService(); |
644 |
-+ for (int i = 0; i < artistList->NumItems(); i++) |
645 |
-+ { |
646 |
-+ MusicBrainz5::CNameCredit* name = artistList->Item(i); |
647 |
-+ MusicBrainz5::CArtist* itemArtist = name->Artist(); |
648 |
-+ |
649 |
-+ if (!name->Name().empty()) |
650 |
-+ { |
651 |
-+ artist += QString::fromUtf8(name->Name().c_str()); |
652 |
-+ } |
653 |
-+ else |
654 |
-+ { |
655 |
-+ artist += QString::fromUtf8(itemArtist->Name().c_str()); |
656 |
-+ } |
657 |
-+ |
658 |
-+ artist += QString::fromUtf8(name->JoinPhrase().c_str()); |
659 |
-+ } |
660 |
-+ |
661 |
-+ return artist; |
662 |
-+} |
663 |
- |
664 |
-- // Set the proper server to use. Defaults to mm.musicbrainz.org:80 |
665 |
-- if (!qgetenv("MB_SERVER").isNull()) |
666 |
-+static QString getArtist(MusicBrainz5::CRelease *release) |
667 |
-+{ |
668 |
-+ QString artist; |
669 |
-+ if (!release) |
670 |
- { |
671 |
-- std::string server(qgetenv("MB_SERVER")); |
672 |
-- ws->setHost(server); |
673 |
-- //kDebug() << "!! set server !!" ; |
674 |
-+ return artist; |
675 |
- } |
676 |
-- else |
677 |
-+ |
678 |
-+ MusicBrainz5::CArtistCredit *artistCredit = release->ArtistCredit(); |
679 |
-+ return getArtistFromArtistCredit(artistCredit); |
680 |
-+} |
681 |
-+ |
682 |
-+static QList<MBTrackInfo> unknownTracks(QString &discArtist, DiscId *m_discid) |
683 |
-+{ |
684 |
-+ QList<MBTrackInfo> tracks; |
685 |
-+ MBTrackInfo track; |
686 |
-+ for (int j = 1; j < discid_get_first_track_num(m_discid); j++) |
687 |
-+ { |
688 |
-+ track.Title = i18n("Unknown title"); |
689 |
-+ track.Artist = discArtist; |
690 |
-+ // Not an audio track |
691 |
-+ track.Duration = 0; |
692 |
-+ |
693 |
-+ tracks << track; |
694 |
-+ } |
695 |
-+ for (int j = discid_get_first_track_num(m_discid); j <= discid_get_last_track_num(m_discid); j++) |
696 |
-+ { |
697 |
-+ track.Title = i18n("Unknown title"); |
698 |
-+ track.Artist = discArtist; |
699 |
-+ // time from mb library in sectors, 75 sectors = 1 second |
700 |
-+ track.Duration = discid_get_track_length(m_discid, j) * 1000 / 75; |
701 |
-+ |
702 |
-+ tracks << track; |
703 |
-+ } |
704 |
-+ |
705 |
-+ return tracks; |
706 |
-+} |
707 |
-+ |
708 |
-+static QList<MBTrackInfo> getTracks(MusicBrainz5::CMedium *medium, QString &discArtist, DiscId *m_discid) |
709 |
-+{ |
710 |
-+ QList<MBTrackInfo> tracks; |
711 |
-+ if (!medium) |
712 |
-+ { |
713 |
-+ return tracks; |
714 |
-+ } |
715 |
-+ |
716 |
-+ MusicBrainz5::CTrackList *trackList = medium->TrackList(); |
717 |
-+ if (!trackList) |
718 |
-+ { |
719 |
-+ return unknownTracks(discArtist, m_discid); |
720 |
-+ } |
721 |
-+ |
722 |
-+ MBTrackInfo track; |
723 |
-+ for (int i = 0; i < trackList->NumItems(); i++) |
724 |
-+ { |
725 |
-+ MusicBrainz5::CTrack *itemTrack = trackList->Item(i); |
726 |
-+ MusicBrainz5::CRecording *recording = itemTrack->Recording(); |
727 |
-+ if (recording && !itemTrack->ArtistCredit()) |
728 |
-+ { |
729 |
-+ track.Artist = getArtistFromArtistCredit(recording->ArtistCredit()); |
730 |
-+ } |
731 |
-+ else |
732 |
-+ { |
733 |
-+ track.Artist = getArtistFromArtistCredit(itemTrack->ArtistCredit()); |
734 |
-+ } |
735 |
-+ |
736 |
-+ if(recording && itemTrack->Title().empty()) |
737 |
-+ { |
738 |
-+ track.Title = QString::fromUtf8(recording->Title().c_str()); |
739 |
-+ } |
740 |
-+ else |
741 |
-+ { |
742 |
-+ track.Title = QString::fromUtf8(itemTrack->Title().c_str()); |
743 |
-+ } |
744 |
-+ |
745 |
-+ track.Duration = itemTrack->Length(); |
746 |
-+ |
747 |
-+ tracks << track; |
748 |
-+ } |
749 |
-+ |
750 |
-+ return tracks; |
751 |
-+} |
752 |
-+ |
753 |
-+static MusicBrainz5::CRelease *getRelease(MusicBrainz5::CQuery &query, std::string &discId, MusicBrainz5::CMetadata &metadata, MusicBrainz5::CMetadata &fullMetadata) |
754 |
-+{ |
755 |
-+ metadata = query.Query("discid", discId); |
756 |
-+ // Check to see how many items were returned from the server |
757 |
-+ if (!metadata.Disc() || !metadata.Disc()->ReleaseList()) |
758 |
-+ { |
759 |
-+ return 0; |
760 |
-+ } |
761 |
-+ |
762 |
-+ MusicBrainz5::CReleaseList *results = metadata.Disc()->ReleaseList(); |
763 |
-+ |
764 |
-+ // TODO if multiple entries found |
765 |
-+ if (results->NumItems() > 1) |
766 |
-+ { |
767 |
-+ kDebug() << results->NumItems() << " entries found"; |
768 |
-+ } |
769 |
-+ |
770 |
-+ MusicBrainz5::CRelease *release; |
771 |
-+ for (int i = 0; i < results->NumItems(); i++) |
772 |
- { |
773 |
-- //kDebug() << "no server"; |
774 |
-+ MusicBrainz5::CRelease *result = results->Item(i); |
775 |
-+ MusicBrainz5::CQuery::tParamMap params; |
776 |
-+ params["inc"] = "artists labels recordings release-groups url-rels " |
777 |
-+ "discids artist-credits"; |
778 |
-+ fullMetadata = query.Query("release", result->ID(), "", params); |
779 |
-+ |
780 |
-+ release = fullMetadata.Release(); |
781 |
-+ if (release) |
782 |
-+ { |
783 |
-+ break; |
784 |
-+ } |
785 |
-+ } |
786 |
-+ |
787 |
-+ return release; |
788 |
-+} |
789 |
-+ |
790 |
-+static MusicBrainz5::CMedium *getMedium(MusicBrainz5::CRelease *release, std::string &discId, MusicBrainz5::CMediumList &mediaList) |
791 |
-+{ |
792 |
-+ if (!release) |
793 |
-+ { |
794 |
-+ return 0; |
795 |
- } |
796 |
- |
797 |
-- // If you need to use a proxy, uncomment/edit the following line |
798 |
-- // as appropriate |
799 |
-- //ws->setProxyHost("proxy.mydomain.com"); |
800 |
-- //ws->setProxyPort(80); |
801 |
-+ // Find the specific media in the release |
802 |
-+ mediaList = release->MediaMatchingDiscID(discId); |
803 |
-+ MusicBrainz5::CMedium* medium = 0; |
804 |
- |
805 |
-- try |
806 |
-+ for (int i = 0; i < mediaList.NumItems(); i++) |
807 |
- { |
808 |
-- MusicBrainz::Disc *disc = MusicBrainz::readDisc(qPrintable(device)); |
809 |
-+ medium = mediaList.Item(i); |
810 |
-+ if (medium) |
811 |
-+ { |
812 |
-+ break; |
813 |
-+ } |
814 |
-+ } |
815 |
- |
816 |
-- MusicBrainz::Query q(ws); |
817 |
-- MusicBrainz::ReleaseResultList results; |
818 |
-+ return medium; |
819 |
-+} |
820 |
- |
821 |
-+void MBManager::discLookup(const QString &device) |
822 |
-+{ |
823 |
-+ m_validInfo = true; |
824 |
-+ MusicBrainz5::CQuery query("kscd"); |
825 |
-+ int discid_ok = discid_read_sparse(m_discid, qPrintable(device), 0); |
826 |
-+ if (discid_ok) |
827 |
-+ { |
828 |
-+ std::string discId(discid_get_id(m_discid)); |
829 |
- try |
830 |
- { |
831 |
-- MusicBrainz::ReleaseFilter f = MusicBrainz::ReleaseFilter().discId(disc->getId()); |
832 |
-- results = q.getReleases(&f); |
833 |
-+ MusicBrainz5::CMetadata metadata, fullMetadata; |
834 |
-+ MusicBrainz5::CMediumList mediaList; |
835 |
-+ MusicBrainz5::CRelease *release = getRelease(query, discId, metadata, fullMetadata); |
836 |
-+ MusicBrainz5::CMedium *medium = getMedium(release, discId, mediaList); |
837 |
- |
838 |
-- // Check to see how many items were returned from the server |
839 |
-- if (!results.empty()) |
840 |
-+ if (release && medium) |
841 |
- { |
842 |
-- // TODO if multiple entries found |
843 |
-- if (results.size() > 1) |
844 |
-- { |
845 |
-- kDebug() << results.size() << " entries found"; |
846 |
-- } |
847 |
-- |
848 |
-- MusicBrainz::ReleaseResult *result = results.front(); |
849 |
-- MusicBrainz::Release *release = q.getReleaseById(result->getRelease()->getId(), |
850 |
-- &MusicBrainz::ReleaseIncludes().tracks().artist()); |
851 |
- // Sets info |
852 |
-- m_discInfo.Title = QString::fromUtf8(release->getTitle().c_str()); |
853 |
-- m_discInfo.Artist = QString::fromUtf8(release->getArtist()->getName().c_str()); |
854 |
-- |
855 |
-- m_trackList.clear(); |
856 |
-- MBTrackInfo track; |
857 |
-- for (MusicBrainz::TrackList::iterator j = release->getTracks().begin(); |
858 |
-- j != release->getTracks().end(); j++) |
859 |
-- { |
860 |
-- MusicBrainz::Track *t = *j; |
861 |
-- MusicBrainz::Artist *artist = t->getArtist(); |
862 |
-- if (!artist) |
863 |
-- artist = release->getArtist(); |
864 |
-- |
865 |
-- track.Title = QString::fromUtf8(t->getTitle().c_str()); |
866 |
-- track.Artist = QString::fromUtf8(artist->getName().c_str()); |
867 |
-- track.Duration = t->getDuration(); |
868 |
-- |
869 |
-- m_trackList << track; |
870 |
-- } |
871 |
-+ m_discInfo.Title = getTitle(release, medium); |
872 |
-+ m_discInfo.Artist = getArtist(release); |
873 |
-+ |
874 |
-+ m_trackList = getTracks(medium, m_discInfo.Artist, m_discid); |
875 |
- } |
876 |
- else |
877 |
- { |
878 |
-@@ -121,75 +274,57 @@ void MBManager::discLookup(const QString &device) |
879 |
- m_validInfo = false; |
880 |
- } |
881 |
- |
882 |
-- |
883 |
- } |
884 |
-- catch (const MusicBrainz::WebServiceError &e) |
885 |
-- { |
886 |
-- kDebug() << "Error: " << e.what(); |
887 |
-+ catch (MusicBrainz5::CExceptionBase& error) |
888 |
-+ { |
889 |
-+ kDebug() << "Connection Exception: '" << error.what() << "'"; |
890 |
-+ kDebug() << "LastResult: " << query.LastResult(); |
891 |
-+ kDebug() << "LastHTTPCode: " << query.LastHTTPCode(); |
892 |
-+ kDebug() << "LastErrorMessage: " << QString::fromUtf8(query.LastErrorMessage().c_str()); |
893 |
-+ |
894 |
- m_validInfo = false; |
895 |
-- } |
896 |
-+ } |
897 |
- catch (...) |
898 |
- { |
899 |
- kDebug() << "Caught Unknown Exception:"; |
900 |
- m_validInfo = false; |
901 |
- } |
902 |
-- |
903 |
-- if (!m_validInfo) |
904 |
-- { |
905 |
-- // If invalid data, fill the information with something |
906 |
-- // Sets info |
907 |
-- m_discInfo.Title = i18n("Unknown album"); |
908 |
-- m_discInfo.Artist = i18n("Unknown artist"); |
909 |
-- |
910 |
-- m_trackList.clear(); |
911 |
-- MBTrackInfo track; |
912 |
-- for (MusicBrainz::Disc::TrackList::iterator j = disc->getTracks().begin(); j != disc->getTracks().end(); j++) |
913 |
-- { |
914 |
-- track.Title = i18n("Unknown title"); |
915 |
-- track.Artist = m_discInfo.Artist; |
916 |
-- // time from mb library in sectors, 75 sectors = 1 second |
917 |
-- track.Duration = (*j).second*1000/75; |
918 |
-- |
919 |
-- m_trackList << track; |
920 |
-- } |
921 |
-- } |
922 |
-- delete disc; |
923 |
- } |
924 |
-- // FIXME Doesn't seem to get caught, why? |
925 |
-- catch (const MusicBrainz::DiscError &e) |
926 |
-- { |
927 |
-- kDebug() << "Error: " << e.what(); |
928 |
-- m_discInfo.Title = i18n("Unknown album"); |
929 |
-- m_discInfo.Artist = i18n("Unknown artist"); |
930 |
-- m_discInfo.Artist = i18n( "No Disc" ); |
931 |
-- m_trackList.clear(); |
932 |
-- } |
933 |
-- catch(...) |
934 |
-+ else |
935 |
-+ { |
936 |
-+ m_validInfo = false; |
937 |
-+ } |
938 |
-+ |
939 |
-+ if (!m_validInfo) |
940 |
- { |
941 |
-+ // If invalid data, fill the information with something |
942 |
-+ // Sets info |
943 |
- m_discInfo.Title = i18n("Unknown album"); |
944 |
- m_discInfo.Artist = i18n("Unknown artist"); |
945 |
-- m_discInfo.Artist = i18n( "No Disc" ); |
946 |
-+ |
947 |
- m_trackList.clear(); |
948 |
-+ if (discid_ok) |
949 |
-+ { |
950 |
-+ m_trackList = unknownTracks(m_discInfo.Artist, m_discid); |
951 |
-+ } |
952 |
- } |
953 |
-- |
954 |
-+ |
955 |
- emit discLookupFinished(); |
956 |
- } |
957 |
- |
958 |
--void MBManager::discUpload() |
959 |
-+void MBManager::discUpload(const QString &device) |
960 |
- { |
961 |
- showArtistLabel(m_discInfo.Artist); |
962 |
-+ const char *discid_device = device.isEmpty()? NULL : qPrintable(device); |
963 |
- |
964 |
-- try |
965 |
-+ int ok = discid_read_sparse(m_discid, discid_device, 0); |
966 |
-+ if (ok) |
967 |
- { |
968 |
-- MusicBrainz::Disc *disc = MusicBrainz::readDisc(); |
969 |
-- std::string url = MusicBrainz::getSubmissionUrl(disc); |
970 |
-- delete disc; |
971 |
-- |
972 |
-- KToolInvocation::invokeBrowser(QString::fromUtf8(url.c_str())); |
973 |
-+ QString url = QString::fromUtf8(discid_get_submission_url(m_discid)); |
974 |
-+ KToolInvocation::invokeBrowser(url); |
975 |
- } |
976 |
-- catch (MusicBrainz::DiscError &e) |
977 |
-+ else |
978 |
- { |
979 |
-- kDebug() << "Error: " << e.what(); |
980 |
-+ kDebug() << "Error: " << discid_get_error_msg(m_discid); |
981 |
- } |
982 |
- } |
983 |
-- |
984 |
-diff --git a/mbmanager.h b/mbmanager.h |
985 |
-index 6b07e95..ea04153 100644 |
986 |
---- a/mbmanager.h |
987 |
-+++ b/mbmanager.h |
988 |
-@@ -42,6 +42,9 @@ |
989 |
- #include <qstring.h> |
990 |
- #include <qlist.h> |
991 |
- |
992 |
-+// musicbrainz discid |
993 |
-+#include <discid/discid.h> |
994 |
-+ |
995 |
- struct DiscInfo |
996 |
- { |
997 |
- QString Title; |
998 |
-@@ -64,6 +67,7 @@ private: |
999 |
- QList <MBTrackInfo> m_trackList; /// List of tracks information |
1000 |
- |
1001 |
- bool m_validInfo; /// Tells whether the lookup query succeeded |
1002 |
-+ DiscId *m_discid; |
1003 |
- |
1004 |
- public: |
1005 |
- MBManager(); |
1006 |
-@@ -82,11 +86,11 @@ public slots: |
1007 |
- void discLookup(const QString& device); |
1008 |
- |
1009 |
- /** Uploads information */ |
1010 |
-- void discUpload(); |
1011 |
-+ void discUpload(const QString& device=QString()); |
1012 |
- |
1013 |
- signals: |
1014 |
- void showArtistLabel(QString&); |
1015 |
-- |
1016 |
-+ |
1017 |
- void discLookupFinished(); |
1018 |
- }; |
1019 |
- |
1020 |
|
1021 |
diff --git a/kde-apps/kscd/kscd-17.08.3.ebuild b/kde-apps/kscd/kscd-17.08.3.ebuild |
1022 |
deleted file mode 100644 |
1023 |
index 2b0ffb54733..00000000000 |
1024 |
--- a/kde-apps/kscd/kscd-17.08.3.ebuild |
1025 |
+++ /dev/null |
1026 |
@@ -1,20 +0,0 @@ |
1027 |
-# Copyright 1999-2017 Gentoo Foundation |
1028 |
-# Distributed under the terms of the GNU General Public License v2 |
1029 |
- |
1030 |
-EAPI=6 |
1031 |
- |
1032 |
-inherit kde4-base |
1033 |
- |
1034 |
-DESCRIPTION="KDE CD player" |
1035 |
-HOMEPAGE="https://www.kde.org/applications/multimedia/kscd/" |
1036 |
-KEYWORDS="~amd64 ~x86" |
1037 |
-IUSE="debug" |
1038 |
- |
1039 |
-DEPEND=" |
1040 |
- media-libs/libdiscid |
1041 |
- media-libs/musicbrainz:5 |
1042 |
- media-libs/phonon[qt4] |
1043 |
-" |
1044 |
-RDEPEND="${DEPEND}" |
1045 |
- |
1046 |
-PATCHES=( "${FILESDIR}/${P}-musicbrainz5.patch" ) |
1047 |
|
1048 |
diff --git a/kde-apps/kscd/metadata.xml b/kde-apps/kscd/metadata.xml |
1049 |
deleted file mode 100644 |
1050 |
index 2fdbf33d963..00000000000 |
1051 |
--- a/kde-apps/kscd/metadata.xml |
1052 |
+++ /dev/null |
1053 |
@@ -1,8 +0,0 @@ |
1054 |
-<?xml version="1.0" encoding="UTF-8"?> |
1055 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1056 |
-<pkgmetadata> |
1057 |
- <maintainer type="project"> |
1058 |
- <email>kde@g.o</email> |
1059 |
- <name>Gentoo KDE Project</name> |
1060 |
- </maintainer> |
1061 |
-</pkgmetadata> |
1062 |
|
1063 |
diff --git a/profiles/package.mask b/profiles/package.mask |
1064 |
index 4d8e44983d6..625096ab773 100644 |
1065 |
--- a/profiles/package.mask |
1066 |
+++ b/profiles/package.mask |
1067 |
@@ -275,16 +275,6 @@ dev-scheme/ikarus |
1068 |
# Masked for removal in 30 days. Bug 631128 |
1069 |
media-plugins/gst-plugins-mad:1.0 |
1070 |
|
1071 |
-# Andreas Sturmlechner <asturm@g.o> (30 Mar 2018) |
1072 |
-# Package moved to kde-frameworks. Masked for removal in 30 days. |
1073 |
-kde-apps/kholidays |
1074 |
- |
1075 |
-# Andreas Sturmlechner <asturm@g.o> (30 Mar 2018) |
1076 |
-# Depends on deprecated Qt4, no revdeps left. |
1077 |
-# Masked for removal in 30 days. |
1078 |
-kde-apps/kscd |
1079 |
-kde-apps/kde4-l10n |
1080 |
- |
1081 |
# Lars Wendler <polynomial-c@g.o> (27 Mar 2018) |
1082 |
# Breaks a couple of revdeps. See tracker bug at |
1083 |
# https://bugs.gentoo.org/651698 |