Move init-scripts to prepare for update from bug #193012.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r4 x86_64

6 files changed, 48 insertions, 45 deletions

diff --git a/net-fs/coda/ChangeLog b/net-fs/coda/ChangeLog
index 0f0a09fd131b..ecd0f06cd2cb 100644
--- a/net-fs/coda/ChangeLog
+++ b/net-fs/coda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/coda
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/ChangeLog,v 1.31 2007/05/19 16:09:17 griffon26 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/ChangeLog,v 1.32 2008/07/12 22:31:40 chtekk Exp $
+
+  12 Jul 2008; Luca Longinotti <chtekk@gentoo.org> +files/6.0.15/auth2,
+  +files/6.0.15/coda-update, +files/6.0.15/codasrv, -files/auth2,
+  -files/coda-update, -files/codasrv, coda-6.0.15.ebuild:
+  Move init-scripts to prepare for update from bug #193012. Also minimal
+  cleanup of ebuild.
 
   19 May 2007; Maurice van der Pot <griffon26@gentoo.org>
   -files/coda-6.0.10-venus-setup-fix.patch,
diff --git a/net-fs/coda/Manifest b/net-fs/coda/Manifest
index d7c16720da10..bce707759ddd 100644
--- a/net-fs/coda/Manifest
+++ b/net-fs/coda/Manifest
@@ -1,9 +1,9 @@
+AUX 6.0.15/auth2 1045 RMD160 5401419520f25d628451ebae451be2b841080fea SHA1 6a0cbe1374430b948908c076094d50348cce77d1 SHA256 ea756698336b89cde04bb8bde3193cc6c16f8292aff9e5e6df14f01548b8590d
+AUX 6.0.15/coda-update 1227 RMD160 5c8ddfa0056d4338e06e885f659cf59cb49cd5a4 SHA1 6967b5de3c419f76877be62157d0fe629539edd8 SHA256 0dbf4e14001d3750fe0b1be2a7b9ce5c9ec5de1dbeb3dcfbbd6a7ccb2c9d0226
+AUX 6.0.15/codasrv 945 RMD160 bc402bfc9851f46ca43dd606c63eaef0202cec64 SHA1 01529252b86fa7dad381a7698bfe40dee51288b7 SHA256 d35464e43f36475136f7e1a2cf4f9e8700cf02041ec5ed44921dd1bbc1b97a33
 AUX 6.0.15/venus 703 RMD160 f80659e9d3a5ad1a7ca755dc372e48cc34df8fbe SHA1 2cfac9787f30347eedf6d183862aec6406b29865 SHA256 01bd6353fadb6e0f2c0bd6c3c6f9d89dd7cb893211bf45d1b2d4b93fa1d99de2
-AUX auth2 1041 RMD160 987b108810cd52fef087e58633a7c15402660631 SHA1 c6b6751d0a9061b3c6423fe4ad07c831eedeca57 SHA256 2990536d366098d56ce248e23a377d227ba556e4dda0f4fe2208d62bc00857a9
 AUX coda-6.0.15-mit-krb5-struct.patch 1282 RMD160 440a95a89ab8e650bc9af98807cda8d1b674ff18 SHA1 4a68d977fb4d8db4e8566038d12ddba58d3d52f4 SHA256 990fce3c2a81eb68b973acf973c5b15717b99b8381c3becfb98458d286f0a663
-AUX coda-update 1223 RMD160 0e3479b2c3295b3a24e2cf2e8667d261b2dd582c SHA1 3e5020975ef3c0cba1f06e830210dd50dcf06000 SHA256 2f625980cd3e8ce6b27662886c62f28f6ff9b9a61e233f56a7fc1fea54175e6a
-AUX codasrv 941 RMD160 ccab4d3477da91b9bc04ad78d041d9dfe10f96eb SHA1 ca8c7023ecba0e95ac953bf5531c1a420787ec4f SHA256 deb56c566064b7a3f6abe1518214450a1a5d27e62b603c78665eba3ecaddc76a
 DIST coda-6.0.15.tar.gz 1573599 RMD160 b453c61a89b71482a8b690a54036c9b6ce1a9c56 SHA1 f245251654bc6859f599b26f79a4ce8799b8c6bd SHA256 aec4140a7bfec26c4991b6865e4c5672633b3bd6dac11fef1102db8ecdee8edd
-EBUILD coda-6.0.15.ebuild 7647 RMD160 96d1ffe459689978ea15579dc695f1ab673a8b24 SHA1 846aa5e6a8e37ad4c6a0f9e6c57fa7225fcf4f72 SHA256 877e5d2c2364df6e00e32daa889e16c2746de3fcf514c1e20a503583e3c22b97
-MISC ChangeLog 7357 RMD160 279ac7e00ea8b64b4bbf5c5e47b891905b7df971 SHA1 175f14f1c18dc510121c1eab702c45b923e6cde9 SHA256 356b1e9017c2fe8832ff9161ff6283251f860ce0a5228aa48170af26a76d3ee4
+EBUILD coda-6.0.15.ebuild 7679 RMD160 009df21988ffbd92b809f35035e4328c5f2397bd SHA1 b1b33f0619cd572427061740c3c696ef678795f7 SHA256 358c34cd92a1ed57c4a423d3cbf676733dd6884a8cec9367f234179ffc10a49b
+MISC ChangeLog 7645 RMD160 13cc2f2be32d8d159d93a72a06542abc73e60403 SHA1 2527520db79fc7a038b3fed36a0b5585f5b00c08 SHA256 d4c14e9839a61e4cb98bddfa429237e8aa9d810a5a8feab6fb6917b67f7df99e
 MISC metadata.xml 159 RMD160 8e0977b9abd90afe9e1d5c1326823a5726f6e2a4 SHA1 33f35324ce730e28838be228d9ee4e4dd1bab1e5 SHA256 562c59615c028ffa088de789b3a792fd4cbbbfe71628ddd6a55d3b176becbc6b
diff --git a/net-fs/coda/coda-6.0.15.ebuild b/net-fs/coda/coda-6.0.15.ebuild
index 6d575c96a5d6..d2fcd2a4b0d3 100644
--- a/net-fs/coda/coda-6.0.15.ebuild
+++ b/net-fs/coda/coda-6.0.15.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/coda-6.0.15.ebuild,v 1.9 2007/07/12 05:38:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/coda-6.0.15.ebuild,v 1.10 2008/07/12 22:31:40 chtekk Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
 
 inherit autotools eutils
 
-IUSE="kerberos ssl"
+KEYWORDS="~ppc x86"
 
-DESCRIPTION="Coda is an advanced networked filesystem developed at Carnegie Mellon Univ."
+DESCRIPTION="Coda is an advanced networked filesystem developed at Carnegie Mellon Uni."
 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="~ppc x86"
+SLOT="0"
+IUSE="kerberos ssl"
 
 # partly based on the deps suggested by Mandrake's RPM, and/or on my current versions
 # Also, definely needs coda.h from linux-headers.
@@ -34,8 +36,9 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-mit-krb5-struct.patch"
+	epatch "${FILESDIR}"/${P}-mit-krb5-struct.patch
 }
 
 src_compile() {
@@ -44,11 +47,11 @@ src_compile() {
 	use kerberos && myflags="${myflags} --with-krb5"
 	use ssl && myflags="${myflags} --with-openssl"
 
-	econf ${myflags} || die "configure failed"
+	econf ${myflags} || die "econf failed"
 	emake -j1 || die "emake failed"
 }
 
-src_install () {
+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
@@ -58,39 +61,35 @@ src_install () {
 	#...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
+		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 client-install failed"
 
 	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 \
+		prefix="${D}"/usr \
+		sysconfdir="${D}"/etc/coda \
+		mandir="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
+		oldincludedir="${D}"/usr/include server-install || die "emake server-install failed"
 
 	dodoc README* ChangeLog CREDITS
 
-	doinitd ${FILESDIR}/${PV}/venus
-	doinitd ${FILESDIR}/coda-update
-	doinitd ${FILESDIR}/codasrv
-	doinitd ${FILESDIR}/auth2
-
-	# We may use a conf.d/coda file at some point ?
-#	insinto /etc/conf.d
-#	newins ${FILESDIR}/coda.conf.d coda
+	doinitd "${FILESDIR}"/${PV}/venus
+	doinitd "${FILESDIR}"/${PV}/coda-update
+	doinitd "${FILESDIR}"/${PV}/codasrv
+	doinitd "${FILESDIR}"/${PV}/auth2
 
 	sed -i -e "s,^#vicedir=/.*,vicedir=/var/lib/vice," \
-		${D}/etc/coda/server.conf.ex
+		"${D}"/etc/coda/server.conf.ex
 
 	sed -i -e "s,^#mountpoint=/.*,mountpoint=/mnt/coda," \
-		${D}/etc/coda/venus.conf.ex
+		"${D}"/etc/coda/venus.conf.ex
 
 	# Fix conflict with backup.sh from tar
-	mv -f ${D}/usr/sbin/backup{,-coda}.sh
+	mv -f "${D}"/usr/sbin/backup{,-coda}.sh
 
 	dodir /var/lib/vice
 	dodir /mnt/coda
@@ -102,8 +101,7 @@ src_install () {
 	dodir /usr/coda/venus.cache
 }
 
-pkg_postinst () {
-	elog
+pkg_postinst() {
 	elog "To enable the coda at boot up, please do:"
 	elog "    rc-update add codasrv default"
 	elog "    rc-update add venus default"
@@ -114,8 +112,7 @@ pkg_postinst () {
 	elog "    emerge --config =${PF}"
 }
 
-pkg_config () {
-
+pkg_config() {
 	# Set of default configuration values
 	local CODA_ROOT_DIR="/var/lib/vice"
 	local CODA_TEST_VOLUME="codatestvol"
diff --git a/net-fs/coda/files/auth2 b/net-fs/coda/files/6.0.15/auth2
index 6700a09c8c1e..9e1f3386e85d 100644
--- a/net-fs/coda/files/auth2
+++ b/net-fs/coda/files/6.0.15/auth2
@@ -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/auth2,v 1.4 2004/07/26 17:50:21 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/6.0.15/auth2,v 1.1 2008/07/12 22:31:41 chtekk Exp $
 
 depend() {
 	need net
diff --git a/net-fs/coda/files/coda-update b/net-fs/coda/files/6.0.15/coda-update
index 9e6276f72b51..7d9cd34f8bf1 100644
--- a/net-fs/coda/files/coda-update
+++ b/net-fs/coda/files/6.0.15/coda-update
@@ -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/coda-update,v 1.4 2004/07/26 17:50:21 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/6.0.15/coda-update,v 1.1 2008/07/12 22:31:41 chtekk Exp $
 
 depend() {
 	need net auth2
diff --git a/net-fs/coda/files/codasrv b/net-fs/coda/files/6.0.15/codasrv
index 6783add42294..7bf9fd4655a9 100644
--- a/net-fs/coda/files/codasrv
+++ b/net-fs/coda/files/6.0.15/codasrv
@@ -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/codasrv,v 1.5 2004/07/26 17:50:21 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/6.0.15/codasrv,v 1.1 2008/07/12 22:31:41 chtekk Exp $
 
 depend() {
 	need net coda-update auth2