summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-09-12 08:34:05 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-09-12 08:34:05 +0000
commitf59674422e502534f7f7761efc50034519a8ebc8 (patch)
treedd5753d90b4279235d844031d20b40f57c6f3b6e /app-backup/amanda
parentVersion Bump, cleaned old (diff)
downloadgentoo-2-f59674422e502534f7f7761efc50034519a8ebc8.tar.gz
gentoo-2-f59674422e502534f7f7761efc50034519a8ebc8.tar.bz2
gentoo-2-f59674422e502534f7f7761efc50034519a8ebc8.zip
Bug #331111: Some of the testsuite fails if you have an old version of amanda and run the testsuite of the new version after building it but before installing it.
(Portage version: 2.2_rc75/cvs/Linux x86_64)
Diffstat (limited to 'app-backup/amanda')
-rw-r--r--app-backup/amanda/ChangeLog7
-rw-r--r--app-backup/amanda/amanda-3.1.2-r1.ebuild9
2 files changed, 11 insertions, 5 deletions
diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog
index 77f95b371d8e..8aeb90db4579 100644
--- a/app-backup/amanda/ChangeLog
+++ b/app-backup/amanda/ChangeLog
@@ -1,6 +1,11 @@
# 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.66 2010/09/10 21:41:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.67 2010/09/12 08:34:05 robbat2 Exp $
+
+ 12 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> amanda-3.1.2-r1.ebuild:
+ Bug #331111: Some of the testsuite fails if you have an old version of
+ amanda and run the testsuite of the new version after building it but
+ before installing it.
*amanda-3.1.2-r1 (10 Sep 2010)
diff --git a/app-backup/amanda/amanda-3.1.2-r1.ebuild b/app-backup/amanda/amanda-3.1.2-r1.ebuild
index d0df16be5f07..cd8a80a37b0e 100644
--- a/app-backup/amanda/amanda-3.1.2-r1.ebuild
+++ b/app-backup/amanda/amanda-3.1.2-r1.ebuild
@@ -1,6 +1,6 @@
# 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-3.1.2-r1.ebuild,v 1.2 2010/09/10 21:45:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.1.2-r1.ebuild,v 1.3 2010/09/12 08:34:05 robbat2 Exp $
EAPI=3
inherit autotools eutils perl-module
@@ -40,9 +40,6 @@ DEPEND="${RDEPEND}
IUSE="gnuplot ipv6 kerberos minimal nls s3 samba xfs"
-# pending bug #331111, tests are disabled
-RESTRICT="test"
-
S="${WORKDIR}/${MY_P}"
MYFILESDIR="${T}/files"
@@ -129,6 +126,10 @@ src_prepare() {
# gentoo bug 248838, check /sbin stuff before /bin
#epatch "${FILESDIR}"/${PN}-2.6.0_p2-syslocpath.patch
+ # gentoo bug #331111
+ sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am
+ sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am
+
eautoreconf
# places for us to work in