Always enable client tools, make server optional using the "server" USE flag.

svn path=/; revision=89

2 files changed, 28 insertions, 21 deletions

diff --git a/coda/net-fs/coda/Manifest b/coda/net-fs/coda/Manifest
index 7f94a56..12512fb 100644
--- a/coda/net-fs/coda/Manifest
+++ b/coda/net-fs/coda/Manifest
@@ -4,5 +4,5 @@ AUX coda-update 929 RMD160 17dc273447dcf9c80ccba62625e065298f5a863f SHA1 4be4d18
 AUX codasrv 528 RMD160 bacac42bcf31c659f10c2dec76a2cc66b1da2d55 SHA1 a7be5983aab0a6d8d86ca97064257a99818fa0d2 SHA256 5239f678bf5be56d61ead907c7ad0992baaf6328d9b750bc0061225a718e1a70
 AUX venus 566 RMD160 7938eeea4decdd21ed05570ff3d19ce598e6a32e SHA1 75656ccd579dce627b5e7e11e98b7127cd1d5262 SHA256 63f7d6f4f7cfc73435b3f16591312d3316c2d5d9906cb88ac7f17fe7c8f399df
 DIST coda-6.9.3.tar.gz 1662535 RMD160 c12e30c84471f1d659d48cd1bf2ecaf5f684fe0e SHA1 cc73ac3e6987154ffa1772d4005b7acedc0f0afb SHA256 608a91fd9cea79b0b77511f47dc29d176f66898b9a0ef1856f8bafa3cc53d320
-EBUILD coda-6.9.3.ebuild 2161 RMD160 3e29d0a84ac516289e725d6a300cf2517bb4c0ac SHA1 3a9860a437b52b56337cbacf70fe5e0be7413056 SHA256 417e2e87b4537947c70e30f04db823a3441665c7c84e43e03c643a4bce351b2e
+EBUILD coda-6.9.3.ebuild 2235 RMD160 e541b178b5774250af0f55038d4f72b397d70f76 SHA1 c87806a14db7d683d883fc67500a580bfceb2de3 SHA256 91fb4522194de5519ac875b387cea8fe6d4cc214671510ad8ef1c4f9d7fea30e
 MISC metadata.xml 250 RMD160 6aa4816072481129f87c0eb8a85c6a15287da965 SHA1 a8f9a0fb13692c19c95e700e32796c147c6c7804 SHA256 1ed32cc76b9bd8664c2bfd7d84f4186b444d5d39659b40523d0bc27e0ebb9846
diff --git a/coda/net-fs/coda/coda-6.9.3.ebuild b/coda/net-fs/coda/coda-6.9.3.ebuild
index 5916d14..7f5965d 100644
--- a/coda/net-fs/coda/coda-6.9.3.ebuild
+++ b/coda/net-fs/coda/coda-6.9.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.coda.cs.cmu.edu/"
 SRC_URI="http://www.coda.cs.cmu.edu/pub/${PN}/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="coda-client coda-server kerberos"
+IUSE="kerberos server"
 
 RDEPEND=">=sys-libs/lwp-2.4
 		>=net-libs/rpc2-2.7
@@ -36,10 +36,9 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=""
+	local myconf="--enable-client"
 
-	use coda-client && myconf="${myconf} --enable-client"
-	use coda-server && myconf="${myconf} --enable-server"
+	use server && myconf="${myconf} --enable-server"
 	use kerberos && myconf="${myconf} --with-crypto --with-krb5"
 
 	econf ${myconf} || die "econf failed"
@@ -53,39 +52,47 @@ src_install() {
 	dodoc INSTALL* README*
 
 	rm -Rf "${D}"/etc/init.d
-	doinitd "${FILESDIR}"/auth2
-	doinitd "${FILESDIR}"/coda-update
-	doinitd "${FILESDIR}"/codasrv
 	doinitd "${FILESDIR}"/venus
+	if use server ; then
+		doinitd "${FILESDIR}"/auth2
+		doinitd "${FILESDIR}"/coda-update
+		doinitd "${FILESDIR}"/codasrv
+	fi
 
 	# Fix conflict with backup.sh from tar.
 	mv -f "${D}"/usr/sbin/backup{,-coda}.sh
 
-	# Add Gentoo specific directories.
-	dodir /var/lib/vice
+	# Add Gentoo specific dirs.
+	if use server ; then
+		dodir /var/lib/vice
+		dodir /mnt/vicepa
+	fi
 	dodir /var/lib/coda/spool
 	dodir /mnt/coda
-	dodir /mnt/vicepa
 
 	diropts -m0700
 	dodir /var/lib/coda/etc
 	dodir /var/lib/coda/venus.cache
 
-	# Symlink traditional coda dirs to Gentoo dirs.
-	dosym /var/lib/vice /vice
+	# Symlink traditional Coda dirs to Gentoo dirs.
+	if use server ; then
+		dosym /var/lib/vice /vice
+		dosym /mnt/vicepa /vicepa
+	fi
 	dosym /var/lib/coda /usr/coda
 	dosym /mnt/coda /coda
-	dosym /mnt/vicepa /vicepa
 }
 
 pkg_postinst() {
-	elog "To enable the coda server at boot up, please do:"
-	elog "    rc-update add auth2 default"
-	elog "    rc-update add coda-update default"
-	elog "    rc-update add codasrv default"
-	elog
+	if use server ; then
+		elog "To configure the coda server, run vice-setup."
+		elog "To enable the coda server at boot up, please do:"
+		elog "    rc-update add auth2 default"
+		elog "    rc-update add coda-update default"
+		elog "    rc-update add codasrv default"
+		elog
+	fi
+	elog "To configure the coda client, run venus-setup."
 	elog "To enable the coda client at boot up, please do:"
 	elog "    rc-update add venus default"
-	elog
-	elog "To get started, run vice-setup (server) and/or venus-setup (client)."
 }