commit: 8f794520eea47dcfc145bc24c524f0295bda9ddc Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Sat Aug 1 17:52:50 2020 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Aug 1 17:53:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f794520
net-wireless/gnuradio: fixed compilation and switched to virtual/jack Closes: https://bugs.gentoo.org/722100 Closes: https://bugs.gentoo.org/684178 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> net-wireless/gnuradio/Manifest | 1 + net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild | 281 ++++++++++++++++++++++ net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild | 228 ++++++++++++++++++ 3 files changed, 510 insertions(+) diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 0c14569032c..ec386c36bee 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1,3 +1,4 @@ +DIST 0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2 6933 BLAKE2B 021574de46f582f668788d35bb0f2fb7a47a03ae9d8009adaf3d53946bdf7fc61301a985a7eb0c6cde37fef36dceae86d71d287a8beb61d793b6309064e4e09d SHA512 f42f997a92592d3caf7e29e50bfb5733ab94988743eb3231c78b31272c5cde840f5abd984e1c6b1f928828a6be84eb5d17c3455207509f48652ed160a4f6c7ae DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15 diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild new file mode 100644 index 00000000000..b85c4e57872 --- /dev/null +++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild @@ -0,0 +1,281 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +CMAKE_BUILD_TYPE="None" +inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils + +DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" +HOMEPAGE="https://www.gnuradio.org/"; +LICENSE="GPL-3" +SLOT="0/${PV}" + +if [[ ${PV} =~ "9999" ]]; then + EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"; + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-1-qt5.tar.xz + https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-codec2.tar.xz + https://dev.gentoo.org/~fordfrog/distfiles/0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2"; + KEYWORDS="~amd64 ~arm ~x86" +fi +if [[ ${PV} == "3.7.9999" ]]; then + EGIT_BRANCH="maint-3.7" +fi + +IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + audio? ( || ( alsa oss jack portaudio ) ) + alsa? ( audio ) + oss? ( audio ) + jack? ( audio ) + portaudio? ( audio ) + analog? ( filter ) + digital? ( filter analog ) + dtv? ( fec ) + pager? ( filter analog ) + qt5? ( filter ) + uhd? ( filter analog ) + fcd? ( || ( alsa oss ) ) + wavelet? ( analog ) + wxwidgets? ( filter analog )" + +# bug #348206 +# comedi? ( >=sci-electronics/comedilib-0.8 ) +# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669 +RDEPEND="${PYTHON_DEPS} + >=dev-lang/orc-0.4.12 + !<=dev-libs/boost-1.52.0-r6:0/1.52 + sci-libs/fftw:3.0= + alsa? ( + media-libs/alsa-lib:= + ) + fcd? ( virtual/libusb:1 ) + jack? ( + virtual/jack + ) + log? ( dev-libs/log4cpp ) + portaudio? ( + >=media-libs/portaudio-19_pre + ) + sdl? ( >=media-libs/libsdl-1.2.0 ) + uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] ) + vocoder? ( media-sound/gsm + >=media-libs/codec2-0.8.1 ) + wavelet? ( + >=sci-libs/gsl-1.10 + ) + zeromq? ( >=net-libs/zeromq-2.1.11 ) + $(python_gen_cond_dep ' + dev-libs/boost:0=[python,${PYTHON_MULTI_USEDEP}] + dev-python/mako[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + filter? ( + || ( + sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}] + sci-libs/scipy[${PYTHON_MULTI_USEDEP}] + ) + ) + grc? ( + dev-python/cheetah[${PYTHON_MULTI_USEDEP}] + dev-python/lxml[${PYTHON_MULTI_USEDEP}] + >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ) + ) + qt5? ( + dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}] + dev-qt/qtcore:5 + dev-qt/qtgui:5 + x11-libs/qwt:6[qt5(+)] + dev-qt/qtwidgets:5 + ) + utils? ( + || ( + dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}] + dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] + ) + ) + wxwidgets? ( + dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ) + ) + ') + " + +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.2 + >=dev-lang/swig-3.0.5 + virtual/pkgconfig + $(python_gen_cond_dep ' + dev-python/cheetah[${PYTHON_MULTI_USEDEP}] + doc? ( + >=app-doc/doxygen-1.5.7.1 + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + ) + ') + grc? ( x11-misc/xdg-utils ) + oss? ( virtual/os-headers ) + test? ( >=dev-util/cppunit-1.9.14 ) + zeromq? ( net-libs/cppzmq ) +" + +src_prepare() { + gnome2_environment_reset #534582 + + if [[ ${PV} == "9999" ]]; then + true + else + epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch + fi + # Useless UI element would require qt3support, bug #365019 + sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die + epatch "${WORKDIR}"/qt5-maint-00*.patch + epatch "${WORKDIR}"/codec2-next-00*.patch + epatch "${FILESDIR}"/${PN}-3.7.13.5-boost-1.70-asio.patch + epatch "${WORKDIR}/0002-boost_qualify_placeholders_with_their_full_namespace.patch" + + use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake + use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake + use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake + + cmake-utils_src_prepare +} + +src_configure() { + #zeromq missing deps isn't fatal + python_export PYTHON_SITEDIR + mycmakeargs=( + -DENABLE_DEFAULT=OFF + -DENABLE_GNURADIO_RUNTIME=ON + -DENABLE_VOLK=ON + -DENABLE_PYTHON=ON + -DENABLE_GR_BLOCKS=ON + -DENABLE_GR_FFT=ON + -DENABLE_GR_AUDIO=ON + -DENABLE_GR_AUDIO_ALSA="$(usex alsa)" + -DENABLE_GR_ANALOG="$(usex analog)" + -DENABLE_GR_ATSC="$(usex atsc)" + -DENABLE_GR_CHANNELS="$(usex channels)" + -DENABLE_GR_DIGITAL="$(usex digital)" + -DENABLE_DOXYGEN="$(usex doc)" + -DENABLE_SPHINX="$(usex doc)" + -DENABLE_GR_DTV="$(usex dtv)" + -DENABLE_GR_FCD="$(usex fcd)" + -DENABLE_GR_FEC="$(usex fec)" + -DENABLE_GR_FILTER="$(usex filter)" + -DENABLE_GRC="$(usex grc)" + -DENABLE_GR_AUDIO_JACK="$(usex jack)" + -DENABLE_GR_LOG="$(usex log)" + -DENABLE_GR_NOAA="$(usex noaa)" + -DENABLE_GR_AUDIO_OSS="$(usex oss)" + -DENABLE_GR_PAGER="$(usex pager)" + -DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)" + -DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)" + -DENABLE_TESTING="$(usex test)" + -DENABLE_GR_TRELLIS="$(usex trellis)" + -DENABLE_GR_UHD="$(usex uhd)" + -DENABLE_GR_UTILS="$(usex utils)" + -DENABLE_GR_VOCODER="$(usex vocoder)" + -DENABLE_GR_WAVELET="$(usex wavelet)" + -DENABLE_GR_WXGUI="$(usex wxwidgets)" + -DENABLE_GR_QTGUI="$(usex qt5)" + -DDESIRED_QT_VERSION="$(usex qt5 5)" + -DENABLE_GR_VIDEO_SDL="$(usex sdl)" + -DENABLE_GR_ZEROMQ="$(usex zeromq)" + -DENABLE_GR_CORE=ON + -DSYSCONFDIR="${EPREFIX}"/etc + -DPYTHON_EXECUTABLE="${PYTHON}" + -DGR_PYTHON_DIR="${PYTHON_SITEDIR}" + -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + ) + use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + if use examples ; then + dodir /usr/share/doc/${PF}/ + mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die + docompress -x /usr/share/doc/${PF}/examples + else + # It seems that the examples are always installed + rm -rf "${ED}"/usr/share/${PN}/examples || die + fi + + if use doc || use examples; then + #this doesn't appear useful + rm -rf "${ED}"/usr/share/doc/${PF}/xml || die + fi + + # We install the mimetypes to the correct locations from the ebuild + rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die + rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die + + # Install icons, menu items and mime-types for GRC + if use grc ; then + local fd_path="${S}/grc/scripts/freedesktop" + insinto /usr/share/mime/packages + doins "${fd_path}/${PN}-grc.xml" + + domenu "${fd_path}/"*.desktop + doicon "${fd_path}/"*.png + fi + + python_fix_shebang "${ED}" +} + +src_test() +{ + ctest -E qtgui +} + +pkg_postinst() +{ + local GRC_ICON_SIZES="32 48 64 128 256" + + if use grc ; then + xdg_desktop_database_update + xdg_mimeinfo_database_update + for size in ${GRC_ICON_SIZES} ; do + xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ + "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ + || die "icon resource installation failed" + xdg-icon-resource install --noupdate --context apps --size ${size} \ + "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \ + || die "icon resource installation failed" + done + xdg-icon-resource forceupdate + fi +} + +pkg_postrm() +{ + local GRC_ICON_SIZES="32 48 64 128 256" + + if use grc ; then + xdg_desktop_database_update + xdg_mimeinfo_database_update + for size in ${GRC_ICON_SIZES} ; do + xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ + application-gnuradio-grc || ewarn "icon uninstall failed" + xdg-icon-resource uninstall --noupdate --context apps --size ${size} \ + gnuradio-grc || ewarn "icon uninstall failed" + + done + xdg-icon-resource forceupdate + fi +} diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild new file mode 100644 index 00000000000..ed6d89a7a8f --- /dev/null +++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild @@ -0,0 +1,228 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + +CMAKE_BUILD_TYPE="None" +inherit cmake python-single-r1 virtualx xdg-utils desktop + +DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" +HOMEPAGE="https://www.gnuradio.org/"; +LICENSE="GPL-3" +SLOT="0/${PV}" + +if [[ ${PV} =~ "9999" ]]; then + EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"; + EGIT_BRANCH="maint-3.8" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~fordfrog/distfiles/0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2"; + KEYWORDS="~amd64 ~arm ~x86" +fi + +IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq" + +#RESTRICT="!test? ( test )" +#Tests are known broken right now +RESTRICT="test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + audio? ( || ( alsa oss jack portaudio ) ) + alsa? ( audio ) + jack? ( audio ) + oss? ( audio ) + portaudio? ( audio ) + analog? ( filter ) + channels? ( filter analog qt5 ) + digital? ( filter analog ) + dtv? ( filter analog fec ) + modtool? ( utils ) + qt5? ( filter ) + trellis? ( analog digital ) + uhd? ( filter analog ) + vocoder? ( filter analog ) + wavelet? ( analog ) +" + +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]') + dev-libs/log4cpp + $(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]') + sci-libs/fftw:3.0= + sci-libs/mpir + sci-libs/volk + alsa? ( media-libs/alsa-lib:= ) + fec? ( + sci-libs/gsl + sci-libs/scipy + ) + filter? ( sci-libs/scipy ) + grc? ( + $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}]') + x11-libs/gtk+:3[introspection] + x11-libs/pango[introspection] + ) + jack? ( virtual/jack ) + portaudio? ( >=media-libs/portaudio-19_pre ) + qt5? ( + $(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]') + dev-qt/qtcore:5 + dev-qt/qtgui:5 + x11-libs/qwt:6[qt5(+)] + dev-qt/qtwidgets:5 + ) + sdl? ( >=media-libs/libsdl-1.2.0 ) + trellis? ( sci-libs/scipy ) + uhd? ( + $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]') + ) + utils? ( + $(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}] + dev-python/click-plugins[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}]') + ) + vocoder? ( + media-sound/gsm + >=media-libs/codec2-0.8.1 + ) + wavelet? ( sci-libs/gsl + dev-libs/gmp + sci-libs/lapack + ) + zeromq? ( >=net-libs/zeromq-2.1.11 ) +" + +#That's right, it can't build if gnuradio 3.7 is installed +#Both due to build failure, and then file collision due to bundled volk +DEPEND="${RDEPEND} + !<net-wireless/gnuradio-3.8 + app-text/docbook-xml-dtd:4.2 + >=dev-lang/swig-3.0.5 + virtual/pkgconfig + doc? ( + >=app-doc/doxygen-1.5.7.1 + ) + grc? ( x11-misc/xdg-utils ) + oss? ( virtual/os-headers ) + test? ( >=dev-util/cppunit-1.9.14 ) + zeromq? ( net-libs/cppzmq ) +" + +PATCHES=( + "${WORKDIR}/0002-boost_qualify_placeholders_with_their_full_namespace.patch" +) + +src_prepare() { + xdg_environment_reset #534582 + + use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake + use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake + use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake + use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake + + cmake_src_prepare +} + +src_configure() { + mycmakeargs=( + -DENABLE_DEFAULT=OFF + -DENABLE_VOLK=OFF + -DENABLE_INTERNAL_VOLK=OFF + -DENABLE_GNURADIO_RUNTIME=ON + -DENABLE_PYTHON=ON + -DENABLE_GR_BLOCKS=ON + -DENABLE_GR_FFT=ON + -DENABLE_GR_AUDIO=ON + -DENABLE_GR_ANALOG="$(usex analog)" + -DENABLE_GR_CHANNELS="$(usex channels)" + -DENABLE_GR_DIGITAL="$(usex digital)" + -DENABLE_DOXYGEN="$(usex doc)" + -DENABLE_GR_DTV="$(usex dtv)" + -DENABLE_GR_FEC="$(usex fec)" + -DENABLE_GR_FILTER="$(usex filter)" + -DENABLE_GRC="$(usex grc)" + -DENABLE_GR_MODTOOL="$(usex modtool)" + -DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)" + -DENABLE_TESTING="$(usex test)" + -DENABLE_GR_TRELLIS="$(usex trellis)" + -DENABLE_GR_UHD="$(usex uhd)" + -DENABLE_GR_UTILS="$(usex utils)" + -DENABLE_GR_VOCODER="$(usex vocoder)" + -DENABLE_GR_WAVELET="$(usex wavelet)" + -DENABLE_GR_QTGUI="$(usex qt5)" + -DENABLE_GR_VIDEO_SDL="$(usex sdl)" + -DENABLE_GR_ZEROMQ="$(usex zeromq)" + -DSYSCONFDIR="${EPREFIX}"/etc + -DPYTHON_EXECUTABLE="${PYTHON}" + -DGR_PYTHON_DIR="$(python_get_sitedir)" + -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use examples ; then + dodir /usr/share/doc/${PF}/ + mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die + docompress -x /usr/share/doc/${PF}/examples + else + # It seems that the examples are always installed + rm -rf "${ED}"/usr/share/${PN}/examples || die + fi + + if use doc || use examples; then + #this doesn't appear useful + rm -rf "${ED}"/usr/share/doc/${PF}/xml || die + fi + + # Remove duplicated icons, MIME and desktop files and installation script + rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die + rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die + + # Install icons, menu items and mime-types for GRC + if use grc ; then + local fd_path="${S}/grc/scripts/freedesktop" + insinto /usr/share/mime/packages + doins "${fd_path}/${PN}-grc.xml" + + domenu "${fd_path}/"*.desktop + doicon "${fd_path}/"*.png + fi + + python_fix_shebang "${ED}" + # Remove incorrectly byte-compiled Python files and replace + find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die + python_optimize +} + +src_test() +{ + virtx cmake_src_test +} + +pkg_postinst() +{ + if use grc ; then + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + fi +} + +pkg_postrm() +{ + if use grc ; then + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + fi +}
