gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

app-admin/keepass: fix build with >=app-text/grep-2.22

Browse Source 
Gentoo-bug: 574480

Package-Manager: portage-2.2.27
This commit is contained in:
Alessandro Di Federico
2016-02-25 23:20:12 +11:00
committed by Michael Palimaka
parent 505076c728
commit 3a15dfadf9
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app-admin/keepass/files/keepass-2.31-force-text-grep.patch Normal file
View File

@@ -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!<SignAssembly>true</SignAssembly>!<SignAssembly>false</SignAssembly>!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

3
app-admin/keepass/keepass-2.31.ebuild
View File

@@ -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