summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2014-01-10 05:33:48 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2014-01-10 05:33:48 +0000
commit921dec90380f5e7cd46021965c42eecb50f1e6f5 (patch)
treecd0784b0159c6f0358bf2caa422fe0bf2e6383a0 /games-puzzle
parentattempt at more rubying the ebuild (diff)
downloadgentoo-2-921dec90380f5e7cd46021965c42eecb50f1e6f5.tar.gz
gentoo-2-921dec90380f5e7cd46021965c42eecb50f1e6f5.tar.bz2
gentoo-2-921dec90380f5e7cd46021965c42eecb50f1e6f5.zip
fix libsdl use deps (bug #460626); skip install for 32bit on amd64 (bug #417187)
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/world-of-goo/ChangeLog9
-rw-r--r--games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild8
2 files changed, 11 insertions, 6 deletions
diff --git a/games-puzzle/world-of-goo/ChangeLog b/games-puzzle/world-of-goo/ChangeLog
index 0b80539281fe..eb01e47ac056 100644
--- a/games-puzzle/world-of-goo/ChangeLog
+++ b/games-puzzle/world-of-goo/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-puzzle/world-of-goo
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/world-of-goo/ChangeLog,v 1.8 2013/01/22 18:44:28 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/world-of-goo/ChangeLog,v 1.9 2014/01/10 05:33:48 mr_bones_ Exp $
+
+ 10 Jan 2014; Michael Sterrett <mr_bones_@gentoo.org>
+ world-of-goo-1.41-r1.ebuild:
+ fix libsdl use deps (bug #460626); skip install for 32bit on amd64 (bug
+ #417187)
22 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
-world-of-goo-1.41.ebuild:
diff --git a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild b/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
index 252c38d8bf20..cfa2d0474844 100644
--- a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
+++ b/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild,v 1.3 2013/01/13 11:21:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild,v 1.4 2014/01/10 05:33:48 mr_bones_ Exp $
EAPI=2
inherit eutils games
@@ -22,7 +22,7 @@ KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="fetch strip"
-RDEPEND="media-libs/libsdl[audio,opengl,video]
+RDEPEND="media-libs/libsdl[alsa,audio,opengl,video]
media-libs/sdl-mixer[vorbis]
sys-libs/glibc
virtual/opengl
@@ -47,7 +47,7 @@ pkg_nofetch() {
src_install() {
exeinto "${dir}"
- doexe ${MY_PN%Demo}* || die
+ doexe ${MY_PN%Demo}{,.$(usex amd64 bin64 bin32)} || die
games_make_wrapper ${PN} "${dir}"/${MY_PN%Demo} || die