gentoo resync : 02.02.2022

3 files changed, 3 insertions, 56 deletions

diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index fa2e7c63424e..3b5328dc4859 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,5 +1,3 @@
-DIST vmpk-0.8.5.tar.bz2 484128 BLAKE2B d13965358d21a81053cc5c32e11d0b8a9f6fda733ef5e7295cee7b774d8ca584ee58c0f7cd5f10f0f3948528031e314d09736fe3f7c0dc94929bcadd3aa94e5d SHA512 62de7acc353b95511c1c1afd54d7c5ddb34de69fd2dff5dfccd6ed83b6e1ca2cfdcd36c1a4878118821dead8dd8b15c44a2c1138b677da3b218f8093e7a49abf
 DIST vmpk-0.8.6.tar.bz2 483376 BLAKE2B a2145394a9ad90f567e292e23bd9b7f62e26160b6375a48cea2a84818139865a65fdde172f6a8b6e42015e0ce14127c1f97558e00b56ebc288fa1e3d3bd11eab SHA512 0b77aabf1dda99c9149a5353fc9d0363469de2678e6089fc7dc13dc349587fd1b1630cf511c4d9ef384a7523b8f023e451d6c543a805dcda0bf5cf9d7a4b4277
-EBUILD vmpk-0.8.5.ebuild 900 BLAKE2B 64581ee3ea7c6f655fdbea25923907e8544ccc386d73e9b460fa98c39f2762b0f3634b164f86e1ab274dca7525fbba502b83d81c453d797eb0eb22f0b2a278db SHA512 82a6105a6345e5796dc4df8fe610b75d7d16797793cbcf8aa55b627d85d889b290de9ac7fa629c62060a54d01f517d15f3ca6311b58ec397c49f2a44d71c42e8
-EBUILD vmpk-0.8.6.ebuild 902 BLAKE2B 175d7a2ca1c5fa21823294e007ec135b43e9f9fab56ba4be96535326fefe87fff06051e5afd1e489e99d709bf711674196997a6f6ea81b8152f46ab41a9e0add SHA512 3c0d204dccb98cdf4d58a38666177ac2b7d8fdeb2e8c8277cef4eca82ce5444464190da30581bca7c9b7211b4b71b4dd223eadc2c2e521e3037f737a9d532b12
+EBUILD vmpk-0.8.6.ebuild 900 BLAKE2B c03d41aca3f7e1f0d4cc9ebab0c8bb6c8f4b4fac7ae9fe44e71f6edc020729f92ca6d175f7fa80cb896bf55fe4f8809b47fd382d52e3e05106c6bcfb0e288ee7 SHA512 3d015e48a8155bf03a0806c3c957f852e51f7ad75d17bbef4543823aca86231ae27e6066b64249321787c8664f5a897c9fd560e141a0ac8da4277bf71474d89a
 MISC metadata.xml 857 BLAKE2B 6d6600a0209d9d251f21c2e9f48ce1a9feffd2680a4e97c29f69f7a19f251607f7a2724e3a170b916dd3f3cad16f59ac8034621ab599f2de74171eedacea68ed SHA512 8d053c4c85a7ae69d87ea01058e0496f1a89994e7ff482e290e97afc4de2714eec397ed05129b98e9a1dbc5932a6067eb97bf17c6e05d13c6d2d1ba3747fd8b3
diff --git a/media-sound/vmpk/vmpk-0.8.5.ebuild b/media-sound/vmpk/vmpk-0.8.5.ebuild
deleted file mode 100644
index 23b8ede7e0ab..000000000000
--- a/media-sound/vmpk/vmpk-0.8.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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.6.ebuild b/media-sound/vmpk/vmpk-0.8.6.ebuild
index 06432a54115a..f75004c7bb05 100644
--- a/media-sound/vmpk/vmpk-0.8.6.ebuild
+++ b/media-sound/vmpk/vmpk-0.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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="