From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 22DAD139694 for ; Mon, 6 Mar 2017 09:45:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59C4821C07B; Mon, 6 Mar 2017 09:45:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2971321C07B for ; Mon, 6 Mar 2017 09:45:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07A383416CA for ; Mon, 6 Mar 2017 09:45:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F21C5E3A for ; Mon, 6 Mar 2017 09:45:07 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1488793503.8d037598fc78bf5e41e5f6b7594fe753dd56b3f5.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/mc/Manifest app-misc/mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch app-misc/mc/mc-4.8.14.ebuild app-misc/mc/mc-4.8.16.ebuild app-misc/mc/mc-4.8.17.ebuild app-misc/mc/mc-4.8.18.ebuild X-VCS-Directories: app-misc/mc/ app-misc/mc/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 8d037598fc78bf5e41e5f6b7594fe753dd56b3f5 X-VCS-Branch: master Date: Mon, 6 Mar 2017 09:45:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 691f53de-6f9b-469e-98b8-514e3abb6abf X-Archives-Hash: 1e8790a9add4eba31cd1ab2f218e6094 commit: 8d037598fc78bf5e41e5f6b7594fe753dd56b3f5 Author: Lars Wendler gentoo org> AuthorDate: Mon Mar 6 09:44:44 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Mar 6 09:45:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d037598 app-misc/mc: Removed old. Package-Manager: Portage-2.3.4, Repoman-2.3.2 app-misc/mc/Manifest | 3 - .../mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch | 11 --- app-misc/mc/mc-4.8.14.ebuild | 101 -------------------- app-misc/mc/mc-4.8.16.ebuild | 106 --------------------- app-misc/mc/mc-4.8.17.ebuild | 103 -------------------- app-misc/mc/mc-4.8.18.ebuild | 102 -------------------- 6 files changed, 426 deletions(-) diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index 9511916028f..dd32e78a0f4 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,6 +1,3 @@ -DIST mc-4.8.14.tar.xz 2305788 SHA256 6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6 SHA512 656a15d117db9a831dcd6f59965a643199cf533d744db3bb6dfaba59854eb07213fa54a3aeb1878abb179d836b434d84490ba505e05c7d829b4ae2ac46e5e724 WHIRLPOOL 6a59dbb517960e39c52c4eaa04b295e17af97cc121ffd2f93f35ad42940dc870f39c3a8c2c310051807ef5649b11fab05e46567b1a635b4e0e192924bd0ae0aa DIST mc-4.8.15.tar.xz 2304812 SHA256 cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16 SHA512 b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760 WHIRLPOOL 6ddf2f5b88825584653a7027d515bfc84caba003408df31b4b8257a3f8c81a179e39a7bb7cc8571976537983f5dac7d6c06ddfbd6142ef0b31639a914f56c0f1 -DIST mc-4.8.16.tar.xz 2387724 SHA256 bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020 SHA512 209a4f92f493d1df5d9976bbd2547b92172270fd35c221e4d4d99630b3530a5cc849bfdff842b47f35e32d215d5af35aadd5cd02bd12567f3736ad4915abb944 WHIRLPOOL 88ec84c10c7f0137b799f7754f25beb372326856107b32fa80f5ecc73dcc9ce6249a8ddc528d2d3e6f723d396828c30dd056b5a3b9b79eb33a0230e9a0c79454 -DIST mc-4.8.17.tar.xz 2457156 SHA256 0447bdddc0baa81866e66f50f9a545d29d6eebb68b0ab46c98d8fddd2bf4e44d SHA512 e995e5b1eb0a5831fe567e4398c9a68fa610c8631f1f13fb277f67f709656bc97bd7b20f289bdace35276984556edd1aed324412d225698c5853809a6d128f72 WHIRLPOOL ad36526d4961baafd35ed55c600c534826036afb1a7b14b81f9617ea766a6cc9100b317a49349428c36b091389e20fa4abd01c931e2e93d9028024857f2419c1 DIST mc-4.8.18.tar.xz 2462080 SHA256 f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece SHA512 edd81f6ab50ca7bb3582064f6722e490d33ae9dfbef3835e26206089d3898420968da394780c594083fa17c01a85cda9068d9931199b8319bf6361f90e900eb8 WHIRLPOOL dd0c1cdfe93468ebc399b270d693751bc7c0665cb49040d9409c3a336c953be0d304c463b8c8a0a26e42c720c116a4b4bd9b930caa2f2101298e01c4ac5c6237 DIST mc-4.8.19.tar.xz 2521808 SHA256 eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df SHA512 aec49f0da1fc69099ce9b0f71926d1e9ee6df0be12f53da94a8f5f4266612515031cd02f328a458bf78260c5efb1c8ca2c34c89e20a77567c8b987e43d446531 WHIRLPOOL 21c57a2717c58488cc7aa5ba5159b9231e09181059662f392a5212a17aa5475493793d49b99e73ebe74d9594201a84cfc63c3a460654579b7399cc563594ab7a diff --git a/app-misc/mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch b/app-misc/mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch deleted file mode 100644 index dda0d834ca9..00000000000 --- a/app-misc/mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mc-4.8.15/misc/syntax/ebuild.syntax -+++ mc-4.8.15/misc/syntax/ebuild.syntax -@@ -75,6 +75,8 @@ - keyword whole dosed yellow - keyword whole dosym yellow - keyword whole eaclocal yellow -+ keyword whole eapply yellow -+ keyword whole eapply_user yellow - keyword whole eautoconf yellow - keyword whole eautoreconf yellow - keyword whole eautomake yellow diff --git a/app-misc/mc/mc-4.8.14.ebuild b/app-misc/mc/mc-4.8.14.ebuild deleted file mode 100644 index bb36c56e0d5..00000000000 --- a/app-misc/mc/mc-4.8.14.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils flag-o-matic - -MY_P=${P/_/-} - -DESCRIPTION="GNU Midnight Commander is a text based file manager" -HOMEPAGE="http://www.midnight-commander.org" -SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg" - -REQUIRED_USE="spell? ( edit )" - -RDEPEND=">=dev-libs/glib-2.8:2 - gpm? ( sys-libs/gpm ) - kernel_linux? ( sys-fs/e2fsprogs ) - samba? ( net-fs/samba ) - sftp? ( net-libs/libssh2 ) - slang? ( >=sys-libs/slang-2 ) - !slang? ( sys-libs/ncurses ) - spell? ( app-text/aspell ) - X? ( x11-libs/libX11 - x11-libs/libICE - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( dev-libs/check ) - " - -[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs) - -src_prepare() { - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh - - epatch "${FILESDIR}"/${PN}-4.8.13-tinfo.patch - epatch "${FILESDIR}"/${PN}-4.8.16-makedev.patch - epatch_user - eautoreconf -} - -S=${WORKDIR}/${MY_P} - -src_configure() { - local myscreen=ncurses - use slang && myscreen=slang - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" - - local homedir=".mc" - use xdg && homedir="XDG" - - econf \ - --disable-silent-rules \ - --disable-dependency-tracking \ - $(use_enable nls) \ - --enable-vfs \ - $(use_enable kernel_linux vfs-undelfs) \ - --enable-charset \ - $(use_with X x) \ - $(use_enable samba vfs-smb) \ - $(use_enable sftp vfs-sftp) \ - $(use_enable spell aspell) \ - $(use_with gpm gpm-mouse) \ - --with-screen=${myscreen} \ - $(use_with edit internal-edit) \ - $(use_enable mclib) \ - $(use_enable test tests) \ - --with-homedir=${homedir} -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS README NEWS - - # fix bug #334383 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then - fowners root:tty /usr/libexec/mc/cons.saver - fperms g+s /usr/libexec/mc/cons.saver - fi - - if ! use xdg ; then - sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \ - -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die - fi -} - -pkg_postinst() { - elog "To enable exiting to latest working directory," - elog "put this into your ~/.bashrc:" - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" -} diff --git a/app-misc/mc/mc-4.8.16.ebuild b/app-misc/mc/mc-4.8.16.ebuild deleted file mode 100644 index 07112364218..00000000000 --- a/app-misc/mc/mc-4.8.16.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic - -MY_P=${P/_/-} - -DESCRIPTION="GNU Midnight Commander is a text based file manager" -HOMEPAGE="http://www.midnight-commander.org" -SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg" - -REQUIRED_USE="spell? ( edit )" - -RDEPEND=">=dev-libs/glib-2.8:2 - gpm? ( sys-libs/gpm ) - kernel_linux? ( sys-fs/e2fsprogs ) - samba? ( net-fs/samba ) - sftp? ( net-libs/libssh2 ) - slang? ( >=sys-libs/slang-2 ) - !slang? ( sys-libs/ncurses:0= ) - spell? ( app-text/aspell ) - X? ( x11-libs/libX11 - x11-libs/libICE - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( dev-libs/check ) - " - -[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs) - -PATCHES=( - "${FILESDIR}"/${PN}-4.8.13-tinfo.patch - "${FILESDIR}"/${PN}-4.8.15-ebuild_syntax_EAPI-6.patch - "${FILESDIR}"/${PN}-4.8.16-makedev.patch -) - -S=${WORKDIR}/${MY_P} - -src_prepare() { - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh - - default - - eautoreconf -} - -src_configure() { - local myscreen=ncurses - use slang && myscreen=slang - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" - - local homedir=".mc" - use xdg && homedir="XDG" - - econf \ - --disable-silent-rules \ - --disable-dependency-tracking \ - $(use_enable nls) \ - --enable-vfs \ - $(use_enable kernel_linux vfs-undelfs) \ - --enable-charset \ - $(use_with X x) \ - $(use_enable samba vfs-smb) \ - $(use_enable sftp vfs-sftp) \ - $(use_enable spell aspell) \ - $(use_with gpm gpm-mouse) \ - --with-screen=${myscreen} \ - $(use_with edit internal-edit) \ - $(use_enable mclib) \ - $(use_enable test tests) \ - --with-homedir=${homedir} -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS README NEWS - - # fix bug #334383 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then - fowners root:tty /usr/libexec/mc/cons.saver - fperms g+s /usr/libexec/mc/cons.saver - fi - - if ! use xdg ; then - sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \ - -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die - fi -} - -pkg_postinst() { - elog "To enable exiting to latest working directory," - elog "put this into your ~/.bashrc:" - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" -} diff --git a/app-misc/mc/mc-4.8.17.ebuild b/app-misc/mc/mc-4.8.17.ebuild deleted file mode 100644 index 0a28315362f..00000000000 --- a/app-misc/mc/mc-4.8.17.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic - -MY_P=${P/_/-} - -DESCRIPTION="GNU Midnight Commander is a text based file manager" -HOMEPAGE="http://www.midnight-commander.org" -SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg" - -REQUIRED_USE="spell? ( edit )" - -RDEPEND=">=dev-libs/glib-2.26.0:2 - gpm? ( sys-libs/gpm ) - kernel_linux? ( sys-fs/e2fsprogs ) - samba? ( net-fs/samba ) - sftp? ( net-libs/libssh2 ) - slang? ( >=sys-libs/slang-2 ) - !slang? ( sys-libs/ncurses:0= ) - spell? ( app-text/aspell ) - X? ( x11-libs/libX11 - x11-libs/libICE - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( dev-libs/check ) - " - -PATCHES=( - "${FILESDIR}"/${PN}-4.8.13-tinfo.patch - "${FILESDIR}"/${PN}-4.8.15-ebuild_syntax_EAPI-6.patch -) - -S=${WORKDIR}/${MY_P} - -src_prepare() { - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh - - default - - eautoreconf -} - -src_configure() { - local myscreen=ncurses - use slang && myscreen=slang - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" - - local homedir=".mc" - use xdg && homedir="XDG" - - econf \ - --disable-silent-rules \ - --disable-dependency-tracking \ - $(use_enable nls) \ - --enable-vfs \ - $(use_enable kernel_linux vfs-undelfs) \ - --enable-charset \ - $(use_with X x) \ - $(use_enable samba vfs-smb) \ - $(use_enable sftp vfs-sftp) \ - $(use_enable spell aspell) \ - $(use_with gpm gpm-mouse) \ - --with-screen=${myscreen} \ - $(use_with edit internal-edit) \ - $(use_enable mclib) \ - $(use_enable test tests) \ - --with-homedir=${homedir} -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS README NEWS - - # fix bug #334383 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then - fowners root:tty /usr/libexec/mc/cons.saver - fperms g+s /usr/libexec/mc/cons.saver - fi - - if ! use xdg ; then - sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \ - -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die - fi -} - -pkg_postinst() { - elog "To enable exiting to latest working directory," - elog "put this into your ~/.bashrc:" - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" -} diff --git a/app-misc/mc/mc-4.8.18.ebuild b/app-misc/mc/mc-4.8.18.ebuild deleted file mode 100644 index 377c9a97c9c..00000000000 --- a/app-misc/mc/mc-4.8.18.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic - -MY_P=${P/_/-} - -DESCRIPTION="GNU Midnight Commander is a text based file manager" -HOMEPAGE="http://www.midnight-commander.org" -SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg" - -REQUIRED_USE="spell? ( edit )" - -RDEPEND=">=dev-libs/glib-2.26.0:2 - gpm? ( sys-libs/gpm ) - kernel_linux? ( sys-fs/e2fsprogs ) - samba? ( net-fs/samba ) - sftp? ( net-libs/libssh2 ) - slang? ( >=sys-libs/slang-2 ) - !slang? ( sys-libs/ncurses:0= ) - spell? ( app-text/aspell ) - X? ( x11-libs/libX11 - x11-libs/libICE - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( dev-libs/check ) - " - -PATCHES=( - "${FILESDIR}"/${PN}-4.8.13-tinfo.patch -) - -S=${WORKDIR}/${MY_P} - -src_prepare() { - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh - - default - - eautoreconf -} - -src_configure() { - local myscreen=ncurses - use slang && myscreen=slang - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" - - local homedir=".mc" - use xdg && homedir="XDG" - - econf \ - --disable-silent-rules \ - --disable-dependency-tracking \ - $(use_enable nls) \ - --enable-vfs \ - $(use_enable kernel_linux vfs-undelfs) \ - --enable-charset \ - $(use_with X x) \ - $(use_enable samba vfs-smb) \ - $(use_enable sftp vfs-sftp) \ - $(use_enable spell aspell) \ - $(use_with gpm gpm-mouse) \ - --with-screen=${myscreen} \ - $(use_with edit internal-edit) \ - $(use_enable mclib) \ - $(use_enable test tests) \ - --with-homedir=${homedir} -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS README NEWS - - # fix bug #334383 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then - fowners root:tty /usr/libexec/mc/cons.saver - fperms g+s /usr/libexec/mc/cons.saver - fi - - if ! use xdg ; then - sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \ - -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die - fi -} - -pkg_postinst() { - elog "To enable exiting to latest working directory," - elog "put this into your ~/.bashrc:" - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" -}