gentoo resync : 20.11.2017

8 files changed, 317 insertions, 72 deletions

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index b8a1832b101d..7386c75becc7 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -3,10 +3,14 @@ AUX clementine-1.3.1-add-missing-functional-includes.patch 1377 SHA256 7356b5210
 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
 DIST clementine-1.3.1.tar.gz 8501827 SHA256 f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c SHA512 1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790 WHIRLPOOL 20a57177dc740865f35c407b981e146d9ddec6aff39e662a27dfe0e238f3baa87b331cc6dc50eebf848279c8860fb74454b4997924e2d4d93357a870364af1a7
-EBUILD clementine-1.3.1-r5.ebuild 4964 SHA256 73875d197550f2e10f9c123391ba0a662ea56801911e5596ad9dcdf504101f3a SHA512 da7ea645cd0c4e25233582d1e3c99738913d50bfcd59b17e495a2b27592a8b3af2a69ecb417a225bed00078057397e1ad657b325acb7e0673a460ec97f194b9f WHIRLPOOL 2aa20c99b722073f1b788f2d35ec995211215c0bacfc679ad6937f8a6b59e415170ccd57e652c59aa183d4f43c726477812cba91b99b5af970245d58e20b81b5
-EBUILD clementine-1.3.1-r6.ebuild 5299 SHA256 2568f07932ee246dec4176a5086bce4d23bdeeb48a25d68817e30e0fa1c2bc57 SHA512 334762d043acbc0792677db2f18e56943dbf9f488f8360b36b057d545a383f64f7164e743c97ef42a081f9bc663d611bc611ca66b939d53bb1afd6254b29c12d WHIRLPOOL b56ca3059814a5d6f147388f8bcbe7017b5f88bb9757ae2521cb3a8fce85e332a5193a9e7cc7f0042bb741393dbb9c3c04df72d6dcaf16db3c5552ea95063427
-EBUILD clementine-9999.ebuild 5113 SHA256 24c7209c65251af7ed553fd254a1256ce865e1121e993b11bdb6461f2a1e37e9 SHA512 732b960b264c37e3ffd2ebca697eff8071b39cbe67acee1c404effc1552d12323b43d9d9e24eb7a83b9feb4d940936fe7cb0f1f89787de0cb6cee51229d4e2af WHIRLPOOL b50eae04eeb964c2e2247042f3de8dd1e627286f08bc02fd083e35c098ea64625b4b1b2323ed4c9e5630ca430c9e83f0a9444aef9a68a202238a848aea7ca274
+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 1645 SHA256 0a1b5ddba729698f936723963d2abab5a5afe305c0221ab4dfef53559db78c9b SHA512 aebce1b21379c5dd33f8675f26124449a66277fc8d736620f20304d091d4a3ac4cb1dcbe31afc4512d18c2cb246b4ee6c246c763eb197a4bad77ed5e707f8ecd WHIRLPOOL d3004303a10da8c0ac324759044a3c9f6159db6a34742f4160712cf139dee9f63a1b342e9b6d7c2fd0946ca6fdf4580237e9335bba61b3beb0e4b377f95d9ad3
+MISC metadata.xml 1537 SHA256 ac9bde82c2f5d8a6317441a25d04fdcaac44552ac5080e0524f046765913d69e SHA512 cf5beb80417c4099a43e7f19bb06112159af557f17ce9c0da1226f5ee41cebc8e94c2c2aa6349d140ee291608d39511477a0aa54e586d11a52bc3f697283da3f WHIRLPOOL 46fed04acc380226fa207518b6abe67e9b16b85e33cf4e9856846800485d61567ac3bd16e3479da61e744cb287c49435a9159bfe8fe4209ee9375e6381c8476d
diff --git a/media-sound/clementine/clementine-1.3.1-r5.ebuild b/media-sound/clementine/clementine-1.3.1-r5.ebuild
index 0edd5356ffe9..88c6a2096dc2 100644
--- a/media-sound/clementine/clementine-1.3.1-r5.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r5.ebuild
@@ -10,8 +10,8 @@ LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr
 inherit cmake-utils flag-o-matic xdg-utils gnome2-utils virtualx
 [[ ${PV} == *9999* ]] && inherit git-r3
 
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
-HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
 [[ ${PV} == *9999* ]] || \
 SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
 
diff --git a/media-sound/clementine/clementine-1.3.1-r6.ebuild b/media-sound/clementine/clementine-1.3.1-r6.ebuild
index 5aac7220fd64..13b223ccee98 100644
--- a/media-sound/clementine/clementine-1.3.1-r6.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r6.ebuild
@@ -10,8 +10,8 @@ LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr
 inherit cmake-utils flag-o-matic xdg-utils gnome2-utils virtualx
 [[ ${PV} == *9999* ]] && inherit git-r3
 
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
-HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
 [[ ${PV} == *9999* ]] || \
 SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
 
diff --git a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild
new file mode 100644
index 000000000000..598e7b1a0f6e
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=83e860eabd9f4a864c553f110742027cdd01b76f
+EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+
+PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+inherit cmake-utils flag-o-matic gnome2-utils l10n vcs-snapshot virtualx xdg-utils
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
+SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+	dev-db/sqlite:=
+	dev-libs/crypto++
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-libs/qjson
+	dev-qt/qtcore:4[ssl]
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qtsql:4
+	media-libs/chromaprint:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt4(+)]
+	media-libs/taglib[mp4(+)]
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio )
+	dbus? ( dev-qt/qtdbus:4 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	projectm? (
+		media-libs/glew:=
+		>=media-libs/libprojectm-1.2.0
+	)
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	|| (
+		>=dev-cpp/gtest-1.8.0
+		dev-cpp/gmock
+	)
+	dev-libs/boost:=
+	dev-qt/qttest:4
+	sys-devel/gettext
+	virtual/pkgconfig
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	pulseaudio? ( media-sound/pulseaudio )
+	seafile? ( dev-cpp/sparsehash )
+	skydrive? ( dev-cpp/sparsehash )
+	test? ( gnome-base/gsettings-desktop-schemas )
+"
+DOCS=( Changelog README.md )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	cmake-utils_src_prepare
+	# some tests fail or hang
+	sed -i \
+		-e '/add_test_file(translations_test.cpp/d' \
+		tests/CMakeLists.txt || die
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# force to find crypto++ see bug #548544
+		-DCRYPTOPP_LIBRARIES="crypto++"
+		-DCRYPTOPP_FOUND=ON
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-DENABLE_DEVICEKIT=OFF
+		-DENABLE_GIO=ON
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DUSE_BUILTIN_TAGLIB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		-DLINGUAS=$(l10n_get_locales)
+		-DENABLE_BOX="$(usex box)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_DBUS="$(usex dbus)"
+		-DENABLE_DROPBOX="$(usex dropbox)"
+		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBLASTFM="$(usex lastfm)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_VISUALISATIONS="$(usex projectm)"
+		-DENABLE_SEAFILE="$(usex seafile)"
+		-DENABLE_SKYDRIVE="$(usex skydrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx emake test
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be intrested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 48a9e1e41b5e..50ae57df0467 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -3,15 +3,16 @@
 
 EAPI=6
 
+EGIT_BRANCH="qt5"
 EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
 
-inherit cmake-utils flag-o-matic xdg-utils gnome2-utils virtualx
+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils
 [[ ${PV} == *9999* ]] && inherit git-r3
 
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
-HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
 [[ ${PV} == *9999* ]] || \
 SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
 
@@ -19,76 +20,86 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks udisks_legacy wiimote"
-IUSE+="${LANGS// / linguas_}"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote +X"
 
 REQUIRED_USE="
 	udisks? ( dbus )
-	udisks_legacy? ( dbus )
 	wiimote? ( dbus )
 "
 
 COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
-	>=dev-libs/glib-2.24.1-r1
+	dev-libs/crypto++
+	dev-libs/glib:2
 	dev-libs/libxml2
 	dev-libs/protobuf:=
-	dev-libs/qjson
-	>=dev-qt/qtcore-4.5:4[ssl]
-	>=dev-qt/qtgui-4.5:4
-	>=dev-qt/qtopengl-4.5:4
-	>=dev-qt/qtsql-4.5:4
-	>=media-libs/chromaprint-0.6
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint:=
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt4(+)]
-	>=media-libs/taglib-1.8[mp4(+)]
+	>=media-libs/libmygpo-qt-1.0.9[qt5]
+	media-libs/taglib[mp4(+)]
 	sys-libs/zlib
-	dev-libs/crypto++
 	virtual/glu
 	virtual/opengl
-	x11-libs/libX11
 	cdda? ( dev-libs/libcdio )
-	dbus? ( >=dev-qt/qtdbus-4.5:4 )
+	dbus? ( dev-qt/qtdbus:5 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
+	lastfm? ( >=media-libs/liblastfm-1[qt5] )
 	moodbar? ( sci-libs/fftw:3.0 )
-	projectm? ( media-libs/glew:=
-			>=media-libs/libprojectm-1.2.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	projectm? (
+		media-libs/glew:=
+		>=media-libs/libprojectm-1.2.0
+	)
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
 "
 # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches:
+# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
 # https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
 # Still possibly essential but not applied yet patches are:
 # 06-fix-numeric-locale.patch
 # 08-stdlib.h-for-rand.patch
 RDEPEND="${COMMON_DEPEND}
-	dbus? ( udisks? ( sys-fs/udisks:2 )
-	        udisks_legacy? ( sys-fs/udisks:0 ) )
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs[mtp] )
 	media-plugins/gst-plugins-meta:1.0
 	media-plugins/gst-plugins-soup:1.0
 	media-plugins/gst-plugins-taglib:1.0
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.39:=
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-qt/qttest:4
 	|| (
 		>=dev-cpp/gtest-1.8.0
 		dev-cpp/gmock
 	)
+	dev-libs/boost:=
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
-	seafile? ( dev-cpp/sparsehash )
 	pulseaudio? ( media-sound/pulseaudio )
+	seafile? ( dev-cpp/sparsehash )
 	skydrive? ( dev-cpp/sparsehash )
-	test? ( gnome-base/gsettings-desktop-schemas )
+	test? (
+		dev-qt/qttest:5
+		gnome-base/gsettings-desktop-schemas
+	)
 "
+
 DOCS=( Changelog README.md )
 
 MY_P="${P/_}"
@@ -96,57 +107,60 @@ MY_P="${P/_}"
 S="${WORKDIR}/${MY_P^}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
+	"${FILESDIR}"/${PN}-fts3-tokenizer.patch
+	"${FILESDIR}"/${PN}-qt5-lconvert.patch
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	l10n_find_plocales_changes "src/translations" "" ".po"
 
+	cmake-utils_src_prepare
 	# some tests fail or hang
 	sed -i \
 		-e '/add_test_file(translations_test.cpp/d' \
 		tests/CMakeLists.txt || die
+
+	if ! use test; then
+		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
+		cmake_comment_add_subdirectory tests
+	fi
 }
 
 src_configure() {
-	local langs x
-	for x in ${LANGS}; do
-		use linguas_${x} && langs+=" ${x}"
-	done
-
 	# spotify is not in portage
 	local mycmakeargs=(
 		-DBUILD_WERROR=OFF
-		-DLINGUAS="${langs}"
+		# force to find crypto++ see bug #548544
+		-DCRYPTOPP_LIBRARIES="crypto++"
+		-DCRYPTOPP_FOUND=ON
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-DENABLE_DEVICEKIT=OFF
+		-DENABLE_GIO=ON
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DUSE_BUILTIN_TAGLIB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		-DLINGUAS=$(l10n_get_locales)
+		-DENABLE_BOX="$(usex box)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DENABLE_DBUS="$(usex dbus)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_DEVICEKIT="$(usex udisks_legacy)"
+		-DENABLE_DROPBOX="$(usex dropbox)"
+		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBLASTFM="$(usex lastfm)"
-		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_GIO=ON
-		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_VISUALISATIONS="$(usex projectm)"
-		-DENABLE_BOX="$(usex box)"
-		-DENABLE_DROPBOX="$(usex dropbox)"
-		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_SEAFILE="$(usex seafile)"
 		-DENABLE_SKYDRIVE="$(usex skydrive)"
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
-		-DUSE_BUILTIN_TAGLIB=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		-DUSE_SYSTEM_PROJECTM=ON
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		# force to find crypto++ see bug #548544
-		-DCRYPTOPP_LIBRARIES="crypto++"
-		-DCRYPTOPP_FOUND=ON
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		)
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11="$(usex X)"
+	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
diff --git a/media-sound/clementine/files/clementine-fts3-tokenizer.patch b/media-sound/clementine/files/clementine-fts3-tokenizer.patch
new file mode 100644
index 000000000000..41a5cd76c992
--- /dev/null
+++ b/media-sound/clementine/files/clementine-fts3-tokenizer.patch
@@ -0,0 +1,36 @@
+From 77b6d72a3e8d841977a3e30ea435cd9e9289fc96 Mon Sep 17 00:00:00 2001
+From: Alexander Golubev <fatzer2@gmail.com>
+Date: Thu, 16 Mar 2017 14:54:55 +0300
+Subject: [PATCH] core/database: configure fts3 tokenizer support
+
+Original patch by Arfrever
+This fixes https://github.com/clementine-player/Clementine/issues/5297
+---
+ src/core/database.cpp | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/src/core/database.cpp b/src/core/database.cpp
+index 86e8a1052..36113d8c1 100644
+--- a/src/core/database.cpp
++++ b/src/core/database.cpp
+@@ -265,6 +265,20 @@ QSqlDatabase Database::Connect() {
+   StaticInit();
+ 
+   {
++
++#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
++    // In case sqlite>=3.12 is compiled without -DSQLITE_ENABLE_FTS3_TOKENIZER (generally a good idea
++    // due to security reasons) the fts3 support should be enabled explicitly.
++    // see https://github.com/clementine-player/Clementine/issues/5297
++    QVariant v = db.driver()->handle();
++    if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
++      sqlite3* handle = *static_cast<sqlite3**>(v.data());
++      if (handle) {
++        sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
++      }
++    }
++#endif
++
+     QSqlQuery set_fts_tokenizer(db);
+     set_fts_tokenizer.prepare("SELECT fts3_tokenizer(:name, :pointer)");
+     set_fts_tokenizer.bindValue(":name", "unicode");
diff --git a/media-sound/clementine/files/clementine-qt5-lconvert.patch b/media-sound/clementine/files/clementine-qt5-lconvert.patch
new file mode 100644
index 000000000000..8565f30cee05
--- /dev/null
+++ b/media-sound/clementine/files/clementine-qt5-lconvert.patch
@@ -0,0 +1,28 @@
+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
+
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index 145208285ecf..40e967ff3e4e 100644
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -29,7 +29,6 @@
 		<flag name="projectm">Build with ProjectM visualization</flag>
 		<flag name="seafile">Enable support for seafile: a file sync service</flag>
 		<flag name="skydrive">Enable Skydrive support</flag>
-		<flag name="udisks_legacy">Enable storage management support via legacy <pkg>sys-fs/udisks</pkg>:0</flag>
 		<flag name="vkontakte">Enable vk.com support</flag>
 		<flag name="wiimote">Enable support for Wii remote</flag>
 	</use>