summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-11-19 22:40:35 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-11-19 22:40:35 +0000
commitdb37a3f54d33d8f24caeb8c84b9ea7da5d689919 (patch)
treef08f868a89777e8c6b8328da398e1dfbbd2f7708 /games-puzzle/pingus
parentuse scons-utils (diff)
downloadgentoo-2-db37a3f54d33d8f24caeb8c84b9ea7da5d689919.tar.gz
gentoo-2-db37a3f54d33d8f24caeb8c84b9ea7da5d689919.tar.bz2
gentoo-2-db37a3f54d33d8f24caeb8c84b9ea7da5d689919.zip
use scons-utils
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-puzzle/pingus')
-rw-r--r--games-puzzle/pingus/ChangeLog5
-rw-r--r--games-puzzle/pingus/pingus-0.7.3.ebuild16
2 files changed, 9 insertions, 12 deletions
diff --git a/games-puzzle/pingus/ChangeLog b/games-puzzle/pingus/ChangeLog
index 43c200bca81c..446903cf9fa8 100644
--- a/games-puzzle/pingus/ChangeLog
+++ b/games-puzzle/pingus/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-puzzle/pingus
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.28 2010/10/15 13:32:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.29 2010/11/19 22:40:35 mr_bones_ Exp $
+
+ 19 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org> pingus-0.7.3.ebuild:
+ use scons-utils
15 Oct 2010; Brent Baude <ranger@gentoo.org> pingus-0.7.3.ebuild:
stable ppc, bug 336376
diff --git a/games-puzzle/pingus/pingus-0.7.3.ebuild b/games-puzzle/pingus/pingus-0.7.3.ebuild
index 5d0137c671e5..ea019aa0470a 100644
--- a/games-puzzle/pingus/pingus-0.7.3.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.7.3.ebuild,v 1.4 2010/10/15 13:32:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.7.3.ebuild,v 1.5 2010/11/19 22:40:35 mr_bones_ Exp $
EAPI=2
-inherit eutils toolchain-funcs games
+inherit eutils scons-utils toolchain-funcs games
DESCRIPTION="free Lemmings clone"
HOMEPAGE="http://pingus.seul.org/"
@@ -14,17 +14,14 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
-RDEPEND="media-libs/libsdl[joystick,video]
+DEPEND="media-libs/libsdl[joystick,video]
media-libs/sdl-image[png]
media-libs/sdl-mixer
media-libs/libpng
dev-libs/boost"
-DEPEND="${RDEPEND}
- >=dev-util/scons-0.97"
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-paths.patch
+ epatch "${FILESDIR}"/${P}-paths.patch
sed -i \
-e "s:GENTOO_BINDIR:${GAMES_BINDIR}:" \
-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
@@ -41,10 +38,7 @@ src_configure() {
}
src_compile() {
- local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
- [[ ${MAKEOPTS/-s/} != ${MAKEOPTS} ]] && sconsopts="${sconsopts} -s"
-
- scons ${sconsopts} || die "scons failed"
+ escons || die
}
src_install() {