gentoo auto-resync : 31:05:2023 - 03:22:19

4 files changed, 44 insertions, 66 deletions

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 772874fbebff..80be33f20fdd 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -28,7 +28,7 @@ DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0
 DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
 DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
 EBUILD mixxx-2.3.3-r1.ebuild 3857 BLAKE2B bcb72472fb83ecbfcc8e1552adcb6e52cfe6406c5b430a14b564b48a4119e64f6180bc6e029abfc0fc1190235ad1c43558143b46f78319121770a23c3760220f SHA512 195025c6f4e47db5557a487eae23a629049cae97f4c299d1b86c106fd5b79c140951f5669ef9416261ccb2546962f3e662a12078cf180dbf154b388db30a4a5f
-EBUILD mixxx-2.3.5.ebuild 3859 BLAKE2B c3bbe1e9aa02d9ad7119b5cce48fb8254a40b9af46a2bca7b44b51d4254fff11859fef977a1c2b08141b62c6749cba0ccf1766ceb4bfa008728aa0fbc8e40ea3 SHA512 06b02b5aecf1fae4373abe94767d2f79c96c34a94ec9c2134310a01716390b8676d0641f9b2cb07ec68f4246052d4cff0f516c41b4005d7105f34dbae8697583
-EBUILD mixxx-2.3.9999.ebuild 3766 BLAKE2B 7188e4a554e4120b63d2bddb7a0e5be07f8f75b3980486ba3d65d449d125b66b33c2cbd018d7a09f1f1e41afccaa70cc3e4e25b26ad1f867d8d8f91bb9f9fdd2 SHA512 0fcd3127613bf0318175967ea623a195664038111b9f8b50f80dd440507f97cff9af3fe8f38702a278fd1bd89f1e6a814eee50bc69d9144d1403df2e1919692f
-EBUILD mixxx-9999.ebuild 2909 BLAKE2B 50a8c6fcf6a5157b199db56c87141e5d6873e2d787f644be29c0ee6e1a68c8fa283aad587a7487844a1e49b85c0f2307070a8d64e83c0dce1831c708438d7736 SHA512 c3f36b618e14ab9d99c89ce1a5ce7d6eb880276b099840bae7707595fc785fa91921f7e39bb1df701b0f7f2429bfa0494bff62a2ca137d059a8911b68e595605
+EBUILD mixxx-2.3.5-r1.ebuild 3784 BLAKE2B 7add5a5f2a60a48eba68d066f582ff95326e4822c01d6786733454e4a0ec302a067a93a866187784658ae96aaef095faced016ac1101564dd5159e052c2abe04 SHA512 808a20dc82b043a7d12412c937e29c15124f4382d3cec557c910c9fe7f3b054519c6793157c170674c9051aeecc421367a33229efc9ecf661bd64c8875e8b3b7
+EBUILD mixxx-2.3.9999.ebuild 3689 BLAKE2B 6d0d2c6a01fe390b5958753f873b995b39492af1a43e32b4c01809da10aa7b9901edd049a4df1ec260edb72071d9ba22d419646b002e39a27d76f8dcd95f84d3 SHA512 f997798193f953f84ee198e6e9052d5e2ddd2cb31f08b3bf527ea371e4af291a240e2ae457473ce27bde6075361f4711f340ed842edfb61104e2e63024fb870c
+EBUILD mixxx-9999.ebuild 2829 BLAKE2B f21165282b08bcd40f3a345bf523c3881efc1268634a2a2f19fa387ad946d447f94c2f22300d5ecb2c553461d1b93edcc2e879962cd83bff9da73cb264664cf0 SHA512 eb55e944cda6a0eff9416415c84cff5e1ad6d35b808b19699e852740587f4020f44b1978236e14254cb8e66bfcede63c88e0eb69b611afdb67932886167c1221
 MISC metadata.xml 903 BLAKE2B 1fd2e01da4d96a257d0ba595e67005e5233503f54ea17c81f65d105a61dc42f84df601cc112ff0a5e99393cbc53a0130b890d96a47cc2b88b59cbe7b9779654d SHA512 7e9dfd69240a57efbdaceb4dcfe71549d7a8c2edba5c81f956407e101cb62a0c51cf231e1e68c029783340189139309dde4fa3e995a231856ea094df09288cd8
diff --git a/media-sound/mixxx/mixxx-2.3.5.ebuild b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
index 69c17499f146..c95ad499da23 100644
--- a/media-sound/mixxx/mixxx-2.3.5.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == *9999 ]] ; then
+HOMEPAGE="https://mixxx.org/"
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-	if [[ "${PV}" == ?.?.9999 ]] ; then
+	if [[ ${PV} == ?.?.9999 ]] ; then
 		EGIT_BRANCH=${PV%.9999}
 	fi
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
@@ -70,9 +70,9 @@ RDEPEND="
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
-	qtkeychain? ( dev-libs/qtkeychain )
+	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
 	wavpack? ( media-sound/wavpack )
-	"
+"
 	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
 	# available in ::gentoo
 	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
@@ -81,9 +81,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 "
-BDEPEND="virtual/pkgconfig
+BDEPEND="
 	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5"
+	dev-qt/qtxmlpatterns:5
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.0-docs.patch
@@ -106,10 +108,6 @@ mixxx_set_globals() {
 }
 mixxx_set_globals
 
-src_prepare() {
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		# Not available on Linux yet and requires additional deps
@@ -131,19 +129,14 @@ src_configure() {
 		-DWAVPACK="$(usex wavpack on off)"
 	)
 
-	if [[ "${PV}" == 9999 ]] ; then
+	if [[ ${PV} == 9999 ]] ; then
 		mycmakeargs+=(
 			-DENGINEPRIME="OFF"
-
 		)
 	fi
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-}
-
 src_install() {
 	cmake_src_install
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
index eed827c69005..8e68e926a377 100644
--- a/media-sound/mixxx/mixxx-2.3.9999.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.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
@@ -6,10 +6,10 @@ EAPI=8
 inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == *9999 ]] ; then
+HOMEPAGE="https://mixxx.org/"
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-	if [[ "${PV}" == ?.?.9999 ]] ; then
+	if [[ ${PV} == ?.?.9999 ]] ; then
 		EGIT_BRANCH=${PV%.9999}
 	fi
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
@@ -25,7 +25,7 @@ IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack
 RDEPEND="
 	dev-db/sqlite
 	dev-libs/glib:2
-	dev-libs/protobuf:0=
+	dev-libs/protobuf:=
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -70,9 +70,9 @@ RDEPEND="
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
-	qtkeychain? ( dev-libs/qtkeychain )
+	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
 	wavpack? ( media-sound/wavpack )
-	"
+"
 	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
 	# available in ::gentoo
 	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
@@ -81,13 +81,15 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 "
-BDEPEND="virtual/pkgconfig
+BDEPEND="
 	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5"
+	dev-qt/qtxmlpatterns:5
+	virtual/pkgconfig
+"
 
 PATCHES=(
-	"${FILESDIR}"/mixxx-9999-docs.patch
-	)
+	"${FILESDIR}"/${PN}-9999-docs.patch
+)
 
 PLOCALES="
 	ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW
@@ -104,10 +106,6 @@ mixxx_set_globals() {
 }
 mixxx_set_globals
 
-src_prepare() {
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		# Not available on Linux yet and requires additional deps
@@ -129,19 +127,14 @@ src_configure() {
 		-DWAVPACK="$(usex wavpack on off)"
 	)
 
-	if [[ "${PV}" == 9999 ]] ; then
+	if [[ ${PV} == 9999 ]] ; then
 		mycmakeargs+=(
 			-DENGINEPRIME="OFF"
-
 		)
 	fi
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-}
-
 src_install() {
 	cmake_src_install
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index d6ba056d0789..0447de377599 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == *9999 ]] ; then
+HOMEPAGE="https://mixxx.org/"
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-	if [[ "${PV}" == ?.?.9999 ]] ; then
+	if [[ ${PV} == ?.?.9999 ]] ; then
 		EGIT_BRANCH=${PV%.9999}
 	fi
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
@@ -70,27 +70,24 @@ RDEPEND="
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
-	qtkeychain? ( dev-libs/qtkeychain )
+	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
 	shout? ( >=media-libs/libshout-2.4.5 )
 	wavpack? ( media-sound/wavpack )
-	"
-
+"
 DEPEND="${RDEPEND}
-	dev-cpp/ms-gsl"
-BDEPEND="virtual/pkgconfig
+	dev-cpp/ms-gsl
+"
+BDEPEND="
 	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5"
+	dev-qt/qtxmlpatterns:5
+	virtual/pkgconfig
+"
 
 PATCHES=(
-	"${FILESDIR}"/mixxx-9999-docs.patch
-	)
-
-src_prepare() {
-	cmake_src_prepare
-}
+	"${FILESDIR}"/${PN}-9999-docs.patch
+)
 
 src_configure() {
-
 	local mycmakeargs=(
 		-DFAAD="$(usex aac on off)"
 		-DFFMPEG="$(usex ffmpeg on off)"
@@ -110,19 +107,14 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=OFF
 	)
 
-	if [[ "${PV}" == 9999 ]] ; then
-	local mycmakeargs+=(
-		-DENGINEPRIME="OFF"
-
-	)
+	if [[ ${PV} == 9999 ]] ; then
+		mycmakeargs+=(
+			-DENGINEPRIME="OFF"
+		)
 	fi
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-}
-
 src_install() {
 	cmake_src_install
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules