Fix bugs #51370, #66842, #69105.

diff --git a/app-admin/amanda/ChangeLog b/app-admin/amanda/ChangeLog
index 1756f04fb7002ea9ac3d25ffc6209090025851ce..2f5ab362a74e1dc84c5595f858babc3ca4dacd35 100644 (file)
--- a/app-admin/amanda/ChangeLog
+++ b/app-admin/amanda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/amanda
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/ChangeLog,v 1.24 2004/10/05 02:58:10 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/ChangeLog,v 1.25 2004/11/22 03:29:31 robbat2 Exp $
+
+  21 Nov 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +files/patch-tar-1.14.90:
+  Fix bugs #51370, #66842, #69105.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   amanda-2.4.4-r3.ebuild, amanda-2.4.4_p2-r1.ebuild:

diff --git a/app-admin/amanda/Manifest b/app-admin/amanda/Manifest
index cdaa041579089f0337b34e66f7f04a3bcf3af4a1..2e69e7da91a895edf5888fd1dfdbb77191e55d92 100644 (file)
--- a/app-admin/amanda/Manifest
+++ b/app-admin/amanda/Manifest
@@ -1,21 +1,33 @@
-MD5 2afa19ca1e9fe8deb5a14711e70cec82 ChangeLog 4784
-MD5 c6b751a034398ef7dd3e207476c53e82 amanda-2.4.4-r3.ebuild 11290
-MD5 e6f1be35cbce779e07dd3d4449a8dfcc amanda-2.4.4_p2-r1.ebuild 11509
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dbebfc7992834d0a916c2479a75e35b4 amanda-2.4.4_p3.ebuild 11780
 MD5 fbae3bebc75f02f1d4fd63ecd968f100 amanda-2.4.4_p2-r2.ebuild 11642
 MD5 1f23611bf44cee67526b78a0e2af4e33 amanda-2.4.4_p2.ebuild 11341
-MD5 e8f6530495f7634139ae11a02230656c amanda-2.4.4_p3.ebuild 11639
+MD5 c6b751a034398ef7dd3e207476c53e82 amanda-2.4.4-r3.ebuild 11290
+MD5 e6f1be35cbce779e07dd3d4449a8dfcc amanda-2.4.4_p2-r1.ebuild 11509
+MD5 0864f2f8f22527a5b6f5b6d42a9c68e5 ChangeLog 4900
 MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
-MD5 451df413de672ae539379c00fb9e62fc files/amanda-amandahosts 339
-MD5 a98390eb2ab16398b7332c42560c190f files/amanda-cron 419
 MD5 89f98efbd6fee9891cd6c39d52e5d7a8 files/amanda-devfs 349
-MD5 ef2e4c8797076d9733b31a860fda8582 files/amanda-inetd.amanda.sample 194
-MD5 c1754144159a9b9e71119c7ca30e6054 files/amanda-profile 49
+MD5 fe28f64731a2dbf85f76b6f38942e032 files/example_disklist 55
+MD5 a98390eb2ab16398b7332c42560c190f files/amanda-cron 419
 MD5 3f55a95767207ed6c8fa0a14ec2a27b3 files/amanda-xinetd 1502
+MD5 c1754144159a9b9e71119c7ca30e6054 files/amanda-profile 49
+MD5 7e3ebbf89155432d9ee2e0ede8d4d8d6 files/example_amanda.conf 635
+MD5 451df413de672ae539379c00fb9e62fc files/amanda-amandahosts 339
+MD5 1c3320d56e74e925e4b3e4a8936488cd files/patch-tar-1.14.90 984
 MD5 7e5571de2054c56f477b5522246a834e files/digest-amanda-2.4.4-r3 65
 MD5 0c1121f81cee9a50018b96c615b4554b files/digest-amanda-2.4.4_p2 67
+MD5 8c132263bed2ee3703b26936b15aa916 files/digest-amanda-2.4.4_p3 67
 MD5 0c1121f81cee9a50018b96c615b4554b files/digest-amanda-2.4.4_p2-r1 67
 MD5 0c1121f81cee9a50018b96c615b4554b files/digest-amanda-2.4.4_p2-r2 67
-MD5 8c132263bed2ee3703b26936b15aa916 files/digest-amanda-2.4.4_p3 67
-MD5 7e3ebbf89155432d9ee2e0ede8d4d8d6 files/example_amanda.conf 635
-MD5 fe28f64731a2dbf85f76b6f38942e032 files/example_disklist 55
 MD5 95a109a0edbf12da91dbabf7977a97f7 files/example_global.conf 1377
+MD5 ef2e4c8797076d9733b31a860fda8582 files/amanda-inetd.amanda.sample 194
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+Comment: Robbat2 @ Orbis-Terrarum Networks
+
+iD8DBQFBoV0dPpIsIjIzwiwRAnCcAKCpRuS+PMZrEGcZ0gLWMe+B0N/g6ACcCbUl
+gjcdUJ3Aun2WoxFByCOzd/4=
+=UbKd
+-----END PGP SIGNATURE-----

diff --git a/app-admin/amanda/amanda-2.4.4_p3.ebuild b/app-admin/amanda/amanda-2.4.4_p3.ebuild
index 13215dbb6bee22222aa84595b03654548e48f148..267f62d82857d7a40e7039c40faae0d6871f31bc 100644 (file)
--- a/app-admin/amanda/amanda-2.4.4_p3.ebuild
+++ b/app-admin/amanda/amanda-2.4.4_p3.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/app-admin/amanda/amanda-2.4.4_p3.ebuild,v 1.1 2004/07/15 17:26:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.4_p3.ebuild,v 1.2 2004/11/22 03:29:31 robbat2 Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.amanda.org/"
 SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 RDEPEND="sys-libs/readline
                virtual/inetd
                app-arch/mt-st
@@ -23,13 +23,12 @@ RDEPEND="sys-libs/readline
                samba? ( net-fs/samba )
                berkdb? ( sys-libs/db )
                gdbm? ( sys-libs/gdbm )
-               !sparc? ( xfs? ( sys-fs/xfsdump ) )"
+               !sparc? ( xfs? ( sys-fs/xfsdump ) )
+               >=sys-apps/portage-2.0.51-r3"
 
 DEPEND="${RDEPEND}
        sys-devel/autoconf
        sys-devel/automake"
-#dev-lang/perl sys-apps/gawk?
-
 
 IUSE="pic debug gdbm berkdb samba xfs"
 
@@ -104,6 +103,9 @@ pkg_setup() {
 
 src_unpack() {
        unpack ${A}
+       # Fix glitch with recognizing tar-1.14.90
+       epatch ${FILESDIR}/patch-tar-1.14.90 || die "Failed to add tar support patch"
+       # now the real fun
        amanda_variable_setup
        # places for us to work in
        mkdir -p ${MYFILESDIR} ${MYTMPDIR}

diff --git a/app-admin/amanda/files/patch-tar-1.14.90 b/app-admin/amanda/files/patch-tar-1.14.90
new file mode 100644 (file)
index 0000000..2d7bd53
--- /dev/null
+++ b/app-admin/amanda/files/patch-tar-1.14.90
@@ -0,0 +1,26 @@
+diff -ru amanda-2.4.4p3/configure amanda-2.4.4p3-new/configure
+--- amanda-2.4.4p3/configure   2004-06-22 07:41:55.000000000 -0500
++++ amanda-2.4.4p3-new/configure       2004-11-20 12:49:12.998686008 -0600
+@@ -8802,7 +8802,7 @@
+ 
+ if test ! -z "$GNUTAR"; then
+   case "`\"$GNUTAR\" --version 2>&1`" in
+-   *GNU*tar* | *Free*paxutils* )
++   *GNU*tar* | *Free*paxutils* | *tar\ \(tar\)\ 1.14.90* )
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define GNUTAR "$GNUTAR"
+diff -ru amanda-2.4.4p3/configure.in amanda-2.4.4p3-new/configure.in
+--- amanda-2.4.4p3/configure.in        2004-06-22 07:41:30.000000000 -0500
++++ amanda-2.4.4p3-new/configure.in    2004-11-20 12:50:15.082247872 -0600
+@@ -1284,7 +1284,7 @@
+ AC_PATH_PROGS(GNUTAR,gtar gnutar tar,,$LOCSYSPATH)
+ if test ! -z "$GNUTAR"; then
+   case "`\"$GNUTAR\" --version 2>&1`" in
+-   *GNU*tar* | *Free*paxutils* )
++   *GNU*tar* | *Free*paxutils* | *tar\ \(tar\)\ 1.14.90* )
+               AC_DEFINE_UNQUOTED(GNUTAR,"$GNUTAR",[Define to the location of Gnu tar. ])
+               ;;
+    *)
+
+