gentoo resync : 15.01.2020

5 files changed, 45 insertions, 36 deletions

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index ec80fbaa2c4d..13894ce3145b 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,9 +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
 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 4552 BLAKE2B 9a41188b10607092a1e6689e490bc835997f79cb5234228a854f041d70d4119b1a7ba550f0139773fb61f46ce7cafaabfc6367a4e41a57ff5693a572899ab306 SHA512 040b8ed1f7381a23900fe17bf29b238716337b457c5579f21a4d610fbb32f23d0aa8932c29b06b5f24189aabed5de3b3764597fa1e2dadeb0b66f9ba12e38cba
+DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B 894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809 SHA512 c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb
+EBUILD clementine-1.3.1_p20190127.ebuild 5027 BLAKE2B 5b9fb6dbbf5b57be7c610e882afc7f5e0bbfebc164b66d471092475106ce9b11e2dafb12d3f383320fa41c0c411c8cceb9644a940e4947b024d48ffab6bf2705 SHA512 1c85a20de5367dae202e44ae93845b5333e89c72f135a180c3f25c8218eb122209a8076a6f72266b242f619ad1c45cd5ac06102f37d0b7b8be90641b85403299
+EBUILD clementine-1.3.1_p20191004.ebuild 4597 BLAKE2B 92e229aa5164fff33e1f099eca0d92dc235b72798a28b524e1588b66e0693fbc1f0050fdc59a454f90eeafcca5fcd0f2625f06c9b391c01cbae3b190b2875537 SHA512 8166d382f4be0047e6423f5f9105a40aed4d617565f3fd019356774ab320a9aa346fef67ec722d673719c238e68f2083f7d57cf271bb2a690b732fe4d89777b3
+EBUILD clementine-1.4.0_rc1.ebuild 4837 BLAKE2B 03f253d587282b49f18abb0cb13d4ef6a2e368e738e9a6bec180d1554d9b17cfbfcbd128c94fd82c1b3f7073dbcea9d5ca520971c513e3ee38b59e2c70bf6b71 SHA512 1250358eeeca2fafb93cc749f9616385daed37129f82a5ec41e21a8984358ba4eb4ea7e7f22a283507fa2707added4d307b006e9f77b1e7360bbe22ce474b88e
+EBUILD clementine-9999.ebuild 4820 BLAKE2B 2fe724b22cc8b7b60e6b71a82fc39c9975e722690905b223f19d910f35ddcd238987dfd5a6cebc63169ee952cd1214e68e1e11768ff281b0ae230a11d0eaf373 SHA512 969c6a71948ce2d59b3074fbe481853ef269168f59a1f9dc74cc1f4cf1508b6c6b726f0b64e4f8c55fdbab14f6c3201064be4033aa4641afd9b1fa53f621a495
 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 9aa4ffa1983b..a2bb0b39fd2e 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 x86"
 fi
-inherit cmake-utils flag-o-matic l10n virtualx xdg
+inherit cmake 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"
@@ -108,7 +108,7 @@ DOCS=( Changelog README.md )
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# some tests fail or hang
 	sed -i \
 		-e '/add_test_file(translations_test.cpp/d' \
@@ -158,7 +158,7 @@ src_configure() {
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/media-sound/clementine/clementine-1.3.1_p20191004.ebuild b/media-sound/clementine/clementine-1.3.1_p20191004.ebuild
index f2d1766fb153..4e52840045fa 100644
--- a/media-sound/clementine/clementine-1.3.1_p20191004.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20191004.ebuild
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN^}-${COMMIT}"
 fi
-inherit cmake-utils flag-o-matic l10n virtualx xdg
+inherit cmake 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"
@@ -101,7 +101,7 @@ DOCS=( Changelog README.md )
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# some tests fail or hang
 	sed -i \
 		-e '/add_test_file(translations_test.cpp/d' \
@@ -151,7 +151,7 @@ src_configure() {
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/media-sound/clementine/clementine-1.3.1_p20190609.ebuild b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
index c1abcfd676e4..8d5ccbe101be 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
@@ -1,29 +1,37 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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"
 
+inherit cmake flag-o-matic l10n virtualx xdg
+
 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=9af827b6acaabb2331246f58436cd34b11548b6c
-	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P/_}"
+	SRC_URI_BASE="https://github.com/clementine-player/${PN^}"
+	COMMIT=""
+	if [[ -n "${COMMIT}" ]] ; then
+		SRC_URI="${SRC_URI_BASE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN^}-${COMMIT}"
+	elif [[ $(ver_cut 3) -gt 90 ]] ; then
+		SRC_URI="${SRC_URI_BASE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz"
+	fi
 	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"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -43,7 +51,7 @@ BDEPEND="
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
-	dev-libs/crypto++:=[asm]
+	dev-libs/crypto++:=
 	dev-libs/glib:2
 	dev-libs/libxml2
 	dev-libs/protobuf:=
@@ -73,12 +81,6 @@ COMMON_DEPEND="
 		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
@@ -104,12 +106,10 @@ RESTRICT="test"
 
 DOCS=( Changelog README.md )
 
-PATCHES=( "${FILESDIR}/${P}-fix-restore-from-systray.patch" )
-
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# some tests fail or hang
 	sed -i \
 		-e '/add_test_file(translations_test.cpp/d' \
@@ -159,7 +159,7 @@ src_configure() {
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 3efe963fe1b3..edb23f4f60da 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -1,21 +1,30 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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"
 
+inherit cmake flag-o-matic l10n virtualx xdg
+
 MY_P="${P/_}"
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P/_}"
+	SRC_URI_BASE="https://github.com/clementine-player/${PN^}"
+	COMMIT=""
+	if [[ -n "${COMMIT}" ]] ; then
+		SRC_URI="${SRC_URI_BASE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN^}-${COMMIT}"
+	elif [[ $(ver_cut 3) -gt 90 ]] ; then
+		SRC_URI="${SRC_URI_BASE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz"
+	fi
 	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"
 
@@ -98,7 +107,7 @@ DOCS=( Changelog README.md )
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# some tests fail or hang
 	sed -i \
 		-e '/add_test_file(translations_test.cpp/d' \
@@ -148,7 +157,7 @@ src_configure() {
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {