Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/pingus/, games-puzzle/pingus/files/
Date: Tue, 23 Aug 2016 17:21:10
Message-Id: 1471972855.2d7c75bb39c63bcead7154614999fbdd2da3a538.polynomial-c@gentoo
1 commit: 2d7c75bb39c63bcead7154614999fbdd2da3a538
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 23 17:20:42 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 23 17:20:55 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d7c75bb
7
8 games-puzzle/pingus: Added a patch to work around Gentoo's crippled dash.
9
10 Package-Manager: portage-2.3.0
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch | 13 +++++++++++++
14 games-puzzle/pingus/pingus-0.7.6.ebuild | 12 ++++++++----
15 2 files changed, 21 insertions(+), 4 deletions(-)
16
17 diff --git a/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch b/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch
18 new file mode 100644
19 index 0000000..ab772d8
20 --- /dev/null
21 +++ b/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch
22 @@ -0,0 +1,13 @@
23 +# Work around Gentoo's crippled dash
24 +
25 +--- pingus-0.7.6/Makefile
26 ++++ pingus-0.7.6/Makefile
27 +@@ -39,7 +39,7 @@
28 + install -d "$(DESTDIR)$(BINDIR)"
29 +
30 + install -D build/pingus "$(DESTDIR)$(BINDIR)/pingus.bin"
31 +- echo -e "#!/bin/sh\nexec \"$(BINDIR)/pingus.bin\" --datadir \"$(DATADIR)\"" > "$(DESTDIR)$(BINDIR)/pingus"
32 ++ printf '%s\n%s' "#!/bin/sh" "exec \"$(BINDIR)/pingus.bin\" --datadir \"$(DATADIR)\"" > "$(DESTDIR)$(BINDIR)/pingus"
33 + chmod 755 "$(DESTDIR)$(BINDIR)/pingus"
34 +
35 + install-data:
36
37 diff --git a/games-puzzle/pingus/pingus-0.7.6.ebuild b/games-puzzle/pingus/pingus-0.7.6.ebuild
38 index 9183480..49ddbd7 100644
39 --- a/games-puzzle/pingus/pingus-0.7.6.ebuild
40 +++ b/games-puzzle/pingus/pingus-0.7.6.ebuild
41 @@ -1,4 +1,4 @@
42 -# Copyright 1999-2015 Gentoo Foundation
43 +# Copyright 1999-2016 Gentoo Foundation
44 # Distributed under the terms of the GNU General Public License v2
45 # $Id$
46
47 @@ -24,11 +24,15 @@ RDEPEND="media-libs/libsdl[joystick,opengl?,video]
48 DEPEND="${RDEPEND}
49 virtual/pkgconfig"
50
51 +PATCHES=(
52 + "${FILESDIR}"/${P}-noopengl.patch
53 + "${FILESDIR}"/${P}-gcc47.patch
54 + "${FILESDIR}"/${P}-echo-e.patch
55 +)
56 +
57 src_prepare() {
58 strip-flags
59 - epatch \
60 - "${FILESDIR}"/${P}-noopengl.patch \
61 - "${FILESDIR}"/${P}-gcc47.patch
62 + epatch "${PATCHES[@]}"
63 }
64
65 src_compile() {