gentoo resync : 20.11.2017

1 files changed, 77 insertions, 63 deletions

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