summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Brown <rbrown@gentoo.org>2007-05-16 15:12:17 +0000
committerRichard Brown <rbrown@gentoo.org>2007-05-16 15:12:17 +0000
commit1b6891c56d152749b02d124c723ce04a099afeb9 (patch)
tree1c0a5303dc82f804c60a0c9776270ceb3f5d0407 /dev-lang
parentalpha/ia64 stable wrt #178185 (diff)
downloadgentoo-2-1b6891c56d152749b02d124c723ce04a099afeb9.tar.gz
gentoo-2-1b6891c56d152749b02d124c723ce04a099afeb9.tar.bz2
gentoo-2-1b6891c56d152749b02d124c723ce04a099afeb9.zip
Remove old 1.8.6 versions
(Portage version: 2.1.2.2)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/ruby/ChangeLog6
-rw-r--r--dev-lang/ruby/files/digest-ruby-1.8.63
-rw-r--r--dev-lang/ruby/files/digest-ruby-1.8.6_pre13
-rw-r--r--dev-lang/ruby/files/digest-ruby-1.8.6_pre33
-rw-r--r--dev-lang/ruby/ruby-1.8.6.ebuild142
-rw-r--r--dev-lang/ruby/ruby-1.8.6_pre1.ebuild147
-rw-r--r--dev-lang/ruby/ruby-1.8.6_pre3.ebuild147
7 files changed, 5 insertions, 446 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 2447acf09b3f..59cb10a25230 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/ruby
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.269 2007/05/16 02:07:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.270 2007/05/16 15:12:17 rbrown Exp $
+
+ 16 May 2007; Richard Brown <rbrown@gentoo.org> -ruby-1.8.6_pre1.ebuild,
+ -ruby-1.8.6_pre3.ebuild, -ruby-1.8.6.ebuild:
+ Remove old 1.8.6 versions
16 May 2007; Steve Dibb <beandog@gentoo.org> ruby-1.8.5_p2-r1.ebuild:
amd64 stable, bug 178346
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.6 b/dev-lang/ruby/files/digest-ruby-1.8.6
deleted file mode 100644
index a77335fc09d4..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 23d2494aa94e7ae1ecbbb8c5e1507683 ruby-1.8.6.tar.gz 4589394
-RMD160 a1ad902bb1311233cd3cf9db52ab2ec076a709f5 ruby-1.8.6.tar.gz 4589394
-SHA256 3ef37fb961d04471a1aef2c8079d6fab09932e3281d79859d5cd5d426bde0868 ruby-1.8.6.tar.gz 4589394
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.6_pre1 b/dev-lang/ruby/files/digest-ruby-1.8.6_pre1
deleted file mode 100644
index 1c5a6ec9a9c3..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.6_pre1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 12c52f3fbf628f6e5c75f1daeda75207 ruby-1.8.6-preview1.tar.gz 4580884
-RMD160 4dcf796eeea75c877996b2e311a157420b55093d ruby-1.8.6-preview1.tar.gz 4580884
-SHA256 098e04d0f309ead93f6ca8ff4f13be7298414bf9fcbfc66400cb10906af5a327 ruby-1.8.6-preview1.tar.gz 4580884
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.6_pre3 b/dev-lang/ruby/files/digest-ruby-1.8.6_pre3
deleted file mode 100644
index a47215d8945d..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.6_pre3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9ff2f92773e9f3ccfe1b8fec22c38848 ruby-1.8.6-preview3.tar.gz 4590346
-RMD160 03871964c878c51a8561fccd26fb7c96d9071d2c ruby-1.8.6-preview3.tar.gz 4590346
-SHA256 e7c7208d027d866a37f358d2074e0eefaec76ad28bff368ba0e2c3633f082777 ruby-1.8.6-preview3.tar.gz 4590346
diff --git a/dev-lang/ruby/ruby-1.8.6.ebuild b/dev-lang/ruby/ruby-1.8.6.ebuild
deleted file mode 100644
index ad9cf754d0ec..000000000000
--- a/dev-lang/ruby/ruby-1.8.6.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6.ebuild,v 1.3 2007/04/24 11:22:57 rbrown Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-# A new version is needed for 1.8.6, currently disabled.
-ONIGURUMA="onigd2_5_8"
-
-inherit flag-o-matic alternatives eutils multilib autotools versionator
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/$(get_version_component_range 1-2)/${P}.tar.gz"
-# cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
-
-LICENSE="Ruby"
-SLOT="1.8"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="debug socks5 tk doc threads examples ipv6" # cjk
-RESTRICT="confcache"
-
-RDEPEND=">=sys-libs/gdbm-1.8.0
- >=sys-libs/readline-4.1
- >=sys-libs/ncurses-5.2
- socks5? ( >=net-proxy/dante-1.1.13 )
- tk? ( dev-lang/tk )
- >=dev-ruby/ruby-config-0.3.1
- !=dev-lang/ruby-cvs-1.8*
- !dev-ruby/rdoc
- !dev-ruby/rexml"
-DEPEND="${RDEPEND}"
-PROVIDE="virtual/ruby"
-
-src_unpack() {
- unpack ${A}
-
-# if use cjk ; then
-# einfo "Applying ${ONIGURUMA}"
-# pushd ${WORKDIR}/oniguruma
-## epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
-# econf --with-rubydir=${S} || die "econf failed"
-# MY_PV=$(get_version_component_range 1-2)
-# make ${MY_PV/./}
-# popd
-# fi
-
- cd "${S}"
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eautoreconf
-}
-
-src_compile() {
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- econf --program-suffix=${SLOT/./} --enable-shared \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- $(use_enable threads pthread) \
- $(use_enable ipv6 ipv6) \
- $(use_enable debug debug) \
- --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- LD_LIBRARY_PATH=${D}/usr/$(get_libdir)
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
- for d in $(find ${S}/ext -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- make DESTDIR="${D}" install || die "make install failed"
-
- MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
- keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
- keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- dodir /usr/share/doc/${PF}
- cp -pPR sample ${D}/usr/share/doc/${PF}
- fi
-
- dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
- dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*})
-
- dodoc ChangeLog NEWS README* ToDo
-}
-
-pkg_postinst() {
- ewarn
- ewarn "Warning: Vim won't work if you've just updated ruby from"
- ewarn "1.6.x to 1.8.x due to the library version change."
- ewarn "In that case, you will need to remerge vim."
- ewarn
-
- ewarn "If you upgrade to >=sys-apps/coreutils-6.7-r1,"
- ewarn "you should re-emerge ruby again."
- ewarn "See bug #159922 for details"
- ewarn
- if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
- ${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
- fi
- elog
- elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
- elog
-}
-
-pkg_postrm() {
- if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
- ${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
- fi
-}
diff --git a/dev-lang/ruby/ruby-1.8.6_pre1.ebuild b/dev-lang/ruby/ruby-1.8.6_pre1.ebuild
deleted file mode 100644
index a82a06745a1a..000000000000
--- a/dev-lang/ruby/ruby-1.8.6_pre1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_pre1.ebuild,v 1.3 2007/04/24 11:22:57 rbrown Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-# A new version is needed for 1.8.6, currently disabled.
-ONIGURUMA="onigd2_5_8"
-
-inherit flag-o-matic alternatives eutils multilib autotools versionator
-
-MY_P="${P/_p/-p}"
-MY_P="${MY_P/pre/preview}"
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-# cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
-
-LICENSE="Ruby"
-SLOT="1.8"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="debug socks5 tk doc threads examples ipv6" # cjk
-RESTRICT="confcache"
-
-RDEPEND=">=sys-libs/gdbm-1.8.0
- >=sys-libs/readline-4.1
- >=sys-libs/ncurses-5.2
- socks5? ( >=net-proxy/dante-1.1.13 )
- tk? ( dev-lang/tk )
- >=dev-ruby/ruby-config-0.3.1
- !=dev-lang/ruby-cvs-1.8*
- !dev-ruby/rdoc
- !dev-ruby/rexml"
-DEPEND="${RDEPEND}"
-PROVIDE="virtual/ruby"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
-
-# if use cjk ; then
-# einfo "Applying ${ONIGURUMA}"
-# pushd ${WORKDIR}/oniguruma
-## epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
-# econf --with-rubydir=${S} || die "econf failed"
-# MY_PV=$(get_version_component_range 1-2)
-# make ${MY_PV/./}
-# popd
-# fi
-
- cd "${S}"
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eautoreconf
-}
-
-src_compile() {
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- econf --program-suffix=${SLOT/./} --enable-shared \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- $(use_enable threads pthread) \
- $(use_enable ipv6 ipv6) \
- $(use_enable debug debug) \
- --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- LD_LIBRARY_PATH=${D}/usr/$(get_libdir)
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
- for d in $(find ${S}/ext -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- make DESTDIR="${D}" install || die "make install failed"
-
- MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
- keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
- keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- dodir /usr/share/doc/${PF}
- cp -pPR sample ${D}/usr/share/doc/${PF}
- fi
-
- dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
- dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*})
-
- dodoc ChangeLog MANIFEST README* ToDo
-}
-
-pkg_postinst() {
- ewarn
- ewarn "Warning: Vim won't work if you've just updated ruby from"
- ewarn "1.6.x to 1.8.x due to the library version change."
- ewarn "In that case, you will need to remerge vim."
- ewarn
-
- ewarn "If you upgrade to >=sys-apps/coreutils-6.7-r1,"
- ewarn "you should re-emerge ruby again."
- ewarn "See bug #159922 for details"
- ewarn
- if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
- ${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
- fi
- elog
- elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
- elog
-}
-
-pkg_postrm() {
- if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
- ${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
- fi
-}
diff --git a/dev-lang/ruby/ruby-1.8.6_pre3.ebuild b/dev-lang/ruby/ruby-1.8.6_pre3.ebuild
deleted file mode 100644
index 82519bc607fc..000000000000
--- a/dev-lang/ruby/ruby-1.8.6_pre3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_pre3.ebuild,v 1.4 2007/04/24 11:22:57 rbrown Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-# A new version is needed for 1.8.6, currently disabled.
-ONIGURUMA="onigd2_5_8"
-
-inherit flag-o-matic alternatives eutils multilib autotools versionator
-
-MY_P="${P/_p/-p}"
-MY_P="${MY_P/pre/preview}"
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-# cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
-
-LICENSE="Ruby"
-SLOT="1.8"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="debug socks5 tk doc threads examples ipv6" # cjk
-RESTRICT="confcache"
-
-RDEPEND=">=sys-libs/gdbm-1.8.0
- >=sys-libs/readline-4.1
- >=sys-libs/ncurses-5.2
- socks5? ( >=net-proxy/dante-1.1.13 )
- tk? ( dev-lang/tk )
- >=dev-ruby/ruby-config-0.3.1
- !=dev-lang/ruby-cvs-1.8*
- !dev-ruby/rdoc
- !dev-ruby/rexml"
-DEPEND="${RDEPEND}"
-PROVIDE="virtual/ruby"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
-
-# if use cjk ; then
-# einfo "Applying ${ONIGURUMA}"
-# pushd ${WORKDIR}/oniguruma
-## epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
-# econf --with-rubydir=${S} || die "econf failed"
-# MY_PV=$(get_version_component_range 1-2)
-# make ${MY_PV/./}
-# popd
-# fi
-
- cd "${S}"
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eautoreconf
-}
-
-src_compile() {
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- econf --program-suffix=${SLOT/./} --enable-shared \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- $(use_enable threads pthread) \
- $(use_enable ipv6 ipv6) \
- $(use_enable debug debug) \
- --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- LD_LIBRARY_PATH=${D}/usr/$(get_libdir)
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
- for d in $(find ${S}/ext -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- make DESTDIR="${D}" install || die "make install failed"
-
- MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
- keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
- keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- dodir /usr/share/doc/${PF}
- cp -pPR sample ${D}/usr/share/doc/${PF}
- fi
-
- dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
- dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*})
-
- dodoc ChangeLog NEWS README* ToDo
-}
-
-pkg_postinst() {
- ewarn
- ewarn "Warning: Vim won't work if you've just updated ruby from"
- ewarn "1.6.x to 1.8.x due to the library version change."
- ewarn "In that case, you will need to remerge vim."
- ewarn
-
- ewarn "If you upgrade to >=sys-apps/coreutils-6.7-r1,"
- ewarn "you should re-emerge ruby again."
- ewarn "See bug #159922 for details"
- ewarn
- if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
- ${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
- fi
- elog
- elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
- elog
-}
-
-pkg_postrm() {
- if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
- ${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
- fi
-}