gentoo resync : 13.01.2018

8 files changed, 3 insertions, 251 deletions

diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 0cbded3c808b..fbb85a0f63c5 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,11 +1,3 @@
-AUX 0.5.0-doc_automagicness.patch 743 BLAKE2B fbfa2c6a32473691e4b7095a08854ba73700874e27281efc48cdf19c212ebbe5abac47583a4ac0456ad542fa872030d007f33fec9b57a8ba83b31c64507279f8 SHA512 171913c74f329d468caafba723db7f6c531330013c20b3613e0320bc9336e639fa103e2010334f66d9b950721104aaf9bdc6cb2e4ed66162bab4bcbc3880d975
-AUX 0.5.0-gcc6-narrowing.patch 1196 BLAKE2B 5ec4bd73c3e071c6b22d379e6806943a34ef36f2b5bfc826823c7bb5874eb7e7b15acc82919c50117c5d01ba4e562739ad222655bba4e0fe8a555bd99d0f1b96 SHA512 f4eaa98b0b85f0d28ce273b03ed0fd3948f95e05918223a51b0f53c3a3e73d4d2e01b3aca6f6166a6e7b7712e36eaa1ce4d5d94811e36fa1292eacd4a770e342
-AUX 0.5.0-underlinking.patch 368 BLAKE2B 14aab9b42a6ce7da4918a635dd2ee5f3f9e1b4a4d5f2a6345b169c09b870d8c72e2e62d3bc0c2c4fd4e9db2013dfbd682009f5496cddf941c0f0fa103cc14b9d SHA512 1f015f2bac64ce84c075383c6c0997e761dcd3618d970f2c3f7dbd918a91511ac0db81ca6cb08647df019acdde3f330d04f492661f444c811af705f55249a450
-AUX drumstick-1.0.2-gcc6.patch 1900 BLAKE2B 97843e8f0c0e159eec056c49db67d8ff26c6d42740b4915fc6b0792eb6ecfb7448a22411b618fd920445ebb4aa7e6cae714961ab63b0c423eb2cf901e8c82042 SHA512 d8969aabee72d701bd69bed74ad1067537152b5a7ca0014b6fb56f7e0bdc29180d898aad61885ea85aa6b050f1026887a85f18f95eb2a05afbc3e0bfcf6bc0b1
-DIST drumstick-0.5.0.tar.bz2 200914 BLAKE2B 9eff33ae033227b7d92e0eed05755426d81b573517917fb64d7311a2cd0bbd162a463cfaa9783fbc118078f1b9733f8c90033aafb1e542b4599ce284f11db4e9 SHA512 12078dbeae7166da210ccbbaee9d55b4c9e233fd317de72c20482466cd29987c976290efecd29cc28a5be6ed7e3b9fe95ddf1081d75222d9cf9d6aef13080a21
-DIST drumstick-1.0.2.tar.bz2 233666 BLAKE2B 5a3fcdb48f2a3c977407784c15d4722e9bf45d0cd6b84029ce2e5a71066ca6b93a162272bd8ae7425415244d5081a11f9f6d69a9fe1ace9209124dd2dfc99848 SHA512 df8d36b58e83b1e06cd1e4788e63c504bf2282c26f505509b2125e6c7be8ce8bc013774755b68e36f372a8682328459a5efb67ff09be1e0190805528458b3e45
 DIST drumstick-1.1.0.tar.bz2 1012405 BLAKE2B ad1e4990cbf4954eadf8c7ae602234852e77abcf534e14090a6e158e9032288fcce6c39b742c40ac9b8c7967dbfcd04578b871088f61ce411de9c910c79e1fbb SHA512 1099b80e1d2819a8343e877742c5f01c114419b2c63a965717bcff2c220aa218f40ac3860cf9496d3586663e73a6c2c7b62aee74c51229578a5ae3044da208da
-EBUILD drumstick-0.5.0.ebuild 1244 BLAKE2B 66e0fad776ca1e69c0566c16be9f0a5dcada410147a9d2bf1b032664f06ae841086f890cd0e39d924c8b4a8cda9fb308b462344b8092a073171e1729aa34169a SHA512 65a6041d7dde795f7d1bf857df2a5021b6ba2dff44ddfc0ea6c2a76c637ee488259f59a1b472956a97f2d21225692520a2d73b2716178eaae0f885fc371752d6
-EBUILD drumstick-1.0.2.ebuild 1310 BLAKE2B bc9c0d3692bccfc401760fb18088d79944101181c26f3f68079f9cd5ce22962c83e83d23a72eb4796c09222f2bafde9c9ddba73749b2e9c9218b75689bcccbbd SHA512 568c3b7a2345b7bfde09da866caa30f8c02a7b92e7ef23c55d9627c61c493f52a905bf71560e60510f1c68051fb1105f830eb02c1dd4b3e1c2021afe5622163b
-EBUILD drumstick-1.1.0.ebuild 1777 BLAKE2B 4a432e25cb2a09981ddc25815f862eb0782bfaa9a9c91808dc36b7258dc42bc4c194b3fd2cc4aac2e582108027a36bf16c3986cf81c54e7f637a693b8d6fcba3 SHA512 dd790f04c44dbdaccf5de2fcfb3294875494eec004cd504beb9c0ba5726a7ca0616d732c650118d15795cd5b33cd3a819986b2ef73463a77d51954064f426d58
+EBUILD drumstick-1.1.0.ebuild 1775 BLAKE2B 45349cbbad2e23ac95c05e9ec36fda08cc6d230aefcd1edbd9a41c33e4356fd8d5fb220cd1b2185ad60e6f4cb682920bdd515f26b58bb27d751e54bfb470dda5 SHA512 25c9e95e3359c648d3a9b9af17cc5b2db2f4f576598c1de13b9936ba2ee736d1a7b89c7730015a64d4adbd58869cd167bd978b290db782d4c01b724bc78b5284
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-0.5.0.ebuild b/media-sound/drumstick/drumstick-0.5.0.ebuild
deleted file mode 100644
index 23e0adbaad10..000000000000
--- a/media-sound/drumstick/drumstick-0.5.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fdo-mime gnome2-utils cmake-utils
-
-DESCRIPTION="Qt4/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="dbus doc"
-
-RDEPEND="
-	media-libs/alsa-lib
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	x11-misc/shared-mime-info
-	dbus? ( dev-qt/qtdbus:4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-doc_automagicness.patch
-	"${FILESDIR}"/${PV}-underlinking.patch
-	"${FILESDIR}"/${PV}-gcc6-narrowing.patch
-)
-
-src_prepare() {
-	sed -i \
-		-e '/CMAKE_EXE_LINKER_FLAGS/d' \
-		CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_DBUS=$(usex dbus)
-		-DWITH_DOC=$(usex doc)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/drumstick/drumstick-1.0.2.ebuild b/media-sound/drumstick/drumstick-1.0.2.ebuild
deleted file mode 100644
index 3facc49b0469..000000000000
--- a/media-sound/drumstick/drumstick-1.0.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils fdo-mime 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"
-
-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
-"
-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 )
-
-PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(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() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/drumstick/drumstick-1.1.0.ebuild b/media-sound/drumstick/drumstick-1.1.0.ebuild
index 4545970a4f5e..88fb5aae789e 100644
--- a/media-sound/drumstick/drumstick-1.1.0.ebuild
+++ b/media-sound/drumstick/drumstick-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
 
 RESTRICT="test"
diff --git a/media-sound/drumstick/files/0.5.0-doc_automagicness.patch b/media-sound/drumstick/files/0.5.0-doc_automagicness.patch
deleted file mode 100644
index c2474ae4f1e1..000000000000
--- a/media-sound/drumstick/files/0.5.0-doc_automagicness.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN drumstick-0.5.0.old/CMakeLists.txt drumstick-0.5.0/CMakeLists.txt
---- drumstick-0.5.0.old/CMakeLists.txt	2010-09-09 12:38:56.000000000 +0200
-+++ drumstick-0.5.0/CMakeLists.txt	2011-05-13 11:03:30.156962982 +0200
-@@ -143,6 +143,8 @@
- ADD_SUBDIRECTORY(library)
- ADD_SUBDIRECTORY(utils)
- ADD_SUBDIRECTORY(icons)
-+OPTION(WITH_DOC "Build documentation" ON)
-+IF( WITH_DOC )
- IF(${CMAKE_SYSTEM} MATCHES "Linux")
-     FIND_PACKAGE(Doxygen)
-     IF(DOXYGEN_FOUND)
-@@ -157,6 +159,7 @@
-     ENDIF(DOXYGEN_FOUND)
-     ADD_SUBDIRECTORY(doc)
- ENDIF(${CMAKE_SYSTEM} MATCHES "Linux")
-+ENDIF( WITH_DOC )
- 
- CONFIGURE_FILE(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY)
- CONFIGURE_FILE(drumstick-file.pc.in drumstick-file.pc IMMEDIATE @ONLY)
diff --git a/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch b/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch
deleted file mode 100644
index 165db470592e..000000000000
--- a/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix GCC 6 failures caused by -Wnarrowing
-
---- a/utils/buildsmf/buildsmf.cpp
-+++ b/utils/buildsmf/buildsmf.cpp
-@@ -53,8 +53,8 @@
-     m_engine->writeKeySignature(0, 2, major_mode); // D major (2 sharps)
- 
-     // system exclusive event
--    static char gsreset[] = { 0xf0, 0x41, 0x10, 0x42, 0x12, 
--                              0x40, 0x00, 0x7f, 0x00, 0x41, 0xf7 };
-+    static char gsreset[] = { (char)0xf0, 0x41, 0x10, 0x42, 0x12, 
-+                              0x40, 0x00, 0x7f, 0x00, 0x41, (char)0xf7 };
-     m_engine->writeMidiEvent(0, system_exclusive, sizeof(gsreset), gsreset);
- 
-     // some note events
---- a/utils/testevents/testevents.cpp
-+++ b/utils/testevents/testevents.cpp
-@@ -262,7 +262,7 @@
-     dumpEvent(new KeyPressEvent(5, 60, 124));
-     dumpEvent(new ChanPressEvent(6, 111));
-     dumpEvent(new PitchBendEvent(7, 1234));
--    char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 0xf7};
-+    char sysex[] = {(char)0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, (char)0xf7};
-     dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));
-     QString text = "This can be a copyright, song name, instrument, lyric...";
-     TextEvent te(text, 3);
diff --git a/media-sound/drumstick/files/0.5.0-underlinking.patch b/media-sound/drumstick/files/0.5.0-underlinking.patch
deleted file mode 100644
index 1ec4fd186029..000000000000
--- a/media-sound/drumstick/files/0.5.0-underlinking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/utils/vpiano/CMakeLists.txt
-+++ b/utils/vpiano/CMakeLists.txt
-@@ -1,3 +1,5 @@
-+find_package(X11 REQUIRED)
-+
- SET(vpiano_forms_SRCS
-     vpianoabout.ui
-     connections.ui
-@@ -52,7 +54,7 @@
- TARGET_LINK_LIBRARIES(drumstick-vpiano
-     ${QT_LIBRARIES} 
-     ${ALSA_LIBS} 
--    ${QT_X11_X11_LIBRARY}
-+    ${X11_X11_LIB}
-     drumstick-common
-     drumstick-alsa
- )
diff --git a/media-sound/drumstick/files/drumstick-1.0.2-gcc6.patch b/media-sound/drumstick/files/drumstick-1.0.2-gcc6.patch
deleted file mode 100644
index 4bb66e85536f..000000000000
--- a/media-sound/drumstick/files/drumstick-1.0.2-gcc6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: library/file/qove.cpp
-===================================================================
---- a/library/file/qove.cpp	(revision 316)
-+++ b/library/file/qove.cpp	(working copy)
-@@ -11356,7 +11356,7 @@
- 				OVE::MeasureData* measureData = d->ove.getMeasureData(i, j, k);
- 				QList<OVE::MusicData*> tempoPtrs = measureData->getMusicDatas(OVE::MusicData_Tempo);
- 
--				if (k == 0 || (k > 0 && abs(measure->getTypeTempo()	- d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) {
-+				if (k == 0 || (k > 0 && std::abs(measure->getTypeTempo()	- d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) {
- 					int tick = d->mtt.getTick(k, 0);
- 					int tempo = (int) measure->getTypeTempo();
- 					tempos[tick] = tempo;
-@@ -11739,7 +11739,7 @@
- 				}
- 				case OVE::Articulation_Arpeggio: {
- 					//if( art->getChangeSoundEffect() ) {
--						unsigned int soundEffect = abs(art->getSoundEffect().first) + abs(art->getSoundEffect().second);
-+						unsigned int soundEffect = std::abs(art->getSoundEffect().first) + std::abs(art->getSoundEffect().second);
- 						int tickAmount = (soundEffect / notes.size()) * ((notes.size() - i) - 1);
- 						startTick -= tickAmount;
- 					//}
-Index: utils/testevents/testevents.cpp
-===================================================================
---- a/utils/testevents/testevents.cpp	(revision 316)
-+++ b/utils/testevents/testevents.cpp	(working copy)
-@@ -262,7 +262,7 @@
-     dumpEvent(new KeyPressEvent(5, 60, 124));
-     dumpEvent(new ChanPressEvent(6, 111));
-     dumpEvent(new PitchBendEvent(7, 1234));
--    char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 0xf7};
-+    char sysex[] = {'\xf0', '\x41', '\x10', '\x42', '\x12', '\x40', '\0', '\x7f', '\0', '\x41', '\xf7'};
-     dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));
-     QString text = "This can be a copyright, song name, instrument, lyric...";
-     TextEvent te(text, 3);