gentoo resync : 31.01.2021

3 files changed, 2 insertions, 82 deletions

diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 34206c82aeb2..eb6851ed972c 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,3 @@
-DIST drumstick-1.1.3.tar.gz 1358468 BLAKE2B af4cc923d380a1da66c835a6302e47e31c17ff90ba9277fe6063e6029c3d4d087e85905487a4dae657cdbfb743d2ac6e6c5a30c0905c9bc736d8666105e52099 SHA512 41990c269c41dc011e14c9bf008b983cd3722ea52429ec7eabaa5689a6f69b1760fc766604378c30bb1dfab537b77f7522a13377b873308835a0e7701d24448e
 DIST drumstick-2.0.0.tar.gz 1865424 BLAKE2B ee87dd222add121c8a6faaac5b8a755e2d6f7b257db890f6bbdbf5380d9771dc5b65a73d716f0cfd343a46c4227adcd2d85e4a359fcaa445b2291dc1ac188cfe SHA512 aacb4ca5a3354da6380ba146ee7ba57e646d19fe6a5d083e00b795221453a87d1baf25965784e7c8a97b9b00a3dda643bce144f62b6a27118f081c681089381a
-EBUILD drumstick-1.1.3.ebuild 1423 BLAKE2B 275235e1c697144a056c1fde8845b5e1dfe11fc91ab5d6e0bc601ba9fdda5a0cd6f34e0215a1c96736f89191a64b70e69790e8ccc5cf1154decb4daa60caf861 SHA512 f9111df83ca27d48c15c35b8adff813a05591c4cdadde60a7e382b7f0da1a24e3ab0802c0df21129b6135b035357c0a6709a83045039f04532a1eeda00272978
-EBUILD drumstick-2.0.0.ebuild 1558 BLAKE2B 0363fc789a52f722ca337afffed6b8b217262ba117c7156fbcbcb431e49cef887f23c10b9089e6f6d14a222898d596a9aa23a66133f5e164570f31b9b52e509c SHA512 6889de16b6fb60bf14d589a419225242f50e2912639ad78dc15ea1e1e6419329102cb6400b3501743f7add671b523c0475a08598b510bf73f7470dd3d488e4f5
+EBUILD drumstick-2.0.0.ebuild 1557 BLAKE2B 9c5e9e54433e49d8af60c992c3779ade767b5ba65176f324ba6639709687af037a4ae2107c1d1fc769d1df9c04c03065fa50187afa73fe4faec2b97b94a22f23 SHA512 fa95c6d86aeecfc4d2f895c5d671776d304481d7c3a96c256a39475ae03446e65a4d18f78ee8bcecb7d629cfb323092bc606236c944f3af9922bbe561c622a35
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-1.1.3.ebuild b/media-sound/drumstick/drumstick-1.1.3.ebuild
deleted file mode 100644
index fbb7e14743ec..000000000000
--- a/media-sound/drumstick/drumstick-1.1.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
-HOMEPAGE="http://drumstick.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc fluidsynth pulseaudio"
-
-BDEPEND="
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	fluidsynth? ( media-sound/fluidsynth )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-RESTRICT="test"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use fluidsynth ; then
-		sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
-			library/rt/CMakeLists.txt \
-			library/rt-backends/CMakeLists.txt \
-			utils/vpiano/CMakeLists.txt || die
-	fi
-
-	if ! use pulseaudio ; then
-		sed -i -e "/pkg_check_modules(PULSE/d" CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-		$(cmake_use_find_package doc Doxygen)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doxygen
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc ; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-	fi
-}
diff --git a/media-sound/drumstick/drumstick-2.0.0.ebuild b/media-sound/drumstick/drumstick-2.0.0.ebuild
index 33495ef0ff59..7aba3ea8a9a5 100644
--- a/media-sound/drumstick/drumstick-2.0.0.ebuild
+++ b/media-sound/drumstick/drumstick-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth pulseaudio"
 
 BDEPEND="