gentoo auto-resync : 02:01:2023 - 14:24:10

4 files changed, 70 insertions, 38 deletions

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 6182413d7920..d544f92844f1 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,5 +1,6 @@
+AUX clementine-1.4.0_rc2-lz.patch 889 BLAKE2B ce04feb2b14c4b1e2e994672c0196100b35672da8b830c3ad1b8103f11327aefbccce97c5ad4253227b88939e16d6a6a88c8b3e3530e8589b1b9e28eb524361c SHA512 4bd24c05dd3d748d6b5f66070900fcef841144baaa8557bdc05a6128ee7b64f7b222344447944ef41d83694ec3f7618fd744d8e6053ec34f35b923b0a3db02a7
 DIST clementine-1.4.0_rc2.tar.gz 9073685 BLAKE2B a2376f1a895c651c2eb089419e20b9ce6050739f1342a6fdf1ebad0a14b65a08f56cc846eb79ad7facb77d6ee2cac74f9e374bd8e284a2a7f87d7c117779a08d SHA512 403093386efabd52e649c0e379abbf4873c4b2f8d0af72cda2b7e0255f90c60259f961045e7b51d0e5bf35425d678ff6b018c9191845ebbd156d9216d8bd7722
-EBUILD clementine-1.4.0_rc2-r1.ebuild 4583 BLAKE2B 883bb18c304f16f0d9ef1ab39e298f14047687a63fcb96cb444a96201aab0059c03335f0265897d5b425761f30363e6607c811de703a770af2a8052b728a833f SHA512 fbccb18fc5c675180975ce076093b287da56af22c3ca400902ceed2efe09135654df39412e890001a28a0715a286b895a7f26dc2c900e286c9f985f1b05771d8
+EBUILD clementine-1.4.0_rc2-r2.ebuild 4560 BLAKE2B 2c423eab051c46049d74982f7b8547644923d6e2425882b4aa08e84069b65cd82aded0db07117707c34f8eab09ecb3595d2cde692169bd1519f15d27208739f3 SHA512 f1275802b75c7ebb44c8a0f75ed07c86a2f1283a1f7da0ba2dba08d1cdeb4acc81e788f537f877ac28984ec34c1d47a120f288ff9b709689b717b8857dd6e603
 EBUILD clementine-1.4.0_rc2.ebuild 4558 BLAKE2B 223403e458f81593ae949508af89828f82d6938b04d42a29caebce70f899f1bb80d5c1d1e64f8f379ce5ea1d9deabb09d534aa1585179544c67862da754bbb6f SHA512 c8550c75dffddf2c617a1f3104641947abb31e7935fd6225d87a81b28af3d8d7a6ec0e6db6e2d7ee81835251d573635c9dcfc9d5271b8229d06af43fdf631e60
-EBUILD clementine-9999.ebuild 4503 BLAKE2B 68f416ad5298ab06c25ccf1a5559d411c8817b0d78efe0ff69b2595996fe2118b217c98f0d43cf5461b60613f91c3ab0d8d3def3ccbb3db260a361ff48e746af SHA512 f0e5056f12cf3bfe8bac02b35526bbcf41b79434adfbb53f1b411093046e54c48b839f65957d8278ecaf4f0c89e52db4139a199a0f6d739a0858da5ed910563c
+EBUILD clementine-9999.ebuild 4422 BLAKE2B 95c1bec54317bbca03bcaee92720914572a398b700ebbd4a5441bda188487a8dd1749d243debe85ef1937850b85f4ad28f56142f9fae1042371c14291c8920fa SHA512 95fa79701f74cd11bc513cfef5b3ab27f774ae445d95486a91b55d5984b459659f917d7854bc5aa41809b8d2db3f628116b9696dbc87aae785d3cbc86720a933
 MISC metadata.xml 1205 BLAKE2B 385d0f742772f036d1d0e03913aa1e38fe165dfeec7a6773fa5685992f9bbc348437bd759c24c54686d19f8dfbadc8bf208909788bc1e0dd957e47bb659fb832 SHA512 58d908699a52724401f167ae20fa05327aa4fd5b705856a43292c98e898b2f13d11c9db6fac6def35eede0c356071ff38e22883ca233a1005173ded18e69ca92
diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r1.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r2.ebuild
index 68143124af82..c10ccef43172 100644
--- a/media-sound/clementine/clementine-1.4.0_rc2-r1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,8 +14,8 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	inherit git-r3
 else
-	S="${WORKDIR}/Clementine-${PV/_}"
 	SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Clementine-${PV/_}"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
@@ -29,19 +29,8 @@ REQUIRED_USE="
 	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="
 	dev-db/sqlite:3
-	dev-libs/crypto++:=
 	dev-libs/glib:2
 	dev-libs/protobuf:=
 	dev-qt/qtconcurrent:5
@@ -64,12 +53,13 @@ COMMON_DEPEND="
 	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 )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
 	projectm? (
 		media-libs/glew:=
 		>=media-libs/libprojectm-3.1.12:0=
 		virtual/opengl
 	)
+	pulseaudio? ( media-libs/libpulse )
 "
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-meta:1.0
@@ -88,10 +78,23 @@ DEPEND="${COMMON_DEPEND}
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
-	pulseaudio? ( media-sound/pulseaudio )
 	seafile? ( dev-cpp/sparsehash )
 	skydrive? ( dev-cpp/sparsehash )
 "
+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
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/clementine-1.4.0_rc2-lz.patch"
+)
 
 DOCS=( Changelog README.md )
 
@@ -116,9 +119,6 @@ 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
@@ -144,6 +144,7 @@ src_configure() {
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+		"$(cmake_use_find_package alsa ALSA)"
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 395332d8f569..249aacb20819 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,8 +14,8 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	inherit git-r3
 else
-	S="${WORKDIR}/Clementine-${PV/_}"
 	SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Clementine-${PV/_}"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
@@ -29,19 +29,8 @@ REQUIRED_USE="
 	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="
 	dev-db/sqlite:3
-	dev-libs/crypto++:=
 	dev-libs/glib:2
 	dev-libs/protobuf:=
 	dev-qt/qtconcurrent:5
@@ -64,12 +53,13 @@ COMMON_DEPEND="
 	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 )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
 	projectm? (
 		media-libs/glew:=
 		>=media-libs/libprojectm-3.1.12:0=
 		virtual/opengl
 	)
+	pulseaudio? ( media-libs/libpulse )
 "
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-meta:1.0
@@ -88,10 +78,19 @@ DEPEND="${COMMON_DEPEND}
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
-	pulseaudio? ( media-sound/pulseaudio )
 	seafile? ( dev-cpp/sparsehash )
 	skydrive? ( dev-cpp/sparsehash )
 "
+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
+	)
+"
 
 DOCS=( Changelog README.md )
 
@@ -115,9 +114,6 @@ src_prepare() {
 src_configure() {
 	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
@@ -141,6 +137,7 @@ src_configure() {
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+		"$(cmake_use_find_package alsa ALSA)"
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch
new file mode 100644
index 000000000000..a33f07d5a5f9
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch
@@ -0,0 +1,33 @@
+https://github.com/clementine-player/Clementine/pull/7238
+https://bugs.gentoo.org/887105
+
+--- a/3rdparty/qtiocompressor/CMakeLists.txt
++++ b/3rdparty/qtiocompressor/CMakeLists.txt
+@@ -15,4 +15,4 @@ ADD_LIBRARY(qtiocompressor STATIC
+     ${IOCOMPRESSOR-SOURCES-MOC}
+ )
+ 
+-target_link_libraries(qtiocompressor Qt5::Core)
++target_link_libraries(qtiocompressor Qt5::Core ${ZLIB_LIBRARIES})
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,9 +78,7 @@ pkg_check_modules(LIBXML libxml-2.0)
+ pkg_check_modules(LIBSPOTIFY libspotify>=12.1.45)
+ pkg_check_modules(TAGLIB taglib)
+ 
+-if (WIN32)
+   find_package(ZLIB REQUIRED)
+-endif (WIN32)
+ 
+ find_library(LASTFM5_LIBRARIES lastfm5)
+ find_path(LASTFM5_INCLUDE_DIRS lastfm5/ws.h)
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1303,7 +1303,6 @@ target_link_libraries(clementine_lib
+   ${SQLITE_LIBRARIES}
+ 
+   Qocoa
+-  z
+ )
+ 
+ link_directories(