From 3a15dfadf94cb3a09f15f483403a144d59f3dc47 Mon Sep 17 00:00:00 2001 From: Alessandro Di Federico Date: Thu, 25 Feb 2016 23:20:12 +1100 Subject: [PATCH] app-admin/keepass: fix build with >=app-text/grep-2.22 Gentoo-bug: 574480 Package-Manager: portage-2.2.27 --- .../files/keepass-2.31-force-text-grep.patch | 13 +++++++++++++ app-admin/keepass/keepass-2.31.ebuild | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 app-admin/keepass/files/keepass-2.31-force-text-grep.patch 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 000000000000..c1086515f492 --- /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 cac738ec62ce..d828fcf1d51a 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 -- 2.26.2