gentoo resync : 08.07.2021

3 files changed, 2 insertions, 66 deletions

diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index d12c92c30713..26f56ecf7731 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,5 +1,3 @@
-DIST rosegarden-20.12.tar.bz2 6438971 BLAKE2B f03862a8523dd43cc7e2b146446bb943229cfa1c598bc36601695465566d1037d360b15ac78802dbcc51c601e605abc9199f3006b3072e5e0ad2b49da9e15c28 SHA512 a2901d35ef7dac9358350fa47e47b9314698790bb2e2a95c6cc444135f49a92e3fb6d6cbf8710194bca6e57e1c82218991ae3db4aa7b6acea311cb3b627d3dc2
 DIST rosegarden-21.06.tar.bz2 6477323 BLAKE2B f5bb9a471122857666edf033d4e760cbf81b0bbcf255e1248a1f865825677c41fb1a55a64835a168174b420793367214e8dfcedea25dc857e1ec847fae87770d SHA512 9cadfed3caba203ea6db78c3600600b9c5ed0e2963228dd6e8129291618e3b7c617b0d6dfaccce0dd753ce229dfaa8c65d1354f591e2923185fb76dcbe48d840
-EBUILD rosegarden-20.12.ebuild 1133 BLAKE2B 923da829748128bc080fad7299d0fca0549c8a265e966bb74daae240cccc057da58efbb7b3faaff769e7be7cef564dc46e79315237f1f372bff5c4710be5cd11 SHA512 3f9f4d9cd5754368ef5d1f09abea4c395ea05a48b8c8c695669d51acb823ebca074bfff81c0f37685f62c8c05406f27bfc878a733008fc9e910386b4d3de34a2
-EBUILD rosegarden-21.06.ebuild 1135 BLAKE2B 350774d8cd0f82e86e09db77fb81eb338cfafdad02b74afcd8cca5677bd65eb517bce08f8fdc1389836d0bddf75ce412cfcacd318281dfa7f3a5837c79a00159 SHA512 06d439b37e18cb255f3c0d591e71fab48e3646ff645ff01630c9a6e509bb7baf70dd1012da4c19251ef999f922b3a2dea7d01da0104a4ce1cfcad404fba66cd7
+EBUILD rosegarden-21.06.ebuild 1133 BLAKE2B 923da829748128bc080fad7299d0fca0549c8a265e966bb74daae240cccc057da58efbb7b3faaff769e7be7cef564dc46e79315237f1f372bff5c4710be5cd11 SHA512 3f9f4d9cd5754368ef5d1f09abea4c395ea05a48b8c8c695669d51acb823ebca074bfff81c0f37685f62c8c05406f27bfc878a733008fc9e910386b4d3de34a2
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/rosegarden-20.12.ebuild b/media-sound/rosegarden/rosegarden-20.12.ebuild
deleted file mode 100644
index 8df3e4a0dfb1..000000000000
--- a/media-sound/rosegarden/rosegarden-20.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 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"
-
-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)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# bug 701682, tries to open network socket and fails.
-	local myctestargs=(
-		-E "(test_notationview_selection)"
-	)
-	virtx cmake_src_test
-}
diff --git a/media-sound/rosegarden/rosegarden-21.06.ebuild b/media-sound/rosegarden/rosegarden-21.06.ebuild
index 6cc3ac2b875d..8df3e4a0dfb1 100644
--- a/media-sound/rosegarden/rosegarden-21.06.ebuild
+++ b/media-sound/rosegarden/rosegarden-21.06.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc"
 
 BDEPEND="