gentoo resync : 25.10.2021

3 files changed, 2 insertions, 73 deletions

diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 86f4068eccee..137119453c09 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,3 @@
-DIST drumstick-2.3.1.tar.gz 1978856 BLAKE2B 47f7c9872964fb267834b23e2d52fc1b10826629fb256dae410161305c3587845ffcaf00f0d30a73df67b4a00849c53f3f1412c0473a52fbf69b106362175b3e SHA512 aaf0080405765878c8d1e164343eff0bb18d4add4a2f67de1ed0e978ae688948b73121f9cb50c52c23fc34b8c57e184d22a5c5aaa29969409071567142685dc7
 DIST drumstick-2.4.0.tar.gz 2094661 BLAKE2B 98f79081e9aa942b24355f86a14bb273145b7d764f19ad671050e74546ff513ee76fe2dac290f75ea1b1c54a709232da0f26e63d1829a5317174793692f2664f SHA512 633ae93c11f22999b6cadac7481e162d6e24499b614ba58e785e73b6af39a1cfbca235fcbb4b21107840f1e4dff059caaf32f9945ea80434a5017b816f62774f
-EBUILD drumstick-2.3.1.ebuild 1318 BLAKE2B fb184940b7b5bf8bb6054586de8f41cc93f755637199da2692466c427d811d3ba78ac3a255642a335efdd8ba2f47257065178ac301b76f9b0e7816f11fbbb5af SHA512 cedb23d0ca9fed19c41197db463ea1d8c01d78f52e0a1dc00d0d1897979dd57150fd683eaa3a344b3bda6b518f46bc2b218fea553d9d4be1d998f14baabe5cdc
-EBUILD drumstick-2.4.0.ebuild 1282 BLAKE2B 019bce62e329ed8f99d946684005d3e9c57d45ef48a9bdc5fe4ac81c6d9f01a8adab66f01bda027d29b6e42ccfc8dd40c24a9a34a40593703a3e25a0ed602cb0 SHA512 497b08f55faf4f3b4f7485936ff1d15515314db60d9366719116e2de469e6880fcb69027066b7f8fa370a667cb969875b589d163256e706849df393e6d03d27a
+EBUILD drumstick-2.4.0.ebuild 1280 BLAKE2B 84f086bcf5bfa81e6f700d1ee82a871daa32929d353db06d91cb572dc18c50dfc25fad9da53a058863281c888bf8fdb2013dcb92baac52ccb1e9b9463c5917b9 SHA512 85a2dc9eff1690c4b441a8b44a3d0bf84240c97fe5a8feb518ffe27b4ac289c46ba78f5709733d6a48a96519f0523cb05700b7be7bfd6db579fef3b2e0225804
 MISC metadata.xml 599 BLAKE2B 1e9aa003d4bb54a9eba1e9ee7a9b36515992fd66bc7f876973c02e59da7dd84667ae8e839ebb1c22a1a463aedb26c5b88588277192673dae23adcd075dde2416 SHA512 59b60a0327a8febf9ddfd6e42d5ff6056a6ee1cca61b0d507f11686eb8fdb6bc2c5f614e19d4276b3c354b291d2bbb8b30b845d8d9bb9dcbadec10db6632e8a5
diff --git a/media-sound/drumstick/drumstick-2.3.1.ebuild b/media-sound/drumstick/drumstick-2.3.1.ebuild
deleted file mode 100644
index 83eff3ef7dbc..000000000000
--- a/media-sound/drumstick/drumstick-2.3.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 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="https://drumstick.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc fluidsynth network pulseaudio"
-
-BDEPEND="
-	dev-libs/libxslt
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	doc? (
-		app-doc/doxygen[dot]
-		app-text/docbook-xsl-stylesheets
-	)
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	fluidsynth? ( media-sound/fluidsynth )
-	network? ( dev-qt/qtnetwork:5 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS readme.md TODO )
-
-RESTRICT="test"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-		-DUSE_DBUS=ON
-		-DUSE_FLUIDSYNTH=$(usex fluidsynth)
-		-DUSE_NETWORK=$(usex network)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_DOCS=$(usex doc)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doxygen
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/drumstick/drumstick-2.4.0.ebuild b/media-sound/drumstick/drumstick-2.4.0.ebuild
index 70bc8c734398..d5cce38803f9 100644
--- a/media-sound/drumstick/drumstick-2.4.0.ebuild
+++ b/media-sound/drumstick/drumstick-2.4.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 network pulseaudio"
 
 RESTRICT="test"