gentoo resync : 17.06.2021

3 files changed, 2 insertions, 55 deletions

diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index 6eaf161e118c..1ed422cc4dc3 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,5 +1,3 @@
-DIST vmpk-0.8.0.tar.bz2 466517 BLAKE2B 9fee766b71ad7f9cd96f9dfd859dc31434f14c913c75f5a8e76c66150522dbf04c6e28582269d1603c6d53d6db436e9e7f73cab1172c0d6b004cc71edccb21c8 SHA512 b3e1e40792661c1e4ce3a5274513b4b75742ca861a6233c2653d6df90b7a89e086d15a4196d59c7021c48e9e2aae83116ba29c3395960179d602f0cb06c1f608
 DIST vmpk-0.8.3.tar.bz2 481537 BLAKE2B 985609c3a9ac69b29ac40dd6a71132d0f429d7961d306caf1f77e9e5b510e8b5af8f996febf87df8dfde02ee486cecbb1ef412dd3ba718dc3f793771230e5988 SHA512 829121a9f7bbbe73a9882c9f569204e4096c57c1c7dc7ba22949a35d3fe104028ba7e259fc2163d2711f31f8adfd52c4ec95bfc78ae9b35574835c1b404183ca
-EBUILD vmpk-0.8.0.ebuild 908 BLAKE2B aca2539550492fbb5a379a7d3e6b9f81f241f4a17df342836d718b9df7e0ab6fd2e7d29485dd4d537a3e0b44bc69e81d65101d72583c08ff7cd6e182ccaab6db SHA512 0138b45e35d4c8ff15e6647656255b25965b56141ad46ceba6d4b72db150f8526e8d3da26be5d2226615f18412e302eae4b9ed48f7dd324f0162450ddcec21c5
-EBUILD vmpk-0.8.3.ebuild 902 BLAKE2B 096ba5ac32644adbcd1be030ad996fbc30ab412c5049ba0a6feba4862da96e1a8bd203af871c71493bf360d0b06410e20147acdb808cbc44817636f2ec34cc86 SHA512 312b15206dda76d9315492a4c9651af13b0086ea8be993d28eb3b8d5f440d3be489539136e2c2f8a2ce027fadab934ce084aed24757101ab119f65e467994682
+EBUILD vmpk-0.8.3.ebuild 900 BLAKE2B 9cf7402d7127f2a41f0785feb47d4d8b487687433b9c282bbb153a8b9f3b53a7295f8a1d1086c869cde5f1e3b375949f32ec7524098451462f49413317ef53e3 SHA512 c102fcb617f4031687bc89a32fac8fb9328583c3b8b2649b1364891a59ae0c9411237a49601918963b6c7030ab2a32169c9fb53972030fa542e8c1ffccc8fa3b
 MISC metadata.xml 856 BLAKE2B 53282a0d72578eb72aa6d3ae3704e915626f12b88315be54f0342cd9b97312fed2c3628871fe7c1215d29b6984c9b829b0718d124effa46eeaf52dd6509e35be SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0
diff --git a/media-sound/vmpk/vmpk-0.8.0.ebuild b/media-sound/vmpk/vmpk-0.8.0.ebuild
deleted file mode 100644
index 7d6762defdb4..000000000000
--- a/media-sound/vmpk/vmpk-0.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Virtual MIDI Piano Keyboard"
-HOMEPAGE="https://vmpk.sourceforge.io/"
-SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus"
-
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=media-sound/drumstick-2.0.0
-	x11-libs/libxcb
-	dbus? ( dev-qt/qtdbus:5 )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DBUS=$(usex dbus)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodir /usr/share/doc/${PF}/html
-	mv "${D}"/usr/share/vmpk/*.html "${D}"/usr/share/doc/${PF}/html/ || die
-}
diff --git a/media-sound/vmpk/vmpk-0.8.3.ebuild b/media-sound/vmpk/vmpk-0.8.3.ebuild
index 8c7430f56134..7865aa398687 100644
--- a/media-sound/vmpk/vmpk-0.8.3.ebuild
+++ b/media-sound/vmpk/vmpk-0.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus"
 
 BDEPEND="