Remove gettext from RDEPEND. Fixes bug 123105. Thanks to Diego Petteno <flameeyes...

Package-Manager: portage-2.0.54

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 851b531bf9d0e7511db6ca75affc6e93e9a9ebd3..cd9f7f8f00ec30a0cf73623c29d9e68fd9922c01 100644 (file)
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.160 2006/02/16 06:21:23 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.161 2006/02/17 01:08:01 vanquirius Exp $
+
+  17 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> gnupg-1.2.6.ebuild,
+  gnupg-1.4.1.ebuild, gnupg-1.4.1-r1.ebuild, gnupg-1.4.2-r1.ebuild,
+  gnupg-1.4.2-r2.ebuild, gnupg-1.4.2-r3.ebuild, gnupg-1.4.2.1.ebuild,
+  gnupg-1.9.20.ebuild:
+  Remove gettext from RDEPEND. Fixes bug 123105. Thanks to Diego Petteno
+  <flameeyes at gentoo dot org>.
 
   16 Feb 2006; Rene Nussbaumer <killerfox@gentoo.org> gnupg-1.4.2.1.ebuild:
   Stable on hppa. See bug #122721.

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index a4b8dc5b44672b2c4ddb5987515a226138e91936..94473e04db6dfc29d2d4f83aa84170c397b5f337 100644 (file)
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,11 +1,11 @@
-MD5 d14e9514294e1256209f3e57fb975b43 ChangeLog 25791
+MD5 e5705f4ffc3c855f2daa0632c99d872d ChangeLog 26132
 MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
 MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2-r1 190
 MD5 f972c88baf3f90f8ef0953df6f328e28 files/digest-gnupg-1.4.2-r2 190
 MD5 f972c88baf3f90f8ef0953df6f328e28 files/digest-gnupg-1.4.2-r3 190
-MD5 27f92020ae62ad7c3dccc1037d8d915f files/digest-gnupg-1.4.2.1 372
+MD5 bc6b26af83d8258c025e691ff0c1a711 files/digest-gnupg-1.4.2.1 192
 MD5 15f59d2129cdfb1c8e6121d45a1e61ca files/digest-gnupg-1.9.20 66
 MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
 MD5 494103ac08d870d8a9c1ed0b83c4ae35 files/gnupg-1.4.1-selftest.patch 1180
@@ -16,12 +16,12 @@ MD5 fb96d149b5fc7dacc041dda2a57b2315 files/gnupg-1.4.2-mpicoder.patch 991
 MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358
 MD5 af68eb5d9d81d48514f170f580d9e83d files/gnupg-1.4.2.1-badruman.patch 558
 MD5 e6487554fb0e281b61ae10aa5105dad9 files/gnupg-1.4.2.1-selftest.patch 1374
-MD5 1539f94509914bf1a9dfeec57f8725e7 gnupg-1.2.6.ebuild 3794
-MD5 c77b579997468bf58a6fc5a5e1a2fb00 gnupg-1.4.1-r1.ebuild 6272
-MD5 6f5e7ed6dfb1ae31f877486a9ff7e441 gnupg-1.4.1.ebuild 6186
-MD5 ffd1a6a73df273ee13e112dc428eb06c gnupg-1.4.2-r1.ebuild 6241
-MD5 314fb0111680f30cd551152636225ea9 gnupg-1.4.2-r2.ebuild 6795
-MD5 b112e76cfc68dc716e5a301523a9411e gnupg-1.4.2-r3.ebuild 6842
-MD5 913bc49d2f8a8b09c3376a5fd762280b gnupg-1.4.2.1.ebuild 6906
-MD5 3eb0f9a3445d5dc346ae950f12977452 gnupg-1.9.20.ebuild 3191
+MD5 c33d4c0d2018fb8ce862e3651f8dc56c gnupg-1.2.6.ebuild 3824
+MD5 f3c9b66ae60d9489af728fb51f43b67d gnupg-1.4.1-r1.ebuild 6298
+MD5 5ef59105c5a53b2bab60c88b06f6a185 gnupg-1.4.1.ebuild 6210
+MD5 962233a8d9a735a8b2fcbafb990fcfdc gnupg-1.4.2-r1.ebuild 6267
+MD5 f444d77227438c1455e4134fbc92742f gnupg-1.4.2-r2.ebuild 6820
+MD5 7704ccabfdf30bc1a86ad81b8449abec gnupg-1.4.2-r3.ebuild 6872
+MD5 4dfdc9c4fa1bf634dfcdc25515d4aefb gnupg-1.4.2.1.ebuild 6933
+MD5 c0303b6186b4642581741079adba89f9 gnupg-1.9.20.ebuild 3262
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481

diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.2.1 b/app-crypt/gnupg/files/digest-gnupg-1.4.2.1
index 4bc4dbb3b5d55788f604332f7a4154e69eeee70a..4fe4547c24e6ab27850d675178f6771d532ddfd7 100644 (file)
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.2.1
+++ b/app-crypt/gnupg/files/digest-gnupg-1.4.2.1
@@ -1,5 +1,3 @@
 MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
-RMD160 5e04b3d6a9f683772916b1686edaddadd8afbb98 gnupg-1.4.2.1.tar.bz2 3030527
-SHA256 df58e9970727306e28dbe3fcadf6cbff1b00abbee3d9c4ac41e2ed4a0a6353b4 gnupg-1.4.2.1.tar.bz2 3030527
 MD5 2d59ed50d92f69994dbfbe00fe1612e4 gnupg-1.4.2.1.tar.bz2 3030527
 MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216

diff --git a/app-crypt/gnupg/gnupg-1.2.6.ebuild b/app-crypt/gnupg/gnupg-1.2.6.ebuild
index bce8a49aff012a8086bc1b41853288362a5e4647..296b44a7c732c56dd5c910baa6a9062f27620169 100644 (file)
--- a/app-crypt/gnupg/gnupg-1.2.6.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.27 2006/01/18 23:04:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.28 2006/02/17 01:08:01 vanquirius Exp $
 
 inherit eutils flag-o-matic
 
@@ -18,7 +18,7 @@ RDEPEND="!static? ( ldap? ( net-nds/openldap )
                        app-arch/bzip2
                        sys-libs/zlib )
        X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-       nls? ( sys-devel/gettext )
+       nls? ( virtual/libintl )
        dev-lang/perl
        virtual/libc
        virtual/mta
@@ -29,7 +29,8 @@ DEPEND="ldap? ( net-nds/openldap )
        !static? ( sys-libs/zlib )
        app-arch/bzip2
        dev-lang/perl
-       virtual/libc"
+       virtual/libc
+       nls? ( sys-devel/gettext )"
 
 src_unpack() {
        unpack ${A}

diff --git a/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
index 18bdc921ee052804463c143b31ea94b5addc2945..87013dcaab2c79e2a5874cac1b69ae9e12c01911 100644 (file)
--- a/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild,v 1.7 2005/09/29 01:59:06 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild,v 1.8 2006/02/17 01:08:01 vanquirius Exp $
 
 inherit eutils flag-o-matic
 
@@ -29,7 +29,7 @@ RDEPEND="
        ldap? ( net-nds/openldap )
        bzip2? ( app-arch/bzip2 )
        zlib? ( sys-libs/zlib )
-       nls? ( sys-devel/gettext )
+       nls? ( virtual/libintl )
        curl? ( net-misc/curl )
        virtual/libc
        virtual/mta
@@ -42,7 +42,8 @@ RDEPEND="${RDEPEND}
        X? ( || (  media-gfx/xloadimage media-gfx/xli ) )"
 
 DEPEND="${RDEPEND}
-       dev-lang/perl"
+       dev-lang/perl
+       nls? ( sys-devel/gettext )"
 
 src_unpack() {
        unpack ${A}

diff --git a/app-crypt/gnupg/gnupg-1.4.1.ebuild b/app-crypt/gnupg/gnupg-1.4.1.ebuild
index c285907c59175dc320f556258807556c5e6dac00..b77c8f6e0e35daa8f03377c8e4583ec3edcabaf2 100644 (file)
--- a/app-crypt/gnupg/gnupg-1.4.1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1.ebuild,v 1.19 2005/09/29 01:59:06 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1.ebuild,v 1.20 2006/02/17 01:08:01 vanquirius Exp $
 
 inherit eutils flag-o-matic
 
@@ -25,11 +25,10 @@ IUSE="bzip2 caps curl ecc idea ldap nls readline selinux smartcard zlib X"
 #                      zlib? ( sys-libs/zlib )
 #              )
 
-RDEPEND="
-       ldap? ( net-nds/openldap )
+RDEPEND="ldap? ( net-nds/openldap )
        bzip2? ( app-arch/bzip2 )
        zlib? ( sys-libs/zlib )
-       nls? ( sys-devel/gettext )
+       nls? ( virtual/libintl )
        curl? ( net-misc/curl )
        virtual/libc
        virtual/mta
@@ -41,7 +40,8 @@ RDEPEND="${RDEPEND}
        X? ( || ( media-gfx/xloadimage media-gfx/xli ) )"
 
 DEPEND="${RDEPEND}
-       dev-lang/perl"
+       dev-lang/perl
+       nls? ( sys-devel/gettext )"
 
 src_unpack() {
        unpack ${A}

diff --git a/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild
index 7d7464549d5eb7d032f7bb414e957f0da19b9c7f..49ccee2b0178f90bed40287069bbce962457ba0d 100644 (file)
--- a/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild,v 1.5 2005/09/29 01:59:06 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild,v 1.6 2006/02/17 01:08:01 vanquirius Exp $
 
 inherit eutils flag-o-matic
 
@@ -29,7 +29,6 @@ COMMON_DEPEND="
        ldap? ( net-nds/openldap )
        bzip2? ( app-arch/bzip2 )
        zlib? ( sys-libs/zlib )
-       nls? ( sys-devel/gettext )
        curl? ( net-misc/curl )
        virtual/libc
        virtual/mta
@@ -39,10 +38,12 @@ COMMON_DEPEND="
 
 RDEPEND="${COMMON_DEPEND}
        X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-       selinux? ( sec-policy/selinux-gnupg )"
+       selinux? ( sec-policy/selinux-gnupg )
+       nls? ( virtual/libintl )"
 
 DEPEND="${COMMON_DEPEND}
-       dev-lang/perl"
+       dev-lang/perl
+       nls? ( sys-devel/gettext )"
 
 src_unpack() {
        unpack ${A}

diff --git a/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild b/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild
index cf8bbd5d3d20b22b701b50a4443d670e2340e13b..1a0996970ce4ed853ab1beada74f71b7402ee5bb 100644 (file)
--- a/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild,v 1.12 2005/11/28 22:31:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild,v 1.13 2006/02/17 01:08:01 vanquirius Exp $
 
 inherit eutils flag-o-matic linux-info
 
@@ -22,7 +22,6 @@ COMMON_DEPEND="
        ldap? ( net-nds/openldap )
        bzip2? ( app-arch/bzip2 )
        zlib? ( sys-libs/zlib )
-       nls? ( sys-devel/gettext )
        curl? ( net-misc/curl )
        virtual/libc
        virtual/mta
@@ -34,10 +33,12 @@ RDEPEND="!static? (
                ${COMMON_DEPEND}
                X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
        )
-       selinux? ( sec-policy/selinux-gnupg )"
+       selinux? ( sec-policy/selinux-gnupg )
+       nls? ( virtual/libintl )"
 
 DEPEND="${COMMON_DEPEND}
-       dev-lang/perl"
+       dev-lang/perl
+       nls? ( sys-devel/gettext )"
 
 pkg_setup() {
        # fix bug #113474 - no compiled kernel needed now

diff --git a/app-crypt/gnupg/gnupg-1.4.2-r3.ebuild b/app-crypt/gnupg/gnupg-1.4.2-r3.ebuild
index 66899dc688cbd8daf153cfb0343f92547e5f0105..3722e692ec46af406620eb8fed25d62ca2382e5f 100644 (file)
--- a/app-crypt/gnupg/gnupg-1.4.2-r3.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r3.ebuild,v 1.14 2006/01/18 23:04:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r3.ebuild,v 1.15 2006/02/17 01:08:01 vanquirius Exp $
 
 inherit eutils flag-o-matic linux-info
 
@@ -22,7 +22,6 @@ COMMON_DEPEND="
        ldap? ( net-nds/openldap )
        bzip2? ( app-arch/bzip2 )
        zlib? ( sys-libs/zlib )
-       nls? ( sys-devel/gettext )
        curl? ( net-misc/curl )
        virtual/libc
        virtual/mta
@@ -34,10 +33,12 @@ RDEPEND="!static? (
                ${COMMON_DEPEND}
                X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
        )
-       selinux? ( sec-policy/selinux-gnupg )"
+       selinux? ( sec-policy/selinux-gnupg )
+       nls? ( virtual/libintl )"
 
 DEPEND="${COMMON_DEPEND}
-       dev-lang/perl"
+       dev-lang/perl
+       nls? ( sys-devel/gettext )"
 
 pkg_setup() {
        # fix bug #113474 - no compiled kernel needed now

diff --git a/app-crypt/gnupg/gnupg-1.4.2.1.ebuild b/app-crypt/gnupg/gnupg-1.4.2.1.ebuild
index 17a07c6e7fe03fc5d386e572b0029eb6a3d1e6f5..4a9a65cbebecffde8e9fec8f7d25fefb12764dac 100644 (file)
--- a/app-crypt/gnupg/gnupg-1.4.2.1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2.1.ebuild,v 1.7 2006/02/16 06:21:23 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2.1.ebuild,v 1.8 2006/02/17 01:08:01 vanquirius Exp $
 
 inherit eutils flag-o-matic linux-info
 
@@ -22,7 +22,6 @@ COMMON_DEPEND="
        ldap? ( net-nds/openldap )
        bzip2? ( app-arch/bzip2 )
        zlib? ( sys-libs/zlib )
-       nls? ( sys-devel/gettext )
        curl? ( net-misc/curl )
        virtual/libc
        virtual/mta
@@ -34,10 +33,12 @@ RDEPEND="!static? (
                ${COMMON_DEPEND}
                X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
        )
-       selinux? ( sec-policy/selinux-gnupg )"
+       selinux? ( sec-policy/selinux-gnupg )
+       nls? ( virtual/libintl )"
 
 DEPEND="${COMMON_DEPEND}
-       dev-lang/perl"
+       dev-lang/perl
+       nls? ( sys-devel/gettext )"
 
 pkg_setup() {
        # fix bug #113474 - no compiled kernel needed now

diff --git a/app-crypt/gnupg/gnupg-1.9.20.ebuild b/app-crypt/gnupg/gnupg-1.9.20.ebuild
index 4b373170df14d2766dcdb278049411045d9458d4..10c4b8157ab48811c2c4f22df84fd10568fa151a 100644 (file)
--- a/app-crypt/gnupg/gnupg-1.9.20.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.20.ebuild,v 1.2 2006/01/18 23:04:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.20.ebuild,v 1.3 2006/02/17 01:08:01 vanquirius Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,8 +13,7 @@ SLOT="1.9"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="X caps ldap nls smartcard selinux"
 
-DEPEND="
-       nls? ( sys-devel/gettext )
+COMMON_DEPEND="
        dev-lang/perl
        sys-libs/zlib
        virtual/libc
@@ -27,10 +26,14 @@ DEPEND="
        ldap? ( net-nds/openldap )
        caps? ( sys-libs/libcap )"
 
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+       nls? ( sys-devel/gettext )"
+
+RDEPEND="${COMMON_DEPEND}
        X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
        virtual/mta
-       selinux? ( sec-policy/selinux-gnupg )"
+       selinux? ( sec-policy/selinux-gnupg )
+       nls? ( virtual/libintl )"
 
 RESTRICT="test"
 # self tests can't work since it depends on gpg-agent

diff --git a/app-crypt/gpg-agent/Manifest b/app-crypt/gpg-agent/Manifest
index 6523fd73146a2540c09c947c41473322ee3e57eb..3e270a5153dd256df2816575a10a17799ec586b8 100644 (file)
--- a/app-crypt/gpg-agent/Manifest
+++ b/app-crypt/gpg-agent/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b7ae2da1cb373b2d40bc63f9eb65e02b ChangeLog 2432
+MD5 3dee0ac15a60f81fab48607c883faf11 ChangeLog 2644
 MD5 7247c8f0379977f0a3dd13568bf283c7 files/digest-gpg-agent-1.9.18 66
 MD5 28ad3af724b879fe86743d59ae4447dd files/digest-gpg-agent-1.9.19 66
-MD5 ff93508de1ff781c60ff6c8eb7cdc2a9 gpg-agent-1.9.18.ebuild 1932
-MD5 704478ba934dc7d530e0caad529e6033 gpg-agent-1.9.19.ebuild 1902
+MD5 1b8c522783f04e8580529cb54deb3baf gpg-agent-1.9.18.ebuild 1957
+MD5 4e6d89fab334d815c89d0d892af15e64 gpg-agent-1.9.19.ebuild 1929
 MD5 cbb90c3fb885f86a1c6bea0f4493f9ab metadata.xml 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDrqtPAiZjviIA2XgRAlDnAJ4hu9f93JGj5mCyd7HQcEeimVhHggCgiQ9z
-xVw82hmjbdBfo7Fa17iy8yk=
-=v7NG
------END PGP SIGNATURE-----