summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-10-27 14:03:09 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-10-27 14:03:09 +0000
commit867ae3a8ce5b10cb5cf6c93b89949f58d5de6e6e (patch)
tree0a647acf4001e0c8ad88d5af2b3dc68e779b6d60
parentstable x86, bug 312333 (diff)
downloadgentoo-2-867ae3a8ce5b10cb5cf6c93b89949f58d5de6e6e.tar.gz
gentoo-2-867ae3a8ce5b10cb5cf6c93b89949f58d5de6e6e.tar.bz2
gentoo-2-867ae3a8ce5b10cb5cf6c93b89949f58d5de6e6e.zip
Fix install with recent automake and coreutils wrt #328755 by "Chris".
(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)
-rw-r--r--app-backup/amanda/ChangeLog6
-rw-r--r--app-backup/amanda/amanda-2.6.0_p2-r4.ebuild6
-rw-r--r--app-backup/amanda/files/amanda-2.6.0_p2-coreutils.patch12
3 files changed, 21 insertions, 3 deletions
diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog
index 7fb0fbaad70f..ca108bfce3a7 100644
--- a/app-backup/amanda/ChangeLog
+++ b/app-backup/amanda/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.70 2010/10/11 22:53:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.71 2010/10/27 14:03:09 ssuominen Exp $
+
+ 27 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+ amanda-2.6.0_p2-r4.ebuild, +files/amanda-2.6.0_p2-coreutils.patch:
+ Fix install with recent automake and coreutils wrt #328755 by "Chris".
11 Oct 2010; Robin H. Johnson <robbat2@gentoo.org>
-files/patch-tar-1.14.90, -files/amanda-amandahosts,
diff --git a/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild b/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild
index 398cbe5c20c3..dfb3cc2256e2 100644
--- a/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild
+++ b/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild,v 1.14 2009/11/22 09:52:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild,v 1.15 2010/10/27 14:03:09 ssuominen Exp $
inherit perl-module autotools eutils
@@ -154,6 +154,8 @@ src_unpack() {
epatch "${FILESDIR}"/s3.c.part2.diff
cd "${S}"
+ epatch "${FILESDIR}"/${P}-coreutils.patch
+
#sed -i 's,amanda_working_ipv6,amanda_cv_working_ipv6,g' \
# "${S}"/configure.in || die "failed to sed"
# rm -f "${S}"/acinclude.m4
diff --git a/app-backup/amanda/files/amanda-2.6.0_p2-coreutils.patch b/app-backup/amanda/files/amanda-2.6.0_p2-coreutils.patch
new file mode 100644
index 000000000000..c670f59ff3ef
--- /dev/null
+++ b/app-backup/amanda/files/amanda-2.6.0_p2-coreutils.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/328755
+
+--- man/Makefile.am
++++ man/Makefile.am
+@@ -31,7 +31,6 @@
+ amverifyrun.8 \
+ amserverconfig.8 \
+ amaddclient.8 \
+- amcheckdump.8 \
+ amcrypt.8 \
+ amaespipe.8 \
+ amgpgcrypt.8 \