From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C75A61388C0 for ; Thu, 25 Feb 2016 12:21:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 804D5E0851; Thu, 25 Feb 2016 12:21:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0FAF6E0851 for ; Thu, 25 Feb 2016 12:21:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA6C7340C40 for ; Thu, 25 Feb 2016 12:21:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF6A4154D for ; Thu, 25 Feb 2016 12:21:34 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1456402885.3a15dfadf94cb3a09f15f483403a144d59f3dc47.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/keepass/, app-admin/keepass/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/keepass/files/keepass-2.31-force-text-grep.patch app-admin/keepass/keepass-2.31.ebuild X-VCS-Directories: app-admin/keepass/ app-admin/keepass/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 3a15dfadf94cb3a09f15f483403a144d59f3dc47 X-VCS-Branch: master Date: Thu, 25 Feb 2016 12:21:34 +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: 5a231569-6040-44b0-88a1-e19b28a54a52 X-Archives-Hash: 19465d0ba62babdbfe1f10342d4e5e1f commit: 3a15dfadf94cb3a09f15f483403a144d59f3dc47 Author: Alessandro Di Federico clearmind me> AuthorDate: Thu Feb 25 12:20:12 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Feb 25 12:21:25 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a15dfad app-admin/keepass: fix build with >=app-text/grep-2.22 Gentoo-bug: 574480 Package-Manager: portage-2.2.27 app-admin/keepass/files/keepass-2.31-force-text-grep.patch | 13 +++++++++++++ app-admin/keepass/keepass-2.31.ebuild | 3 +++ 2 files changed, 16 insertions(+) diff --git a/app-admin/keepass/files/keepass-2.31-force-text-grep.patch b/app-admin/keepass/files/keepass-2.31-force-text-grep.patch new file mode 100644 index 0000000..c108651 --- /dev/null +++ b/app-admin/keepass/files/keepass-2.31-force-text-grep.patch @@ -0,0 +1,13 @@ +Force text mode for >=grep-2.22 (bug #574480). + +--- a/Build/PrepMonoDev.sh ++++ b/Build/PrepMonoDev.sh +@@ -3,7 +3,7 @@ + + sed 's!true!false!g' ../KeePass/KeePass.csproj > ../KeePass/KeePass.csproj.new + sed 's! ToolsVersion="3.5"!!g' ../KeePass/KeePass.csproj.new > ../KeePass/KeePass.csproj.new2 +-cat ../KeePass/KeePass.csproj.new2 | grep -v 'sgen\.exe' > ../KeePass/KeePass.csproj ++cat ../KeePass/KeePass.csproj.new2 | grep -va 'sgen\.exe' > ../KeePass/KeePass.csproj + rm -f ../KeePass/KeePass.csproj.new2 + rm -f ../KeePass/KeePass.csproj.new + diff --git a/app-admin/keepass/keepass-2.31.ebuild b/app-admin/keepass/keepass-2.31.ebuild index cac738e..d828fcf 100644 --- a/app-admin/keepass/keepass-2.31.ebuild +++ b/app-admin/keepass/keepass-2.31.ebuild @@ -25,6 +25,9 @@ DEPEND="${COMMON_DEPEND} S=${WORKDIR} src_prepare() { + # Force text mode for >grep-2.21 (bug #574480) + epatch "${FILESDIR}/${PN}-2.31-force-text-grep.patch" + # Remove Windows-specific things pushd Build > /dev/null || die . PrepMonoDev.sh || die