gentoo resync : 25.08.2020

5 files changed, 39 insertions, 124 deletions

diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 55c0bb34e348..ed38a67a632c 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,7 +1,4 @@
-DIST rosegarden-17.12.1.tar.bz2 6692715 BLAKE2B 698ecfb58754ee292e589e0fb3618e2076a6e59dde1f06d15ed3bad43313cc79ed03307364350f5cd2323350173119ccc71b42c839d8498d360461a19801a96a SHA512 8bd4a464bbf2825d6c2fb8d36123e68d94de7f4e997c6ed8efc5670e87799781eb8251995890979c9d107d4fc58c636fe73e699c859c8e95aa567c4289958495
-DIST rosegarden-19.06.tar.bz2 6667374 BLAKE2B c204a99dd46a0dcbfda6afc361ec31b7f211d2b95a8d171ff3fb06e37b3dbabc2b36fdbc04a3dfc821a9e331681d2a1e2395e91a86fe9d9fecd3af173f5b675b SHA512 13eddd4ec88662f3275d83bf40471ca0a34d43b3c9c9f07cf46b891c74f087ec7fe0d4b8ffe8204f2f3a30829352f4d952bb035a5bd09a7b6bdeb41ff5d1e8d8
-DIST rosegarden-19.12.tar.bz2 6672820 BLAKE2B f4541c894d0de7f4c5fc435ce463b9fc6940cf1c595e9d9b6c168f51b9e05e63a449b8f3a99456801baf864d0788130368ed87c81646af04a6f2891a6372e444 SHA512 22c45346b1a4d69f009e59091bdf5f5f68633241a48df7bd6ee73462cc281ee7182be3d48c3afc0843aa551145c203a8b881501891eb84b6d3f3def5f7650fc6
-EBUILD rosegarden-17.12.1.ebuild 978 BLAKE2B 7c57370632c64626aefa7d1c68f16c254d0674a6d3d3b5e8d2bc0e1fcc820fef2f9eb1791ce437841973f248ea07f938ebf2dec8a4bfe98fab394b19b77643f2 SHA512 5f1b554f6f7c602a390deb20015ba33813591edf3f43a014dfbd0703549bf4791323773438d990280ef618630310ce04b339288759f4a5798bda09f397d1946a
-EBUILD rosegarden-19.06.ebuild 1054 BLAKE2B b5f72dea27fe57c9afec4bf5377e31eb2ab705a8e08b260015557dde8f2ae8f5b7248ccd5b8a64302afd197f323f53119b7ead85dddf89214efce2c1638d7ae5 SHA512 a5b3d1431c58ca1dde4875217f328660d11913673e7d61b43f4b4a177ea53497596dcb1fa3372aa90e54763f4016141eee0ffa1763dd7dc6b0aa7ac2d7e25457
-EBUILD rosegarden-19.12.ebuild 1055 BLAKE2B f0f41218f8c351f42e7cf101798c502b820f7852a4bacd134f5ca3302372982248aa78b3cc056dabaa16d5d857f5b10b6922ae5f2f1ac79c0cdf9b8231b255a0 SHA512 bbbb8e0ac28266978036aba8cccbf859abca4e4bd6e22cfa4616ed990802e5d8c18acc211008e9b788e9d02948cc1cf988af09f3bdc12721161926d91defac34
+AUX rosegarden-fix-qt5.15.patch 670 BLAKE2B 4c8eb957c80ddad78444ee484b11da94865e55d161a6bd3e5b4f08d1697a0bcc89e2b5c947df99b89840734a84cca773bb1f9252d444e6b39a8630235f7eddf0 SHA512 a13ced3528552e3c2609442f81696628ef93cbab3d31526cbc7d2d3c0f4d6d44a84171fb3824d6a662f297d792f27d62ccb2c9e89f074e0aca3fcc1dd3ed645d
+DIST rosegarden-20.06.tar.bz2 6821122 BLAKE2B 2c37729133f60524466c9eb6cb761e36698acc2addee802fa01b498c4450e0f87a8d02dc66f893e87c23484f7fc4f32e4e4e13f01a457a86363b4fa98bca4a1d SHA512 7f3892697b99344d47e2bf398f6fe82de9867a093f3396d571730a30f3442a923f16a5472a74bda865205696ff3834c0a188ceefae17e56b137d8df1a56e03f7
+EBUILD rosegarden-20.06.ebuild 1189 BLAKE2B d7e10002805af53a13a51070d95768d63970ec161ba700dbb9397458d9cc8af3b18f9711a372a2a76d67f949a2ac3988bcd5c3e6b33554b8e90a8735fb89c84b SHA512 42f7d4363b59fe2313f2c056591dbe63d7ab2d50f53c36df3d9f3873fdf24fb2c0a273ebc1437d02160fc8c4d3c784a74467ddad173c8119f602e87402d1b4d6
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch b/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch
new file mode 100644
index 000000000000..bb4244baeba9
--- /dev/null
+++ b/media-sound/rosegarden/files/rosegarden-fix-qt5.15.patch
@@ -0,0 +1,24 @@
+diff --git a/src/gui/general/ThornStyle.cpp b/src/gui/general/ThornStyle.cpp
+index 4374607..de426f1 100644
+--- a/src/gui/general/ThornStyle.cpp
++++ b/src/gui/general/ThornStyle.cpp
+@@ -34,6 +34,7 @@
+ #include <QLabel>
+ #include <QLayout>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRadioButton>
+ #include <QStyleFactory>
+ #include <QStyleOption>
+diff --git a/src/gui/widgets/Panner.cpp b/src/gui/widgets/Panner.cpp
+index ceba4ea..ead23fa 100644
+--- a/src/gui/widgets/Panner.cpp
++++ b/src/gui/widgets/Panner.cpp
+@@ -24,6 +24,7 @@
+ #include "misc/Debug.h"
+ #include "base/Profiler.h"
+ 
++#include <QPainterPath>
+ #include <QPolygon>
+ #include <QMouseEvent>
+ 
diff --git a/media-sound/rosegarden/rosegarden-17.12.1.ebuild b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
deleted file mode 100644
index dac7760081c1..000000000000
--- a/media-sound/rosegarden/rosegarden-17.12.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="https://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="lirc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib:=
-	>=media-libs/dssi-1.0.0:=
-	media-libs/ladspa-sdk:=
-	media-libs/liblo:=
-	media-libs/liblrdf:=
-	media-libs/libsamplerate:=
-	media-libs/libsndfile:=
-	sci-libs/fftw:3.0
-	sys-libs/zlib:=
-	virtual/jack
-	x11-libs/libSM:=
-	lirc? ( app-misc/lirc:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/rosegarden/rosegarden-19.12.ebuild b/media-sound/rosegarden/rosegarden-19.12.ebuild
deleted file mode 100644
index 7ed9801029fe..000000000000
--- a/media-sound/rosegarden/rosegarden-19.12.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg virtualx
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="https://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="lirc"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib:=
-	>=media-libs/dssi-1.0.0:=
-	media-libs/ladspa-sdk:=
-	media-libs/liblo:=
-	media-libs/liblrdf:=
-	media-libs/libsamplerate:=
-	media-libs/libsndfile:=
-	sci-libs/fftw:3.0
-	sys-libs/zlib:=
-	virtual/jack
-	x11-libs/libSM:=
-	lirc? ( app-misc/lirc:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	 virtx cmake_src_test
-}
diff --git a/media-sound/rosegarden/rosegarden-19.06.ebuild b/media-sound/rosegarden/rosegarden-20.06.ebuild
index a86fbbdda3ed..2042a29fe018 100644
--- a/media-sound/rosegarden/rosegarden-19.06.ebuild
+++ b/media-sound/rosegarden/rosegarden-20.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,9 +11,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc"
-RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -43,17 +42,25 @@ DEPEND="${RDEPEND}
 	dev-qt/qttest:5
 "
 
+PATCHES=(
+	"${FILESDIR}"/rosegarden-fix-qt5.15.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
+		-DDISABLE_LIRC=$(usex !lirc)
 	)
 	cmake_src_configure
 }
 
 src_test() {
-	 virtx cmake_src_test
+	# bug 701682, tries to open network socket and fails.
+	local myctestargs=(
+		-E "(test_notationview_selection)"
+	)
+	virtx cmake_src_test
 }