From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Nov 2021 13:10:00 +0000 Subject: gentoo resync : 13.11.2021 --- sci-electronics/Manifest.gz | Bin 8889 -> 8887 bytes sci-electronics/labone/Manifest | 8 +- sci-electronics/labone/files/hf2-data-server | 11 +++ sci-electronics/labone/files/hf2-data-server.conf | 4 + sci-electronics/labone/files/labone-data-server | 13 ++++ .../labone/files/labone-data-server.conf | 4 + sci-electronics/labone/labone-16.12.42529.ebuild | 74 ------------------ .../labone/labone-21.08.20515-r1.ebuild | 85 +++++++++++++++++++++ 8 files changed, 123 insertions(+), 76 deletions(-) create mode 100644 sci-electronics/labone/files/hf2-data-server create mode 100644 sci-electronics/labone/files/hf2-data-server.conf create mode 100644 sci-electronics/labone/files/labone-data-server create mode 100644 sci-electronics/labone/files/labone-data-server.conf delete mode 100644 sci-electronics/labone/labone-16.12.42529.ebuild create mode 100644 sci-electronics/labone/labone-21.08.20515-r1.ebuild (limited to 'sci-electronics') diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz index 2fc92a6b2045..eacfbbc4f5e2 100644 Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ diff --git a/sci-electronics/labone/Manifest b/sci-electronics/labone/Manifest index 00aaff617c97..c25b106aba38 100644 --- a/sci-electronics/labone/Manifest +++ b/sci-electronics/labone/Manifest @@ -1,3 +1,7 @@ -DIST LabOneLinux64-16.12.42529.tar.gz 120562203 BLAKE2B 5d5e3816ad47e79b8b029b318f76b72908949fb4f92b5497d4b03abf5562144951d2a95832cdd2112df8922a9ea002a508f0d81c5f1fee3a017540dceb70233a SHA512 31068792ca4c2ab88490eacf35a84f8a2c31b330087ee91154e5ecdae63bcf557563c80e45af4a855df9d7d9a1d5b5a761ef5d957ce357368706307ea5ea196b -EBUILD labone-16.12.42529.ebuild 2240 BLAKE2B ec70017f8283cff3a81f2223495df050b771b163358241f5a5aba75227b59d6c2a72e280744907a65fcd4fbead0cfd9c1e9150b425521315485ced484914e42a SHA512 b52e3ee3805fefdf676339d7bb635fa3b66cf4fea3434f6e20adcfcaa7d9820f7438fdb71e7b3d25cedf13616c055b54e4c754831e8108a7f3d8609e95de7784 +AUX hf2-data-server 225 BLAKE2B 403645de4967a28d67de2c70bdb21dadc0bf9f2feb42c4ed114d7757cc43be147207c341ac8e621d5851a495cf5727514d42a1d74d17ec48de0ac3fb5f78e3a5 SHA512 20d84c60344c0fb0bf7d5a9205805ac102ea995e57c6354aa8c1818f0b7cbdff00c35a641d241d131943606f858f5dc6771af58c046070cd664f50dcbd8ed679 +AUX hf2-data-server.conf 146 BLAKE2B 6bdf91b7f003589cba90896493161fea57e7ce32383671185e5c3bd6e8335de17f4198768f04dfbc06ba72b0d2785f2e9ea62f75b6869bb2967bdc5a6c5c3152 SHA512 314a048cf65641ee8cbfb4b0aae8200ffd801d193a173f1575f0673516f088121da6f4bda1d94529d3ccefb972cab5c347d73c081d5a93ec4a9a849a9f23c021 +AUX labone-data-server 298 BLAKE2B 85a80af471b37c73600d8958cd786aada03ebab26900735678b975a86f3510b4f127109f8b0f9d01cad95161d7ffbc0d310a5aa29485e917dc244eef1edfb89b SHA512 2dd770743dc25b01e0799363930e7e84b785d1639dffed46530d23c50fc07f2f9aa1b82570ce189e6be2fc6a1402498ae4d05234d515b653514e6ae4e7b534d3 +AUX labone-data-server.conf 149 BLAKE2B 60c9376c2470bc7026ae858ad23a9e814ff9e45fd9da464c74ffc66994b2674115f45afb368f322d7e18297b990707c7966032993ab7ebe49ec4a0ca44242639 SHA512 7ef09dc2b8f4b9f2c05753cfa275793afd7f396f8513079dc1eec8ddc8c2648b4defc456ad5b23d2ba20b3c5aa725bb9cde3500ce8d88c0b16df6805811e30b3 +DIST LabOneLinux64-21.08.20515.tar.gz 399058267 BLAKE2B 624c4dc4a01edb69f9b36a435744d10b3638c91c7ac0c1e9765cf913e605fe32d1935fa131d650f38a5b713df916d92b985ac5f6489b031bba9b6ec8a1370d4a SHA512 f229a885ea91cc518c4819ad76a928829eb1699603ba48fb745d4a99faca116b100831c17a48243922912c68de27b7938387677ffa2e996a122f36c33d0a205c +EBUILD labone-21.08.20515-r1.ebuild 2689 BLAKE2B c71d7048a458266cf6a06430d6cf9e0af8976b014c8c4dffc7e9a349a20c0bf7c06d01a687cf5ace2104480d31850dcdf580316ae356512affd83ef537f1dcb6 SHA512 f11a495c6e78f96ebfbf56227f6934c35508be670f1aa8babaf0854582d7825dd5a0819b19130b93554be57b364d0bff102d22b050867223903f000c5f4a3179 MISC metadata.xml 255 BLAKE2B 4126840e4c5ef0d5669e923458adafa3e4e4f23ad9ed34e890a7c44631222c599e932eca4c8653a3abc976d495226245a666d53ccd846aa474b2c965b106024c SHA512 288b2ec4a0f95ab1bc76c893dc96761ba538330df4368de244ba37db87d0dc870c9af76be202c44441c1ccac4ea34454c69471cd41a37068698e82c074d2dde5 diff --git a/sci-electronics/labone/files/hf2-data-server b/sci-electronics/labone/files/hf2-data-server new file mode 100644 index 000000000000..b9fa83ad3acd --- /dev/null +++ b/sci-electronics/labone/files/hf2-data-server @@ -0,0 +1,11 @@ +#!/sbin/openrc-run +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +pidfile="/run/hf2-data-server.pid" +command="/opt/bin/ziServer" +command_args="" + +depend() { + need net +} diff --git a/sci-electronics/labone/files/hf2-data-server.conf b/sci-electronics/labone/files/hf2-data-server.conf new file mode 100644 index 000000000000..db93c775c456 --- /dev/null +++ b/sci-electronics/labone/files/hf2-data-server.conf @@ -0,0 +1,4 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Configuration file for hf2-data-server diff --git a/sci-electronics/labone/files/labone-data-server b/sci-electronics/labone/files/labone-data-server new file mode 100644 index 000000000000..62b5cab85214 --- /dev/null +++ b/sci-electronics/labone/files/labone-data-server @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +pidfile="/run/labone-data-server.pid" +command="/opt/bin/ziDataServer" +command_args="-l /var/log/labone" +supervisor=supervise-daemon +command_user=nobody + +depend() { + need net +} diff --git a/sci-electronics/labone/files/labone-data-server.conf b/sci-electronics/labone/files/labone-data-server.conf new file mode 100644 index 000000000000..bee6a54310fa --- /dev/null +++ b/sci-electronics/labone/files/labone-data-server.conf @@ -0,0 +1,4 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Configuration file for labone-data-server diff --git a/sci-electronics/labone/labone-16.12.42529.ebuild b/sci-electronics/labone/labone-16.12.42529.ebuild deleted file mode 100644 index d0e0dd38e67c..000000000000 --- a/sci-electronics/labone/labone-16.12.42529.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Platform independent instrument control for Zurich Instruments devices" -HOMEPAGE="https://www.zhinst.com/labone" -SRC_URI="https://www.zhinst.com/system/files/downloads/files/LabOneLinux64-${PV}.tar.gz" - -LICENSE="zi-labone" -SLOT="0" -KEYWORDS="-* ~amd64" -RESTRICT="mirror bindist" -IUSE="minimal" - -QA_PREBUILT="*" - -RDEPEND="" - -S=${WORKDIR}/LabOneLinux64-${PV} - -src_install() { - local instPath=/opt/zi - local instrDir="LabOne64-${PV}" - - if ! use minimal ; then - - dodir ${instPath}/${instrDir} - for dir in API DataServer Documentation WebServer release_notes_16.12.txt ; do - cp -a "$dir" "${D}${instPath}/${instrDir}/" || die - done - - dosym ../..${instPath}/${instrDir}/DataServer/ziServer /opt/bin/ziServer - dosym ../..${instPath}/${instrDir}/DataServer/ziDataServer /opt/bin/ziDataServer - - echo "#!/bin/bash" > "${T}/startWebServer" || die - echo "${instPath}/${instrDir}/WebServer/ziWebServer -r ${instPath}/${instrDir}/WebServer/html --ip 127.0.0.1 --server-port 8004" >> "${T}/startWebServer" || die - chmod 755 "${T}/startWebServer" || die - exeinto /opt/bin - doexe "${T}/startWebServer" - elog For security reasons the startWebServer script listens on the localhost interface only. - else - - insinto "${instPath}/${instrDir}/API/C/lib" - doins API/C/lib/*.so - insinto "${instPath}/${instrDir}/API/C/include" - doins API/C/include/*.h - - fi - - dosym "../..${instPath}/${instrDir}/API/C/include/ziAPI.h" "usr/include/ziAPI.h" - dosym "../..${instPath}/${instrDir}/API/C/lib/libziAPI-linux64.so" "usr/$(get_libdir)/libziAPI-linux64.so" - - # the udev integration - - sed -e 's:/usr/bin/ziServer:/opt/bin/ziServer:g' -i Installer/udev/config || die - insinto /etc/ziService - doins Installer/udev/config - sed -e 's:/usr/bin/ziServer:/opt/bin/ziServer:g' -i Installer/udev/55-zhinst.rules || die - insinto /lib/udev/rules.d - doins Installer/udev/55-zhinst.rules - exeinto /opt/bin - doexe Installer/udev/ziService - - # just to make sure - dosym ../../opt/bin/ziService usr/bin/ziService -} - -pkg_prerm() { - if [[ -x /opt/bin/ziService ]]; then - einfo "Stopping ziService for safe unmerge" - /opt/bin/ziService stop - fi -} diff --git a/sci-electronics/labone/labone-21.08.20515-r1.ebuild b/sci-electronics/labone/labone-21.08.20515-r1.ebuild new file mode 100644 index 000000000000..0c0c263143ff --- /dev/null +++ b/sci-electronics/labone/labone-21.08.20515-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg desktop systemd udev + +DESCRIPTION="Platform independent instrument control for Zurich Instruments devices" +HOMEPAGE="https://www.zhinst.com/labone" +SRC_URI="https://www.zhinst.com/sites/default/files/media/release_file/2021-09/LabOneLinux64-${PV}.tar.gz" + +LICENSE="zi-labone" +SLOT="0" +KEYWORDS="-* ~amd64" +RESTRICT="mirror bindist" +IUSE="minimal" + +QA_PREBUILT="*" + +RDEPEND="" + +S=${WORKDIR}/LabOneLinux64-${PV} + +src_install() { + local application_directory=/opt/zi + local installation_directory="${application_directory}/LabOne64-${PV}" + + if ! use minimal ; then + + # the applications + + dodir ${installation_directory} + for dir in API DataServer Firmware Documentation WebServer ; do + mv "$dir" "${D}${installation_directory}/" || die + done + + cp "release_notes_$(ver_cut 1-2).txt" "${D}${installation_directory}/" || die + + dosym ../..${installation_directory}/DataServer/ziServer /opt/bin/ziServer + dosym ../..${installation_directory}/DataServer/ziDataServer /opt/bin/ziDataServer + + # the services + + # LabOne comes with systemd support. + + local service + for service in labone-data-server hf2-data-server ; do + sed -e 's:/usr/local/bin/:/opt/bin/:g' -i Installer/systemd/${service}.service || die + systemd_dounit Installer/systemd/${service}.service + done + + # For OpenRC we need to do our own thing... + + for service in labone-data-server hf2-data-server ; do + doinitd "${FILESDIR}/${service}" + doconfd "${FILESDIR}/${service}.conf" + done + + echo "#!/bin/bash" > "${T}/startziWebServer" || die + echo "${installation_directory}/WebServer/ziWebServer -r ${installation_directory}/WebServer/html --ip 127.0.0.1 --server-port 8004 -a 1" '$@ &' >> "${T}/startziWebServer" || die + chmod 755 "${T}/startziWebServer" || die + exeinto /opt/bin + doexe "${T}/startziWebServer" + elog For security reasons the startziWebServer script listens on the localhost interface only. + + newicon "${D}${installation_directory}/WebServer/html/images/favicons/firefox_app_128x128.png" zi-labone.png + + make_desktop_entry /opt/bin/startziWebServer "ZI LabOne" zi-labone "Science;Physics;Engineering" + + keepdir /var/log/labone + fowners nobody /var/log/labone + else + + insinto "${installation_directory}/API/C/lib" + doins API/C/lib/*.so + insinto "${installation_directory}/API/C/include" + doins API/C/include/*.h + + fi + + dosym "../..${installation_directory}/API/C/include/ziAPI.h" "usr/include/ziAPI.h" + dosym "../..${installation_directory}/API/C/lib/libziAPI-linux64.so" "usr/$(get_libdir)/libziAPI-linux64.so" + + udev_dorules Installer/udev/55-zhinst.rules +} -- cgit v1.2.3