gentoo resync : 26.11.2017

3 files changed, 12 insertions, 46 deletions

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 7386c75becc7..10d39fb1582e 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,16 +1,13 @@
-AUX clementine-1.3-fix-tokenizer.patch 674 SHA256 eeb5828314e8531dd0d3ce8c3af38b61840a864345314aee73b5ed3299f04baa SHA512 4f520dcd4937634ebf5bb814ec64267d42473886fc5abd4924ac551bbae8ecc7643ddbacd9e2f9a5b0d8c7b0f67cf5aec420b5eb73162b248cbf6b3eafafbbd8 WHIRLPOOL cd49b399587c1726e2a409df3fecad7b71959326812003edbd3a69eb459947e49590e36e5476ba886d6407c522d840907c2b2091596245209149b4c6b4045a72
-AUX clementine-1.3.1-add-missing-functional-includes.patch 1377 SHA256 7356b5210985a9e030eb57ac2d6190ad5ec66fa25a73497503337be6679780a8 SHA512 bea6fa8d7213404e1d048ec866cbc6d8b60ce7ff76af7f8c2bbc2c89959f478ff3201ddf072691c3e4d5c007e2ea8ad5c07150076920516f82ae1956b1be4075 WHIRLPOOL 2d248bc7d723d77a3296c0535a70e63f7b7f5728b5b6309a11b1d7987cf56ad4ddc8d360aedb92b66cf0bd5a54224ada5c3aee519bab1ad06630a1086fae9bab
-AUX clementine-1.3.1-chromaprint14.patch 1535 SHA256 cf5c1c625885cc4436722ac38dc201cdc491478dc73e171ea2af95bfb59fd0c6 SHA512 21ceda98534e4fe7f860d869cf83387e6c2a5c4c1a0db75c29dc8c9de18a3a117cebcfb98ea816723370009dc08e1804ec2b46c118e657eb293fb45d1fba2601 WHIRLPOOL 3341d3b3c9eda2d4e27b4df085c1cb500e852c1fe985a04088eb7e98e2f042dbc064b5c3bd04ce58404aa9a153b44b8cfcd68e1c4646f08eeab97ccfce15f007
-AUX clementine-1.3.1-fix-desktop-file.patch 1488 SHA256 af6f32da9324a3a6fdbb6ff0bccf2ba770ea82b3d25948e93285600624b04fa9 SHA512 55a787a63da9b1b4970e794d95233b22d704ff591e32cfc6c9b73023289e58a4cce2f2a43ec8186beb2feffe44b3cffa6b50f015a41cab5bba559087a868e826 WHIRLPOOL 52f8af4584b90cf0f52d2246f44fc22c2259a909c82cb6d9d591cbaa002d6005dacc9266d1a41196fdf5d02f8113da0ae3224292c17de150e6acb8b0dcd8bd8d
-AUX clementine-1.3.1-libechonest_removal.patch 23130 SHA256 7623f26a3a9cacf9f4850c51d128b575988059e07c4c35ed030e9d86a77f4f2b SHA512 44f28096567d48446fdd5769d91e32d3987f121e04f8f8fec956892c3a42693863cd5c9ab878e88c0477353fd369a005047c04e5da4661c701ab85103893947a WHIRLPOOL 121077646ea620d4d9633726848f5997aaaafd4a443844fc8c6f5bc196d9b6fe73ee99b332d90c335357612ed74541ea60e0a54b916dcb325ea930436c21ddff
-AUX clementine-fts3-tokenizer.patch 1395 SHA256 3af6ba3748b7ba4eb9cb022c1fd7ce039d9fc877df007f79646a57470ea9f7e7 SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a WHIRLPOOL 7d2657292e955ba331c5f177a50f6f432976e7ae0cdfe28565fb99ae67a2303e53045e2b8cb9e71a604eb4ec6ebdcc443b8630499dd43596d159cacc8565a1e8
-AUX clementine-qt5-lconvert.patch 919 SHA256 a357c7116e044a4293258c19b1574c1d8f2b9ca8a99ca104ce5af1dfaf59635f SHA512 3d8cc87a5bb92cecb60c566d5ad1e1a124aa8141ed5f92ed681dae24ca49af80c50f04acf649756f96c4e1690182dca4137fd6babed28c1c305b5b89cbcf7e77 WHIRLPOOL d5cb96b8a29d8d175af0fa3ad2b3e90cd343e6a1b81458a4485a74034fb31ce6267b621fd55efec1aa804c85d914d1706722eba81d8eed66cab257a2c27d43b5
+AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db134710f5aaf62c4e8105ab1b8ab0e69a0953b6177fb91dd89fcdcf5493dfc1e634f51658eea9f050689aa1e219dbd8db189 SHA512 4f520dcd4937634ebf5bb814ec64267d42473886fc5abd4924ac551bbae8ecc7643ddbacd9e2f9a5b0d8c7b0f67cf5aec420b5eb73162b248cbf6b3eafafbbd8
+AUX clementine-1.3.1-add-missing-functional-includes.patch 1377 BLAKE2B f409b81e27e99f2580f63c9940ef3f90212bc3d2d5e9fab2fc0b9a477c7bb283313d6e6c65efb1e6dfe40e547c6c0924c9363a93703da4116ec5b93a5b940f64 SHA512 bea6fa8d7213404e1d048ec866cbc6d8b60ce7ff76af7f8c2bbc2c89959f478ff3201ddf072691c3e4d5c007e2ea8ad5c07150076920516f82ae1956b1be4075
+AUX clementine-1.3.1-chromaprint14.patch 1535 BLAKE2B 8253b27b759f8675d2d2368cc9ac4b220ae93770f7c09c5b290a3d29c1c58cba0ea8f32db061afbc902d5276238b141ef13c16b8fb8e379bca53a02bd115cb6c SHA512 21ceda98534e4fe7f860d869cf83387e6c2a5c4c1a0db75c29dc8c9de18a3a117cebcfb98ea816723370009dc08e1804ec2b46c118e657eb293fb45d1fba2601
+AUX clementine-1.3.1-fix-desktop-file.patch 1488 BLAKE2B 45bd063f49868988bf5b37fbd3dd12f10f265e5f2309f68fa8a3ae8d3d903dddcbbf13755160c1da36db0cde105bb6ea3c441da89b67b79cc510449a8bdea9fa SHA512 55a787a63da9b1b4970e794d95233b22d704ff591e32cfc6c9b73023289e58a4cce2f2a43ec8186beb2feffe44b3cffa6b50f015a41cab5bba559087a868e826
+AUX clementine-1.3.1-libechonest_removal.patch 23130 BLAKE2B 245fc8d2747bd3e3d65a8141e298e1e518b3857581297dcc35ef64bd38c43b11743be6f7fadbe1a01cab90d077f97dd9b16f50acab195ee06de65548083bcf05 SHA512 44f28096567d48446fdd5769d91e32d3987f121e04f8f8fec956892c3a42693863cd5c9ab878e88c0477353fd369a005047c04e5da4661c701ab85103893947a
+AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1.tar.gz 8501827 SHA256 f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c SHA512 1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790 WHIRLPOOL 20a57177dc740865f35c407b981e146d9ddec6aff39e662a27dfe0e238f3baa87b331cc6dc50eebf848279c8860fb74454b4997924e2d4d93357a870364af1a7
 DIST clementine-1.3.1_p20171113.tar.gz 8467904 SHA256 d0393deefe4cf385ef793935272169871be4080e03687251005385a7a19ea3e4 SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674 WHIRLPOOL 81580f4d1bdcec406e646c6121533089645234962aa16aaa4ea706e56b672cf01b10836514db05ed0007ca1eb0de11ebd69c6e1131d3e42589e91c45a9e15f11
-EBUILD clementine-1.3.1-r5.ebuild 4962 SHA256 d485f696fd7b5b529355495bc9cc09bb4e3985a72fda6ccb493e714713f97c52 SHA512 f1815b573a1e921d257a7f64579bb42f7cdf1e6d67075d4b490c71c4fe508c579ba3aedbd7a4e54df96dcdcdcf5e2e4de87067cf56433574ae7ba19e21d0785c WHIRLPOOL f443b975988353f9678cd107a986450473a82402869de87406a4b9f6fc64c3246e086af8b825aa7ded0903e60599950730a7d20a1b89043b980b5f4ed5641f23
-EBUILD clementine-1.3.1-r6.ebuild 5297 SHA256 c11970964d94659d0fcd6c9007d583275e7960083a397d60143b8a68e10f044f SHA512 1edef30b329ad8b40c2b1ac53311fc02cb3e98f435cb8a412398f3484ae7bc897c691b4238685f19e75969bb6511d5193091644d9fdb25226775e4fce92f3370 WHIRLPOOL a7ecbf146de31bbbfa87481ac63aff18af478279f3aca8b3253b45efd9d27335d88cd4c79db8b64ed597c9690a217b67dbd4944d07e49e8656f126add0dd396d
-EBUILD clementine-1.3.1_p20171113.ebuild 4799 SHA256 991833cd871e833935cba681f6f56c3bd5d4728152b307856b4d9cd724f3d32a SHA512 f34627e95778005ccc7b70827a2b5b87225e662c7034c242569e31a1bca0627dae6dc2817ff9921346f357f3b91507012979c2cf9b74a685d253d3a066017f6c WHIRLPOOL 5fed6806d5868f6ecc92a473931f9e311a147c1b7c51a5a68c2d02e35bfb7452ae95607c5c3e2a1aca3690f47d8ed57115cfe9ae1b538695eb07a3a538cfed99
-EBUILD clementine-9999.ebuild 5295 SHA256 c9c80a2e653cdf9a53de0ecaf65d55fbaaac2a9173eaff7efdecaf4bdf0299b6 SHA512 3d4ce6035ee149565e77c6f88569e2368741ee88b349b22b122dfc5bc05f4f4f60b9343957581dba21711aa1a6beafe88b30f0b440f3b3cc8a15126f0197f813 WHIRLPOOL 0776994e4cd6e7905dba8c040b86ee398f20b5a5ce9692b8384691a85fdde9bbfcffa7075489b8819c2184efad44b00354d5502a4102821ecc9c17e3ad044407
-MISC ChangeLog 9850 SHA256 5be4c79e7322aac6053e857bf192cd1dfc755d14d4eb6fd625ae6057a95ec483 SHA512 60dee44e488580005a61584743363789e1a34ef8526773efa7b91dfa16903e9d72b0c4f237fed17527d73925bf086a5be8878d64ba4057e4adfef90ea47efbcf WHIRLPOOL c80e7694a32e8577081d5acb2569fafe3553efde2154cac6f04c312cc8261771c98ea672f2bb98014966dca83d744d18111117b4dad9e8f70c4bf5e4553da067
-MISC ChangeLog-2015 15896 SHA256 f0ea70385e7167c03bd2864689f9a6ba8a09fb96cd606dc6d6e3d2a5c214705b SHA512 0e7f8cee28a56e833fdb1290cf7ed34bb439451a9500fd6e617743262dcd32bfc64a12cde09fb2ea309235fda464b55315ce8f01bc645c2d41eb4bf4551d482c WHIRLPOOL b953911d7c5695feccb32f8a53aef0a20f2c620f0ab4cbb67b9189d54fef4f38b62568b7664aa9a11a87879a44ff9af10fa9433c2d103ded1c4f878f4d089585
-MISC metadata.xml 1537 SHA256 ac9bde82c2f5d8a6317441a25d04fdcaac44552ac5080e0524f046765913d69e SHA512 cf5beb80417c4099a43e7f19bb06112159af557f17ce9c0da1226f5ee41cebc8e94c2c2aa6349d140ee291608d39511477a0aa54e586d11a52bc3f697283da3f WHIRLPOOL 46fed04acc380226fa207518b6abe67e9b16b85e33cf4e9856846800485d61567ac3bd16e3479da61e744cb287c49435a9159bfe8fe4209ee9375e6381c8476d
+EBUILD clementine-1.3.1-r5.ebuild 4962 BLAKE2B 061ffdab9f81560d33ba90271056824999d17b3219f3cd4fbea6e4cfa08435045172f3bd4f10bce3a98d4b89c647ee66fb63209fed2826d914494d45231603a6 SHA512 f1815b573a1e921d257a7f64579bb42f7cdf1e6d67075d4b490c71c4fe508c579ba3aedbd7a4e54df96dcdcdcf5e2e4de87067cf56433574ae7ba19e21d0785c
+EBUILD clementine-1.3.1-r6.ebuild 5297 BLAKE2B 656fcbfaec471e5adb07bd569be65e721142cc81e4b20d1defb177477b21b9edb9dad2cdf7a2b20284c4602996184002e4d397646da7205708ddbb133df6381d SHA512 1edef30b329ad8b40c2b1ac53311fc02cb3e98f435cb8a412398f3484ae7bc897c691b4238685f19e75969bb6511d5193091644d9fdb25226775e4fce92f3370
+EBUILD clementine-1.3.1_p20171113.ebuild 4799 BLAKE2B 62f5799342dadfcce6fabca227d870e815c17e1b5e17227a699474b12fbbe6825b84ea1d8b03e4b44acbbaa0ecf022923ec80ee3b996688c494635f35cc74a7d SHA512 f34627e95778005ccc7b70827a2b5b87225e662c7034c242569e31a1bca0627dae6dc2817ff9921346f357f3b91507012979c2cf9b74a685d253d3a066017f6c
+EBUILD clementine-9999.ebuild 5254 BLAKE2B ca7185e8348af0263f160d6f927e6c6c018ba6e91d9c0f2614a4977ee56c27aafb05fcb274f348e7a1b464591d8a02596886c35af70095f51f44f6e4419c8e94 SHA512 6bbf92baa8ee8fc51efaaf362af0ec20f71007596c5b356ba5ad2e87874985e56c27846e6f330ac1bcab678c7c9b794ee35ca06a89c4f9ba0948cbd72a8a46ce
+MISC metadata.xml 1537 BLAKE2B e63db763bbd9c013dd426a710bfb042335faf01f5cc8b3321a4e698e41313ba6994c059502e3f2113eaa3216d519c9f1a0b5a7467cecb27da94cd59d21bbe453 SHA512 cf5beb80417c4099a43e7f19bb06112159af557f17ce9c0da1226f5ee41cebc8e94c2c2aa6349d140ee291608d39511477a0aa54e586d11a52bc3f697283da3f
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 50ae57df0467..b0f63f84244e 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -106,10 +106,7 @@ MY_P="${P/_}"
 [[ ${PV} == *9999* ]] || \
 S="${WORKDIR}/${MY_P^}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-fts3-tokenizer.patch
-	"${FILESDIR}"/${PN}-qt5-lconvert.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
 
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
diff --git a/media-sound/clementine/files/clementine-qt5-lconvert.patch b/media-sound/clementine/files/clementine-qt5-lconvert.patch
deleted file mode 100644
index 8565f30cee05..000000000000
--- a/media-sound/clementine/files/clementine-qt5-lconvert.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5f75801a08a606073c700bd829ea694950de0729 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 19 Nov 2017 16:00:55 +0100
-Subject: [PATCH] Properly find Qt5LinguistTools
-
----
- CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4022c383b..5bdb2a00e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,9 +45,8 @@ if(NOT APPLE)
-   find_package(Qt5 COMPONENTS WebKitWidgets)
- endif(NOT APPLE)
- 
--# Find Qt's lconvert binary.  Try qt's binary dir first, fall back to looking in PATH
--find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH)
--find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5)
-+find_package(Qt5LinguistTools CONFIG REQUIRED)
-+set(QT_LCONVERT_EXECUTABLE Qt5::lconvert)
- 
- if(APPLE)
-   if(NOT QT_MAC_USE_COCOA)
--- 
-2.15.0
-