gentoo resync : 16.01.2021

3 files changed, 3 insertions, 70 deletions

diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index e013381811f4..af1656d39645 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,3 @@
-DIST drumstick-2.4.1.tar.gz 2014026 BLAKE2B 4e2765430438505c910919d5a5069b13a63e72083c4a40bd8b406e3463842ccd5ab024f4a0fccbceafe808e3926b3be03e98338afcac4520de978b0f5c950ee8 SHA512 5063201b643cd3e58db4c77521444e7816febb39ceb739309ac63b164b2fc67b6bdec16a98945141d7b41add41d82b2bd2ddf99890f12edb2f86b73e643ac6d6
 DIST drumstick-2.5.0.tar.gz 1914679 BLAKE2B 1b9c12304156577230f22dee5bde068ecdc2a3c0dc7406db4d9d8588788a29e1115330d0f9bab8376e1adb72cbf0ff23f4b72ac66c90e1ee83c8322510cf2a2a SHA512 d2e4438d66307dc8259b1da8455c4f2c9954bc3605836b993ec004fb0ca326189d3c8a706ea86bf4836701b80b24d51e756d46c86f04301d5c1601687d1fa6fc
-EBUILD drumstick-2.4.1.ebuild 1280 BLAKE2B 84f086bcf5bfa81e6f700d1ee82a871daa32929d353db06d91cb572dc18c50dfc25fad9da53a058863281c888bf8fdb2013dcb92baac52ccb1e9b9463c5917b9 SHA512 85a2dc9eff1690c4b441a8b44a3d0bf84240c97fe5a8feb518ffe27b4ac289c46ba78f5709733d6a48a96519f0523cb05700b7be7bfd6db579fef3b2e0225804
-EBUILD drumstick-2.5.0.ebuild 1282 BLAKE2B 019bce62e329ed8f99d946684005d3e9c57d45ef48a9bdc5fe4ac81c6d9f01a8adab66f01bda027d29b6e42ccfc8dd40c24a9a34a40593703a3e25a0ed602cb0 SHA512 497b08f55faf4f3b4f7485936ff1d15515314db60d9366719116e2de469e6880fcb69027066b7f8fa370a667cb969875b589d163256e706849df393e6d03d27a
+EBUILD drumstick-2.5.0.ebuild 1280 BLAKE2B af1759e413709c7eedf42360d78b96adbafe7c5b8f6ffd98f7f9c73b83e578c8036d41a7035999e80113a63bf43e8d30bf27b99528074872e8a8ddf72708d2ca SHA512 90a1641dfbdc541d276af856fd091b9940aa0b276ce126a1877f450d3e78f1eb4069bdf01f575682ba87a1c884a0fca1ac00df615546340469835ff2149a1eb0
 MISC metadata.xml 599 BLAKE2B 1e9aa003d4bb54a9eba1e9ee7a9b36515992fd66bc7f876973c02e59da7dd84667ae8e839ebb1c22a1a463aedb26c5b88588277192673dae23adcd075dde2416 SHA512 59b60a0327a8febf9ddfd6e42d5ff6056a6ee1cca61b0d507f11686eb8fdb6bc2c5f614e19d4276b3c354b291d2bbb8b30b845d8d9bb9dcbadec10db6632e8a5
diff --git a/media-sound/drumstick/drumstick-2.4.1.ebuild b/media-sound/drumstick/drumstick-2.4.1.ebuild
deleted file mode 100644
index d5cce38803f9..000000000000
--- a/media-sound/drumstick/drumstick-2.4.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-
-RESTRICT="test"
-
-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 )
-
-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.5.0.ebuild b/media-sound/drumstick/drumstick-2.5.0.ebuild
index 70bc8c734398..29329502f5d2 100644
--- a/media-sound/drumstick/drumstick-2.5.0.ebuild
+++ b/media-sound/drumstick/drumstick-2.5.0.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/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth network pulseaudio"
 
 RESTRICT="test"