ppc stable, #105264. Housekeeping.

(Portage version: 2.1-r1)
 (Unsigned Manifest commit)

9 files changed, 8 insertions, 319 deletions

diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index 49b6587c4f0a..200d15d26ecc 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,47 +1,16 @@
-AUX include-compiler.patch 1260 RMD160 054a8863319672925878cf668024377fc43537cd SHA1 2cb6dddb54d6371450aad4297c0ed1ab62e012cc SHA256 7be4f7ba94f7a093599140716ea097adde66a4d427eb888cc8c75724e4e6fca9
-MD5 bc32f42062ca5fdd9ab06af3a2d28002 files/include-compiler.patch 1260
-RMD160 054a8863319672925878cf668024377fc43537cd files/include-compiler.patch 1260
-SHA256 7be4f7ba94f7a093599140716ea097adde66a4d427eb888cc8c75724e4e6fca9 files/include-compiler.patch 1260
-AUX makefile_0.2.7.patch 516 RMD160 8475ff3d6e3bbef8c2bab95f6768fd2cac273eab SHA1 26418bd49c3beb67b8a7a8d3fc375e3da3227b04 SHA256 e8225537204b1d85852d85183c343032623688a6a7579f271ad07422827f37ff
-MD5 f61489ef14c36f4ae6bffd22c3c9e341 files/makefile_0.2.7.patch 516
-RMD160 8475ff3d6e3bbef8c2bab95f6768fd2cac273eab files/makefile_0.2.7.patch 516
-SHA256 e8225537204b1d85852d85183c343032623688a6a7579f271ad07422827f37ff files/makefile_0.2.7.patch 516
-DIST davfs2-0.2.4.tar.gz 141438
-DIST davfs2-0.2.7.tar.gz 144219 RMD160 7d72752425031d88ccbcb9c93f62ba0046fced1b SHA256 8e230254e8a1c426ddb6a78de62de931c0c8cfe0767686b7a10a5031c4340826
 DIST davfs2-0.2.8.tar.gz 150594 RMD160 3a8b5661d145c74652d310d760e5f39c356ae490 SHA1 40b682f6673003a237336e30b6c465d9df0063c6 SHA256 04f98a83e6339f490046d908c0fcca1275e79462f11592187eb23c7368a172f1
-EBUILD davfs2-0.2.4-r1.ebuild 2057 RMD160 98a436e46922366d50641a17d499735ab90f0ee0 SHA1 2803a8b3a7433f5dc659f12bead7b6eac31c53f4 SHA256 0863fab06ca7cbd8712db75af89d9fa7341ddce3af57cb922d9f3b4cc434a997
-MD5 74c01404315b11a4321861f8171c561e davfs2-0.2.4-r1.ebuild 2057
-RMD160 98a436e46922366d50641a17d499735ab90f0ee0 davfs2-0.2.4-r1.ebuild 2057
-SHA256 0863fab06ca7cbd8712db75af89d9fa7341ddce3af57cb922d9f3b4cc434a997 davfs2-0.2.4-r1.ebuild 2057
-EBUILD davfs2-0.2.4-r2.ebuild 2124 RMD160 aeefad642b3665df8f3fc9bf318b71a0c30b6979 SHA1 2e1e60d629981c45af836d79beb2b7cbc44168db SHA256 dae01422636802696d55320e00a22ac0954f0bc670095aab72c54cdb1fc91173
-MD5 7d1a317e3aae3ab91a4d58d89c9aad17 davfs2-0.2.4-r2.ebuild 2124
-RMD160 aeefad642b3665df8f3fc9bf318b71a0c30b6979 davfs2-0.2.4-r2.ebuild 2124
-SHA256 dae01422636802696d55320e00a22ac0954f0bc670095aab72c54cdb1fc91173 davfs2-0.2.4-r2.ebuild 2124
-EBUILD davfs2-0.2.7.ebuild 2105 RMD160 7d4f05e511dfb328fca5b55001058fee1adae9e1 SHA1 c3e89576ac69abb45ee97a2b4e549c61821d6d74 SHA256 dd0d4162f54ed000cac38f9eb9fdafdd69dd364e8ea2c5ef2e4b41bd5aa5e7ea
-MD5 d473cab9e7d12504ef11ec33b54ba5be davfs2-0.2.7.ebuild 2105
-RMD160 7d4f05e511dfb328fca5b55001058fee1adae9e1 davfs2-0.2.7.ebuild 2105
-SHA256 dd0d4162f54ed000cac38f9eb9fdafdd69dd364e8ea2c5ef2e4b41bd5aa5e7ea davfs2-0.2.7.ebuild 2105
-EBUILD davfs2-0.2.8.ebuild 1797 RMD160 32016a725716b91746a7717a78389eb45d2cb622 SHA1 95ba73ed4870d797086ed4e83428dec89ef8da4b SHA256 52ce1753bf379fabf77f2f0531530590c36c5462e8c72bf1da0bbac7b29f7252
-MD5 b29c10801f35ffd391fe8dfe7bcd217d davfs2-0.2.8.ebuild 1797
-RMD160 32016a725716b91746a7717a78389eb45d2cb622 davfs2-0.2.8.ebuild 1797
-SHA256 52ce1753bf379fabf77f2f0531530590c36c5462e8c72bf1da0bbac7b29f7252 davfs2-0.2.8.ebuild 1797
-MISC ChangeLog 5467 RMD160 4da9664357c0d12d37cff80cb7fa1087648e26f8 SHA1 40ae4f918f86365cb2aa0a70099db4f6d037f807 SHA256 aae53d8b46eb8b0ae984c7248d58cb22b7663c06e5babf1edbee9a5af2c4bca2
-MD5 791c88ede0426bf08d91461c01ac3d62 ChangeLog 5467
-RMD160 4da9664357c0d12d37cff80cb7fa1087648e26f8 ChangeLog 5467
-SHA256 aae53d8b46eb8b0ae984c7248d58cb22b7663c06e5babf1edbee9a5af2c4bca2 ChangeLog 5467
+EBUILD davfs2-0.2.8.ebuild 1799 RMD160 0774802d440d0454090068eef29b7f0abc4c28f4 SHA1 cf5f09e45d39b5491acfd5f012e7e74bc5e64f2b SHA256 9c6b4e913a1588001e2348494c10fa3597390667e861c7748b353d1f7e4c3001
+MD5 9d7d9cea96653e254b307a709047c9dd davfs2-0.2.8.ebuild 1799
+RMD160 0774802d440d0454090068eef29b7f0abc4c28f4 davfs2-0.2.8.ebuild 1799
+SHA256 9c6b4e913a1588001e2348494c10fa3597390667e861c7748b353d1f7e4c3001 davfs2-0.2.8.ebuild 1799
+MISC ChangeLog 5723 RMD160 7b388b05ffcafe3ae83475fbcf36d90681cedf1e SHA1 1364c4e6d9d6fc4e53e7cfe305a0bc16c6fd54eb SHA256 3549a94ce1b358153ad46a36d12c98d12206bfbf56c5df73c2b71ba1176db4fe
+MD5 39e50f58358fca8b905412162e008914 ChangeLog 5723
+RMD160 7b388b05ffcafe3ae83475fbcf36d90681cedf1e ChangeLog 5723
+SHA256 3549a94ce1b358153ad46a36d12c98d12206bfbf56c5df73c2b71ba1176db4fe ChangeLog 5723
 MISC metadata.xml 264 RMD160 2f8b1195d6d7e399bb5c66301c2035afe54ddd73 SHA1 294a3324f4ba64623163fe2da2ef2c12a4e6922b SHA256 5eb597f5a232999a303e75d3fd716eb086cb87b40f0b50bb80e6c2693323f8b0
 MD5 90d54af17451a3725b7244f94d7ac81a metadata.xml 264
 RMD160 2f8b1195d6d7e399bb5c66301c2035afe54ddd73 metadata.xml 264
 SHA256 5eb597f5a232999a303e75d3fd716eb086cb87b40f0b50bb80e6c2693323f8b0 metadata.xml 264
-MD5 fcd02008e517ea0eb9ff6a675723e3bc files/digest-davfs2-0.2.4-r1 64
-RMD160 87356d36892aea6eebc7cdd89ab4bbd267cc868f files/digest-davfs2-0.2.4-r1 64
-SHA256 c780a7a7aff92a5a709e60899ea81547d25de2e1e7fb3e53d0a266cf8c3ed14b files/digest-davfs2-0.2.4-r1 64
-MD5 fcd02008e517ea0eb9ff6a675723e3bc files/digest-davfs2-0.2.4-r2 64
-RMD160 87356d36892aea6eebc7cdd89ab4bbd267cc868f files/digest-davfs2-0.2.4-r2 64
-SHA256 c780a7a7aff92a5a709e60899ea81547d25de2e1e7fb3e53d0a266cf8c3ed14b files/digest-davfs2-0.2.4-r2 64
-MD5 d50b1d50f97cabb082dd73a4b3868163 files/digest-davfs2-0.2.7 238
-RMD160 066b090d07f49e84ce2ad9f319e8eb00d28c4ab9 files/digest-davfs2-0.2.7 238
-SHA256 eaed9ef91d5c06ea2d608e9958d8926af241862b97a5375c9f4a4348ca9829a2 files/digest-davfs2-0.2.7 238
 MD5 6155dcca5ce1f30b25c6baa07307c12f files/digest-davfs2-0.2.8 238
 RMD160 c8151185ce61f569c7e54121a903a47001c9582e files/digest-davfs2-0.2.8 238
 SHA256 4d64f0dd2950a36334086fc2eb3442dbd4f45ce64c16ce7668881a35ec1e0008 files/digest-davfs2-0.2.8 238
diff --git a/net-fs/davfs2/davfs2-0.2.4-r1.ebuild b/net-fs/davfs2/davfs2-0.2.4-r1.ebuild
deleted file mode 100644
index f0cbc8ee87d8..000000000000
--- a/net-fs/davfs2/davfs2-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-0.2.4-r1.ebuild,v 1.5 2006/06/13 10:47:05 uberlord Exp $
-
-inherit linux-info eutils
-
-DESCRIPTION="a Linux file system driver that allows you to mount a WebDAV server as a local disk drive. Davfs2 uses Coda for kernel driver and neon for WebDAV interface"
-SRC_URI="mirror://sourceforge/dav/${P}.tar.gz"
-HOMEPAGE="http://dav.sourceforge.net"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc x86"
-IUSE="ssl debug socks5"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
-		socks5? ( >=net-proxy/dante-1.1.13 )
-		dev-libs/libxml2
-		<net-misc/neon-0.25
-		sys-libs/zlib"
-SLOT="0"
-
-CONFIG_CHECK="CODA_FS !CODA_FS_OLD_API"
-CODA_FS_ERROR="${P} requires kernel support for Coda to be found in filesystems, network filesystems"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/include-compiler.patch #81507
-}
-
-src_compile() {
-	local myconf
-
-	if use debug; then
-		myconf="--with-debug"
-	fi
-	if kernel_is 2 4; then
-		myconf="${myconf} --with-kernel-src=${KV_DIR}"
-	else
-		myconf="${myconf} --without-kernel-src"
-	fi
-
-	econf \
-		$(use_with ssl) \
-		$(use_with socks5 socks) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/sbin
-	einstall || die "einstall failed"
-	dodoc BUGS ChangeLog davfs2.conf.template FAQ NEWS README secrets.template THANKS TODO
-
-	#fix einstalled files in wrong places
-	cd ${D}/usr/share
-	rm COPYING ChangeLog davfs2.conf.template FAQ NEWS README secrets.template THANKS TODO INSTALL
-	dodir /usr/share/man/man8
-	mv ${D}/usr/share/man/mount.davfs.8.gz ${D}/usr/share/man/man8
-
-	dodir /var/run/mount.davfs
-	keepdir /var/run/mount.davfs
-	fowners root:users /var/run/mount.davfs
-	fperms 1774 /var/run/mount.davfs
-
-	dodir /sbin
-	dosym /usr/sbin/mount.davfs /sbin/mount.davfs
-
-	dodir /etc/modules.d
-	cat >${D}/etc/modules.d/davfs2 <<EOF
-alias char-major-67	coda
-alias /dev/davfs*	coda
-EOF
-}
-
-pkg_postinst() {
-	[[ ${ROOT} == / ]] && /sbin/modules-update
-}
diff --git a/net-fs/davfs2/davfs2-0.2.4-r2.ebuild b/net-fs/davfs2/davfs2-0.2.4-r2.ebuild
deleted file mode 100644
index 62041275503f..000000000000
--- a/net-fs/davfs2/davfs2-0.2.4-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-0.2.4-r2.ebuild,v 1.3 2006/06/13 10:47:05 uberlord Exp $
-
-inherit linux-info eutils
-
-DESCRIPTION="a Linux file system driver that allows you to mount a WebDAV server as a local disk drive. Davfs2 uses Coda for kernel driver and neon for WebDAV interface"
-SRC_URI="mirror://sourceforge/dav/${P}.tar.gz"
-HOMEPAGE="http://dav.sourceforge.net"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ssl debug socks5"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
-		socks5? ( >=net-proxy/dante-1.1.13 )
-		dev-libs/libxml2
-		<net-misc/neon-0.25
-		sys-libs/zlib"
-SLOT="0"
-
-CONFIG_CHECK="CODA_FS !CODA_FS_OLD_API"
-CODA_FS_ERROR="${P} requires kernel support for Coda to be found in filesystems, network filesystems"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/include-compiler.patch #81507
-}
-
-src_compile() {
-	local myconf
-
-	if use debug; then
-		myconf="--with-debug"
-	fi
-	if kernel_is 2 4; then
-		myconf="${myconf} --with-kernel-src=${KV_DIR}"
-	else
-		myconf="${myconf} --without-kernel-src"
-	fi
-
-	econf \
-		$(use_with ssl) \
-		$(use_with socks5 socks) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/sbin
-	einstall localstatedir=${D}/var/run/mount.davfs sysconfdir=${D}/etc/${PN} || die "einstall failed"
-	dodoc BUGS ChangeLog davfs2.conf.template FAQ NEWS README secrets.template THANKS TODO
-
-	#fix einstalled files in wrong places
-	cd ${D}/usr/share
-	rm COPYING ChangeLog davfs2.conf.template FAQ NEWS README secrets.template THANKS TODO INSTALL
-	dodir /usr/share/man/man8
-	mv ${D}/usr/share/man/mount.davfs.8.gz ${D}/usr/share/man/man8
-
-	dodir /var/run/mount.davfs
-	keepdir /var/run/mount.davfs
-	fowners root:users /var/run/mount.davfs
-	fperms 1774 /var/run/mount.davfs
-
-	dodir /sbin
-	dosym /usr/sbin/mount.davfs /sbin/mount.davfs
-
-	dodir /etc/modules.d
-	cat >${D}/etc/modules.d/davfs2 <<EOF
-alias char-major-67	coda
-alias /dev/davfs*	coda
-EOF
-}
-
-pkg_postinst() {
-	[[ ${ROOT} == / ]] && /sbin/modules-update
-}
diff --git a/net-fs/davfs2/davfs2-0.2.7.ebuild b/net-fs/davfs2/davfs2-0.2.7.ebuild
deleted file mode 100644
index 23dbdc493caf..000000000000
--- a/net-fs/davfs2/davfs2-0.2.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-0.2.7.ebuild,v 1.2 2006/06/13 10:47:05 uberlord Exp $
-
-inherit linux-info eutils
-
-DESCRIPTION="a Linux file system driver that allows you to mount a WebDAV server as a local disk drive. Davfs2 uses Coda for kernel driver and neon for WebDAV interface"
-SRC_URI="mirror://sourceforge/dav/${P}.tar.gz"
-HOMEPAGE="http://dav.sourceforge.net"
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
-IUSE="ssl debug socks5"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
-		socks5? ( >=net-proxy/dante-1.1.13 )
-		dev-libs/libxml2
-		<net-misc/neon-0.25
-		sys-libs/zlib"
-SLOT="0"
-
-CONFIG_CHECK="CODA_FS !CODA_FS_OLD_API"
-CODA_FS_ERROR="${P} requires kernel support for Coda to be found in filesystems, network filesystems"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/makefile_0.2.7.patch
-}
-
-src_compile() {
-	local myconf
-
-	if use debug; then
-		myconf="--with-debug"
-	fi
-	if kernel_is 2 4; then
-		myconf="${myconf} --with-kernel-src=${KV_DIR}"
-	else
-		myconf="${myconf} --without-kernel-src"
-	fi
-
-	econf \
-		$(use_with ssl) \
-		$(use_with socks5 socks) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/sbin
-	einstall localstatedir=${D}/var/run/mount.davfs sysconfdir=${D}/etc/${PN} || die "einstall failed"
-	dodoc BUGS ChangeLog davfs2.conf.template FAQ NEWS README secrets.template THANKS TODO
-
-	#fix einstalled files in wrong places
-	cd ${D}/usr/share
-	rm COPYING ChangeLog davfs2.conf.template FAQ NEWS README secrets.template THANKS TODO INSTALL
-	dodir /usr/share/man/man8
-	mv ${D}/usr/share/man/mount.davfs.8.gz ${D}/usr/share/man/man8
-
-	dodir /var/run/mount.davfs
-	keepdir /var/run/mount.davfs
-	fowners root:users /var/run/mount.davfs
-	fperms 1774 /var/run/mount.davfs
-
-	dodir /sbin
-	dosym /usr/sbin/mount.davfs /sbin/mount.davfs
-
-	dodir /etc/modules.d
-	cat >${D}/etc/modules.d/davfs2 <<EOF
-alias char-major-67	coda
-alias /dev/davfs*	coda
-EOF
-}
-
-pkg_postinst() {
-	[[ ${ROOT} == / ]] && /sbin/modules-update
-}
diff --git a/net-fs/davfs2/files/digest-davfs2-0.2.4-r1 b/net-fs/davfs2/files/digest-davfs2-0.2.4-r1
deleted file mode 100644
index a78b524a35ee..000000000000
--- a/net-fs/davfs2/files/digest-davfs2-0.2.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8f76634ddd7a26f0f277f86262887b6 davfs2-0.2.4.tar.gz 141438
diff --git a/net-fs/davfs2/files/digest-davfs2-0.2.4-r2 b/net-fs/davfs2/files/digest-davfs2-0.2.4-r2
deleted file mode 100644
index a78b524a35ee..000000000000
--- a/net-fs/davfs2/files/digest-davfs2-0.2.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8f76634ddd7a26f0f277f86262887b6 davfs2-0.2.4.tar.gz 141438
diff --git a/net-fs/davfs2/files/digest-davfs2-0.2.7 b/net-fs/davfs2/files/digest-davfs2-0.2.7
deleted file mode 100644
index 332aafd54279..000000000000
--- a/net-fs/davfs2/files/digest-davfs2-0.2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c17d450b655bf4503c22f9f07bd9b087 davfs2-0.2.7.tar.gz 144219
-RMD160 7d72752425031d88ccbcb9c93f62ba0046fced1b davfs2-0.2.7.tar.gz 144219
-SHA256 8e230254e8a1c426ddb6a78de62de931c0c8cfe0767686b7a10a5031c4340826 davfs2-0.2.7.tar.gz 144219
diff --git a/net-fs/davfs2/files/include-compiler.patch b/net-fs/davfs2/files/include-compiler.patch
deleted file mode 100644
index 5be460b2ea1a..000000000000
--- a/net-fs/davfs2/files/include-compiler.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur davfs2-0.2.4.orig/src/davfsd.c davfs2-0.2.4/src/davfsd.c
---- davfs2-0.2.4.orig/src/davfsd.c	2005-08-21 10:50:08.000000000 +0200
-+++ davfs2-0.2.4/src/davfsd.c	2005-08-21 10:50:16.000000000 +0200
-@@ -33,6 +33,7 @@
- /* Linux Kernel Source */
- /* avoid inclusion of kernel time.h, since it conflicts with userland time.h */
- #define _LINUX_TIME_H
-+#include <linux/compiler.h>
- #include <linux/coda.h>
- 
- /* Neon */
-diff -ur davfs2-0.2.4.orig/src/davfsd.h davfs2-0.2.4/src/davfsd.h
---- davfs2-0.2.4.orig/src/davfsd.h	2005-08-21 10:50:08.000000000 +0200
-+++ davfs2-0.2.4/src/davfsd.h	2005-08-21 10:50:16.000000000 +0200
-@@ -25,6 +25,7 @@
- /* Linux Kernel Source */
- /* avoid inclusion of kernel time.h, since it conflicts with userland time.h */
- #define _LINUX_TIME_H
-+#include <linux/compiler.h>
- #include <linux/coda.h>
- 
- #ifndef DIRBLKSIZ
-diff -ur davfs2-0.2.4.orig/src/util.c davfs2-0.2.4/src/util.c
---- davfs2-0.2.4.orig/src/util.c	2005-08-21 10:50:38.000000000 +0200
-+++ davfs2-0.2.4/src/util.c	2005-08-21 10:47:40.000000000 +0200
-@@ -34,6 +34,7 @@
- /* Linux coda head file */
- /* avoid inclusion of kernel time.h, since it conflicts with userland time.h */
- #define _LINUX_TIME_H
-+#include <linux/compiler.h>
- #include <linux/coda.h>
- 
- /* Neon */
diff --git a/net-fs/davfs2/files/makefile_0.2.7.patch b/net-fs/davfs2/files/makefile_0.2.7.patch
deleted file mode 100644
index bf1632f09ae6..000000000000
--- a/net-fs/davfs2/files/makefile_0.2.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- davfs2-0.2.7/Makefile.in	2005-12-30 16:21:07.000000000 +0100
-+++ davfs2-0.2.7/Makefile.in.diff	2006-01-26 12:37:36.000000000 +0100
-@@ -82,8 +82,6 @@
- 	$(INSTALL_DIR) $(DESTDIR)$(mandir)
- 	for t in $(MANS); do \
-           $(INSTALL_DATA) $(top_builddir)/$$t $(DESTDIR)$(mandir)/$$t;done
--	if [ -L /sbin/$(PROGRAM_NAME) ]; then rm /sbin/$(PROGRAM_NAME); fi
--	ln -s $(DESTDIR)$(sbindir)/$(PROGRAM_NAME) /sbin/$(PROGRAM_NAME) 2> /dev/null
- 
- 	@echo ""
- 	@echo "----------------------------------------------------"