gentoo resync : 13.10.2019

5 files changed, 176 insertions, 12 deletions

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 2980d9cbb009..ae9128e9ec65 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,7 +1,9 @@
 AUX clementine-1.3.1_p20190609-fix-restore-from-systray.patch 1235 BLAKE2B 9904a6df024998d4268ca952fc2c17cebec01873b93aa141ac6db193e1a69481d4f7f5f02cf9fec6174eb390fce66b443ef86de8b2379c6c9192c6d5eed5edd8 SHA512 86be2b64b38347d5f0bd086dd35970d6f2c1fcffe315a116d68251193e91a05a0fe02f029d558290d4ebc09175067f0f2bb4e59bb58984150d52d219a8c9503e
 DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
 DIST clementine-1.3.1_p20190609.tar.gz 8516585 BLAKE2B a02e473703da5cfa3a7fb702f3ff90f3aa0fd97faf8b10b2c080b4a9a052f514f67fe40dcd0fd435c1681bd8749b0f4d731b21e4b842979e9dbe516cf7a19e76 SHA512 d72d29a01920bfe74d1a51b419cdbb5bd096cfd816edec4e7325bf43cc5b75a893c273b131539ae362f2a804cbb4ca57002737e4833ef6e5c1adc1b7f142dd57
-EBUILD clementine-1.3.1_p20190127.ebuild 5043 BLAKE2B 4d6c2113a990744bb310f7d2ef0c20e24554fc64a5df1546a11cad449a689f5aa2515508dd30cf77b9294eb2b880980f24a5e3b22dd8ca6521c752939eafabb2 SHA512 ca57e01f9fbce22460f1d52a01fbc641afbe2a6981f04544e21fd4a35fc8a16c36313b86637e5bd7ce1b0aa87eeb32178acd92266c47f8c50666a0f4f93e1143
-EBUILD clementine-1.3.1_p20190609.ebuild 5108 BLAKE2B 062c21a837d595d1a45a82306330c39a35137acf0d703ea107ebe9b2dd1cc3abbf41cbb28dd8e68f7eb4d85506102be585bdf3f9339621c89133bc3e99f6a51b SHA512 06fbd7be87b7e7266141a505606d6f54e103ee9554094d46023e5fea168390ed4dab18402c128eb33454dd0aee637b6497647fabd0d7adc6e6bdef8835268f0d
-EBUILD clementine-9999.ebuild 4974 BLAKE2B e25668017fc68c1443848e9677e44672109522bf4e1a6ca806dffbb262f063b430eb31af17c36e349b872f32d7a1b05b5989f457dcaced6cc913ac61121c64d7 SHA512 e3e1d1e24f2290281644313c5c29a531b53d80c5f22c09e87e8f3f5119bb56540844020fce471bbd4070bbb55f08229c35c2b0b0e7d736b0b49c6b12cf34a1c7
+DIST clementine-1.3.1_p20191004.tar.gz 8528437 BLAKE2B 11c7bd7ac4ad4cdc75e2c5e54651832c1aa31448341230917df973227fcb1cd659309bb361f0b62a12dc38ce48e1f25697742df478650f4c10996938a7093acf SHA512 eb755d47f2e518c4e1bb28596e6554184d9fb6bab594e2f16b73c0bdecaa7c19692d368e9ec6a91e5012b786368eb7d3b2d051db11f3b5934233ba3e5b488679
+EBUILD clementine-1.3.1_p20190127.ebuild 5045 BLAKE2B 1a5413ccdf502d0c56cf09c4067161b128e5f8a2fe960e9c3b0dc2b7ed05e13b59fac2a866c11d5d53a715a4d3557b8ce84050e94c5974a9aa357a3dededae1b SHA512 88d87ecba083252f52a4aac810680ea088c49b70216dbe1d9a51f1a7b7d8912c35e8dbcee3879a8475f53fb8db3a5f95449d22b2f185cd179a077b57f6804b92
+EBUILD clementine-1.3.1_p20190609.ebuild 5110 BLAKE2B 2ace372f4b6ba4969d075e8954f0a5bfa5ea78037cb1dfb129b1a4d726990df4a862925a3b901da2ef1d5de088a20d720e4b3a59d5b66778e2bb4a860850daa5 SHA512 3689915216cebe991bd0d5ae9596ea0844f0583ec39f287f9487bd859e6e95d4dcc8c075efc94a69af52df3fbf4af222b2d430e7dedc002b92c0f38b067bf810
+EBUILD clementine-1.3.1_p20191004.ebuild 4615 BLAKE2B 310536c020206dc6754799dc80261ebe2fbb18304923fb61a241484f0bd019c4310e2d3fead5eabd07e89369d3aab54eb87fbc6d365e1000730a47afe453074b SHA512 edca69e331d5547b8e274b5151713ad45bb171bddbe9f3558142be4e6d8da05525297688a0b8f5c1ae2283c9bd364b0297154c5483c323886da694b3d5198965
+EBUILD clementine-9999.ebuild 4544 BLAKE2B 0f73b23c5478fa964180ff29e7e7b0a22b340088074a32bcf152e54206c39736923d6dfb43443d7d3d9e2a9e7c8f924af6d1aaa2938d74b1c1603cf92ecd7d38 SHA512 441b2d6b3e08ad6218fef936fbb1c37103b10ec4367e1d53aba8537d72dd48ea51d040cda1053b970b1224ffa5b1d6ea7f2f63933188fc248729d06b11ec356f
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
index 64add8ac854a..9aa4ffa1983b 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
@@ -68,7 +68,7 @@ COMMON_DEPEND="
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	projectm? (
 		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0
+		>=media-libs/libprojectm-1.2.0:=
 		virtual/opengl
 	)
 "
diff --git a/media-sound/clementine/clementine-1.3.1_p20190609.ebuild b/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
index a4d5f63d5bb0..c1abcfd676e4 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND="
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	projectm? (
 		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0
+		>=media-libs/libprojectm-1.2.0:=
 		virtual/opengl
 	)
 "
diff --git a/media-sound/clementine/clementine-1.3.1_p20191004.ebuild b/media-sound/clementine/clementine-1.3.1_p20191004.ebuild
new file mode 100644
index 000000000000..f2d1766fb153
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1_p20191004.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+MY_P="${P/_}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_BRANCH="qt5"
+	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+	inherit git-r3
+else
+	COMMIT=664c5a31f9cf519af5a4c3adcb30dbbc73d037d6
+	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN^}-${COMMIT}"
+fi
+inherit cmake-utils flag-o-matic l10n virtualx xdg
+
+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"
+
+LICENSE="GPL-3"
+SLOT="0"
+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 )
+"
+
+BDEPEND="
+	>=dev-cpp/gtest-1.8.0
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-qt/qttest:5
+		gnome-base/gsettings-desktop-schemas
+	)
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/crypto++:=[asm]
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/chromaprint:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	>=media-libs/taglib-1.11.1_p20181028
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	projectm? (
+		media-libs/glew:=
+		>=media-libs/libprojectm-1.2.0:=
+		virtual/opengl
+	)
+"
+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-libs/boost
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	pulseaudio? ( media-sound/pulseaudio )
+	seafile? ( dev-cpp/sparsehash )
+	skydrive? ( dev-cpp/sparsehash )
+"
+
+RESTRICT="test"
+
+DOCS=( Changelog README.md )
+
+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
+
+	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# force to find crypto++ see bug #548544
+		-DCRYPTOPP_LIBRARIES="cryptopp"
+		-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_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_BOX="$(usex box)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(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_postinst() {
+	xdg_pkg_postinst
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 95744f36b833..3f87ebadac97 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -68,16 +68,10 @@ COMMON_DEPEND="
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	projectm? (
 		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0
+		>=media-libs/libprojectm-1.2.0:=
 		virtual/opengl
 	)
 "
-# 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