gentoo resync : 05.12.2021

3 files changed, 2 insertions, 55 deletions

diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index e557ccd16b67..2f05349e6866 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,5 +1,3 @@
-DIST vmpk-0.8.4.tar.bz2 483243 BLAKE2B 12deda1ce752db4a0723e0b54e96a734cfcc11cbd2974a5957d315f1080d7d8b8ab3adf9203c8a25514f708ff6cadec69ab560239cb0f7d1b6859032ff6b976d SHA512 1704d8d39a2750549b524202e46e51507e25aeed00fe5c36202148661af2fc98613d937b2ea36f958706f371608d50ce82a6633b56e344e9cdcfed223892cb9d
 DIST vmpk-0.8.5.tar.bz2 484128 BLAKE2B d13965358d21a81053cc5c32e11d0b8a9f6fda733ef5e7295cee7b774d8ca584ee58c0f7cd5f10f0f3948528031e314d09736fe3f7c0dc94929bcadd3aa94e5d SHA512 62de7acc353b95511c1c1afd54d7c5ddb34de69fd2dff5dfccd6ed83b6e1ca2cfdcd36c1a4878118821dead8dd8b15c44a2c1138b677da3b218f8093e7a49abf
-EBUILD vmpk-0.8.4.ebuild 900 BLAKE2B 9cf7402d7127f2a41f0785feb47d4d8b487687433b9c282bbb153a8b9f3b53a7295f8a1d1086c869cde5f1e3b375949f32ec7524098451462f49413317ef53e3 SHA512 c102fcb617f4031687bc89a32fac8fb9328583c3b8b2649b1364891a59ae0c9411237a49601918963b6c7030ab2a32169c9fb53972030fa542e8c1ffccc8fa3b
-EBUILD vmpk-0.8.5.ebuild 902 BLAKE2B 175d7a2ca1c5fa21823294e007ec135b43e9f9fab56ba4be96535326fefe87fff06051e5afd1e489e99d709bf711674196997a6f6ea81b8152f46ab41a9e0add SHA512 3c0d204dccb98cdf4d58a38666177ac2b7d8fdeb2e8c8277cef4eca82ce5444464190da30581bca7c9b7211b4b71b4dd223eadc2c2e521e3037f737a9d532b12
+EBUILD vmpk-0.8.5.ebuild 900 BLAKE2B 64581ee3ea7c6f655fdbea25923907e8544ccc386d73e9b460fa98c39f2762b0f3634b164f86e1ab274dca7525fbba502b83d81c453d797eb0eb22f0b2a278db SHA512 82a6105a6345e5796dc4df8fe610b75d7d16797793cbcf8aa55b627d85d889b290de9ac7fa629c62060a54d01f517d15f3ca6311b58ec397c49f2a44d71c42e8
 MISC metadata.xml 857 BLAKE2B 6d6600a0209d9d251f21c2e9f48ce1a9feffd2680a4e97c29f69f7a19f251607f7a2724e3a170b916dd3f3cad16f59ac8034621ab599f2de74171eedacea68ed SHA512 8d053c4c85a7ae69d87ea01058e0496f1a89994e7ff482e290e97afc4de2714eec397ed05129b98e9a1dbc5932a6067eb97bf17c6e05d13c6d2d1ba3747fd8b3
diff --git a/media-sound/vmpk/vmpk-0.8.4.ebuild b/media-sound/vmpk/vmpk-0.8.4.ebuild
deleted file mode 100644
index 7865aa398687..000000000000
--- a/media-sound/vmpk/vmpk-0.8.4.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
-	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.5.ebuild b/media-sound/vmpk/vmpk-0.8.5.ebuild
index 06432a54115a..23b8ede7e0ab 100644
--- a/media-sound/vmpk/vmpk-0.8.5.ebuild
+++ b/media-sound/vmpk/vmpk-0.8.5.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="