summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-04-22 17:25:16 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-04-22 17:25:16 +0000
commit33ed44b139f821729a03dc94b13d7a1e5a2f9f5e (patch)
tree344f4a183180e436b109315ef0550487d0b1f4b6 /dev-libs/boost
parentold (diff)
downloadhistorical-33ed44b139f821729a03dc94b13d7a1e5a2f9f5e.tar.gz
historical-33ed44b139f821729a03dc94b13d7a1e5a2f9f5e.tar.bz2
historical-33ed44b139f821729a03dc94b13d7a1e5a2f9f5e.zip
Remove boost-1.36.0 for gcc-porting wrt #287638.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/boost')
-rw-r--r--dev-libs/boost/ChangeLog6
-rw-r--r--dev-libs/boost/Manifest15
-rw-r--r--dev-libs/boost/boost-1.36.0-r1.ebuild332
3 files changed, 6 insertions, 347 deletions
diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 1b1aa8223ccc..32e751dfad91 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/boost
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.194 2010/04/17 23:52:17 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.195 2010/04/22 17:25:16 ssuominen Exp $
+
+ 22 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+ -boost-1.36.0-r1.ebuild:
+ Remove boost-1.36.0 for gcc-porting wrt #287638.
17 Apr 2010; Joseph Jezak <josejx@gentoo.org> boost-1.41.0-r3.ebuild:
Marked ppc stable for bug #305195.
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 9d7ebe19c66f..a56585c183d8 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 1.35-remove-hardlink-creation.patch 547 RMD160 0c0bae87977869efcd2e25144b910025ab3e6924 SHA1 c3833411ab8e7c84efddc5cfb4ab99abcba1eed5 SHA256 9b0515f343f0c8f7f0ce51e2c6f243edae0f3d5ce5df5b9f77a46b00041a134e
AUX boost-1.37.0-darwin-long-double.patch 556 RMD160 54b1111e9dbc51131f01f50071f1c4f337b35d2f SHA1 827dcef39cf884948c3720ae1d94d1b5b5279578 SHA256 0beb2bf9ae43ad86c307873ab19b049152ef7798ba17523638cdb78017642c31
AUX boost-1.41.0-fix-CRC-on-x64-during-gzip-decompression.patch 1030 RMD160 8cf63aa1179ed4d8e3a79fb3f00b6c8f3db816f0 SHA1 028d0d2611392a68b35403f089486963d7d4e549 SHA256 4b935fe0b3c9f3a2b1fcedda048b0ebc518531aa143f95cdd1b7fa51de1133d4
@@ -16,29 +13,19 @@ AUX remove-toolset-1.42.0.patch 465 RMD160 5d93141f9cf98fc558e15c273d4ede298a96d
AUX remove_toolset_from_targetname.patch 490 RMD160 e050992fd79005af73410a2ea4037a82177ddf33 SHA1 80d96cca8cb0acb752c428ffcada3ef2964642b1 SHA256 5c5c6fea3c1e20e290d15a68f91b6c084cc5b34daae338e3aa0879a3fd5b9fb5
DIST boost-patches-1.35.0-3.tbz2 4521 RMD160 8a1cac05a7db956482ffb9bc16accaae04891970 SHA1 bcb41aa6bba2ad46df82d9a87751a2ae046bf988 SHA256 e6360a99de6daa43daa3a605d1e2eeee2bf3a8bb4bf0128fc17b4e9d3f9348b8
DIST boost-patches-1.35.0-5.tbz2 5537 RMD160 94ce8edab7127308b93705d6fb0317277dbd88db SHA1 2d195374d6cb6af3b187544afc58a00ee1e2309d SHA256 9d8d6c61d6915cb7629f5f1537054949b616301ecd1f1cfe1d0e2a5a7a676e11
-DIST boost-patches-1.36.0-1.tbz2 1392 RMD160 d179db21115da98def22fe41a6cad84e3eb776bc SHA1 3aa5733bff99f1922e792ea0dec06973a4bdaa7a SHA256 55ec3be6b19535a130ab6e9dc783f5fe7a063cdaca7e4184c6d54acaba2d7697
DIST boost-patches-1.37.0-1.tbz2 1207 RMD160 009566c470f15608061cd48b2303ea20c4f907ae SHA1 4344d12f6e0ebcebbc82671d10190e15d36d48b4 SHA256 a10e3de954a812a181835f62b410c53b9ff21b8e7a063850fc70c0cf58804b37
DIST boost-patches-1.39.0-1.tbz2 1113 RMD160 29753fc7ca54fa57c65410073621e251750b89bc SHA1 6389ba81a977bfd42ab1fc7d911290a3976afd8a SHA256 f98f4ed539425b46de47a14b8b9ca06a69bb3248f966342999a73a619db8fec3
DIST boost_1_35_0.tar.bz2 23416747 RMD160 89dc46b7841cd288b5fb6f4b9a1ac7309786dc14 SHA1 80d1fe7b0c45541e2af7628295b18f2af996de16 SHA256 f8bf7368a22ccf2e2cf77048ab2129744be4c03f8488c76ad31c0aa229b280da
-DIST boost_1_36_0.tar.bz2 28839275 RMD160 0ac38ee3c355c22fd5534bc806bf516890e5182d SHA1 b8f0f5d90b260aff995ef38fad4eee5e73d00810 SHA256 9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
DIST boost_1_37_0.tar.bz2 29435646 RMD160 3c4cf7eb97a8fb126e564ba529ed9edec8765185 SHA1 c0d0cf9ad8d954507824aed51a3e93e6a9da1d99 SHA256 d52ef49f70b1b9addc4e0d1a3a2a1966227f0d173c3301bac3e6d399eeac5472
DIST boost_1_39_0.tar.bz2 29408537 RMD160 4962256b48fa8563bf373b8bed97cc8655206a51 SHA1 6af42f74ab24ccc51589a025593bad298c8adde8 SHA256 44785eae8c6cce61a29a8a51f9b737e57b34d66baa7c0bcd4af188832b8018fd
DIST boost_1_41_0.tar.bz2 33348161 RMD160 a604ef5a6f6f5bf50be59206c8534258ab431aea SHA1 31134e28866b90c39ca4a903c263e036bb25550c SHA256 1ef94e6749eaf13318284b4f629be063544c7015b45e38113b975ac1945cc726
DIST boost_1_42_0.tar.bz2 33426755 RMD160 90cea6aaa35f22b97e6eb3f5879ca9fe21098349 SHA1 3ce3bb1a1bed504635287017f9e628597b409e7b SHA256 4b1eb95bd250ce15ac66435d6167f225b072b0d3a7eb72477a31847a9ca9e609
EBUILD boost-1.35.0-r2.ebuild 7110 RMD160 561df964af02bc9aac75ad3f33f610c2aa8a9ad7 SHA1 70b4d1946342770d6a361cb61fdbaba678fc70c3 SHA256 be62c1e09e7aa5bb4e44115fa0a49797f4a8333dd40f0311e4019090c0b09626
EBUILD boost-1.35.0-r5.ebuild 9714 RMD160 15a86ae2b066e759352954f9e7dbbc520b71acc0 SHA1 8ddb9fffce9068bed7d99fcdcac8e520a519b768 SHA256 4eddd4aa993478e1fa0bdab8c4d9f3ab73913380b49975d3695494ef0089292e
-EBUILD boost-1.36.0-r1.ebuild 9662 RMD160 f415650ed89492c5a635f4b8183a6693a1f61578 SHA1 33c523b5aaf2a9822ae67a7616b8541f736cff3d SHA256 5b452ed5fa1b3f01f3420a0854c0e5356e3130f9f09b1a4cda19b5ccd479df92
EBUILD boost-1.37.0-r1.ebuild 13178 RMD160 14d44df115bb49d1551abd07ad9dc5303ade1f94 SHA1 5108f92ac808fb83fa4dd1d49c29ae299ab86cf0 SHA256 96a715f1af3950b5440bd5b415f01efea3b186c480eaf48d4d63cca4f633c809
EBUILD boost-1.39.0.ebuild 12985 RMD160 f6f349747e51213713321a3d31b1e1c53713f47e SHA1 a26afdda9369d7ea8a690ec67e854e53eee3d045 SHA256 74d8f0e1992659639b52012bf01097d3f9b4da809f8bf7aed4eb2dea5a4bb22a
EBUILD boost-1.41.0-r2.ebuild 15247 RMD160 f4ba3600d5eecf90ecb5dc576e3889f03bb5480b SHA1 caa0837da2cef41b4db5036b0de7a3a688a71bec SHA256 1880b29eb5ebb7f6d5ed05ee151c935053e07622402c259b01f2bcba4faffdfd
EBUILD boost-1.41.0-r3.ebuild 15557 RMD160 055ad29c9cee055e54d81afb9a4b33222f03623b SHA1 2fb7238bc802909f7c249d85db46d6d6195d93f3 SHA256 c6d1d5195d3affec14627b1a6180c237c238ee76ac052330c30842577487fc72
EBUILD boost-1.42.0.ebuild 16152 RMD160 63a9cf2995b1f15f9829d42d80567b1148fead79 SHA1 4bba36eb5d344535aa13fc651d052b3888b04d44 SHA256 575a536b30024cb315a93fb957b00f18d4c599a0c646650ae10ac0e280a22a5c
-MISC ChangeLog 29947 RMD160 cb726fdabf32f8f2a2763377709407c17fe408d0 SHA1 46d7c0b8aa6df5cc3f3b90832615a2b1733880b1 SHA256 323c1bb342cb6a219558469ea26b9650a1710d6c9eb02c7148bd44d7143358a6
+MISC ChangeLog 30083 RMD160 e1e9049c736c0f7de76ad50c0587096f9d6f1355 SHA1 aed1f1bb75631b3973d362c469bc0a165ebef7b9 SHA256 2a333585c8d8286c30780bdb97ebf1fb8b052490d8ca189cb3182b493d29a7ee
MISC metadata.xml 772 RMD160 297ebd4b4bed754fdfe0886a749c07abf7126c56 SHA1 75c9d162fe0b342ceffb3e1c465106d7d8b8673b SHA256 3753a208b747a53c9f0e18daad731b9bffa95cfa7efdce409f2d6ed2aac5340b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvKSa4ACgkQcsIHjyDViGTAqgCgz2QaCUbOApW/YF++9l/A6rOr
-k+gAoNdulaaKOfgFn4ttE6QA2DDyZtDH
-=oU3Z
------END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.36.0-r1.ebuild b/dev-libs/boost/boost-1.36.0-r1.ebuild
deleted file mode 100644
index 2b7630829437..000000000000
--- a/dev-libs/boost/boost-1.36.0-r1.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.36.0-r1.ebuild,v 1.11 2009/11/25 17:59:16 jer Exp $
-
-EAPI="2"
-
-inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-MY_P=${PN}_$(replace_all_version_separators _)
-PATCHSET_VERSION="${PV}-1"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2
- mirror://gentoo/boost-patches-${PATCHSET_VERSION}.tbz2
- http://www.gentoo.org/~dev-zero/distfiles/boost-patches-${PATCHSET_VERSION}.tbz2"
-LICENSE="Boost-1.0"
-SLOT="1.36"
-IUSE="doc +eselect expat icu mpi python test tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.3 )
- expat? ( dev-libs/expat )
- mpi? ( || ( >=sys-cluster/openmpi-1.2.9[cxx] <sys-cluster/openmpi-1.2.9[-nocxx] ) )
- sys-libs/zlib
- python? ( virtual/python )
- !!<=dev-libs/boost-1.35.0-r2
- >=app-admin/eselect-boost-0.3"
-DEPEND="${RDEPEND}
- dev-util/boost-build:${SLOT}"
-
-S=${WORKDIR}/${MY_P}
-
-# Maintainer Information
-# ToDo:
-# - write a patch to support /dev/urandom on FreeBSD and OSX (see below)
-
-MAJOR_PV=$(replace_all_version_separators _ ${SLOT})
-BJAM="bjam-${MAJOR_PV}"
-
-# Usage:
-# _add_line <line-to-add> <profile>
-# ... to add to specific profile
-# or
-# _add_line <line-to-add>
-# ... to add to all profiles for which the use flag set
-
-_add_line() {
- if [ -z "$2" ] ; then
- echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/default"
- else
- echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/${2}"
- fi
-}
-
-pkg_setup() {
- if use test ; then
- CHECKREQS_DISK_BUILD="1024"
- check_reqs
-
- ewarn "The tests may take several hours on a recent machine"
- ewarn "but they will not fail (unless something weird happens ;-)"
- ewarn "This is because the tests depend on the used compiler/-version"
- ewarn "and the platform and upstream says that this is normal."
- ewarn "If you are interested in the results, please take a look at the"
- ewarn "generated results page:"
- ewarn " ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
- ebeep 5
-
- fi
-}
-
-src_prepare() {
- EPATCH_SOURCE="${WORKDIR}/patches"
- EPATCH_SUFFIX="patch"
- epatch
-
- epatch \
- "${FILESDIR}/remove_toolset_from_targetname.patch"
-
- # This enables building the boost.random library with /dev/urandom support
- if ! use userland_Darwin ; then
- mkdir -p libs/random/build
- cp "${FILESDIR}/random-Jamfile" libs/random/build/Jamfile.v2
- fi
-}
-
-src_configure() {
- einfo "Writing new user-config.jam"
-
- local compiler compilerVersion compilerExecutable mpi
- if [[ ${CHOST} == *-darwin* ]] ; then
- compiler=darwin
- compilerVersion=$(gcc-version)
- compilerExecutable=$(tc-getCXX)
- append-ldflags -ldl
- else
- compiler=gcc
- compilerVersion=$(gcc-version)
- compilerExecutable=$(tc-getCXX)
- fi
-
- # Huge number of strict-aliasing warnings cause a build failure w/ >= GCC4.4 bug #252287
- [[ $(gcc-version) > 4.3 ]] && append-flags -Wno-strict-aliasing
-
- use mpi && mpi="using mpi ;"
-
- if use python ; then
- python_version
- pystring="using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;"
- fi
-
- cat > "${S}/user-config.jam" << __EOF__
-
-variant gentoorelease : release : <optimization>none <debug-symbols>none ;
-variant gentoodebug : debug : <optimization>none ;
-
-using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-
-${pystring}
-
-${mpi}
-
-__EOF__
-
- # Maintainer information:
- # The debug-symbols=none and optimization=none
- # are not official upstream flags but a Gentoo
- # specific patch to make sure that all our
- # CXXFLAGS/LDFLAGS are being respected.
- # Using optimization=off would for example add
- # "-O0" and override "-O2" set by the user.
- # Please take a look at the boost-build ebuild
- # for more infomration.
-
- use icu && OPTIONS="-sICU_PATH=/usr"
- use expat && OPTIONS="${OPTIONS} -sEXPAT_INCLUDE=/usr/include -sEXPAT_LIBPATH=/usr/$(get_libdir)"
- use mpi || OPTIONS="${OPTIONS} --without-mpi"
- use python || OPTIONS="${OPTIONS} --without-python"
-
- OPTIONS="${OPTIONS} --user-config=${S}/user-config.jam --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=${D}/usr --layout=versioned"
-
-}
-
-src_compile() {
-
- NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS})
-
- einfo "Using the following options to build: "
- einfo " ${OPTIONS}"
-
- export BOOST_ROOT="${S}"
-
- ${BJAM} ${NUMJOBS} -q \
- gentoorelease \
- ${OPTIONS} \
- threading=single,multi link=shared,static runtime-link=shared,static \
- || die "building boost failed"
-
- if use tools; then
- cd "${S}/tools/"
- ${BJAM} ${NUMJOBS} -q \
- gentoorelease \
- ${OPTIONS} \
- || die "building tools failed"
- fi
-
-}
-
-src_install () {
- einfo "Using the following options to install: "
- einfo " ${OPTIONS}"
-
- export BOOST_ROOT="${S}"
-
- ${BJAM} -q \
- gentoorelease \
- ${OPTIONS} \
- threading=single,multi link=shared,static runtime-link=shared,static \
- --includedir="${D}/usr/include" \
- --libdir="${D}/usr/$(get_libdir)" \
- install || die "install failed for options '${OPTIONS}'"
-
- use python || rm -rf "${D}/usr/include/boost-${MAJOR_PV}/boost"/python*
-
- dodir /usr/share/boost-eselect/profiles/${SLOT}
- touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/default"
-
- # Move the mpi.so to the right place and make sure it's slotted
- if use mpi && use python; then
- mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}"
- mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/"
- touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py"
- _add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/mpi.so\""
- fi
-
- if use doc ; then
- find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
- dohtml \
- -A pdf,txt,cpp,cpp,hpp \
- *.{htm,html,png,css} \
- -r doc more people wiki
- insinto /usr/share/doc/${PF}/html
- doins -r libs
-
- # To avoid broken links
- insinto /usr/share/doc/${PF}/html
- doins LICENSE_1_0.txt
-
- dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
- fi
-
- cd "${D}/usr/$(get_libdir)"
-
- # Remove (unversioned) symlinks
- # And check for what we remove to catch bugs
- # got a better idea how to do it? tell me!
- for f in $(ls -1 *.{a,so} | grep -v "${MAJOR_PV}") ; do
- if [ ! -h "${f}" ] ; then
- eerror "Ups, tried to remove '${f}' which is a a real file instead of a symlink"
- die "slotting/naming of the libs broken!"
- fi
- rm "${f}"
- done
-
- # The threading libs obviously always gets the "-mt" (multithreading) tag
- # some packages seem to have a problem with it. Creating symlinks...
- for lib in libboost_thread-mt-${MAJOR_PV}{.a,.so} ; do
- dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
- done
-
- # The same goes for the mpi libs
- if use mpi ; then
- for lib in libboost_mpi-mt-${MAJOR_PV}{.a,.so} ; do
- dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
- done
- fi
-
- # Create a subdirectory with completely unversioned symlinks
- # and store the names in the profiles-file for eselect
- dodir /usr/$(get_libdir)/boost-${MAJOR_PV}
-
- _add_line "libs=\"" default
- for f in libboost_*.{a,so} ; do
- dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}}
- _add_line "/usr/$(get_libdir)/${f}" default
- done
- _add_line "\"" default
-
- _add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" default
-
- if use tools; then
- cd "${S}/dist/bin"
- # Append version postfix to binaries for slotting
- _add_line "bins=\""
- for b in * ; do
- newbin "${b}" "${b}-${MAJOR_PV}"
- _add_line "/usr/bin/${b}-${MAJOR_PV}"
- done
- _add_line "\""
-
- cd "${S}/dist"
- insinto /usr/share
- doins -r share/boostbook
- # Append version postfix for slotting
- mv "${D}/usr/share/boostbook" "${D}/usr/share/boostbook-${MAJOR_PV}"
- _add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\""
- fi
-
- cd "${S}/status"
- if [ -f regress.log ] ; then
- docinto status
- dohtml *.{html,gif} ../boost.png
- dodoc regress.log
- fi
-
- use python && python_need_rebuild
-}
-
-src_test() {
- export BOOST_ROOT=${S}
-
- cd "${S}/tools/regression/build"
- ${BJAM} -q \
- gentoorelease \
- ${OPTIONS} \
- process_jam_log compiler_status \
- || die "building regression test helpers failed"
-
- cd "${S}/status"
-
- # Some of the test-checks seem to rely on regexps
- export LC_ALL="C"
-
- # The following is largely taken from tools/regression/run_tests.sh,
- # but adapted to our needs.
-
- # Run the tests & write them into a file for postprocessing
- ${BJAM} \
- ${OPTIONS} \
- --dump-tests 2>&1 | tee regress.log
-
- # Postprocessing
- cat regress.log | "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/process_jam_log" --v2
- if test $? != 0 ; then
- die "Postprocessing the build log failed"
- fi
-
- cat > "${S}/status/comment.html" <<- __EOF__
- <p>Tests are run on a <a href="http://www.gentoo.org">Gentoo</a> system.</p>
-__EOF__
-
- # Generate the build log html summary page
- "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/compiler_status" --v2 \
- --comment "${S}/status/comment.html" "${S}" \
- cs-$(uname).html cs-$(uname)-links.html
- if test $? != 0 ; then
- die "Generating the build log html summary page failed"
- fi
-
- # And do some cosmetic fixes :)
- sed -i -e 's|http://www.boost.org/boost.png|boost.png|' *.html
-}
-
-pkg_postinst() {
- use eselect && eselect boost update
- if [ ! -h "${ROOT}/etc/eselect/boost/active" ] ; then
- elog "No active boost version found. Calling eselect to select one..."
- eselect boost update
- fi
-}