From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C570C139085 for ; Thu, 2 Feb 2017 20:01:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07E8FE0E15; Thu, 2 Feb 2017 20:01:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D5652E0E15 for ; Thu, 2 Feb 2017 20:01:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7D4A340F2A for ; Thu, 2 Feb 2017 20:01:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A8813B9F for ; Thu, 2 Feb 2017 20:01:44 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1486065688.a120cba32531abbc6aa01e190dbaa3736696ef08.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/amanda/amanda-3.4.2.ebuild X-VCS-Directories: app-backup/amanda/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: a120cba32531abbc6aa01e190dbaa3736696ef08 X-VCS-Branch: master Date: Thu, 2 Feb 2017 20:01:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f1e42b9d-8843-4a3e-a281-995de4203bbd X-Archives-Hash: ceb279bbda69a874980949313001a7ad commit: a120cba32531abbc6aa01e190dbaa3736696ef08 Author: Stefan G. Weichinger oops co at> AuthorDate: Thu Feb 2 14:36:29 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Thu Feb 2 20:01:28 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a120cba3 fixes bug #607980 (cherry picked from commit 8b620fe3f8143a1a394937fda520ce9e2306fe16) Signed-off-by: Robin H. Johnson gentoo.org> Fixes: https://github.com/gentoo/gentoo/pull/3773 app-backup/amanda/amanda-3.4.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-backup/amanda/amanda-3.4.2.ebuild b/app-backup/amanda/amanda-3.4.2.ebuild index 472b5ab..2964176 100644 --- a/app-backup/amanda/amanda-3.4.2.ebuild +++ b/app-backup/amanda/amanda-3.4.2.ebuild @@ -170,7 +170,7 @@ src_prepare() { done if use minimal; then - cat "${MYFILESDIR}"/amanda-amandahosts-server.5.1_p3-r1 > "${T}"/amandahosts || die + cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die else sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \ server-src/am{addclient,serverconfig}.pl || die