gentoo resync : 28.04.2021

5 files changed, 11 insertions, 143 deletions

diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index eaba85fd4207..7d65a803c35e 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,8 +1,6 @@
-DIST strawberry-0.8.5.tar.xz 10801412 BLAKE2B 4b55a747df72cbf57c56f3e146c8e26e335cfc1238f4dcc8065b4b911fc0ab3894644639a17642a26d7a074d662103e1c55a4acbb6f59bdc971a6ca6e45117ed SHA512 33ab6751e5bd17ff98beed29c179c47bebca92229b94b863a172169704b2fd69d6605cf31db456dee552666b58bcbad867b3cca7bcff2cc6582c4c2c0a2f49c8
-DIST strawberry-0.9.1.tar.xz 9937164 BLAKE2B 64d988f3d5030a3145bc8310b4c44c12d075c584fbc4705af833953fe9dfe29ac2fe9a374ffd8a0494b58d3379e89cf8a9abf3a35de315b0dcce732c96071508 SHA512 6b8ef30e9e1d2349c02f254e775de4f0eed0f365c315e9471c7274e74ddb4e29b92e3da2a04d40df57450971f5656430ef94339cf246d0c1ed336963a9f9afe3
 DIST strawberry-0.9.2.tar.xz 9956324 BLAKE2B 0b5ccfa76aa98c0d7cf5ca0f79465948c34d6c7e7f51264b1fb8623099a4de2d0548464f51d813a4b75b8e524c653a32e8682410741a3c3fbc604ccaa4816204 SHA512 2ce22e7bed5832dc33191f5ff6f0f656861f4e574ad5ae2d2987a0c75274490dad2723579fcc5766f398654600a0819c5d0fa956dce12a54d5aab505a2f1ea30
-EBUILD strawberry-0.8.5.ebuild 3043 BLAKE2B 8989c13d89c0513cf77ea672b3aa3a7fa9677946722bdb27d1d967106a53001a3cf45dcfedab0c9a76dcf2d2d6f75ddb111479ec884177b4edb3df289fc1cbbb SHA512 c14726be6bc9e0ed00fe1652a5ea4d9621d26abebe18ff83e76abeb0225acd2e3b6dd32a7419883c4558d60d85a4b228108346d8986b70ff8f5ac0e2516849b0
-EBUILD strawberry-0.9.1.ebuild 3007 BLAKE2B 1b32707a4270c44dc61e21c6faa6906b87317e68fc46dc3311f8159467a9c299efafe64643920afff04ab42f288918ba8b3632f8447f7eb3a99ef313f82376d6 SHA512 cf8def2118dd90e1c0a4e01092a041f814c405cfd408df762980c017192d781b8761183085e296a17e8e1721a8b14a33eb6cd6ab0e30c271f72d5a05234fc1e5
-EBUILD strawberry-0.9.2.ebuild 3007 BLAKE2B 1b32707a4270c44dc61e21c6faa6906b87317e68fc46dc3311f8159467a9c299efafe64643920afff04ab42f288918ba8b3632f8447f7eb3a99ef313f82376d6 SHA512 cf8def2118dd90e1c0a4e01092a041f814c405cfd408df762980c017192d781b8761183085e296a17e8e1721a8b14a33eb6cd6ab0e30c271f72d5a05234fc1e5
-EBUILD strawberry-9999.ebuild 3007 BLAKE2B 1b32707a4270c44dc61e21c6faa6906b87317e68fc46dc3311f8159467a9c299efafe64643920afff04ab42f288918ba8b3632f8447f7eb3a99ef313f82376d6 SHA512 cf8def2118dd90e1c0a4e01092a041f814c405cfd408df762980c017192d781b8761183085e296a17e8e1721a8b14a33eb6cd6ab0e30c271f72d5a05234fc1e5
+DIST strawberry-0.9.3.tar.xz 10928116 BLAKE2B 3edb80065876d63b79292c6b75660aaaeaa6ea294bb84011124fa8aee3163717b8ab4f0e8d6e7aff321466d3cfbc214b5e8b987c9ae9b0823f8d3c681aae6e9e SHA512 d253ffaa6cf0412eb135bc792c31458816fc0a1ae7070d6885487da4fb4855ffeeeeddd285b853fd10220c797c3beb73a91059514d76b1b1638350fdff17107c
+EBUILD strawberry-0.9.2.ebuild 2936 BLAKE2B 696328255c443ede4eb118a09edb84f8818307cc2c4288ab5513d01377af86a5e9a1ef452550e328a471ce61b87a9326d7417f92efcfb08a8627bfc80378a63a SHA512 58357aa926039d93c1bacbe435350fee3cf23287024ad89a5cf08c9f5b1e8eb0c296edff64add7beec37529c3fa7ea2f7bb67dc1fdd76b3bb68308bb8e37e427
+EBUILD strawberry-0.9.3.ebuild 2938 BLAKE2B b0c616bf39d4161c62a8e6cdf268976a9c2c76e6d36bb159807dcc9accbc01b4e6cb87cd06df4b29ea212f2b75819d21952684664ecaf2333f150d2663815dc4 SHA512 19c81894d095c42d63554f8290160d9ddde1eeab99b06d3d99c82c699839983c91c4157e3fca024a158613983a6a88c11c7e5fcd8420746d9c3c0d367809871a
+EBUILD strawberry-9999.ebuild 2938 BLAKE2B b0c616bf39d4161c62a8e6cdf268976a9c2c76e6d36bb159807dcc9accbc01b4e6cb87cd06df4b29ea212f2b75819d21952684664ecaf2333f150d2663815dc4 SHA512 19c81894d095c42d63554f8290160d9ddde1eeab99b06d3d99c82c699839983c91c4157e3fca024a158613983a6a88c11c7e5fcd8420746d9c3c0d367809871a
 MISC metadata.xml 531 BLAKE2B 1bf5ffc07a64de7716ead9a8f53cd82dd713b243cef24b9782d782887d4d1644585c21d0eacb4cba6768a2807a2823f60bd1457ce992ca0b4fafaab8a1054079 SHA512 c8febfcdf8dfbf0857e2ccdaf3d27606a2a05f2365e4ee0d9634452e4274e7e57d5688a8b97de8833a06f2dddffb07707f523abc9bc5b0a5850f1fc84d00081a
diff --git a/media-sound/strawberry/strawberry-0.8.5.ebuild b/media-sound/strawberry/strawberry-0.8.5.ebuild
deleted file mode 100644
index 103a1e6068f2..000000000000
--- a/media-sound/strawberry/strawberry-0.8.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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 sv"
-
-DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawbs.org/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlite:=
-	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/alsa-lib
-	media-libs/chromaprint:=
-	>=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 )
-	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}
-	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 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-cpp/gtest-1.8.0
-	dev-libs/boost
-	dev-qt/qtopengl:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-"
-
-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
-}
-
-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="$(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)"
-		-DENABLE_VLC="$(usex vlc)"
-		-DUSE_SYSTEM_TAGLIB=ON
-		-DWITH_QT6=OFF
-	)
-
-	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-0.9.2.ebuild b/media-sound/strawberry/strawberry-0.9.2.ebuild
index be8135080fd1..d3fdeec4bd47 100644
--- a/media-sound/strawberry/strawberry-0.9.2.ebuild
+++ b/media-sound/strawberry/strawberry-0.9.2.ebuild
@@ -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 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
+IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 	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]
@@ -50,7 +51,6 @@ COMMON_DEPEND="
 	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
@@ -100,7 +100,6 @@ src_configure() {
 		-DENABLE_GIO=ON
 		-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)"
diff --git a/media-sound/strawberry/strawberry-0.9.1.ebuild b/media-sound/strawberry/strawberry-0.9.3.ebuild
index be8135080fd1..9735f0e9a08f 100644
--- a/media-sound/strawberry/strawberry-0.9.1.ebuild
+++ b/media-sound/strawberry/strawberry-0.9.3.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
+IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 	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]
@@ -50,7 +51,6 @@ COMMON_DEPEND="
 	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
@@ -100,7 +100,6 @@ src_configure() {
 		-DENABLE_GIO=ON
 		-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)"
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index be8135080fd1..9735f0e9a08f 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
+IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 	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]
@@ -50,7 +51,6 @@ COMMON_DEPEND="
 	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
@@ -100,7 +100,6 @@ src_configure() {
 		-DENABLE_GIO=ON
 		-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)"