gentoo auto-resync : 30:08:2024 - 12:00:55

5 files changed, 32 insertions, 156 deletions

diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 2105e7532450..9f61e6bd4064 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,7 +1,6 @@
 DIST strawberry-1.0.23.tar.xz 11297440 BLAKE2B 4110a19ac27a254ec778bc46592f4b1b00ea8cb077a231d5dc0bb69c8ef78aca02a15339b888812c7cb31540f61647e2c8b15d416c68c4da4690407ac851dec4 SHA512 f3249e97b2f0130dadf2a5fcfc128d7054accd6b86cf088a3a45549c584529aefbadaf09e9ed074af85c679495b03ad700e78f6952e913a40b38eaf7c77d5adb
 DIST strawberry-1.1.1.tar.xz 11352308 BLAKE2B f43f39f254dce088dd41141715a639f62eb847f0c881e228d5fb1d75a1ee6f70a94fcea732bffda839e2bf7179dc4bf0d8967eb2713c84111339afdc31891bdd SHA512 f44042bc44b6711b8c433b23733c10a13ac6c09f524604fb6d5b71df236cd211a16ea05587af4681ff6859c0af45dc384c67c5f1712182ff692ecf78d6938e19
-EBUILD strawberry-1.0.23-r2.ebuild 3305 BLAKE2B 3b1597fbcc27e8b65af5cd8c28fe5021a00859de470ddfd4f71c2fa900a3f5a66c5197491ce488ec734f07a00d2f0766cb98e48162946775e9e4b68854ed1b80 SHA512 deb0e3feadd2151ab8ac9a7e29fdd765adfbce11ab310bc03613bda5679e1f901798bbd6e5c88aa1d19475b9815661772d9e131fef48afe7f5ff457e116c5dfc
 EBUILD strawberry-1.0.23.ebuild 3042 BLAKE2B 6b91de595b351e4eac774aeae042b3753bf77fbd7ae126f6ddfcf98470f513bf62ecd71e5f186e7116110f06f61d1a6cd854a9c3f51d19deed9233814d807d42 SHA512 a29598ebcaac8a56ae5480a8545b6ca7ec6dbcd193273a8b2ea3f76de08f80cf4f22a7c0abaa413e6bd6aad3860d74532ef60e523ab172922cc55e05ce14d545
-EBUILD strawberry-1.1.1.ebuild 3308 BLAKE2B 24aa062685a3e96cd33b43f2ae65186eff2b6ad14d8586f7d65709c8c6b12e40d342a512c16cfd668ba2f141e5864fa8948e454518bf9c1782c16c64ed5b7767 SHA512 bcd69d3f3de90c9f301c09995fb3533f5947a1cb961ec7ffc263f4d41a16643dfda5160a440da937c615877b2e0ac28a7984e46ae611788c3b32fbb56ba41d54
-EBUILD strawberry-9999.ebuild 3044 BLAKE2B ac6d5bd75207a1e25fafaae64f23e00086f45568bdc777a2a2ec925814485d681203d75ef7a33d170d0c4a19bc55a19df8a6d9542665140dde0c5a9555cdc987 SHA512 d864e9d29034f6c0605ffbde348e64235216e6656363b5e11d28b49411e26084d5acf1ea601f0120a0facbd10169472909f95acfdfe9cee3933dba469ded61e0
-MISC metadata.xml 520 BLAKE2B 4ccf0012addc2359fcfd904dff7298e6e98bce0c4eac1bb008ff20b7365157ecf21618e97935215bf2a9486391c43e11995720d26b487a08dffc81215e95c589 SHA512 f705eba2dbd7cc207feff8546cf6105c9f4d73ec759e1fe93ba71f5e394e811ced3943413b774a1784c739fc5e1f1bb13e34378d3266eed6650205f1f15e32c4
+EBUILD strawberry-1.1.1.ebuild 3267 BLAKE2B 8894a29426e9e3ec2033a527465cdc3d69219ab2d4d26db890dcdaf67d47f9906e2d409854238ed6ff15be63bd1b854d8b28807d7fdd08870a364d64ffc49edb SHA512 b43721d6fdf714e7bf3848b23935434864b74478890afc0bbe8263a5fb9a8e4264233304b366efd1c4c62a2e8679d017ec9ed0a1886963b570181d5b40c5017a
+EBUILD strawberry-9999.ebuild 3271 BLAKE2B 156e321b1b37e9225d1cec14113cef9c8767dd00bb139d648f1539d47fd496a4bd107a5636c56f1ca49048aa6f8d2515b1a64830dd185d39d50c083d5bde9c8d SHA512 4270c1a85f7c651f5ddc26ebb38fe8481047c73d60eab60a3189b21437c0ef3353db505c7459c21ca9d76768a7f9ca554495ce14f7443708b3c3cfe4a3b2c73b
+MISC metadata.xml 563 BLAKE2B 0fd9e599071332ea3db196da30e8bf7b20592b239fc6e0d8a27de5fd0a99eb7b7eab7ddd5e51e68919cafe693081ac777d7d1a8be486e61e7865e85b1b8192be SHA512 610078300250c88041c59ac1b294471431a03801f809325c5a4207d80aaab9fa388b6a79ea879fc37b1ca1a754f60c0067778e825bdfa3bcaeaec05d27a6162f
diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml
index c5351200e084..9496c014df75 100644
--- a/media-sound/strawberry/metadata.xml
+++ b/media-sound/strawberry/metadata.xml
@@ -8,7 +8,7 @@
 	<use>
 		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag>
 		<flag name="moodbar">Enable moodbar support</flag>
-		<flag name="soup">Enable soup support</flag>
+		<flag name="soup">Allow streaming with <pkg>media-plugins/gst-plugins-soup</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">jonaski/strawberry</remote-id>
diff --git a/media-sound/strawberry/strawberry-1.0.23-r2.ebuild b/media-sound/strawberry/strawberry-1.0.23-r2.ebuild
deleted file mode 100644
index ad37177bd647..000000000000
--- a/media-sound/strawberry/strawberry-1.0.23-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic plocale xdg
-
-PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
-
-DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawberrymusicplayer.org/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio qt6 soup +udisks vlc"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	!qt6? ( dev-qt/linguist-tools:5 )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/protobuf:=
-	media-libs/alsa-lib
-	media-libs/taglib
-	!qt6? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-	)
-	qt6? (
-		dev-libs/kdsingleapplication[qt6(+)]
-		dev-qt/qtbase[concurrent,dbus,gui,network,ssl,sql,sqlite,widgets]
-	)
-	cdda? ( dev-libs/libcdio:= )
-	gstreamer? (
-		media-libs/chromaprint:=
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	icu? ( dev-libs/icu:= )
-	ipod? ( media-libs/libgpod )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( media-libs/libpulse )
-	vlc? ( media-video/vlc )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-RDEPEND="${COMMON_DEPEND}
-	gstreamer? (
-		media-plugins/gst-plugins-meta:1.0
-		soup? ( media-plugins/gst-plugins-soup:1.0 )
-		media-plugins/gst-plugins-taglib:1.0
-	)
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gtest
-	dev-libs/boost
-	!qt6? ( dev-qt/qttest:5 )
-"
-
-DOCS=( Changelog README.md )
-
-REQUIRED_USE="
-	cdda? ( gstreamer )
-	|| ( gstreamer vlc )
-"
-
-src_prepare() {
-	plocale_find_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DLINGUAS="$(plocale_get_locales)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_GSTREAMER="$(usex gstreamer)"
-		-DUSE_ICU="$(usex icu)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
-		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_VLC="$(usex vlc)"
-		-DBUILD_WITH_QT6="$(usex qt6)"
-		-DBUILD_WITH_QT5="$(usex !qt6)"
-		-DQT_VERSION_MAJOR="$(usex qt6 6 5)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use gstreamer ; then
-		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"
-	fi
-}
diff --git a/media-sound/strawberry/strawberry-1.1.1.ebuild b/media-sound/strawberry/strawberry-1.1.1.ebuild
index 0ffec658a10b..a74ee32e184c 100644
--- a/media-sound/strawberry/strawberry-1.1.1.ebuild
+++ b/media-sound/strawberry/strawberry-1.1.1.ebuild
@@ -14,12 +14,12 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio qt6 soup +udisks vlc"
+IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio qt6 soup +udisks vlc"
 
 BDEPEND="
 	sys-devel/gettext
@@ -29,6 +29,7 @@ BDEPEND="
 COMMON_DEPEND="
 	dev-db/sqlite:=
 	dev-libs/glib:2
+	dev-libs/icu:=
 	dev-libs/protobuf:=
 	media-libs/alsa-lib
 	media-libs/taglib
@@ -53,7 +54,6 @@ COMMON_DEPEND="
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	icu? ( dev-libs/icu:= )
 	ipod? ( media-libs/libgpod )
 	moodbar? ( sci-libs/fftw:3.0 )
 	mtp? ( media-libs/libmtp )
@@ -99,7 +99,6 @@ src_configure() {
 		-DLINGUAS="$(plocale_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DENABLE_GSTREAMER="$(usex gstreamer)"
-		-DUSE_ICU="$(usex icu)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 3db9ec7c7628..3b96cd045947 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake flag-o-matic plocale xdg
 
-PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+PLOCALES="ca cs de es es_AR es_ES es_MX et fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
 HOMEPAGE="https://www.strawberrymusicplayer.org/"
@@ -19,35 +19,41 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio +udisks vlc"
+IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio qt6 soup +udisks vlc"
 
 BDEPEND="
-	dev-qt/linguist-tools:5
 	sys-devel/gettext
 	virtual/pkgconfig
+	!qt6? ( dev-qt/linguist-tools:5 )
 "
 COMMON_DEPEND="
 	dev-db/sqlite:=
 	dev-libs/glib:2
+	dev-libs/icu:=
 	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
 	media-libs/taglib
-	x11-libs/libX11
+	!qt6? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
+	qt6? (
+		dev-libs/kdsingleapplication[qt6(+)]
+		dev-qt/qtbase:6[concurrent,dbus,gui,network,ssl,sql,sqlite,widgets]
+	)
 	cdda? ( dev-libs/libcdio:= )
 	gstreamer? (
 		media-libs/chromaprint:=
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	icu? ( dev-libs/icu:= )
 	ipod? ( media-libs/libgpod )
 	moodbar? ( sci-libs/fftw:3.0 )
 	mtp? ( media-libs/libmtp )
@@ -58,7 +64,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	gstreamer? (
 		media-plugins/gst-plugins-meta:1.0
-		media-plugins/gst-plugins-soup:1.0
+		soup? ( media-plugins/gst-plugins-soup:1.0 )
 		media-plugins/gst-plugins-taglib:1.0
 	)
 	mtp? ( gnome-base/gvfs[mtp] )
@@ -67,7 +73,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-cpp/gtest
 	dev-libs/boost
-	dev-qt/qttest:5
+	!qt6? ( dev-qt/qttest:5 )
 "
 
 DOCS=( Changelog README.md )
@@ -93,7 +99,6 @@ src_configure() {
 		-DLINGUAS="$(plocale_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DENABLE_GSTREAMER="$(usex gstreamer)"
-		-DUSE_ICU="$(usex icu)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
@@ -102,7 +107,9 @@ src_configure() {
 		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_VLC="$(usex vlc)"
-		-DQT_VERSION_MAJOR=5
+		-DBUILD_WITH_QT6="$(usex qt6)"
+		-DBUILD_WITH_QT5="$(usex !qt6)"
+		-DQT_VERSION_MAJOR="$(usex qt6 6 5)"
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT