Fixed collision with tar's backup.sh script

diff --git a/net-fs/coda/ChangeLog b/net-fs/coda/ChangeLog
index 7e2749d414f96c0b88b266fef77c795599730db7..70e00da55a4ce00fe792e33892ff51c67bf48b6f 100644 (file)
--- a/net-fs/coda/ChangeLog
+++ b/net-fs/coda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/coda
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/ChangeLog,v 1.13 2004/10/23 18:18:47 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/ChangeLog,v 1.14 2004/11/06 22:48:33 griffon26 Exp $
+
+  06 Nov 2004; Maurice van der Pot <griffon26@gentoo.org> coda-6.0.6.ebuild,
+  coda-6.0.7.ebuild:
+  Coda backup script is now installed as backup-coda.sh to prevent a 
+  collision with tar's backup.sh. Thanks to Alexander Skwar 
+  <askwar@digitalprojects.com> in bug #70231.
 
   23 Oct 2004; Maurice van der Pot <griffon26@gentoo.org> +files/6.0.7/venus,
   coda-6.0.7.ebuild:

diff --git a/net-fs/coda/Manifest b/net-fs/coda/Manifest
index 4772dc97a624a7e0d62a9a12520520ed6fd959de..a24c3e9c801606fcd12a7c7b49a75350a9c05142 100644 (file)
--- a/net-fs/coda/Manifest
+++ b/net-fs/coda/Manifest
@@ -3,9 +3,9 @@ Hash: SHA1
 
 MD5 f905a614fde3a85e0adefb203ece18fc metadata.xml 321
 MD5 14e8df1cfd403bd955f4de826e758920 coda-6.0.3.ebuild 2974
-MD5 bfd3abaab090ccc7e90b6b5aa4263a9d coda-6.0.6.ebuild 7603
-MD5 dda7dacd85f6fd3a73acc28f7f6e49f7 ChangeLog 2966
-MD5 c3971180feb0f7af6e4f5b51e41c8723 coda-6.0.7.ebuild 7581
+MD5 f4acc029a9f1809a19c727cd4fe12bb1 coda-6.0.6.ebuild 7683
+MD5 8d6bf713b589a16c4a8475a46e799785 coda-6.0.7.ebuild 7661
+MD5 18ec745e9515c2f2138800b50b8c6359 ChangeLog 3242
 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
@@ -19,7 +19,7 @@ MD5 77ec9d405290c5bd33e924efe4624866 files/6.0.7/venus 702
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBeqCPMGnpIbeahxwRAslyAKCVFz6TAYdDoQzrpJNHbcfNGQSE0ACfR6DV
-5JS9qUu2SPXkC97wMpvgD6Q=
-=r6qi
+iD8DBQFBjVTPMGnpIbeahxwRAmvFAJ9tyKhd/XcuT3nHAP45QaAkSJwjUwCfZoNE
+rRe4rQ44QPalzGQwbs2PGB0=
+=JPmx
 -----END PGP SIGNATURE-----

diff --git a/net-fs/coda/coda-6.0.6.ebuild b/net-fs/coda/coda-6.0.6.ebuild
index 709bbf08c7812f5da5a88c58de71c1a9d5f7082e..7b55db720e3a321368143c3e10759e040bb37584 100644 (file)
--- a/net-fs/coda/coda-6.0.6.ebuild
+++ b/net-fs/coda/coda-6.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.8 2004/10/23 15:33:57 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/coda-6.0.6.ebuild,v 1.9 2004/11/06 22:48:33 griffon26 Exp $
 
 inherit eutils
 
@@ -101,6 +101,9 @@ src_install () {
        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

diff --git a/net-fs/coda/coda-6.0.7.ebuild b/net-fs/coda/coda-6.0.7.ebuild
index 3c051294875caf9e50ce1f29dfffe5a0188a98af..64ca0f81292d59af0ca242d985d338b1f823a603 100644 (file)
--- a/net-fs/coda/coda-6.0.7.ebuild
+++ b/net-fs/coda/coda-6.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.2 2004/10/23 18:18:47 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/coda-6.0.7.ebuild,v 1.3 2004/11/06 22:48:33 griffon26 Exp $
 
 inherit eutils
 
@@ -95,6 +95,9 @@ src_install () {
        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