Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/open-ephys-gui/files/, sci-biology/open-ephys-gui/
Date: Tue, 07 Sep 2021 12:56:29
Message-Id: 1631019382.62113d3ad5aa7336888fea7ba6d5237e175df5e4.andrewammerlaan@gentoo
1 commit: 62113d3ad5aa7336888fea7ba6d5237e175df5e4
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 7 12:41:56 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 7 12:56:22 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=62113d3a
7
8 sci-biology/open-ephys-gui: add version 0.5.5
9
10 Closes: https://github.com/gentoo/sci/pull/1111
11 Package-Manager: Portage-3.0.22, Repoman-3.0.3
12 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
13
14 .../files/open-ephys-gui-0.5.5.patch | 12 +++++++
15 .../open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild | 2 +-
16 ...-0.5.2.2.ebuild => open-ephys-gui-0.5.5.ebuild} | 40 ++++++++++------------
17 .../open-ephys-gui/open-ephys-gui-9999.ebuild | 40 ++++++++++------------
18 .../open-ephys-gui/open-ephys-gui-99999999.ebuild | 40 ++++++++++------------
19 5 files changed, 70 insertions(+), 64 deletions(-)
20
21 diff --git a/sci-biology/open-ephys-gui/files/open-ephys-gui-0.5.5.patch b/sci-biology/open-ephys-gui/files/open-ephys-gui-0.5.5.patch
22 new file mode 100644
23 index 000000000..77e401639
24 --- /dev/null
25 +++ b/sci-biology/open-ephys-gui/files/open-ephys-gui-0.5.5.patch
26 @@ -0,0 +1,12 @@
27 +# Add 'Gentoo' build type
28 +
29 +--- ../CMakeLists.txt 2019-12-02 22:29:24.021065669 -0300
30 ++++ ../CMakeLists.txt 2019-12-02 22:29:11.251065418 -0300
31 +@@ -123,6 +123,7 @@
32 + if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
33 +
34 + elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
35 ++ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Gentoo")
36 + else()
37 + message(FATAL_ERROR "Invalid build type")
38 + endif()
39
40 diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild
41 index b0266e0ac..b4cbc6d8f 100644
42 --- a/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild
43 +++ b/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild
44 @@ -5,7 +5,7 @@ EAPI=7
45 inherit cmake
46
47 DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
48 -HOMEPAGE="http://www.open-ephys.org/gui/"
49 +HOMEPAGE="https://open-ephys.org/gui/"
50 LICENSE="GPL-3"
51
52 if [[ ${PV} == "9999" ]] ; then
53
54 diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-0.5.5.ebuild
55 similarity index 60%
56 copy from sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild
57 copy to sci-biology/open-ephys-gui/open-ephys-gui-0.5.5.ebuild
58 index b0266e0ac..1c2b20e24 100644
59 --- a/sci-biology/open-ephys-gui/open-ephys-gui-0.5.2.2.ebuild
60 +++ b/sci-biology/open-ephys-gui/open-ephys-gui-0.5.5.ebuild
61 @@ -2,38 +2,35 @@
62 # Distributed under the terms of the GNU General Public License v2
63
64 EAPI=7
65 -inherit cmake
66 +inherit cmake udev
67
68 DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
69 -HOMEPAGE="http://www.open-ephys.org/gui/"
70 +HOMEPAGE="https://open-ephys.org/gui/"
71 LICENSE="GPL-3"
72
73 if [[ ${PV} == "9999" ]] ; then
74 inherit git-r3
75 EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
76 EGIT_BRANCH="master"
77 - Suffix=$EGIT_BRANCH
78 + Suffix=${EGIT_BRANCH}
79 SubDir=${P}
80 elif [[ ${PV} == "99999999" ]] ; then
81 inherit git-r3
82 EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
83 EGIT_BRANCH="development"
84 - Suffix=$EGIT_BRANCH
85 + Suffix=${EGIT_BRANCH}
86 SubDir=${P}
87 else
88 SRC_URI="https://github.com/open-ephys/plugin-GUI/archive/v${PV}.tar.gz -> ${P}.tar.gz"
89 Suffix=${PV}
90 SubDir="plugin-GUI-${PV}"
91 - S="${WORKDIR}/$SubDir"
92 + S="${WORKDIR}/${SubDir}"
93 KEYWORDS="~amd64 ~x86"
94 fi
95
96 SLOT="${PV}"
97 IUSE="jack"
98
99 -BDEPEND="
100 - <sys-devel/gcc-9
101 -"
102 DEPEND="
103 media-libs/alsa-lib
104 media-libs/freeglut
105 @@ -41,17 +38,17 @@ DEPEND="
106 x11-libs/libXrandr
107 x11-libs/libXcursor
108 x11-libs/libXinerama
109 - jack? ( media-sound/jack-audio-connection-kit )
110 + jack? ( || ( media-sound/jack-audio-connection-kit media-sound/jack2 ) )
111 "
112 RDEPEND="${DEPEND}"
113
114 -BUILD_DIR="$S/Build"
115 +BUILD_DIR="${S}/Build"
116 PATCHES=( "${FILESDIR}"/${P}.patch )
117
118 -QA_PREBUILT="opt/open-ephys-0.5.2.2/shared/*.so"
119 +QA_PREBUILT="opt/open-ephys-*/shared/*.so"
120 QA_PRESTRIPPED="
121 - opt/open-ephys-0.5.2.2/plugins/*.so
122 - opt/open-ephys-0.5.2.2/open-ephys
123 + opt/open-ephys-*/plugins/*.so
124 + opt/open-ephys-*/open-ephys
125 "
126
127 src_prepare() {
128 @@ -68,15 +65,16 @@ src_configure() {
129 }
130
131 src_install() {
132 - dodir opt/open-ephys-"$Suffix"/ lib/udev/rules.d/
133 - cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"$Suffix"/
134 - cp -R "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules "${ED}"/lib/udev/rules.d/
135 - dosym ../../opt/open-ephys-"$Suffix"/open-ephys usr/bin/open-ephys-"$Suffix"
136 + dodir opt/open-ephys-"${Suffix}"/ lib/udev/rules.d/
137 + cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"${Suffix}"/
138 + udev_newrules "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules 40-open-ephys-"${Suffix}".rules
139 + dosym ../../opt/open-ephys-"${Suffix}"/open-ephys usr/bin/open-ephys-"${Suffix}"
140 }
141
142 pkg_postinst() {
143 - ewarn " "
144 - ewarn "You must restart the udev service in order to allow your computer to"
145 - ewarn "communicate with the Open Ephys acquisition board."
146 - ewarn " "
147 + udev_reload
148 +}
149 +
150 +pkg_postrm() {
151 + udev_reload
152 }
153
154 diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
155 index b0266e0ac..1c2b20e24 100644
156 --- a/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
157 +++ b/sci-biology/open-ephys-gui/open-ephys-gui-9999.ebuild
158 @@ -2,38 +2,35 @@
159 # Distributed under the terms of the GNU General Public License v2
160
161 EAPI=7
162 -inherit cmake
163 +inherit cmake udev
164
165 DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
166 -HOMEPAGE="http://www.open-ephys.org/gui/"
167 +HOMEPAGE="https://open-ephys.org/gui/"
168 LICENSE="GPL-3"
169
170 if [[ ${PV} == "9999" ]] ; then
171 inherit git-r3
172 EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
173 EGIT_BRANCH="master"
174 - Suffix=$EGIT_BRANCH
175 + Suffix=${EGIT_BRANCH}
176 SubDir=${P}
177 elif [[ ${PV} == "99999999" ]] ; then
178 inherit git-r3
179 EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
180 EGIT_BRANCH="development"
181 - Suffix=$EGIT_BRANCH
182 + Suffix=${EGIT_BRANCH}
183 SubDir=${P}
184 else
185 SRC_URI="https://github.com/open-ephys/plugin-GUI/archive/v${PV}.tar.gz -> ${P}.tar.gz"
186 Suffix=${PV}
187 SubDir="plugin-GUI-${PV}"
188 - S="${WORKDIR}/$SubDir"
189 + S="${WORKDIR}/${SubDir}"
190 KEYWORDS="~amd64 ~x86"
191 fi
192
193 SLOT="${PV}"
194 IUSE="jack"
195
196 -BDEPEND="
197 - <sys-devel/gcc-9
198 -"
199 DEPEND="
200 media-libs/alsa-lib
201 media-libs/freeglut
202 @@ -41,17 +38,17 @@ DEPEND="
203 x11-libs/libXrandr
204 x11-libs/libXcursor
205 x11-libs/libXinerama
206 - jack? ( media-sound/jack-audio-connection-kit )
207 + jack? ( || ( media-sound/jack-audio-connection-kit media-sound/jack2 ) )
208 "
209 RDEPEND="${DEPEND}"
210
211 -BUILD_DIR="$S/Build"
212 +BUILD_DIR="${S}/Build"
213 PATCHES=( "${FILESDIR}"/${P}.patch )
214
215 -QA_PREBUILT="opt/open-ephys-0.5.2.2/shared/*.so"
216 +QA_PREBUILT="opt/open-ephys-*/shared/*.so"
217 QA_PRESTRIPPED="
218 - opt/open-ephys-0.5.2.2/plugins/*.so
219 - opt/open-ephys-0.5.2.2/open-ephys
220 + opt/open-ephys-*/plugins/*.so
221 + opt/open-ephys-*/open-ephys
222 "
223
224 src_prepare() {
225 @@ -68,15 +65,16 @@ src_configure() {
226 }
227
228 src_install() {
229 - dodir opt/open-ephys-"$Suffix"/ lib/udev/rules.d/
230 - cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"$Suffix"/
231 - cp -R "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules "${ED}"/lib/udev/rules.d/
232 - dosym ../../opt/open-ephys-"$Suffix"/open-ephys usr/bin/open-ephys-"$Suffix"
233 + dodir opt/open-ephys-"${Suffix}"/ lib/udev/rules.d/
234 + cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"${Suffix}"/
235 + udev_newrules "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules 40-open-ephys-"${Suffix}".rules
236 + dosym ../../opt/open-ephys-"${Suffix}"/open-ephys usr/bin/open-ephys-"${Suffix}"
237 }
238
239 pkg_postinst() {
240 - ewarn " "
241 - ewarn "You must restart the udev service in order to allow your computer to"
242 - ewarn "communicate with the Open Ephys acquisition board."
243 - ewarn " "
244 + udev_reload
245 +}
246 +
247 +pkg_postrm() {
248 + udev_reload
249 }
250
251 diff --git a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild b/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
252 index b0266e0ac..1c2b20e24 100644
253 --- a/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
254 +++ b/sci-biology/open-ephys-gui/open-ephys-gui-99999999.ebuild
255 @@ -2,38 +2,35 @@
256 # Distributed under the terms of the GNU General Public License v2
257
258 EAPI=7
259 -inherit cmake
260 +inherit cmake udev
261
262 DESCRIPTION="Processing, recording, and visualizing multichannel ephys data"
263 -HOMEPAGE="http://www.open-ephys.org/gui/"
264 +HOMEPAGE="https://open-ephys.org/gui/"
265 LICENSE="GPL-3"
266
267 if [[ ${PV} == "9999" ]] ; then
268 inherit git-r3
269 EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
270 EGIT_BRANCH="master"
271 - Suffix=$EGIT_BRANCH
272 + Suffix=${EGIT_BRANCH}
273 SubDir=${P}
274 elif [[ ${PV} == "99999999" ]] ; then
275 inherit git-r3
276 EGIT_REPO_URI="https://github.com/open-ephys/plugin-GUI"
277 EGIT_BRANCH="development"
278 - Suffix=$EGIT_BRANCH
279 + Suffix=${EGIT_BRANCH}
280 SubDir=${P}
281 else
282 SRC_URI="https://github.com/open-ephys/plugin-GUI/archive/v${PV}.tar.gz -> ${P}.tar.gz"
283 Suffix=${PV}
284 SubDir="plugin-GUI-${PV}"
285 - S="${WORKDIR}/$SubDir"
286 + S="${WORKDIR}/${SubDir}"
287 KEYWORDS="~amd64 ~x86"
288 fi
289
290 SLOT="${PV}"
291 IUSE="jack"
292
293 -BDEPEND="
294 - <sys-devel/gcc-9
295 -"
296 DEPEND="
297 media-libs/alsa-lib
298 media-libs/freeglut
299 @@ -41,17 +38,17 @@ DEPEND="
300 x11-libs/libXrandr
301 x11-libs/libXcursor
302 x11-libs/libXinerama
303 - jack? ( media-sound/jack-audio-connection-kit )
304 + jack? ( || ( media-sound/jack-audio-connection-kit media-sound/jack2 ) )
305 "
306 RDEPEND="${DEPEND}"
307
308 -BUILD_DIR="$S/Build"
309 +BUILD_DIR="${S}/Build"
310 PATCHES=( "${FILESDIR}"/${P}.patch )
311
312 -QA_PREBUILT="opt/open-ephys-0.5.2.2/shared/*.so"
313 +QA_PREBUILT="opt/open-ephys-*/shared/*.so"
314 QA_PRESTRIPPED="
315 - opt/open-ephys-0.5.2.2/plugins/*.so
316 - opt/open-ephys-0.5.2.2/open-ephys
317 + opt/open-ephys-*/plugins/*.so
318 + opt/open-ephys-*/open-ephys
319 "
320
321 src_prepare() {
322 @@ -68,15 +65,16 @@ src_configure() {
323 }
324
325 src_install() {
326 - dodir opt/open-ephys-"$Suffix"/ lib/udev/rules.d/
327 - cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"$Suffix"/
328 - cp -R "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules "${ED}"/lib/udev/rules.d/
329 - dosym ../../opt/open-ephys-"$Suffix"/open-ephys usr/bin/open-ephys-"$Suffix"
330 + dodir opt/open-ephys-"${Suffix}"/ lib/udev/rules.d/
331 + cp -R "${BUILD_DIR}"/Gentoo/* "${ED}"/opt/open-ephys-"${Suffix}"/
332 + udev_newrules "${WORKDIR}"/"${SubDir}"/Resources/Scripts/40-open-ephys.rules 40-open-ephys-"${Suffix}".rules
333 + dosym ../../opt/open-ephys-"${Suffix}"/open-ephys usr/bin/open-ephys-"${Suffix}"
334 }
335
336 pkg_postinst() {
337 - ewarn " "
338 - ewarn "You must restart the udev service in order to allow your computer to"
339 - ewarn "communicate with the Open Ephys acquisition board."
340 - ewarn " "
341 + udev_reload
342 +}
343 +
344 +pkg_postrm() {
345 + udev_reload
346 }
Report Message
Find on MARC Find on Google Groups