Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/
Date: Sun, 12 Feb 2017 16:07:28
Message-Id: 1486915634.54139b7d8917fed0e368029c3a44df198b309a66.johu@gentoo
1 commit: 54139b7d8917fed0e368029c3a44df198b309a66
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 12 16:05:17 2017 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 12 16:07:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54139b7d
7
8 media-sound/zynaddsubfx: Remove 2.4.3
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 media-sound/zynaddsubfx/Manifest | 1 -
13 .../zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch | 12 -----
14 .../files/zynaddsubfx-2.4.3-nofltk.patch | 24 ---------
15 media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild | 57 ----------------------
16 4 files changed, 94 deletions(-)
17
18 diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
19 index cfd4c0c0d1..5d9451e3f1 100644
20 --- a/media-sound/zynaddsubfx/Manifest
21 +++ b/media-sound/zynaddsubfx/Manifest
22 @@ -1,4 +1,3 @@
23 -DIST ZynAddSubFX-2.4.3.tar.bz2 2536667 SHA256 b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d SHA512 2314c456db1a8a032a38b012c7c9e01f0a487c5eeb0027a741a4ffd6a7eea3382fcd26a8cd97b89af40800613c1ba164bb683be800957ea403f97dd6f23df5ff WHIRLPOOL 46aa59378f310105504b0ab5903d35826aa03dd080e6c7313237e34a2c9c82cea1d9c0f2cd986c65da38320b1376477b33424b8c69fd8fa591a53325df0b4a65
24 DIST zynaddsubfx-2.5.4.tar.bz2 6765621 SHA256 014b1d9ad1750c310369676b46a4555ba6bec512c38ccba17ceb89c78552949a SHA512 d63bf4582f308f02e75502478923f58cd4660706ba6122ee03e3e6697ce661c9ed82477f8c50e0c5eaf93f1ab9dfd4cc8b1c14d78ba0c38971c5d6ecbae413c7 WHIRLPOOL cda1ed0f8fe73f05bc293f13394c6d7f360224adc9d2cd8b2c6c5081d8850c22b4690df0416737765856a9d832fe19a300417ff927769b1d539eca63ec4d9d90
25 DIST zynaddsubfx-3.0.0.tar.bz2 6809813 SHA256 94593db88402dedd2f451720b81dd1caea1217a954349bbf254620c12904c45c SHA512 5fec53680352610301b1cfa9b6a6d73dfe17a17bbb5f39f765344054054434e1699c2bca6e56dd416cac9b88e456760be44c760012ddd0e24b9b52c69ffcc8e4 WHIRLPOOL 5377001e8f157c909705834695f05b8ea04d097e045879f12ab24f5e61bca747d8d0415c9f3b8df64e52bcaf7fb26f281c3088911ef9ceaab02983648178e957
26 DIST zynaddsubfx-3.0.1.tar.bz2 6811606 SHA256 a8017f382be5af9e46e6e8771fb7d7c1fd2e480cf099bbb0c29606b217dd32e2 SHA512 49592e46872ae966461dfc5f7cbd2ebcf3f3a6d43139f6cd0eba65e098fb33370840c0e1f4f224a18adfc97eae9fa5583eca6a48f43b9200d5522cc413b0ce43 WHIRLPOOL 3bfe976e24f10bd94b6b3c1c994a505fcdb65d993cd76360c5b477567a10a3b864f155a035b538d081607b90ab71ed96a116249399dbda6050ce068c8dd5458b
27
28 diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch
29 deleted file mode 100644
30 index 587e4a4219..0000000000
31 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch
32 +++ /dev/null
33 @@ -1,12 +0,0 @@
34 -Index: ZynAddSubFX-2.4.1/CMakeLists.txt
35 -===================================================================
36 ---- ZynAddSubFX-2.4.1.orig/CMakeLists.txt
37 -+++ ZynAddSubFX-2.4.1/CMakeLists.txt
38 -@@ -5,7 +5,3 @@ project(zynaddsubfx)
39 - enable_testing()
40 - #Currently the only directory that uses cmake
41 - add_subdirectory(src)
42 --
43 --install(FILES AUTHORS.txt COPYING FAQ.txt HISTORY.txt README.txt
44 -- DESTINATION share/doc/zynaddsubfx
45 -- )
46
47 diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch
48 deleted file mode 100644
49 index c20828328f..0000000000
50 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch
51 +++ /dev/null
52 @@ -1,24 +0,0 @@
53 -https://bugs.gentoo.org/show_bug.cgi?id=437018
54 -
55 -Index: ZynAddSubFX-2.4.3/src/main.cpp
56 -===================================================================
57 ---- ZynAddSubFX-2.4.3.orig/src/main.cpp
58 -+++ ZynAddSubFX-2.4.3/src/main.cpp
59 -@@ -37,8 +37,6 @@
60 - #include "Misc/Dump.h"
61 - extern Dump dump;
62 -
63 --#include <FL/Fl.H>
64 --
65 - //Nio System
66 - #include "Nio/Nio.h"
67 -
68 -@@ -51,6 +49,8 @@ QApplication *app;
69 -
70 - #elif defined FLTK_GUI
71 -
72 -+#include <FL/Fl.H>
73 -+
74 - #include "UI/MasterUI.h"
75 - #endif // FLTK_GUI
76 -
77
78 diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
79 deleted file mode 100644
80 index 356c173ac6..0000000000
81 --- a/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
82 +++ /dev/null
83 @@ -1,57 +0,0 @@
84 -# Copyright 1999-2014 Gentoo Foundation
85 -# Distributed under the terms of the GNU General Public License v2
86 -# $Id$
87 -
88 -EAPI=4
89 -inherit eutils cmake-utils
90 -
91 -MY_P=ZynAddSubFX-${PV}
92 -
93 -DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
94 -HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
95 -SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_P}.tar.bz2"
96 -
97 -LICENSE="GPL-2"
98 -SLOT="0"
99 -KEYWORDS="amd64 ~ppc x86"
100 -IUSE="alsa +fltk jack lash"
101 -
102 -RDEPEND=">=dev-libs/mini-xml-2.2.1
103 - sci-libs/fftw:3.0
104 - alsa? ( media-libs/alsa-lib )
105 - fltk? ( >=x11-libs/fltk-1.3:1 )
106 - jack? ( media-sound/jack-audio-connection-kit )
107 - lash? ( media-sound/lash )"
108 -# portaudio? ( media-libs/portaudio )"
109 -DEPEND="${RDEPEND}
110 - virtual/pkgconfig"
111 -# Upstream uses the following preferences: alsa > jack > portaudio
112 -# At least one of them must be enabled
113 -# We do not support portaudio, so if alsa is disabled force jack.
114 -REQUIRED_USE="!alsa? ( jack )"
115 -
116 -S=${WORKDIR}/${MY_P}
117 -
118 -PATCHES=(
119 - "${FILESDIR}"/${PN}-2.4.1-docs.patch
120 - "${FILESDIR}"/${PN}-2.4.3-nofltk.patch
121 -)
122 -
123 -DOCS="ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt"
124 -
125 -src_configure() {
126 - use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
127 - mycmakeargs=(
128 - `use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
129 - `use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
130 - `use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
131 - `use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
132 - )
133 - cmake-utils_src_configure
134 -}
135 -
136 -src_install() {
137 - cmake-utils_src_install
138 - insinto /usr/share/${PN}
139 - doins -r "${S}"/instruments/*
140 -}