gentoo resync : 20.03.2021

3 files changed, 29 insertions, 22 deletions

diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index f9d0cbea8d1e..3ecc07df1911 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,8 +1,8 @@
 DIST strawberry-0.8.3.tar.xz 10280356 BLAKE2B 3c99193af3e753d48822567a3391900b1d4326ece49582718b949eb3753fd15d3cae2469ffdcc28334db95099a914c1065ed84c397b4ade53c624e7eab5cdfe5 SHA512 e64c49a6b479677486ae7868107e945a63a028cbaa6dcfb68c9c0784fe0ea8a1133264832367d092628fb1094ca90d87d6ab49199d4aab7f56f2620eb4e9b2f7
-DIST strawberry-0.8.4.tar.xz 10781080 BLAKE2B 395898e68117848613666edb545d15db22eea418c7dce553c442c52b459406c88640368da9a98c4f25e5cbff40369127ee4cec2dfadacdb79e4cef4c17e0f875 SHA512 a93308e6ba3450e8164f02c2b46bd5e785995d59963be7a896e769fa8312467fe29f1c7d48f5fbc290ccd6392293dc6af65e24001912a9f54292f25a023468b4
 DIST strawberry-0.8.5.tar.xz 10801412 BLAKE2B 4b55a747df72cbf57c56f3e146c8e26e335cfc1238f4dcc8065b4b911fc0ab3894644639a17642a26d7a074d662103e1c55a4acbb6f59bdc971a6ca6e45117ed SHA512 33ab6751e5bd17ff98beed29c179c47bebca92229b94b863a172169704b2fd69d6605cf31db456dee552666b58bcbad867b3cca7bcff2cc6582c4c2c0a2f49c8
+DIST strawberry-0.9.1.tar.xz 9937164 BLAKE2B 64d988f3d5030a3145bc8310b4c44c12d075c584fbc4705af833953fe9dfe29ac2fe9a374ffd8a0494b58d3379e89cf8a9abf3a35de315b0dcce732c96071508 SHA512 6b8ef30e9e1d2349c02f254e775de4f0eed0f365c315e9471c7274e74ddb4e29b92e3da2a04d40df57450971f5656430ef94339cf246d0c1ed336963a9f9afe3
 EBUILD strawberry-0.8.3.ebuild 2879 BLAKE2B 2aafb75ee7415b165024983c825759f0355c2c0b86e0d3a8e308633ada9a9b9eae2209bb9bb0c554ea6e7469cc5b84d7c48012354b5c72bc13cac3c64f433267 SHA512 36fc1bf4ee4a8aa2d221cb7f402bf1fe4277544d792980d85489b5242540d48f843d10af0eb66b2acf61d3c6ebff43b3a5cbc4444ba05ea40e9d49a573e6994a
-EBUILD strawberry-0.8.4.ebuild 2881 BLAKE2B 2e02483874fb74f25f69cecf46982485edf74df2b8c8a95d88ab50471ddf47f0c2a2ed36c77bd80360c5da0798210325c3f1398333fcee0a293d7e6f90ba5269 SHA512 c1c9df0afc346e7da6c7c9b14290969449b9bb1de94ad7c83f9e66aace65f9d5cb23c46341b09126184710f462234482017fcca2e683aa087b16af0e45ffeab3
 EBUILD strawberry-0.8.5.ebuild 3045 BLAKE2B 0414e05ead58a2a571e074c79bf118d5377d205aa2eda08fe472360a51d4b61f601429a66891e4cfb24d069ca0a3ef8f6addaa836fada2de364881d7cb99d025 SHA512 07f79ac5c27140b1aa7c533d8d2ccebee62cb716dd77d9669dcc77afff718eb5d6ff84624de86e9ac12f4693a1e1621c0eab60ce056ed3d3d6f2074c9853d57c
-EBUILD strawberry-9999.ebuild 3038 BLAKE2B ff7e8e7505139bad178b42463b0d6949705d63496577c2d29fd5e0e2ba0f8c79eea4234305c5b903490803a92a1a6de464185c31d7fadc1dea541788524c6285 SHA512 9e189364e00e64d22771fee5bb4d8b3becb722d986e23be7bf601f90758698eaf95d6b3d2978ed2de4d6d2c42960caca5ab546e35bdcc8110f1b450b1f3be6b8
+EBUILD strawberry-0.9.1.ebuild 2990 BLAKE2B 908b9e0bd8bff064c66f05d1c0d86f6102f5b01b183e4af1f572f320bd0bee4ed098edffab1ad9e113ca0f47364c02bbfdb0256128558f9ad8eb08db5b39d44e SHA512 7faf0fdabd819a94971406203f42968874021adeab094a9d58eb9e6a8b53474d53fd58caec47c5aec43045b9495634643719c7a1ba4b1e027bf0846e8048e88d
+EBUILD strawberry-9999.ebuild 2990 BLAKE2B 908b9e0bd8bff064c66f05d1c0d86f6102f5b01b183e4af1f572f320bd0bee4ed098edffab1ad9e113ca0f47364c02bbfdb0256128558f9ad8eb08db5b39d44e SHA512 7faf0fdabd819a94971406203f42968874021adeab094a9d58eb9e6a8b53474d53fd58caec47c5aec43045b9495634643719c7a1ba4b1e027bf0846e8048e88d
 MISC metadata.xml 531 BLAKE2B 1bf5ffc07a64de7716ead9a8f53cd82dd713b243cef24b9782d782887d4d1644585c21d0eacb4cba6768a2807a2823f60bd1457ce992ca0b4fafaab8a1054079 SHA512 c8febfcdf8dfbf0857e2ccdaf3d27606a2a05f2365e4ee0d9634452e4274e7e57d5688a8b97de8833a06f2dddffb07707f523abc9bc5b0a5850f1fc84d00081a
diff --git a/media-sound/strawberry/strawberry-0.8.4.ebuild b/media-sound/strawberry/strawberry-0.9.1.ebuild
index 2e4b045125e9..3f39eabea722 100644
--- a/media-sound/strawberry/strawberry-0.8.4.ebuild
+++ b/media-sound/strawberry/strawberry-0.9.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake flag-o-matic l10n virtualx xdg
 
-PLOCALES="cs de es fr hu id it ko nb pl ru"
+PLOCALES="cs de es fr hu id it ko nb pl ru sv"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
 HOMEPAGE="https://www.strawbs.org/"
@@ -14,12 +14,12 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda +dbus debug ipod mms mtp pulseaudio +udisks"
+IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -44,26 +44,29 @@ COMMON_DEPEND="
 	dev-qt/qtwidgets:5
 	media-libs/alsa-lib
 	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
-	media-video/vlc
 	sys-libs/zlib
 	virtual/glu
 	x11-libs/libX11
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
 	ipod? ( >=media-libs/libgpod-0.8.0 )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	pulseaudio? ( media-sound/pulseaudio )
+	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}
-	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 )
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-taglib:1.0
+	)
 	mtp? ( gnome-base/gvfs[mtp] )
 	udisks? ( sys-fs/udisks:2 )
 "
@@ -77,10 +80,13 @@ DEPEND="${COMMON_DEPEND}
 
 DOCS=( Changelog README.md )
 
+REQUIRED_USE="
+	|| ( gstreamer vlc )
+"
+
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	rm -r 3rdparty/taglib || die
 	cmake_src_prepare
 }
 
@@ -94,11 +100,12 @@ src_configure() {
 		-DLINGUAS="$(l10n_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
-		-DUSE_SYSTEM_TAGLIB=ON
+		-DENABLE_VLC="$(usex vlc)"
 		-DWITH_QT6=OFF
 	)
 
@@ -110,7 +117,9 @@ src_configure() {
 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"
+	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-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 0d5281b6b697..3f39eabea722 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -87,7 +87,6 @@ REQUIRED_USE="
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
-	rm -r 3rdparty/taglib || die
 	cmake_src_prepare
 }
 
@@ -107,7 +106,6 @@ src_configure() {
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_VLC="$(usex vlc)"
-		-DUSE_SYSTEM_TAGLIB=ON
 		-DWITH_QT6=OFF
 	)