gentoo resync : 04.01.2022

3 files changed, 12 insertions, 26 deletions

diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 8fd87f7347f8..d7507b6a3a27 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,4 +1,4 @@
 DIST strawberry-1.0.0.tar.xz 11149316 BLAKE2B db500acb75c1e206c7eb2b5b668fc850444da8383ea98926e05d3eaee46a477f9b7c24017c75a1ea8d0ac8d89287a137aa65ef9098527b0449e3b5b14e37fa9e SHA512 e7f03eb068bd2de22b83b0bdd493dabbbe054bb0f7d3f4d237ff38955e382a13d7c42f60c9a257c906ded46567b6f4ca9139920291df8a7688fb4025cdfec488
-EBUILD strawberry-1.0.0-r2.ebuild 3158 BLAKE2B eb0105b01331c95f162ac0cc8ffdc3cec4fd2fa69e7fa7d912ca61471cdafb3025f836f8baa886740e9377f35ef53d967017ad56382e150af1437979c2f849b1 SHA512 e9fa7f4eb3e23aacb4c3d376d2725997b8d5aab614bc8b1b091b3eca1c8a52a303343de4e98b835dc2073b0f250daf65f31047275a4b5f34be998958ced86fd6
-EBUILD strawberry-9999.ebuild 3160 BLAKE2B 08afb3e7c4d0b32c675f9bfb400f947f71538a2eebdc27206552819dde7d1a17f0778446af994fe007ecda0ddc951acc5dd4d92366d41b12fc13cec4efa4c40a SHA512 81a3f1449f973492f757ebf8f0fe16743a7d5cba3793c2fbe7b56d819edf1b28868bc4307ac356b2f11ae9f5f6141745914c994567149364e69238e715f5f03d
+EBUILD strawberry-1.0.0-r3.ebuild 3050 BLAKE2B cc7af3d47d128f8bf0ec448100c413f2a8575e1e777967fd1fbab801393ae22fa984a326215c3d0f7effda78a247e194fc7d1f805524fb6a9dbd79e9a80b8c68 SHA512 05985dafb6975a6a2a94cc91d3a5c19fbd2d883ad79483adb1f9428aced426a37dc1520899f7588edd8717e483a8e804317af2f2587c62e38a1eb10bfb153405
+EBUILD strawberry-9999.ebuild 3052 BLAKE2B 9a491efa29dae00d1bbb920fd3f54344db71cbf9e2b55286ccecdac0715c16a66b3a1d2ee56cfc6e2e749576c45b134024364f5534824985034623dda9ea485b SHA512 cabc602ece8c7e895a741d6158c031a9e74922b6e1c0b9ebc826af22b065eb9076f495f67d27f6d72bf0535dbfff876afd5d3a92f3188ffc95735e6742f51cc9
 MISC metadata.xml 585 BLAKE2B 1b52d815e1846552591795504e346af937c10cec32eb466c2d6ce64d541b94ce635fe30b268fd0b4180cc6b755086a3a9350ae319a3c11c9291351e419f5a363 SHA512 e3c610802ecf38062db532d7124f19bf555238359701627bcd0765ffad22aab6c8c8b457d45795a0784eef4beaa2e6764a15083dd203e2a3d3fa04d5de8208fa
diff --git a/media-sound/strawberry/strawberry-1.0.0-r2.ebuild b/media-sound/strawberry/strawberry-1.0.0-r3.ebuild
index 7fb0814fa2d5..ab29187dd035 100644
--- a/media-sound/strawberry/strawberry-1.0.0-r2.ebuild
+++ b/media-sound/strawberry/strawberry-1.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,12 +8,12 @@ inherit cmake flag-o-matic plocale xdg
 PLOCALES="ca cs de es 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.strawbs.org/"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
 	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
@@ -27,10 +27,8 @@ BDEPEND="
 	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
@@ -39,11 +37,9 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
-	>=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:= )
 	gstreamer? (
@@ -70,10 +66,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
-	dev-qt/qtopengl:5
 	dev-qt/qttest:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
 "
 
 DOCS=( Changelog README.md )
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 83b0bbf5f703..3649ac2be758 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,12 +8,12 @@ inherit cmake flag-o-matic plocale xdg
 PLOCALES="ca cs de es 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.strawbs.org/"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
@@ -27,10 +27,8 @@ BDEPEND="
 	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
@@ -39,11 +37,9 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
-	>=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:= )
 	gstreamer? (
@@ -70,10 +66,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
-	dev-qt/qtopengl:5
 	dev-qt/qttest:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
 "
 
 DOCS=( Changelog README.md )