Bump to 1.2.12b

Package-Manager: portage-2.1.2.5

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 4bc18735f3dea2d95325bec38670db1ca0b4921f..435f529741da25f30b22311947ddbc0c0f0c382b 100644 (file)
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.95 2007/04/23 16:11:47 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.96 2007/04/28 01:20:53 dang Exp $
+
+*liferea-1.2.12b (28 Apr 2007)
+
+  28 Apr 2007; Daniel Gryniewicz <dang@gentoo.org> -liferea-1.2.7.ebuild,
+  -liferea-1.2.10.ebuild, +liferea-1.2.12b.ebuild:
+  Bump to 1.2.12b
+
+  23 Apr 2007; Daniel Gryniewicz <dang@gentoo.org> -liferea-1.2.7.ebuild,
+  -liferea-1.2.10.ebuild:
+  Remove some old versions
 
 *liferea-1.2.12 (23 Apr 2007)
 

diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 0492d931f465502b6a6ab44cb259704dc5f9379b..ab697ddcdae283734cba0f65ff5c7e085326fc7b 100644 (file)
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -15,10 +15,9 @@ RMD160 0bf67b33913e08ed5528b86813aae30649123304 files/liferea-1.1.0-libnotify.pa
 SHA256 73a54e020b045ee261f9444464a68f4f1aba831182498b8a103886b7c0108bab files/liferea-1.1.0-libnotify.patch 552
 DIST liferea-1.0.16.tar.gz 1575690 RMD160 c5ba8aed414c333a9e12d950a821042216cee310 SHA1 6a134e12cad915dd85f0fb467f39397400a69614 SHA256 591d7d6b6ea6d8c0a90c68418d1e65076bbfe32976f00d229357f45176e3ebe4
 DIST liferea-1.0.24.tar.gz 1572698 RMD160 53d4e332373563b1a813f342d690f28722a5d867 SHA1 1c486d559796ab921dd4dd858ba03ab0c46f62f1 SHA256 00218636ddae880d7e409435332a754316ead94f2af3aad53c9e5f2106f05964
-DIST liferea-1.2.10.tar.gz 1400950 RMD160 32dece0769c6a417c83ddb5e135152cd6e989c01 SHA1 f4d4840a65ec94ddddee472f56c713412d75e1ff SHA256 456f478a015b68652f48375729341e884822e0db95b6d7d8945c25ca557e2359
 DIST liferea-1.2.10c.tar.gz 1402817 RMD160 b54023166255d28b3b7b0bf85504de31db7519a9 SHA1 2fe1a0cbe9f791f074ac3d5528f00537f208267e SHA256 ffb72efdc11ccb13fb784f82c4e0b62f2932a0e3316730df41f9f60db9ffc732
 DIST liferea-1.2.12.tar.gz 1424338 RMD160 3d377cac75bfd92584732d075383af3cd1fa30a0 SHA1 64526891333ab712740d4a212df4ffb270999827 SHA256 f77edddd1e4273afd20b8f4b4c1e9130dd59cc600879a0638152b2436c243545
-DIST liferea-1.2.7.tar.gz 1380329 RMD160 a73924fd8b95f37d8377b340a71aafb72567dbda SHA1 cfb0b442dd7b25aefbfb4f24b4bf5c5277f883a9 SHA256 f97d61c0b9ce4d0d79f259a84db82135ee80c524dbc24c83a7bd7dd928151a6a
+DIST liferea-1.2.12b.tar.gz 1424496 RMD160 3690eb4ae338e29633e4381e50c4b5f09d1fd53a SHA1 b96db455e9c7646d9df0fda69f2edba772e7832e SHA256 b3750a0f96cd2ab62b1ac6ffa3b30d27d62d10b7d77ade3b00f180a9b3e0f032
 DIST liferea-1.2.8.tar.gz 1399175 RMD160 6487beb704f1e6d24155ab88e9ac40fde353bc3c SHA1 50065e7f7ee6903280c73af0496555f62271413c SHA256 92f9337498c55feadd6eee4a8e3e800b07fb579dbb2bd2490b1ad0d2348768c6
 EBUILD liferea-1.0.16.ebuild 1781 RMD160 37f9ac79e37c9ce76f0a396e04a71f083ea09239 SHA1 e39eaab188ef5cf800339fc7ecb224f6a5d98a5e SHA256 7f1821ca36162fc7f437716fa5c4f0980b45a0e1daa8ce8d40a9060dd36f5cc9
 MD5 63379fdc2f15c36a3961adc442c7f63d liferea-1.0.16.ebuild 1781
@@ -28,10 +27,6 @@ EBUILD liferea-1.0.24.ebuild 1833 RMD160 ac38ec4ffe265aeb33e67faa56e2464cbf2cfa1
 MD5 eb64edd6fd83271f3f9451dc55c2aa76 liferea-1.0.24.ebuild 1833
 RMD160 ac38ec4ffe265aeb33e67faa56e2464cbf2cfa12 liferea-1.0.24.ebuild 1833
 SHA256 46b00fb201e40375edb0d86af4d8dd7ae8a0d12a8c7bc4fd5777d17ff206c1f5 liferea-1.0.24.ebuild 1833
-EBUILD liferea-1.2.10.ebuild 2677 RMD160 ce2d06fea3e05f4c17c809ede37a1e09f9bddcc0 SHA1 8d75461f56d2e5918932205fe413dff1277435bb SHA256 141dd057508adc9830576b455be55cef639c760ca0e545fa85bf10782bc36906
-MD5 5447d6d60af1f4889ae68ec795f19920 liferea-1.2.10.ebuild 2677
-RMD160 ce2d06fea3e05f4c17c809ede37a1e09f9bddcc0 liferea-1.2.10.ebuild 2677
-SHA256 141dd057508adc9830576b455be55cef639c760ca0e545fa85bf10782bc36906 liferea-1.2.10.ebuild 2677
 EBUILD liferea-1.2.10c.ebuild 2766 RMD160 4ec9fe50f6953a5a69ff7c0a4a72eba8de58e67a SHA1 a61edaccb48c004497541f70c0e1a6fc931790fe SHA256 02f8b8b70a79294df25100d5afde29d71d5a8779c455c83bc0d924a9af5e97c4
 MD5 29f672de1a0eea29155f2a6d24ec9561 liferea-1.2.10c.ebuild 2766
 RMD160 4ec9fe50f6953a5a69ff7c0a4a72eba8de58e67a liferea-1.2.10c.ebuild 2766
@@ -40,18 +35,18 @@ EBUILD liferea-1.2.12.ebuild 2714 RMD160 6ce55428dc74e457de7e5b5a119d7a561b08d7d
 MD5 6c4be86a5caf4097d51414cf8875de76 liferea-1.2.12.ebuild 2714
 RMD160 6ce55428dc74e457de7e5b5a119d7a561b08d7d5 liferea-1.2.12.ebuild 2714
 SHA256 6571b358a697090b91736efaa76e0515fd5ad5d6b69bf887ab3a42496d6f9719 liferea-1.2.12.ebuild 2714
-EBUILD liferea-1.2.7.ebuild 2679 RMD160 21af96fec1847abab60e79b70a4a327a09a2282e SHA1 60fbe5b8e577d5e316f4c3e509adbf78a058005b SHA256 14e5251ced8a9a6b4b25bfac264e4b0c7092e7f0bce3996df6a4492815e1b73e
-MD5 14647db42a9fd128563439d3ebcc9bee liferea-1.2.7.ebuild 2679
-RMD160 21af96fec1847abab60e79b70a4a327a09a2282e liferea-1.2.7.ebuild 2679
-SHA256 14e5251ced8a9a6b4b25bfac264e4b0c7092e7f0bce3996df6a4492815e1b73e liferea-1.2.7.ebuild 2679
+EBUILD liferea-1.2.12b.ebuild 2745 RMD160 5f4ea92f547342272b5844d52a4c6c05640855b9 SHA1 25d90148570a70915d9fbdbaf9925f9f8ed2c244 SHA256 be1c48b5f4d0db55374bfe98411b336ac467df88b8ee5c5bfab5cdb246d7f52d
+MD5 9be81322fce69f820af503c76fbd2773 liferea-1.2.12b.ebuild 2745
+RMD160 5f4ea92f547342272b5844d52a4c6c05640855b9 liferea-1.2.12b.ebuild 2745
+SHA256 be1c48b5f4d0db55374bfe98411b336ac467df88b8ee5c5bfab5cdb246d7f52d liferea-1.2.12b.ebuild 2745
 EBUILD liferea-1.2.8.ebuild 2676 RMD160 38d66cc0002b458526b6d84fb2cc719aef760c23 SHA1 c4fcf181a4b89262c547b5f7ac5a95dff3d1a171 SHA256 a3cc12f58a470e2a2f53d79b62c49e4503984f79458b70b3839b046ce5cb355c
 MD5 a677d5677236e5a3cf9306365f24a620 liferea-1.2.8.ebuild 2676
 RMD160 38d66cc0002b458526b6d84fb2cc719aef760c23 liferea-1.2.8.ebuild 2676
 SHA256 a3cc12f58a470e2a2f53d79b62c49e4503984f79458b70b3839b046ce5cb355c liferea-1.2.8.ebuild 2676
-MISC ChangeLog 22778 RMD160 e7492c973e63cc227e842db49b2af3ab90a3eeda SHA1 fffd89db15eb9ba9b879556836e950afb18cf311 SHA256 63594de724f767c2750c12bb10da16061db3d611d644dc9d8cf36b1f6525d616
-MD5 04ed81d09772f02719dd3c6f95e3409b ChangeLog 22778
-RMD160 e7492c973e63cc227e842db49b2af3ab90a3eeda ChangeLog 22778
-SHA256 63594de724f767c2750c12bb10da16061db3d611d644dc9d8cf36b1f6525d616 ChangeLog 22778
+MISC ChangeLog 23082 RMD160 c8145b88a0c8e6f3fbd18aa7f0b6077c911f59e6 SHA1 be4dacbfd8e74922f6652890895f8ba9662dfdd6 SHA256 7ea2aa95b0de8c81af9f8eb1857cf7b0b0d7571508dfea259a14a00b8c054f78
+MD5 996fe08f22af847d0806e2e510acc8c5 ChangeLog 23082
+RMD160 c8145b88a0c8e6f3fbd18aa7f0b6077c911f59e6 ChangeLog 23082
+SHA256 7ea2aa95b0de8c81af9f8eb1857cf7b0b0d7571508dfea259a14a00b8c054f78 ChangeLog 23082
 MISC metadata.xml 234 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d SHA1 f541accc026d4661bfb88d67e90b52688bdd5bb7 SHA256 d591157e9bfeb2310593aed627aeb34ba920b77b253285649a87f7749c39592f
 MD5 4f37ad0cecc87d9509c096e2c59e10fd metadata.xml 234
 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d metadata.xml 234
@@ -62,25 +57,22 @@ SHA256 665ce96de96f78e6071d90c65196782710a5f736e599ae3cc61cf1ec70dc8d24 files/di
 MD5 0466adafefcf633997604b59182915d2 files/digest-liferea-1.0.24 247
 RMD160 f05de6c55ee2573c7a04ed45afb380a106c30732 files/digest-liferea-1.0.24 247
 SHA256 9de48950eb66e768e3163a3fd128a197198bc47c4b041d0afc77679765dd1bf6 files/digest-liferea-1.0.24 247
-MD5 aed9b35a9cbcb2de6f1dc46efb09fb9c files/digest-liferea-1.2.10 247
-RMD160 340bb298a158e464916aefad3805112f1f1ebf67 files/digest-liferea-1.2.10 247
-SHA256 1e71e28cfc208f71f63294e766667d7537f3bfa52848f1786a4084f208e9fe2a files/digest-liferea-1.2.10 247
 MD5 05436fcad1d0a8a9ca2107b5c7fb3ef3 files/digest-liferea-1.2.10c 250
 RMD160 feb66bd9ad352d42a7ce487f1752e4fd5ad1335a files/digest-liferea-1.2.10c 250
 SHA256 f6270c7590735c66eae83278fb0e016913b0649d8ae9ef22e9c25059d608c6a4 files/digest-liferea-1.2.10c 250
 MD5 57d194480dec97c436c7b76a4106ffa4 files/digest-liferea-1.2.12 247
 RMD160 5c71ec34addec3fbdf3688f0a3bc9cc822fc2b00 files/digest-liferea-1.2.12 247
 SHA256 3dcd2806e6299050dbcf079b87f0d0eb4c3cd9caa054306313f0edac6f103897 files/digest-liferea-1.2.12 247
-MD5 211cb480c41ff367387849a60112548f files/digest-liferea-1.2.7 244
-RMD160 e24ef6115281550a076e8833ed1fa7ab452a6730 files/digest-liferea-1.2.7 244
-SHA256 2e2dc2fa070e942e41072da2925cb62920b3be74c2c25b63c1adfd48fcbb6deb files/digest-liferea-1.2.7 244
+MD5 18aa5d5737c13fff5a38333b493e9b24 files/digest-liferea-1.2.12b 250
+RMD160 bdc823bb612df57fa705450c49dba45942961a30 files/digest-liferea-1.2.12b 250
+SHA256 85f553f1d2138f0b93679afcb8cf8d69e27ad8cf6d00d875a0d3b12ae956f20b files/digest-liferea-1.2.12b 250
 MD5 e8b078858ab2cee39b76a20d15964c7b files/digest-liferea-1.2.8 244
 RMD160 2349e294de7d85e8cb2b84f6dc6a6b74049d01a6 files/digest-liferea-1.2.8 244
 SHA256 65c7a92d7f51c243696118c17d7a7c45580231c3ec3a33e09daafea6a0e364e9 files/digest-liferea-1.2.8 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGLNrQomPajV0RnrERAvKQAJ9WDfuPdbE3+LJkoAv7Xz9UgoafKACfbRyb
-4M7GHnGyYKZyevgH883/Rjo=
-=SVBw
+iD8DBQFGMqGAomPajV0RnrERAk5RAJ0bQvCzFrWZstAXnz7Kxofx/0A4uwCfZfPX
+62ZowGXjkkDa3VhdU65y3Aw=
+=86Mp
 -----END PGP SIGNATURE-----

diff --git a/net-news/liferea/files/digest-liferea-1.2.10 b/net-news/liferea/files/digest-liferea-1.2.10
deleted file mode 100644 (file)
index 2c81ab6..0000000
--- a/net-news/liferea/files/digest-liferea-1.2.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 963eb68814ead684d295afadd08298f4 liferea-1.2.10.tar.gz 1400950
-RMD160 32dece0769c6a417c83ddb5e135152cd6e989c01 liferea-1.2.10.tar.gz 1400950
-SHA256 456f478a015b68652f48375729341e884822e0db95b6d7d8945c25ca557e2359 liferea-1.2.10.tar.gz 1400950

diff --git a/net-news/liferea/files/digest-liferea-1.2.12b b/net-news/liferea/files/digest-liferea-1.2.12b
new file mode 100644 (file)
index 0000000..3c7e581
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.2.12b
@@ -0,0 +1,3 @@
+MD5 87bf926986f4fc6dcd7fd2310c60a7ac liferea-1.2.12b.tar.gz 1424496
+RMD160 3690eb4ae338e29633e4381e50c4b5f09d1fd53a liferea-1.2.12b.tar.gz 1424496
+SHA256 b3750a0f96cd2ab62b1ac6ffa3b30d27d62d10b7d77ade3b00f180a9b3e0f032 liferea-1.2.12b.tar.gz 1424496

diff --git a/net-news/liferea/files/digest-liferea-1.2.7 b/net-news/liferea/files/digest-liferea-1.2.7
deleted file mode 100644 (file)
index 9cb5731..0000000
--- a/net-news/liferea/files/digest-liferea-1.2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e15b37b9f96606581c941431a38fd933 liferea-1.2.7.tar.gz 1380329
-RMD160 a73924fd8b95f37d8377b340a71aafb72567dbda liferea-1.2.7.tar.gz 1380329
-SHA256 f97d61c0b9ce4d0d79f259a84db82135ee80c524dbc24c83a7bd7dd928151a6a liferea-1.2.7.tar.gz 1380329

diff --git a/net-news/liferea/liferea-1.2.10.ebuild b/net-news/liferea/liferea-1.2.12b.ebuild
similarity index 88%
rename from net-news/liferea/liferea-1.2.10.ebuild
rename to net-news/liferea/liferea-1.2.12b.ebuild
index babee2783f3663fd37829582cf8d8e766b9b9320..5c8f8f534de1a29768584332b5606d09dd660208 100644 (file)
--- a/net-news/liferea/liferea-1.2.10.ebuild
+++ b/net-news/liferea/liferea-1.2.12b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.10.ebuild,v 1.1 2007/03/28 03:12:25 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.12b.ebuild,v 1.1 2007/04/28 01:20:54 dang Exp $
 
 WANT_AUTOMAKE=1.7
 WANT_AUTOCONF=latest
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus firefox gtkhtml seamonkey libnotify gnutls xulrunner"
+IUSE="dbus firefox gtkhtml gnutls libnotify networkmanager seamonkey xulrunner"
 
 RDEPEND=">=x11-libs/gtk+-2.8
        x11-libs/pango
@@ -26,10 +26,9 @@ RDEPEND=">=x11-libs/gtk+-2.8
        !xulrunner? ( !firefox? ( seamonkey? ( www-client/seamonkey ) ) )
        !amd64? ( !xulrunner? ( !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) ) )
        !amd64? ( gtkhtml? ( =gnome-extra/gtkhtml-2* ) )
-       dbus? ( || ( >=dev-libs/dbus-glib-0.71
-               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 ) )
-       )
+       dbus? ( >=dev-libs/dbus-glib-0.71 )
        libnotify? ( >=x11-libs/libnotify-0.3.2 )
+       networkmanager? ( net-misc/networkmanager )
        gnutls? ( net-libs/gnutls )"
 
 DEPEND="${RDEPEND}
@@ -38,10 +37,9 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
+S="${WORKDIR}/liferea-1.2.12"
 src_unpack() {
-       unpack ${A}
-
-       cd ${S}
+       gnome2_src_unpack
 
        epatch "${FILESDIR}/${PN}-1.1.0-libnotify.patch"
 
@@ -80,7 +78,8 @@ pkg_setup() {
        G2CONF="${G2CONF} \
                $(use_enable dbus) \
                $(use_enable gnutls) \
-               $(use_enable libnotify)"
+               $(use_enable libnotify) \
+               $(use_enable networkmanager nm)"
 }
 
 src_install() {

diff --git a/net-news/liferea/liferea-1.2.7.ebuild b/net-news/liferea/liferea-1.2.7.ebuild
deleted file mode 100644 (file)
index 9a75df7..0000000
--- a/net-news/liferea/liferea-1.2.7.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.7.ebuild,v 1.2 2007/03/07 19:12:29 corsair Exp $
-
-WANT_AUTOMAKE=1.7
-WANT_AUTOCONF=latest
-inherit gnome2 flag-o-matic eutils autotools
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
-HOMEPAGE="http://liferea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus firefox gtkhtml seamonkey libnotify gnutls xulrunner"
-
-RDEPEND=">=x11-libs/gtk+-2.8
-       x11-libs/pango
-       >=gnome-base/gconf-2
-       >=dev-libs/libxml2-2.6.27
-       >=dev-libs/libxslt-1.1.19
-       >=dev-libs/glib-2
-       xulrunner? ( net-libs/xulrunner )
-       !xulrunner? ( firefox? ( www-client/mozilla-firefox ) )
-       !xulrunner? ( !firefox? ( seamonkey? ( www-client/seamonkey ) ) )
-       !amd64? ( !xulrunner? ( !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) ) )
-       !amd64? ( gtkhtml? ( =gnome-extra/gtkhtml-2* ) )
-       dbus? ( || ( >=dev-libs/dbus-glib-0.71
-               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 ) )
-       )
-       libnotify? ( >=x11-libs/libnotify-0.3.2 )
-       gnutls? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       >=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_unpack() {
-       unpack ${A}
-
-       cd ${S}
-
-       epatch "${FILESDIR}/${PN}-1.1.0-libnotify.patch"
-
-       eautoreconf || die "Autoreconf failed"
-}
-
-pkg_setup() {
-       # On amd64, gtkhtml isn't supported.  You need one of the gecko use flags
-       if use amd64 && ! use firefox && ! use seamonkey && ! use xulrunner; then
-               elog "gtkhtml is no longer supported on amd64; you will need to select"
-               elog "one of the gecko backends to use liferea"
-               die "You must enable on of the gecko backends on amd64"
-       fi
-
-       # if you don't choose a gecko to use, we will automatically
-       # use gtkhtml2 as the backend except on amd64 (where we failed above)
-       if ! use seamonkey && ! use firefox && ! use xulrunner && ! use amd64 ; then
-               G2CONF="${G2CONF} --enable-gtkhtml2"
-       elif ! use amd64 && use gtkhtml ; then
-               G2CONF="${G2CONF} --enable-gtkhtml2"
-       else
-               G2CONF="${G2CONF} --disable-gtkhtml2"
-       fi
-
-       # we prefer xulrunner over firefox over seamonkey
-       if use xulrunner ; then
-               G2CONF="${G2CONF} --enable-xulrunner"
-       elif use firefox ; then
-               G2CONF="${G2CONF} --enable-gecko=firefox"
-       elif use seamonkey ; then
-               G2CONF="${G2CONF} --enable-gecko=seamonkey"
-       else
-               G2CONF="${G2CONF} --disable-gecko"
-       fi
-
-       G2CONF="${G2CONF} \
-               $(use_enable dbus) \
-               $(use_enable gnutls) \
-               $(use_enable libnotify)"
-}
-
-src_install() {
-       gnome2_src_install
-       rm -f ${D}/usr/bin/${PN}
-       mv ${D}/usr/bin/${PN}-bin ${D}/usr/bin/${PN}
-}