| 1 |
commit: c17f1c0fd5dbcb1916b648ace6a4e3c304005cc0 |
| 2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 18 23:43:17 2015 +0000 |
| 4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 18 23:43:51 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17f1c0f |
| 7 |
|
| 8 |
fix building with gcc5 (bug #568684); use deps for libsdl; add sound use flag |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.24 |
| 11 |
|
| 12 |
games-puzzle/lpairs/lpairs-1.0.4.ebuild | 14 ++++++++------ |
| 13 |
1 file changed, 8 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/games-puzzle/lpairs/lpairs-1.0.4.ebuild b/games-puzzle/lpairs/lpairs-1.0.4.ebuild |
| 16 |
index 6d08273..9f3a038 100644 |
| 17 |
--- a/games-puzzle/lpairs/lpairs-1.0.4.ebuild |
| 18 |
+++ b/games-puzzle/lpairs/lpairs-1.0.4.ebuild |
| 19 |
@@ -9,12 +9,12 @@ DESCRIPTION="A classical memory game" |
| 20 |
HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LPairs" |
| 21 |
SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz" |
| 22 |
|
| 23 |
-LICENSE="GPL-2" |
| 24 |
+LICENSE="GPL-2+" |
| 25 |
SLOT="0" |
| 26 |
KEYWORDS="amd64 ppc x86" |
| 27 |
-IUSE="nls" |
| 28 |
+IUSE="nls sound" |
| 29 |
|
| 30 |
-RDEPEND="media-libs/libsdl |
| 31 |
+RDEPEND="media-libs/libsdl[sound?,video] |
| 32 |
nls? ( virtual/libintl )" |
| 33 |
DEPEND="${RDEPEND} |
| 34 |
nls? ( sys-devel/gettext )" |
| 35 |
@@ -23,14 +23,16 @@ src_prepare() { |
| 36 |
sed -i \ |
| 37 |
-e 's:$localedir:/usr/share/locale:' \ |
| 38 |
-e 's:$(localedir):/usr/share/locale:' \ |
| 39 |
- configure po/Makefile.in.in \ |
| 40 |
- || die "sed failed" |
| 41 |
+ configure po/Makefile.in.in || die |
| 42 |
+ # gcc5 doesn't like the way inline is used. just punt it. (bug #568684) |
| 43 |
+ sed -i -e 's/^inline//g' lpairs/{sdl.[ch],pairs.[ch]} || die |
| 44 |
} |
| 45 |
|
| 46 |
src_configure() { |
| 47 |
egamesconf \ |
| 48 |
--datadir="${GAMES_DATADIR_BASE}" \ |
| 49 |
- $(use_enable nls) |
| 50 |
+ $(use_enable nls) \ |
| 51 |
+ $(usex sound '' --disable-sound) |
| 52 |
} |
| 53 |
|
| 54 |
src_install() { |
Archives