Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/yoshimi/, media-sound/yoshimi/files/
Date: Wed, 08 May 2019 17:05:27
Message-Id: 1557335015.c8fa43c4b21ab2c19cf6a4d9ce6f4e875b651a89.asturm@gentoo
1 commit: c8fa43c4b21ab2c19cf6a4d9ce6f4e875b651a89
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 6 13:50:47 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed May 8 17:03:35 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8fa43c4
7
8 media-sound/yoshimi: Drop old
9
10 Package-Manager: Portage-2.3.66, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-sound/yoshimi/Manifest | 2 -
14 .../yoshimi/files/yoshimi-1.5.10-cxxflags.patch | 64 ----------------------
15 media-sound/yoshimi/yoshimi-1.5.10.ebuild | 63 ---------------------
16 media-sound/yoshimi/yoshimi-1.5.8.2.ebuild | 53 ------------------
17 4 files changed, 182 deletions(-)
18
19 diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
20 index 945ef733a6c..5677960a65f 100644
21 --- a/media-sound/yoshimi/Manifest
22 +++ b/media-sound/yoshimi/Manifest
23 @@ -1,3 +1 @@
24 DIST yoshimi-1.5.10.2.tar.gz 9668476 BLAKE2B 1b443a51e952123abaf54b992902113533461064f2fc99032ac89f28a25ba4687176a97013ea118283e8ca2b7d92f44c105380e3d6cecb66560db7a0a8ef6532 SHA512 a39ba123f304e43d70833648ce224733794cb43c160fd2e6cf29bb4a782bea355c4bbfa1c33bf20c98a8c1f5d049788154aaf906a3daa56f288719a0b019139c
25 -DIST yoshimi-1.5.10.tar.bz2 9406870 BLAKE2B e665f6a30094e8396fcadb2e423ccb74e07226d02a51811466fa4a04ee266364d6d9fa9f6bdef6712d24616888b9042bd7c818d21e41fde1d2f41b1eaad47c01 SHA512 1d6371f1d82438dc8b65fdb21b0460d998616c4a27bcee4f3e450542eb346eeb87e59a9448ef210fa45a119efdfc3d6dd7a6acd20ef3ad5a29d982f218704d48
26 -DIST yoshimi-1.5.8.2.tar.bz2 7537329 BLAKE2B d26619742f351a48f0457468c5c3f2a85cb04c479a8fe5b88616e4738092875df6e5d27be91d2fca42693e2e32d6c6f4b76308b93d99496dc5fff7d16da1712d SHA512 398fb57c171ee72d160b680cbb3de9db226cd281972a1a518cb52fdae617ba89e72b7d5fd1c6666e4bcd2df2d17789daf46aff2299c103429f07db0c83160d84
27
28 diff --git a/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
29 deleted file mode 100644
30 index 7e64e1fdc72..00000000000
31 --- a/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
32 +++ /dev/null
33 @@ -1,64 +0,0 @@
34 -Respect user CXXFLAGS setting.
35 -
36 ---- yoshimi-1.5.10/src/CMakeLists.txt
37 -+++ yoshimi-1.5.10/src/CMakeLists.txt
38 -@@ -302,27 +302,27 @@
39 - set (YOSHI_INCLUDES ${FLTK_INCLUDE_DIR})
40 -
41 - # set platform specific compiler flags
42 --if (BuildFor0ld_X86)
43 -- set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
44 --else (BuildFor0ld_X86)
45 -- if (BuildForAMD_X86_64)
46 -- set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
47 -- else (BuildForAMD_X86_64)
48 -- if (BuildForCore2_X86_64)
49 -- set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
50 -- else (BuildForCore2_X86_64)
51 -- if (BuildForNEON)
52 -- set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
53 -- else (BuildForNEON)
54 -- if (BuildForThisCPU)
55 -- set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
56 -- else (BuildForThisCPU)
57 -- set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
58 -- endif (BuildForThisCPU)
59 -- endif (BuildForNEON)
60 -- endif (BuildForCore2_X86_64)
61 -- endif (BuildForAMD_X86_64)
62 --endif (BuildFor0ld_X86)
63 -+#if (BuildFor0ld_X86)
64 -+ #set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
65 -+#else (BuildFor0ld_X86)
66 -+ #if (BuildForAMD_X86_64)
67 -+ #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
68 -+ #else (BuildForAMD_X86_64)
69 -+ #if (BuildForCore2_X86_64)
70 -+ #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
71 -+ #else (BuildForCore2_X86_64)
72 -+ #if (BuildForNEON)
73 -+ #set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
74 -+ #else (BuildForNEON)
75 -+ #if (BuildForThisCPU)
76 -+ #set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
77 -+ #else (BuildForThisCPU)
78 -+ #set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
79 -+ #endif (BuildForThisCPU)
80 -+ #endif (BuildForNEON)
81 -+ #endif (BuildForCore2_X86_64)
82 -+ #endif (BuildForAMD_X86_64)
83 -+#endif (BuildFor0ld_X86)
84 -
85 - if (BuildForDebug)
86 - set (CMAKE_BUILD_TYPE "Debug")
87 -@@ -330,8 +330,8 @@
88 - message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
89 - else (BuildForDebug)
90 - set (CMAKE_BUILD_TYPE "Release")
91 -- set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
92 -- message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
93 -+ #set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
94 -+ message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}")
95 - endif (BuildForDebug)
96 -
97 - configure_file(
98
99 diff --git a/media-sound/yoshimi/yoshimi-1.5.10.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.ebuild
100 deleted file mode 100644
101 index e7de4819215..00000000000
102 --- a/media-sound/yoshimi/yoshimi-1.5.10.ebuild
103 +++ /dev/null
104 @@ -1,63 +0,0 @@
105 -# Copyright 1999-2019 Gentoo Authors
106 -# Distributed under the terms of the GNU General Public License v2
107 -
108 -EAPI=6
109 -
110 -inherit cmake-utils gnome2-utils xdg-utils
111 -
112 -DESCRIPTION="A software synthesizer based on ZynAddSubFX"
113 -HOMEPAGE="http://yoshimi.sourceforge.net/"
114 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
115 -
116 -LICENSE="GPL-2"
117 -SLOT="0"
118 -KEYWORDS="~amd64 ~x86"
119 -IUSE="+lv2"
120 -
121 -RDEPEND="
122 - >=dev-libs/mxml-2.5
123 - >=media-libs/alsa-lib-1.0.17
124 - media-libs/fontconfig
125 - media-libs/libsndfile
126 - >=media-sound/jack-audio-connection-kit-0.115.6
127 - sci-libs/fftw:3.0=
128 - sys-libs/ncurses:0=
129 - sys-libs/readline:0=
130 - sys-libs/zlib:0=
131 - x11-libs/cairo[X]
132 - x11-libs/fltk:1[opengl]
133 - lv2? ( media-libs/lv2 )
134 -"
135 -DEPEND="${RDEPEND}
136 - dev-libs/boost
137 - virtual/pkgconfig
138 -"
139 -
140 -CMAKE_USE_DIR="${WORKDIR}/${P}/src"
141 -PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
142 -
143 -DOCS=( Changelog README.txt )
144 -
145 -src_prepare() {
146 - # respect doc dir
147 - sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
148 -
149 - cmake-utils_src_prepare
150 -}
151 -
152 -src_configure() {
153 - local mycmakeargs=(
154 - -DLV2Plugin=$(usex lv2)
155 - )
156 - cmake-utils_src_configure
157 -}
158 -
159 -pkg_postinst() {
160 - gnome2_icon_cache_update
161 - xdg_desktop_database_update
162 -}
163 -
164 -pkg_postrm() {
165 - gnome2_icon_cache_update
166 - xdg_desktop_database_update
167 -}
168
169 diff --git a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
170 deleted file mode 100644
171 index c5fd3cc38be..00000000000
172 --- a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
173 +++ /dev/null
174 @@ -1,53 +0,0 @@
175 -# Copyright 1999-2018 Gentoo Foundation
176 -# Distributed under the terms of the GNU General Public License v2
177 -
178 -EAPI=6
179 -
180 -inherit cmake-utils
181 -
182 -DESCRIPTION="A software synthesizer based on ZynAddSubFX"
183 -HOMEPAGE="http://yoshimi.sourceforge.net/"
184 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
185 -
186 -LICENSE="GPL-2"
187 -SLOT="0"
188 -KEYWORDS="~amd64 ~x86"
189 -IUSE="+lv2"
190 -
191 -RDEPEND="
192 - >=dev-libs/mxml-2.5
193 - >=media-libs/alsa-lib-1.0.17
194 - media-libs/fontconfig
195 - media-libs/libsndfile
196 - >=media-sound/jack-audio-connection-kit-0.115.6
197 - sci-libs/fftw:3.0
198 - sys-libs/ncurses:0=
199 - sys-libs/readline:0=
200 - sys-libs/zlib
201 - x11-libs/cairo[X]
202 - x11-libs/fltk:1[opengl]
203 - lv2? ( media-libs/lv2 )
204 -"
205 -DEPEND="${RDEPEND}
206 - dev-libs/boost
207 - virtual/pkgconfig
208 -"
209 -
210 -CMAKE_USE_DIR="${WORKDIR}/${P}/src"
211 -
212 -src_prepare() {
213 - mv Change{l,L}og || die
214 - sed -i \
215 - -e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
216 - -e "s:lib/lv2:$(get_libdir)/lv2:" \
217 - src/CMakeLists.txt || die
218 -
219 - cmake-utils_src_prepare
220 -}
221 -
222 -src_configure() {
223 - local mycmakeargs=(
224 - -DLV2Plugin=$(usex lv2)
225 - )
226 - cmake-utils_src_configure
227 -}