gentoo resync : 27.03.2018

5 files changed, 97 insertions, 2 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2591ef7f0ac8..1d01e66c714d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 5061f205af12..7f556af68897 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -11,4 +11,4 @@ EBUILD csound-6.08.0.ebuild 5569 BLAKE2B e134b89d7e62ba355621b3b57aa9b2b05df1477
 EBUILD csound-6.09.1.ebuild 5972 BLAKE2B ec879625528671ccd4d82f14b71c2ce525260e8051986825f86ffd747e57dc0ed64af3fea6fe2eb3d316e54a89b235ceebd6577ab24b8834a9c59dc43b137cdb SHA512 e5be516ec79273158ee1b574753047b50ef980e0478a77a0fc73548083a7985b0befc074c9b71eb36fde943ef296b351e584b58adbd38a63276b2c71f2eaacd6
 EBUILD csound-6.10.0.ebuild 5927 BLAKE2B f2915b61df2e5aef642bacc0df54ee96e60b1b3c725852ee9a76e3d1640a55fdb9ebacd9e71f156ce14b083256624d0dd451437ddb016e3120461e277fd92cd9 SHA512 28207d944e58eac4ef03b9f14205928d68947b301620138b3125772d961f2b873c69697c5ab232870aa879be156d24392e79fa469ce08899557d2db9e597c30d
 EBUILD csound-9999.ebuild 5927 BLAKE2B f2915b61df2e5aef642bacc0df54ee96e60b1b3c725852ee9a76e3d1640a55fdb9ebacd9e71f156ce14b083256624d0dd451437ddb016e3120461e277fd92cd9 SHA512 28207d944e58eac4ef03b9f14205928d68947b301620138b3125772d961f2b873c69697c5ab232870aa879be156d24392e79fa469ce08899557d2db9e597c30d
-MISC metadata.xml 1612 BLAKE2B 0198bbe7fb501a97f7545c0e07e7bd5201c8f1b36a244f5df94b7773dee0a8104c497c7dd9af5abe978697a1978680381da745b0f7bed43fad04ed65dfe75cc5 SHA512 2a471051eddcd4e46a28e5101aac7d2ae3ffb3e19cfc0fa137e1445e502a3aba5a9c0e0fb4e40b8539715bee30be33bc80d66e2c8ac7cf40ee9834f15e52cbbf
+MISC metadata.xml 1487 BLAKE2B e94fef343f96f5fe68a0fb486b7f8bd9f8af7fb3f585696a4b6d909cc1e87f2da66ab73b24ad1b3c809db472877febb8fbde2c3fc5b2abfab35c3efe9eddf321 SHA512 215f491284f409a299d5c4ef8d9df6f377a4a5e032bce40870fb72c7c6bbcdaa8ea0879a86c3379207e0b69df7f735254936e97ed68ebd2aeecf9498c646037e
diff --git a/media-sound/csound/metadata.xml b/media-sound/csound/metadata.xml
index 7bee7a51e80e..9cea2aaf92d9 100644
--- a/media-sound/csound/metadata.xml
+++ b/media-sound/csound/metadata.xml
@@ -15,7 +15,6 @@
 		<flag name="image">Build the image opcodes</flag>
 		<flag name="keyboard">Build Virtual MIDI keyboard</flag>
 		<flag name="linear">Build the linear algebra Opcodes</flag>
-		<flag name="luajit">Use the lua just-in-time compiler <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
 		<flag name="portmidi">Build the PortMIDI I/O module</flag>
 		<flag name="samples">Install the HRTF datafiles for use with hrtfmove, hrtfmove2, hrtfstat, hrtfearly, and hrtfreverb</flag>
 		<flag name="score">Build the alternative score parser</flag>
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index fbb85a0f63c5..02be0f289c5f 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,3 +1,5 @@
 DIST drumstick-1.1.0.tar.bz2 1012405 BLAKE2B ad1e4990cbf4954eadf8c7ae602234852e77abcf534e14090a6e158e9032288fcce6c39b742c40ac9b8c7967dbfcd04578b871088f61ce411de9c910c79e1fbb SHA512 1099b80e1d2819a8343e877742c5f01c114419b2c63a965717bcff2c220aa218f40ac3860cf9496d3586663e73a6c2c7b62aee74c51229578a5ae3044da208da
+DIST drumstick-1.1.1.tar.bz2 1011275 BLAKE2B dff36487a1cf79512150638c793c471fb410c3563184e9acdbd9d441c53596a0bc611d4ebef2b4dc0214c0fef5324443fe0dfe4158f45521762abf4e838cf716 SHA512 f3278be71b1850bbe742ff46b65a656443a1d655c5bcc1e289d92492db985ab185ed140b88ca68f37235c07926be5b82cfe97ae2f95ca7e3a7f48a7c95c61654
 EBUILD drumstick-1.1.0.ebuild 1775 BLAKE2B 45349cbbad2e23ac95c05e9ec36fda08cc6d230aefcd1edbd9a41c33e4356fd8d5fb220cd1b2185ad60e6f4cb682920bdd515f26b58bb27d751e54bfb470dda5 SHA512 25c9e95e3359c648d3a9b9af17cc5b2db2f4f576598c1de13b9936ba2ee736d1a7b89c7730015a64d4adbd58869cd167bd978b290db782d4c01b724bc78b5284
+EBUILD drumstick-1.1.1.ebuild 1730 BLAKE2B ed1ee5f692adc0d0bc23edc6240064e24646a33bb7a7e2048665df46a951aefacfcefe9af4fa6701907fb4dbaf718b76b980cc32362cfe634ce32118efea762f SHA512 4bd7f70a09d328a13125827f5bf76f37e4fafc83c2d88cb74db9f3b28d24a955bdf0422bb3f6272d6cce3995b8fd0a9860cf8eda15b351c9a7f1cd1755c432e4
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-1.1.1.ebuild b/media-sound/drumstick/drumstick-1.1.1.ebuild
new file mode 100644
index 000000000000..dec23c6a8c83
--- /dev/null
+++ b/media-sound/drumstick/drumstick-1.1.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils gnome2-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
+	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 )
+"
+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
+}