gentoo resync : 28.04.2019

4 files changed, 2 insertions, 178 deletions

diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 3ed41c35b0cd..243cf8f49fff 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,7 +1,3 @@
-DIST drumstick-1.1.0.tar.bz2 1012405 BLAKE2B ad1e4990cbf4954eadf8c7ae602234852e77abcf534e14090a6e158e9032288fcce6c39b742c40ac9b8c7967dbfcd04578b871088f61ce411de9c910c79e1fbb SHA512 1099b80e1d2819a8343e877742c5f01c114419b2c63a965717bcff2c220aa218f40ac3860cf9496d3586663e73a6c2c7b62aee74c51229578a5ae3044da208da
-DIST drumstick-1.1.1.tar.bz2 1011275 BLAKE2B dff36487a1cf79512150638c793c471fb410c3563184e9acdbd9d441c53596a0bc611d4ebef2b4dc0214c0fef5324443fe0dfe4158f45521762abf4e838cf716 SHA512 f3278be71b1850bbe742ff46b65a656443a1d655c5bcc1e289d92492db985ab185ed140b88ca68f37235c07926be5b82cfe97ae2f95ca7e3a7f48a7c95c61654
 DIST drumstick-1.1.2.tar.bz2 1012371 BLAKE2B e60a5678d33db1831130037bb4a6df6da8de815a6a0ca33a167f85596f45a1d420ca4c689c756c1fd3f794fb2a097bc19878d78bfe0789a40f9eae1b306b769f SHA512 6e84fbf2ce717cdb3c669a477de65d2f32c277073d812546267c0a9556f7ead612e3140cbc412fcd560786ca024f201a1eb3ba9de4b037e3ba8d4db89e0e2e29
-EBUILD drumstick-1.1.0.ebuild 1764 BLAKE2B 2c42c5d81f55c43ad019db34a15765ed2578541e69550c6871898a1b2568fd3b5ff3dfaeadf46e9a5803b284020463f1f7278da2fbcfd9266fe070169d84077c SHA512 26f6cbb97288f9d1b0413f5fc7545491e68b725a9633898b2147d846855bb01411ab3a28b3a39113d277048e90b53e6416104b75ec45fbc15bfa294ed3f2312d
-EBUILD drumstick-1.1.1.ebuild 1467 BLAKE2B 152cc25ca806b624879653c1ba904003ea941941ceea8924f99828c8a55fa0b747550631e4179b14f8dcad46744eb16eb22792e8bcf3f8cb737e847a78454b09 SHA512 b57479c4c339a7d9ca6577787eef67fc1b4c9252b57564405dc7eaf2bd78401d8b73e2710a51e68ca0917310812a3a414c65f4c63c150570fbd2358b7be76a01
-EBUILD drumstick-1.1.2.ebuild 1467 BLAKE2B 41261e947a6f6183976e66b1ea6fd1a2088df669542ca5d5b253bce0855067aae8a00a1b3bb55cb6d3a23e19cce3bcc57e423cc259c10d2c2317c9714f3b4472 SHA512 2571bab9d4936521b08c8847ab866553acd87974b5a428cfcfffa2febe05aa940efece6ee6f1c501b5f1c25db0c376a62bbf8d75e63157a467733abcafbd87c1
+EBUILD drumstick-1.1.2.ebuild 1466 BLAKE2B 1875c3fc6df6afcda35ff243fecdde7e30558a11096976d18a9f22ef595bd32401d72a63182c3ae28a0da9905c99862338225f0d545b10bc3b1153d36db9f710 SHA512 6fadb06cd83001be43e08c5e468935333d6ad045618b407ce84133ac949b083089789f5ff366a26aeda5774ec63d74eb30bcf0553f60db9e9a75b488cc4b91d7
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-1.1.0.ebuild b/media-sound/drumstick/drumstick-1.1.0.ebuild
deleted file mode 100644
index 3c51d0d2cf4b..000000000000
--- a/media-sound/drumstick/drumstick-1.1.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
-HOMEPAGE="http://drumstick.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc fluidsynth pulseaudio"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.7:5
-	>=dev-qt/qtdbus-5.7:5
-	>=dev-qt/qtgui-5.7:5
-	>=dev-qt/qtnetwork-5.7:5
-	>=dev-qt/qtsvg-5.7:5
-	>=dev-qt/qtwidgets-5.7:5
-	media-libs/alsa-lib
-	fluidsynth? ( media-sound/fluidsynth )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	cmake-utils_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-utils_use_find_package doc Doxygen)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && cmake-utils_src_compile doxygen
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/drumstick/drumstick-1.1.1.ebuild b/media-sound/drumstick/drumstick-1.1.1.ebuild
deleted file mode 100644
index 4c119fe9f8d3..000000000000
--- a/media-sound/drumstick/drumstick-1.1.1.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-utils xdg
-
-DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
-HOMEPAGE="http://drumstick.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-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-utils_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-utils_use_find_package doc Doxygen)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doxygen
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-	fi
-}
diff --git a/media-sound/drumstick/drumstick-1.1.2.ebuild b/media-sound/drumstick/drumstick-1.1.2.ebuild
index ba70fe478c6a..c76b61480434 100644
--- a/media-sound/drumstick/drumstick-1.1.2.ebuild
+++ b/media-sound/drumstick/drumstick-1.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth pulseaudio"
 
 BDEPEND="