commit: 2f95a9b240763d995210e80d5852b6cf257ad2a8 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Fri Jan 12 09:58:55 2018 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Fri Jan 12 10:38:59 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f95a9b2
media-sound/drumstick: remove 0.5.0 and 1.0.2 Package-Manager: Portage-2.3.14, Repoman-2.3.6 media-sound/drumstick/Manifest | 2 - media-sound/drumstick/drumstick-0.5.0.ebuild | 66 ------------------- media-sound/drumstick/drumstick-1.0.2.ebuild | 76 ---------------------- .../drumstick/files/0.5.0-doc_automagicness.patch | 20 ------ .../drumstick/files/0.5.0-gcc6-narrowing.patch | 26 -------- .../drumstick/files/0.5.0-underlinking.patch | 17 ----- .../drumstick/files/drumstick-1.0.2-gcc6.patch | 35 ---------- 7 files changed, 242 deletions(-) diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest index 88092aaec9b..a502991da50 100644 --- a/media-sound/drumstick/Manifest +++ b/media-sound/drumstick/Manifest @@ -1,3 +1 @@ -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 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 23e0adbaad1..00000000000 --- 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 3facc49b046..00000000000 --- 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/files/0.5.0-doc_automagicness.patch b/media-sound/drumstick/files/0.5.0-doc_automagicness.patch deleted file mode 100644 index c2474ae4f1e..00000000000 --- 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 165db470592..00000000000 --- 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 1ec4fd18602..00000000000 --- 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 4bb66e85536..00000000000 --- 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);
