[gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/, media-sound/zynaddsubfx/files/

[Alexis Ballier]

commit:     876c124d08385adf0daea095aaf6409e932d15f0
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 09:25:22 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 09:25:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876c124d

media-sound/zynaddsubfx: remove old

Package-Manager: portage-2.3.2

 media-sound/zynaddsubfx/Manifest                   |  3 --
 .../zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch | 38 --------------
 .../files/zynaddsubfx-2.4.1-fltk13.patch           | 58 ----------------------
 .../zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch | 14 ------
 media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild   | 54 --------------------
 media-sound/zynaddsubfx/zynaddsubfx-2.5.1.ebuild   | 54 --------------------
 media-sound/zynaddsubfx/zynaddsubfx-2.5.2.ebuild   | 54 --------------------
 7 files changed, 275 deletions(-)

diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 85a9b5e..bf3f4c4 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,6 +1,3 @@
 DIST ZynAddSubFX-2.4.3.tar.bz2 2536667 SHA256 b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d SHA512 2314c456db1a8a032a38b012c7c9e01f0a487c5eeb0027a741a4ffd6a7eea3382fcd26a8cd97b89af40800613c1ba164bb683be800957ea403f97dd6f23df5ff WHIRLPOOL 46aa59378f310105504b0ab5903d35826aa03dd080e6c7313237e34a2c9c82cea1d9c0f2cd986c65da38320b1376477b33424b8c69fd8fa591a53325df0b4a65
-DIST zynaddsubfx-2.5.0.tar.gz 4185453 SHA256 a3810708291367298e04002eda29237ff5f70240e432be84ea48b54895746aa7 SHA512 830388593079690153ae9cdcfb35362bd33208d93d7d56d5f4967c626dc3a12c7717088281d382696fbe22294874e37efd1566874743fb17dba54fee0eb40b0a WHIRLPOOL 81ca9724906846fcfdbc91e04865da9d8d3ebbb5a19ac5cb42639f13228d709815e651c07a4fd80b3c2af7b0f2f2538d50c06b0026119bb7f9e7eb922a9ed6a3
-DIST zynaddsubfx-2.5.1.tar.gz 4214568 SHA256 e2e3b92cfc4c2add5e7af6afc81dc74e31509459034b0680372dabbf68d98405 SHA512 387d96bb5d6dfebd3129c047091380850d80092cf8e397ab1932b7a149d0fd9fb67033768ef68b50d33362f98ba20697ad9e4c25b5cf268484a24ecc156857e0 WHIRLPOOL 323f30cacc6d3c875a1324413aba091cdf4f62925b0deb6faa8500ee0574f2d96e3030151c0bc7c8d044be91c6e38f4283a5251456957e7bc714f914e1daa519
-DIST zynaddsubfx-2.5.2.tar.gz 4572973 SHA256 9588f97c83f38899a3c5c0407208ae29edea03c2db8939bffed9f17e7c53d987 SHA512 c48c3ce896d111d96fcfbff482f7488af66b71bff7d3129d34e3bd6db2c6a8433429317a648b3fdbaac5ae1307aa74b9c356e6d956898d0fa903f56d90ed1d8c WHIRLPOOL 3084386f6f3ea8d5caaea2c2b32fc242f1f7b8b539e9984aeea3efbc7743829d9fb5e8bb9da7708085e23b79aa6df9575470facdfcbc9f6cb672ac28de35070c
 DIST zynaddsubfx-2.5.4.tar.bz2 6765621 SHA256 014b1d9ad1750c310369676b46a4555ba6bec512c38ccba17ceb89c78552949a SHA512 d63bf4582f308f02e75502478923f58cd4660706ba6122ee03e3e6697ce661c9ed82477f8c50e0c5eaf93f1ab9dfd4cc8b1c14d78ba0c38971c5d6ecbae413c7 WHIRLPOOL cda1ed0f8fe73f05bc293f13394c6d7f360224adc9d2cd8b2c6c5081d8850c22b4690df0416737765856a9d832fe19a300417ff927769b1d539eca63ec4d9d90
 DIST zynaddsubfx-3.0.0.tar.bz2 6809813 SHA256 94593db88402dedd2f451720b81dd1caea1217a954349bbf254620c12904c45c SHA512 5fec53680352610301b1cfa9b6a6d73dfe17a17bbb5f39f765344054054434e1699c2bca6e56dd416cac9b88e456760be44c760012ddd0e24b9b52c69ffcc8e4 WHIRLPOOL 5377001e8f157c909705834695f05b8ea04d097e045879f12ab24f5e61bca747d8d0415c9f3b8df64e52bcaf7fb26f281c3088911ef9ceaab02983648178e957

diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch
deleted file mode 100644
index 38446d7..00000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: ZynAddSubFX-2.4.1/src/CMakeLists.txt
-===================================================================
---- ZynAddSubFX-2.4.1.orig/src/CMakeLists.txt
-+++ ZynAddSubFX-2.4.1/src/CMakeLists.txt
-@@ -96,24 +96,7 @@ if(FltkGui)
-     #message(STATUS "FLTK_LIBRARIES: ${FLTK_LIBRARIES}")
-     #message(STATUS "FLTK_MATH_LIBRARY: ${FLTK_MATH_LIBRARY}")
- 
--    #UGLY WORKAROUND
--    find_program (MYFLTK_CONFIG fltk-config)
--    if (MYFLTK_CONFIG)
--        execute_process (COMMAND ${MYFLTK_CONFIG} --ldflags OUTPUT_VARIABLE MYFLTK_LDFLAGS)
--        string(STRIP ${MYFLTK_LDFLAGS} MYFLTK_LIBRARIES)
--    endif()
--    mark_as_advanced(FORCE FLTK_BASE_LIBRARY)
--    mark_as_advanced(FORCE FLTK_CONFIG_SCRIPT)
--    mark_as_advanced(FORCE FLTK_DIR)
--    mark_as_advanced(FORCE FLTK_FLUID_EXECUTABLE)
--    mark_as_advanced(FORCE FLTK_FORMS_LIBRARY)
--    mark_as_advanced(FORCE FLTK_GL_LIBRARY)
--    mark_as_advanced(FORCE FLTK_IMAGES_LIBRARY)
--    mark_as_advanced(FORCE FLTK_INCLUDE_DIR)
--    mark_as_advanced(FORCE FLTK_MATH_LIBRARY)
--
--
--    set(GUI_LIBRARIES ${FLTK_LIBRARIES} ${MYFLTK_LIBRARIES} ${OPENGL_LIBRARIES} zynaddsubfx_gui)
-+    set(GUI_LIBRARIES ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES} zynaddsubfx_gui)
-     add_definitions(-DFLTK_GUI)
- 
-     message(STATUS "Will build fltk gui")
-@@ -121,6 +104,7 @@ if(FltkGui)
- 	include_directories(
- 			"${CMAKE_CURRENT_SOURCE_DIR}/UI"
- 			"${CMAKE_CURRENT_BINARY_DIR}/UI"
-+                        ${FLTK_INCLUDE_DIR}
- 			)
- 
- 	add_subdirectory(UI)

diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
deleted file mode 100644
index 72fa30a..00000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Sounds hackish but that's the only way I found to force it to generate the
-functions in the .cxx files with fluid 1.3...
-
-Index: ZynAddSubFX-2.4.1/src/UI/BankUI.fl
-===================================================================
---- ZynAddSubFX-2.4.1.orig/src/UI/BankUI.fl
-+++ ZynAddSubFX-2.4.1/src/UI/BankUI.fl
-@@ -32,7 +32,7 @@ decl {\#include "../Misc/Config.h"} {pub
- 
- class BankProcess_ {} {
-   Function {process()} {open return_type {virtual void}
--  } {}
-+  } {code{;}}
-   decl {Bank *bank;} {public
-   }
- } 
-Index: ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl
-===================================================================
---- ZynAddSubFX-2.4.1.orig/src/UI/OscilGenUI.fl
-+++ ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl
-@@ -129,7 +129,7 @@ delete [] spc;} {selected
- 
- class PSlider {: {public Fl_Slider}
- } {
--  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {}
-+  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {code{;}}
-   Function {handle(int event)} {return_type int
-   } {
-     code {int X=x(),Y=y(),W=w(),H=h();
-Index: ZynAddSubFX-2.4.1/src/UI/PartUI.fl
-===================================================================
---- ZynAddSubFX-2.4.1.orig/src/UI/PartUI.fl
-+++ ZynAddSubFX-2.4.1/src/UI/PartUI.fl
-@@ -85,7 +85,7 @@ end();} {}
- 
- class PartUI_ {} {
-   Function {showparameters(int kititem,int engine)} {return_type virtual
--  } {}
-+  } {code{;}}
- } 
- 
- class PartKitItem {: {public Fl_Group}
-Index: ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl
-===================================================================
---- ZynAddSubFX-2.4.1.orig/src/UI/PresetsUI.fl
-+++ ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl
-@@ -18,9 +18,9 @@ decl {\#include "../Params/Presets.h"} {
- 
- class PresetsUI_ {} {
-   Function {refresh()} {open return_type {virtual void}
--  } {}
-+  } {code{;}}
-   Function {~PresetsUI_()} {open return_type virtual
--  } {}
-+  } {code{;}}
- } 
- 
- class PresetsUI {} {

diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch
deleted file mode 100644
index a1b7d93..00000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: zynaddsubfx-2.5.0/CMakeLists.txt
-===================================================================
---- zynaddsubfx-2.5.0.orig/CMakeLists.txt
-+++ zynaddsubfx-2.5.0/CMakeLists.txt
-@@ -27,9 +27,6 @@ include(CTestConfig.cmake)
- #Currently the only directory that uses cmake
- add_subdirectory(src)
- 
--install(FILES AUTHORS.txt COPYING FAQ.txt HISTORY.txt README.adoc
--	DESTINATION share/doc/zynaddsubfx
--	)
- install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop
-     DESTINATION share/applications)
- install(FILES zynaddsubfx.svg

diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild
deleted file mode 100644
index 668a82f..00000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils flag-o-matic
-
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa +fltk jack lash"
-
-RDEPEND=">=dev-libs/mini-xml-2.2.1
-	sci-libs/fftw:3.0
-	alsa? ( media-libs/alsa-lib )
-	fltk? ( >=x11-libs/fltk-1.3:1 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lash? ( media-sound/lash )"
-#	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-# Upstream uses the following preferences: alsa > jack > portaudio
-# At least one of them must be enabled
-# We do not support portaudio, so if alsa is disabled force jack.
-REQUIRED_USE="!alsa? ( jack )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-docs.patch
-)
-
-DOCS="ChangeLog FAQ.txt HISTORY.txt README.adoc bugs.txt"
-
-src_configure() {
-	append-cxxflags "-std=c++11"
-	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
-	mycmakeargs=(
-		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
-		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
-		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
-		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto /usr/share/${PN}
-	doins -r "${S}"/instruments/*
-}

diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.5.1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.5.1.ebuild
deleted file mode 100644
index 668a82f..00000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.5.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils flag-o-matic
-
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa +fltk jack lash"
-
-RDEPEND=">=dev-libs/mini-xml-2.2.1
-	sci-libs/fftw:3.0
-	alsa? ( media-libs/alsa-lib )
-	fltk? ( >=x11-libs/fltk-1.3:1 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lash? ( media-sound/lash )"
-#	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-# Upstream uses the following preferences: alsa > jack > portaudio
-# At least one of them must be enabled
-# We do not support portaudio, so if alsa is disabled force jack.
-REQUIRED_USE="!alsa? ( jack )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-docs.patch
-)
-
-DOCS="ChangeLog FAQ.txt HISTORY.txt README.adoc bugs.txt"
-
-src_configure() {
-	append-cxxflags "-std=c++11"
-	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
-	mycmakeargs=(
-		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
-		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
-		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
-		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto /usr/share/${PN}
-	doins -r "${S}"/instruments/*
-}

diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.5.2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.5.2.ebuild
deleted file mode 100644
index fdf3a48..00000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.5.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils flag-o-matic
-
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa +fltk jack lash"
-
-RDEPEND=">=dev-libs/mini-xml-2.2.1
-	sci-libs/fftw:3.0
-	alsa? ( media-libs/alsa-lib )
-	fltk? ( >=x11-libs/fltk-1.3:1 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lash? ( media-sound/lash )"
-#	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-# Upstream uses the following preferences: alsa > jack > portaudio
-# At least one of them must be enabled
-# We do not support portaudio, so if alsa is disabled force jack.
-REQUIRED_USE="!alsa? ( jack )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-docs.patch
-)
-
-DOCS=( ChangeLog HISTORY.txt README.adoc )
-
-src_configure() {
-	append-cxxflags "-std=c++11"
-	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
-	mycmakeargs=(
-		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
-		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
-		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
-		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto /usr/share/${PN}
-	doins -r "${S}"/instruments/*
-}