Added coda-6.0.11, removed old versions, fixed a few minor bugs including bug #93791

Package-Manager: portage-2.0.51.22-r1

15 files changed, 69 insertions, 547 deletions

diff --git a/net-fs/coda/ChangeLog b/net-fs/coda/ChangeLog
index 46c1dda94fed..2f9c2ad849c0 100644
--- a/net-fs/coda/ChangeLog
+++ b/net-fs/coda/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-fs/coda
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/ChangeLog,v 1.17 2005/05/05 13:21:08 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/ChangeLog,v 1.18 2005/06/08 20:39:05 griffon26 Exp $
+
+  08 Jun 2005; Maurice van der Pot <griffon26@gentoo.org>
+  -files/coda-6.0.3-iowr.patch, -files/6.0.7/venus, +files/6.0.10/venus,
+  -files/coda-6.0.6-gcc3.4.patch, -files/venus, -coda-6.0.3.ebuild,
+  -coda-6.0.6.ebuild, -coda-6.0.7.ebuild, coda-6.0.8.ebuild,
+  coda-6.0.10.ebuild, +coda-6.0.11.ebuild:
+  - Added new coda version 6.0.11
+  - Added venus init script that was forgotten when coda 6.0.10 was added.
+  - Removed old coda versions. 
+  - Made coda 6.0.8 depend on lwp 1.12, because it doesn't work with 2.0.
+  - Adapted to changed location of source packages
+  - Added workaround for bug #93791 reported by Toralf Förster 
+    <toralf.foerster@gmx.de> to all ebuilds until a more permanent
+    solution can be implemented.
 
 *coda-6.0.10 (05 May 2005)
 
diff --git a/net-fs/coda/Manifest b/net-fs/coda/Manifest
index 9b19eb71065d..ba5b93e5473c 100644
--- a/net-fs/coda/Manifest
+++ b/net-fs/coda/Manifest
@@ -2,30 +2,23 @@
 Hash: SHA1
 
 MD5 f905a614fde3a85e0adefb203ece18fc metadata.xml 321
-MD5 984a170f446d6284de26ec9fdf62ffda coda-6.0.3.ebuild 2974
-MD5 822864ea8dae08ab9e6f41dbecb99c69 coda-6.0.10.ebuild 7472
-MD5 9cdef0c579fe857c4c6149674809ca92 ChangeLog 3763
-MD5 8b8dac6466d36ebb1ad811b7ee5ec066 coda-6.0.6.ebuild 7684
-MD5 b702542e22ef6ea95537c5f0baa09bb2 coda-6.0.7.ebuild 7661
-MD5 f667aaee3ec73250a12d74407bfd0b61 coda-6.0.8.ebuild 7444
-MD5 d21e4e5142a0266459b5ad8b39e3e707 files/coda-6.0.3-iowr.patch 607
-MD5 464a8cd91e3af12266c0570034388221 files/coda-6.0.6-gcc3.4.patch 1984
-MD5 d08316a08429d573d30dbc9924707206 files/digest-coda-6.0.3 63
-MD5 eb72604e9995f1f6c1fbcb84edfee3fb files/digest-coda-6.0.6 63
+MD5 ef64d9087aca52cdc10d3598ed70281d coda-6.0.8.ebuild 7720
+MD5 690c439313760e541c3c228c1ae62ac8 coda-6.0.10.ebuild 7750
+MD5 beea3fe4a7785c4fe2b6705ef09f2470 coda-6.0.11.ebuild 7672
+MD5 eda227ce2a883d01c15f082347c46d73 ChangeLog 4498
 MD5 78b3c40cf0a838d73ed8a67e9d153589 files/coda-update 1223
 MD5 f40f2b0227b97168e8dcd64c86f2e8cc files/codasrv 941
 MD5 1ea6425841d7fed645aad9d06d728ff7 files/auth2 1041
-MD5 494ef5b4a48b5a4aa77251d2b5942a91 files/venus 697
-MD5 0dd425125e2797d85724264c3255d77a files/digest-coda-6.0.7 63
 MD5 9c2db8abdf6c03a125489b31ab191c00 files/digest-coda-6.0.8 63
 MD5 fcba6f871a054b13f4f49b5c64c746f2 files/digest-coda-6.0.10 64
 MD5 bc3186837c0aeaec912e7040cadd36d9 files/coda-6.0.10-venus-setup-fix.patch 662
-MD5 77ec9d405290c5bd33e924efe4624866 files/6.0.7/venus 702
+MD5 90ab5e322be7ffed9b181e74c6c35072 files/digest-coda-6.0.11 64
 MD5 0e33cefc07af92d1e9351c60412f9628 files/6.0.8/venus 702
+MD5 b4e38a53462318a1c6db3a3b1d7e3db3 files/6.0.10/venus 703
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCeh3YMGnpIbeahxwRAnqaAJ408WLGZpvpTC5tTyvAXMc26nJdygCfXunu
-c11/QvUPBBKs0IS1jtDKSdw=
-=8Qvf
+iD8DBQFCp1eIMGnpIbeahxwRArMzAKC8hhsPWCc3YDUa4A2CNkqIPCjDOACdHps0
+9np3SMcAafTKYiDzmGAg9kk=
+=b0Ic
 -----END PGP SIGNATURE-----
diff --git a/net-fs/coda/coda-6.0.10.ebuild b/net-fs/coda/coda-6.0.10.ebuild
index 02d0ef088ffb..b1dca4199c25 100644
--- a/net-fs/coda/coda-6.0.10.ebuild
+++ b/net-fs/coda/coda-6.0.10.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/coda-6.0.10.ebuild,v 1.1 2005/05/05 13:21:08 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/coda-6.0.10.ebuild,v 1.2 2005/06/08 20:39:05 griffon26 Exp $
 
 inherit eutils
 
 IUSE="kerberos"
 
 DESCRIPTION="Coda is an advanced networked filesystem developed at Carnegie Mellon Univ."
-HOMEPAGE="http://www.coda.cs.cmu.edu"
-SRC_URI="ftp://ftp.coda.cs.cmu.edu/pub/coda/src/${P}.tar.gz"
+HOMEPAGE="http://www.coda.cs.cmu.edu/"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/coda/src/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -228,6 +228,12 @@ pkg_config () {
 	# Start coda server
 	/etc/init.d/codasrv start || exit 1
 
+	# Workaround to increase the likelihood that the coda server finished
+	# starting up. Once there is a nicer way to detect this, it should 
+	# probably be added to the codasrv init script.
+	# See http://www.coda.cs.cmu.edu/maillists/codalist/codalist-2004/6954.html
+	sleep 5
+
 	einfo "Creating root volume..."
 	# Create root volume
 	createvoloutput=`createvol_rep / ${FQDN} 2>&1 <<- EOF
diff --git a/net-fs/coda/coda-6.0.7.ebuild b/net-fs/coda/coda-6.0.11.ebuild
index 0b6e0e1cfded..ecb8724055d6 100644
--- a/net-fs/coda/coda-6.0.7.ebuild
+++ b/net-fs/coda/coda-6.0.11.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/coda-6.0.7.ebuild,v 1.5 2005/02/05 14:36:20 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/coda-6.0.11.ebuild,v 1.1 2005/06/08 20:39:05 griffon26 Exp $
 
 inherit eutils
 
 IUSE="kerberos"
 
 DESCRIPTION="Coda is an advanced networked filesystem developed at Carnegie Mellon Univ."
-HOMEPAGE="http://www.coda.cs.cmu.edu"
-SRC_URI="ftp://ftp.coda.cs.cmu.edu/pub/coda/src/${P}.tar.gz"
+HOMEPAGE="http://www.coda.cs.cmu.edu/"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/coda/src/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~x86 ~ppc"
 
 # partly based on the deps suggested by Mandrake's RPM, and/or on my current versions
 # Also, definely needs coda.h from linux-headers.
-DEPEND=">=sys-libs/lwp-1.12
-	>=net-libs/rpc2-1.23
-	>=sys-libs/rvm-1.10
+DEPEND=">=sys-libs/lwp-2.0
+	>=net-libs/rpc2-1.27
+	>=sys-libs/rvm-1.11
 	>=sys-libs/db-3
 	>=sys-libs/ncurses-4
 	>=sys-libs/readline-3
@@ -29,13 +29,9 @@ DEPEND=">=sys-libs/lwp-1.12
 	sys-apps/grep
 	virtual/os-headers"
 
-#	>=sys-apps/sed-4
-#	net-fs/coda-kernel
-
-
-RDEPEND=">=sys-libs/lwp-1.12
-	>=net-libs/rpc2-1.23
-	>=sys-libs/rvm-1.10
+RDEPEND=">=sys-libs/lwp-2.0
+	>=net-libs/rpc2-1.27
+	>=sys-libs/rvm-1.11
 	>=sys-libs/db-3
 	>=sys-libs/ncurses-4
 	>=sys-libs/readline-3
@@ -74,7 +70,7 @@ src_install () {
 		oldincludedir=${D}/usr/include server-install || die
 		infodir=${D}/usr/share/info \
 
-	dodoc README* ChangeLog CREDITS LICENSE
+	dodoc README* ChangeLog CREDITS
 
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/${PV}/venus
@@ -86,9 +82,6 @@ src_install () {
 #	insinto /etc/conf.d
 #	newins ${FILESDIR}/coda.conf.d coda
 
-	# I am not sure why coda misplaces this file...
-	mv -f ${D}/etc/server.conf.ex ${D}/etc/coda/server.conf.ex
-
 	sed -i -e "s,^#vicedir=/.*,vicedir=/var/lib/vice," \
 		${D}/etc/coda/server.conf.ex
 
@@ -124,7 +117,6 @@ pkg_config () {
 
 	# Set of default configuration values 
 	local CODA_ROOT_DIR="/var/lib/vice"
-	local CODA_ROOT_VOLUME="codarootvol"
 	local CODA_TEST_VOLUME="codatestvol"
 	local CODA_TEST_VOLUME_MOUNTPOINT="test"
 	local CODA_ADMIN_UID="6000"
@@ -196,7 +188,7 @@ pkg_config () {
 	einfo "- a coda SCM (System Control Machine)"
 	einfo "- a coda administrator '${CODA_ADMIN_NAME}' with coda uid ${CODA_ADMIN_UID} and password 'changeme'"
 	einfo "- a coda root volume available at /mnt/coda/${FQDN}"
-	einfo "- a writable coda volume available at ${CODA_MOUNTPOINT}/${FQDN}/${CODA_TEST_VOLUME_MOUNTPOINT}"
+	einfo "- a test volume mounted at ${CODA_MOUNTPOINT}/${FQDN}/${CODA_TEST_VOLUME_MOUNTPOINT}"
 	echo
 	einfon "Are you sure you want to do this? (y/n) "
 	read answer
@@ -214,7 +206,6 @@ pkg_config () {
 	${AUTH2_AUTHENTICATION_TOKEN}
 	${VOLUTIL_AUTHENTICATION_TOKEN}
 	1
-	${CODA_ROOT_VOLUME}
 	${CODA_ADMIN_UID}
 	${CODA_ADMIN_NAME}
 	yes
@@ -226,24 +217,31 @@ pkg_config () {
 	${CODA_STORAGE_DIR}/${VICE_PARTITION}
 	y
 	2M
+	n
 	EOF
 
 	# Start coda server
 	/etc/init.d/codasrv start || exit 1
 
+	# Workaround to increase the likelihood that the coda server finished
+	# starting up. Once there is a nicer way to detect this, it should 
+	# probably be added to the codasrv init script.
+	# See http://www.coda.cs.cmu.edu/maillists/codalist/codalist-2004/6954.html
+	sleep 5
+
 	einfo "Creating root volume..."
 	# Create root volume
-	createvoloutput=`createvol_rep ${CODA_ROOT_VOLUME} ${FQDN} 2>&1 <<- EOF
+	createvoloutput=`createvol_rep / ${FQDN} 2>&1 <<- EOF
 	n
 	EOF`
-	if ! volutil info ${CODA_ROOT_VOLUME} &> /dev/null
+	if ! volutil info / &> /dev/null
 	then
 		eerror "Unable to create root volume, output of createvol_rep follows"
 		echo "$createvoloutput"
 		exit 1
 	fi
 
-	einfo "Creating writable volume..."
+	einfo "Creating test volume..."
 	# Create test volume
 	createvoloutput=`createvol_rep ${CODA_TEST_VOLUME} ${FQDN} 2>&1 <<- EOF
 	n
@@ -259,7 +257,7 @@ pkg_config () {
 
 	/etc/init.d/venus start
 
-	einfo "Mounting coda volume at ${CODA_MOUNTPOINT}/${FQDN}/${CODA_TEST_VOLUME_MOUNTPOINT}"
+	einfo "Mounting test volume at ${CODA_MOUNTPOINT}/${FQDN}/${CODA_TEST_VOLUME_MOUNTPOINT}"
 	clog ${CODA_ADMIN_NAME}@${FQDN} > /dev/null <<- EOF
 	changeme
 	EOF
diff --git a/net-fs/coda/coda-6.0.3.ebuild b/net-fs/coda/coda-6.0.3.ebuild
deleted file mode 100644
index 19bcb0c9b887..000000000000
--- a/net-fs/coda/coda-6.0.3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/coda-6.0.3.ebuild,v 1.6 2005/02/05 14:36:20 griffon26 Exp $
-
-inherit eutils
-
-IUSE="kerberos"
-
-DESCRIPTION="Coda is an advanced networked filesystem developed at Carnegie Mellon Univ."
-HOMEPAGE="http://www.coda.cs.cmu.edu"
-SRC_URI="ftp://ftp.coda.cs.cmu.edu/pub/coda/src/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-# partly based on the deps suggested by Mandrake's RPM, and/or on my current versions
-# Also, definely needs coda.h from linux-headers.
-DEPEND=">=sys-apps/portage-2.0.47-r10
-	>=sys-libs/lwp-1.10
-	>=net-libs/rpc2-1.20
-	>=sys-libs/rvm-1.8
-	>=sys-libs/db-3
-	>=sys-libs/ncurses-4
-	>=sys-libs/readline-3
-	>=sys-kernel/linux-headers-2.4
-	>=dev-lang/perl-5.8
-	kerberos? ( virtual/krb5 )"
-
-#	>=sys-apps/sed-4
-#	net-fs/coda-kernel
-
-
-RDEPEND=">=sys-libs/lwp-1.10
-	>=net-libs/rpc2-1.20
-	>=sys-libs/rvm-1.8
-	>=sys-libs/db-3
-	>=sys-libs/ncurses-4
-	>=sys-libs/readline-3
-	kerberos? ( virtual/krb5 )"
-
-
-
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/coda-6.0.3-iowr.patch
-}
-
-src_compile() {
-	local myflags=""
-
-	use kerberos && myflags="${myflags} --with-crypto"
-
-	econf ${myflags} || die "configure failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install () {
-	#these crazy makefiles dont seem to use DESTDIR, but they do use these... 
-	# (except infodir, but no harm in leaving it there)
-	# see Makeconf.setup in the package
-
-	#Also note that for Coda, we need to do "make client-install" for
-	# the client, and "make server-install" for the server.
-	#...you can find out about this from ./configs/Makerules
-	emake \
-		CINIT-SCRIPTS="" \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc/coda \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		oldincludedir=${D}/usr/include client-install || die
-
-	emake \
-		SINIT-SCRIPTS="" \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc/coda \
-		mandir=${D}/usr/share/man \
-		oldincludedir=${D}/usr/include server-install || die
-		infodir=${D}/usr/share/info \
-
-	dodoc README* ChangeLog CREDITS LICENSE
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/venus
-	doexe ${FILESDIR}/coda-update
-	doexe ${FILESDIR}/codasrv
-	doexe ${FILESDIR}/auth2
-
-	# We may use a conf.d/coda file at some point ?
-#	insinto /etc/conf.d
-#	newins ${FILESDIR}/coda.conf.d coda
-
-	# I am not sure why coda misplaces this file...
-	mv -f ${D}/etc/server.conf.ex ${D}/etc/coda/server.conf.ex
-
-	sed -i -e "s,^#vicedir=/.*,vicedir=/var/lib/vice," \
-		${D}/etc/coda/server.conf.ex
-
-	sed -i -e "s,^#mountpoint=/.*,mountpoint=/mnt/coda," \
-		${D}/etc/coda/venus.conf.ex
-
-	dodir /var/lib/vice
-	dodir /mnt/coda
-	dodir /usr/coda
-	dodir /usr/coda/spool
-
-	diropts -m0700
-	dodir /usr/coda/etc
-	dodir /usr/coda/venus.cache
-}
-
-pkg_postinst () {
-	einfo
-	einfo "To enable the coda at boot up, please do:"
-	einfo "    rc-update add venus default"
-	einfo
-	einfo "* To get started, run venus-setup and vice-setup"
-	einfo
-}
diff --git a/net-fs/coda/coda-6.0.6.ebuild b/net-fs/coda/coda-6.0.6.ebuild
deleted file mode 100644
index 3ddb28766541..000000000000
--- a/net-fs/coda/coda-6.0.6.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/coda-6.0.6.ebuild,v 1.10 2005/02/05 14:36:20 griffon26 Exp $
-
-inherit eutils
-
-IUSE="kerberos"
-
-DESCRIPTION="Coda is an advanced networked filesystem developed at Carnegie Mellon Univ."
-HOMEPAGE="http://www.coda.cs.cmu.edu"
-SRC_URI="ftp://ftp.coda.cs.cmu.edu/pub/coda/src/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-
-# partly based on the deps suggested by Mandrake's RPM, and/or on my current versions
-# Also, definely needs coda.h from linux-headers.
-DEPEND=">=sys-libs/lwp-1.11
-	>=net-libs/rpc2-1.22
-	>=sys-libs/rvm-1.9
-	>=sys-libs/db-3
-	>=sys-libs/ncurses-4
-	>=sys-libs/readline-3
-	>=dev-lang/perl-5.8
-	kerberos? ( virtual/krb5 )
-	sys-apps/gawk
-	sys-devel/bison
-	sys-apps/grep
-	virtual/os-headers"
-
-#	>=sys-apps/sed-4
-#	net-fs/coda-kernel
-
-
-RDEPEND=">=sys-libs/lwp-1.11
-	>=net-libs/rpc2-1.22
-	>=sys-libs/rvm-1.9
-	>=sys-libs/db-3
-	>=sys-libs/ncurses-4
-	>=sys-libs/readline-3
-	kerberos? ( virtual/krb5 )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/coda-6.0.6-gcc3.4.patch
-}
-
-
-src_compile() {
-	local myflags=""
-
-	use kerberos && myflags="${myflags} --with-crypto"
-
-	econf ${myflags} || die "configure failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install () {
-	#these crazy makefiles dont seem to use DESTDIR, but they do use these... 
-	# (except infodir, but no harm in leaving it there)
-	# see Makeconf.setup in the package
-
-	#Also note that for Coda, we need to do "make client-install" for
-	# the client, and "make server-install" for the server.
-	#...you can find out about this from ./configs/Makerules
-	emake \
-		CINIT-SCRIPTS="" \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc/coda \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		oldincludedir=${D}/usr/include client-install || die
-
-	emake \
-		SINIT-SCRIPTS="" \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc/coda \
-		mandir=${D}/usr/share/man \
-		oldincludedir=${D}/usr/include server-install || die
-		infodir=${D}/usr/share/info \
-
-	dodoc README* ChangeLog CREDITS LICENSE
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/venus
-	doexe ${FILESDIR}/coda-update
-	doexe ${FILESDIR}/codasrv
-	doexe ${FILESDIR}/auth2
-
-	# We may use a conf.d/coda file at some point ?
-#	insinto /etc/conf.d
-#	newins ${FILESDIR}/coda.conf.d coda
-
-	# I am not sure why coda misplaces this file...
-	mv -f ${D}/etc/server.conf.ex ${D}/etc/coda/server.conf.ex
-
-	sed -i -e "s,^#vicedir=/.*,vicedir=/var/lib/vice," \
-		${D}/etc/coda/server.conf.ex
-
-	sed -i -e "s,^#mountpoint=/.*,mountpoint=/mnt/coda," \
-		${D}/etc/coda/venus.conf.ex
-
-	# Fix conflict with backup.sh from tar
-	mv -f ${D}/usr/sbin/backup{,-coda}.sh
-
-	dodir /var/lib/vice
-	dodir /mnt/coda
-	dodir /usr/coda
-	dodir /usr/coda/spool
-
-	diropts -m0700
-	dodir /usr/coda/etc
-	dodir /usr/coda/venus.cache
-}
-
-pkg_postinst () {
-	einfo
-	einfo "To enable the coda at boot up, please do:"
-	einfo "    rc-update add codasrv default"
-	einfo "    rc-update add venus default"
-	einfo
-	einfo "To get started, run vice-setup and venus-setup."
-	einfo
-	einfo "Alternatively you can get a default coda setup by running:"
-	einfo "    ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-}
-
-pkg_config () {
-
-	# Set of default configuration values 
-	local CODA_ROOT_DIR="/var/lib/vice"
-	local CODA_ROOT_VOLUME="codarootvol"
-	local CODA_TEST_VOLUME="codatestvol"
-	local CODA_TEST_VOLUME_MOUNTPOINT="test"
-	local CODA_ADMIN_UID="6000"
-	local CODA_ADMIN_NAME="codaroot"
-	local CODA_STORAGE_DIR="/var/lib/vice"
-	local RVM_LOG_PARTITION="rvmlogpartition.img"
-	local RVM_DATA_PARTITION="rvmdatapartition.img"
-	local VICE_PARTITION="vicepa"
-	local UPDATE_AUTHENTICATION_TOKEN="updatetoken"
-	local AUTH2_AUTHENTICATION_TOKEN="auth2token"
-	local VOLUTIL_AUTHENTICATION_TOKEN="volutiltoken"
-
-	# Do not modify after this line
-
-	local FQDN=$(hostname --fqdn)
-	local CODA_MOUNTPOINT=$(codaconfedit venus.conf mountpoint)
-
-	# Make sure coda is not running before we start messing with its files
-	if [ "x$(pidof auth2)" != "x" ]; then
-		eerror "Please stop coda, coda-update and auth2 first."
-		exit 1
-	fi
-
-	# Also make sure venus is not running
-	if [ "x$(pidof venus)" != "x" ]; then
-		eerror "Please stop venus first."
-		exit 1
-	fi
-
-	# Ask for the location of (amongst other things) the vice partition
-	ewarn "This default configuration of coda will require 350MB of free space"
-	ewarn "for Recoverable Virtual Memory. Additional space is required for"
-	ewarn "the files that you store on your coda volume."
-	echo
-	einfon "Please specify where coda should store this data [${CODA_STORAGE_DIR}]: "
-	read new_storage_dir
-	if [ "x${new_storage_dir}" != "x" ]; then
-		CODA_STORAGE_DIR=${new_storage_dir}
-	fi
-	echo
-
-	# Check if an existing server.conf is in the way
-	conf=$(codaconfedit server.conf)
-	intheway=
-	if [ ${conf} != /dev/null ]; then
-		intheway="${intheway} ${conf}"
-	fi
-
-	# Check if an existing vice root dir is in the way
-	if [ -e ${CODA_ROOT_DIR} ]; then
-		intheway="${intheway} ${CODA_ROOT_DIR}"
-	fi
-
-	# Check if an existing vice partition is in the way
-	if [ -e ${CODA_STORAGE_DIR}/${VICE_PARTITION} ]; then
-		intheway="${intheway} ${CODA_STORAGE_DIR}/${VICE_PARTITION}"
-	fi
-
-	if [ "x${intheway}" != "x" ]; then
-		eerror "Please remove the following items manually first if you want to"
-		eerror "set up a default coda configuration:"
-		for item in ${intheway}; do
-			eerror "\t${item}"
-		done
-		exit 1
-	fi
-
-	einfo "A default coda server and client configuration will be set up that consists of:"
-	einfo "- a coda SCM (System Control Machine)"
-	einfo "- a coda administrator '${CODA_ADMIN_NAME}' with coda uid ${CODA_ADMIN_UID} and password 'changeme'"
-	einfo "- a coda root volume available at /mnt/coda/${FQDN}"
-	einfo "- a writable coda volume available at ${CODA_MOUNTPOINT}/${FQDN}/${CODA_TEST_VOLUME_MOUNTPOINT}"
-	echo
-	einfon "Are you sure you want to do this? (y/n) "
-	read answer
-	if [ "x${answer}" != "xy" ]; then
-		exit 1
-	fi
-	echo
-
-	einfo "Setting up vice (the coda server)..."
-	vice-setup > /dev/null <<- EOF
-	yes
-	${CODA_ROOT_DIR}
-	y
-	${UPDATE_AUTHENTICATION_TOKEN}
-	${AUTH2_AUTHENTICATION_TOKEN}
-	${VOLUTIL_AUTHENTICATION_TOKEN}
-	1
-	${CODA_ROOT_VOLUME}
-	${CODA_ADMIN_UID}
-	${CODA_ADMIN_NAME}
-	yes
-	${CODA_STORAGE_DIR}/${RVM_LOG_PARTITION}
-	2M
-	${CODA_STORAGE_DIR}/${RVM_DATA_PARTITION}
-	315M
-	y
-	${CODA_STORAGE_DIR}/${VICE_PARTITION}
-	y
-	2M
-	EOF
-
-	# Start coda server
-	/etc/init.d/codasrv start || exit 1
-
-	einfo "Creating root volume..."
-	# Create root volume
-	createvol_rep ${CODA_ROOT_VOLUME} E0000100 ${CODA_STORAGE_DIR}/${VICE_PARTITION} &> /dev/null <<- EOF
-	n
-	EOF
-
-	einfo "Creating writable volume..."
-	# Create test volume
-	createvol_rep ${CODA_TEST_VOLUME} E0000100 ${CODA_STORAGE_DIR}/${VICE_PARTITION} &> /dev/null <<- EOF
-	n
-	EOF
-
-	einfo "Setting up venus (the coda client)..."
-	venus-setup ${FQDN} 20000 > /dev/null
-
-	/etc/init.d/venus start
-
-	einfo "Waiting for ${CODA_MOUNTPOINT} to be mounted... "
-	for count in 4 3 2 1 0; do
-		if [ ! -e ${CODA_MOUNTPOINT}/NOT_REALLY_CODA ]; then
-			break
-		fi
-		sleep 1
-	done
-
-	if [ ${count} = 0 ]; then
-		eerror "Mounting failed!"
-		exit 1
-	fi
-
-	einfo "Mounting coda volume at ${CODA_MOUNTPOINT}/${FQDN}/${CODA_TEST_VOLUME_MOUNTPOINT}"
-	clog ${CODA_ADMIN_NAME}@${FQDN} > /dev/null <<- EOF
-	changeme
-	EOF
-
-	cfs mkmount ${CODA_MOUNTPOINT}/${FQDN}/${CODA_TEST_VOLUME_MOUNTPOINT} ${CODA_TEST_VOLUME}
-
-	echo
-	einfo "The coda server and client have been set up successfully."
-	einfo "Please refer to http://www.coda.cs.cmu.edu/doc/html/ for Coda documentation."
-	echo
-	einfo "Tip: use pdbtool to add a normal coda user and clog to authenticate and get write access."
-}
-
diff --git a/net-fs/coda/coda-6.0.8.ebuild b/net-fs/coda/coda-6.0.8.ebuild
index 7a9afd50086d..c268c4bf5cf1 100644
--- a/net-fs/coda/coda-6.0.8.ebuild
+++ b/net-fs/coda/coda-6.0.8.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/coda-6.0.8.ebuild,v 1.2 2005/02/05 14:36:20 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/coda-6.0.8.ebuild,v 1.3 2005/06/08 20:39:05 griffon26 Exp $
 
 inherit eutils
 
 IUSE="kerberos"
 
 DESCRIPTION="Coda is an advanced networked filesystem developed at Carnegie Mellon Univ."
-HOMEPAGE="http://www.coda.cs.cmu.edu"
-SRC_URI="ftp://ftp.coda.cs.cmu.edu/pub/coda/src/${P}.tar.gz"
+HOMEPAGE="http://www.coda.cs.cmu.edu/"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/coda/src/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -16,7 +16,7 @@ KEYWORDS="x86 ~ppc"
 
 # partly based on the deps suggested by Mandrake's RPM, and/or on my current versions
 # Also, definely needs coda.h from linux-headers.
-DEPEND=">=sys-libs/lwp-1.12
+DEPEND="~sys-libs/lwp-1.12
 	>=net-libs/rpc2-1.25
 	>=sys-libs/rvm-1.10
 	>=sys-libs/db-3
@@ -33,7 +33,7 @@ DEPEND=">=sys-libs/lwp-1.12
 #	net-fs/coda-kernel
 
 
-RDEPEND=">=sys-libs/lwp-1.12
+RDEPEND="~sys-libs/lwp-1.12
 	>=net-libs/rpc2-1.25
 	>=sys-libs/rvm-1.10
 	>=sys-libs/db-3
@@ -227,6 +227,12 @@ pkg_config () {
 	# Start coda server
 	/etc/init.d/codasrv start || exit 1
 
+	# Workaround to increase the likelihood that the coda server finished
+	# starting up. Once there is a nicer way to detect this, it should 
+	# probably be added to the codasrv init script.
+	# See http://www.coda.cs.cmu.edu/maillists/codalist/codalist-2004/6954.html
+	sleep 5
+
 	einfo "Creating root volume..."
 	# Create root volume
 	createvoloutput=`createvol_rep / ${FQDN} 2>&1 <<- EOF
diff --git a/net-fs/coda/files/6.0.7/venus b/net-fs/coda/files/6.0.10/venus
index d8a262c0cead..12fcc7182550 100644
--- a/net-fs/coda/files/6.0.7/venus
+++ b/net-fs/coda/files/6.0.10/venus
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/6.0.7/venus,v 1.1 2004/10/23 18:18:47 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/6.0.10/venus,v 1.1 2005/06/08 20:39:05 griffon26 Exp $
 
 depend() {
 	need net
diff --git a/net-fs/coda/files/coda-6.0.3-iowr.patch b/net-fs/coda/files/coda-6.0.3-iowr.patch
deleted file mode 100644
index f7f374c17051..000000000000
--- a/net-fs/coda/files/coda-6.0.3-iowr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru coda-6.0.3.orig/lib-src/kernel-includes/coda.h coda-6.0.3/lib-src/kernel-includes/coda.h
---- coda-6.0.3.orig/lib-src/kernel-includes/coda.h	2003-05-24 03:57:52.000000000 +0930
-+++ coda-6.0.3/lib-src/kernel-includes/coda.h	2004-02-13 20:57:57.012548016 +0930
-@@ -311,7 +311,7 @@
- #define VC_MAXMSGSIZE      sizeof(union inputArgs)+sizeof(union outputArgs) +\
-                             VC_MAXDATASIZE  
- 
--#define CIOC_KERNEL_VERSION _IOWR('c', 10, sizeof (int))
-+#define CIOC_KERNEL_VERSION _IOWR('c', 10, int)
- 
- #if 0
- #define CODA_KERNEL_VERSION 0 /* don't care about kernel version number */
diff --git a/net-fs/coda/files/coda-6.0.6-gcc3.4.patch b/net-fs/coda/files/coda-6.0.6-gcc3.4.patch
deleted file mode 100644
index 246310ac9033..000000000000
--- a/net-fs/coda/files/coda-6.0.6-gcc3.4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur coda-6.0.6.old/coda-src/kerndep/pioctl.h coda-6.0.6/coda-src/kerndep/pioctl.h
---- coda-6.0.6.old/coda-src/kerndep/pioctl.h	2003-05-23 20:26:31.000000000 +0200
-+++ coda-6.0.6/coda-src/kerndep/pioctl.h	2004-05-10 15:28:51.172684560 +0200
-@@ -100,7 +100,8 @@
- 
- 
- /* people who understand ioctling probably know why this is useful... */
--#define _VICEIOCTL(id)  (_IOW('V', id, struct ViceIoctl))
-+//#define _VICEIOCTL(id)  (_IOW('V', id, struct ViceIoctl))
-+#define _VICEIOCTL(id) (_IOC(_IOC_WRITE,'V',id,sizeof(struct ViceIoctl)))
- #define _VALIDVICEIOCTL(com) (com >= _VICEIOCTL(0) && com <= _VICEIOCTL(255))
- 
- 
-diff -Naur coda-6.0.6.old/coda-src/venus/comm.cc coda-6.0.6/coda-src/venus/comm.cc
---- coda-6.0.6.old/coda-src/venus/comm.cc	2004-02-02 20:32:34.000000000 +0100
-+++ coda-6.0.6/coda-src/venus/comm.cc	2004-05-10 14:52:08.982468360 +0200
-@@ -173,7 +173,7 @@
-     sei.AckPoint = sftp_ackpoint;
-     sei.PacketSize = sftp_packetsize;
-     sei.EnforceQuota = 1;
--    sei.Port.Tag = (enum PortTag)0;
-+    sei.Port.Tag = (PortTag)0;
-     SFTP_Activate(&sei);
- 
-     /* RPC2 initialization. */
-diff -Naur coda-6.0.6.old/coda-src/venus/fso.h coda-6.0.6/coda-src/venus/fso.h
---- coda-6.0.6.old/coda-src/venus/fso.h	2004-03-05 22:15:53.000000000 +0100
-+++ coda-6.0.6/coda-src/venus/fso.h	2004-05-10 14:49:23.400640624 +0200
-@@ -539,7 +539,7 @@
-     void DetachHdbBindings();
-     void DetachHdbBinding(binding *, int =0);
-     int PredetermineFetchState(int, int);
--    void SetFetchAllowed(enum HoardFetchState new_state)
-+    void SetFetchAllowed(HoardFetchState new_state)
-         { FetchAllowed = new_state; }
-     int IsFetchAllowed()
-         { if (FetchAllowed == HF_Fetch) 
-@@ -547,7 +547,7 @@
-           else 
-               return 0; 
-         }
--    void SetAskingAllowed(enum HoardAskState new_state)
-+    void SetAskingAllowed(HoardAskState new_state)
-         { AskingAllowed = new_state; }
-     int IsAskingAllowed()
-         { if (AskingAllowed == HA_Ask)
diff --git a/net-fs/coda/files/digest-coda-6.0.11 b/net-fs/coda/files/digest-coda-6.0.11
new file mode 100644
index 000000000000..698fa5996353
--- /dev/null
+++ b/net-fs/coda/files/digest-coda-6.0.11
@@ -0,0 +1 @@
+MD5 aad65cafc27572287276d0fa355b6164 coda-6.0.11.tar.gz 1558534
diff --git a/net-fs/coda/files/digest-coda-6.0.3 b/net-fs/coda/files/digest-coda-6.0.3
deleted file mode 100644
index 708ec8699bf4..000000000000
--- a/net-fs/coda/files/digest-coda-6.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 86af6c30582724a9899e39791a20435f coda-6.0.3.tar.gz 1488634
diff --git a/net-fs/coda/files/digest-coda-6.0.6 b/net-fs/coda/files/digest-coda-6.0.6
deleted file mode 100644
index c59c07b92ede..000000000000
--- a/net-fs/coda/files/digest-coda-6.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1feb4b431b72f725b568cc57a759714f coda-6.0.6.tar.gz 1497287
diff --git a/net-fs/coda/files/digest-coda-6.0.7 b/net-fs/coda/files/digest-coda-6.0.7
deleted file mode 100644
index e1f951ad506a..000000000000
--- a/net-fs/coda/files/digest-coda-6.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f22c4f1743d7c6bc9d1c103e193905b coda-6.0.7.tar.gz 1536304
diff --git a/net-fs/coda/files/venus b/net-fs/coda/files/venus
deleted file mode 100644
index ce6bf3f3fc9e..000000000000
--- a/net-fs/coda/files/venus
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/venus,v 1.4 2004/07/26 17:50:21 griffon26 Exp $
-
-depend() {
-	need net
-	after codasrv
-}
-
-checkconfig() {
-	if ! /usr/sbin/codaconfedit venus.conf &>/dev/null; then
-		eerror "Please run venus-setup before starting the service..."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting venus"
-	start-stop-daemon --start --quiet --exec /usr/sbin/venus --background
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping venus"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/venus
-	umount -l coda &>/dev/null
-	eend $?
-}