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
commit81e6e7af34b199c5d48e8878517823ff5bcfcd57 (patch)
treecd1e3d4b4c3ce6188beb2aa27e6921b80e72cc42 /games-puzzle
parentuse scons-utils (diff)
downloadhistorical-81e6e7af34b199c5d48e8878517823ff5bcfcd57.tar.gz
historical-81e6e7af34b199c5d48e8878517823ff5bcfcd57.tar.bz2
historical-81e6e7af34b199c5d48e8878517823ff5bcfcd57.zip
use scons-utils
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/pingus/ChangeLog5
-rw-r--r--games-puzzle/pingus/Manifest4
-rw-r--r--games-puzzle/pingus/pingus-0.7.3.ebuild16
3 files changed, 11 insertions, 14 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/Manifest b/games-puzzle/pingus/Manifest
index c264a9b64f85..c0db6d9b24b6 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -1,5 +1,5 @@
AUX pingus-0.7.3-paths.patch 961 RMD160 9409f3d2fb56f81b0b0e5f8bfc17b3ad625c8b99 SHA1 5cf09662a9d812c77eb0699a45b1bfdbe7ded769 SHA256 d5e65707a4a9fb78c77d648a29e76ea3fe78c0038a099efbc1cb4272c70238ff
DIST pingus-0.7.3.tar.bz2 11127278 RMD160 664d259a98a172d10480be9aa4ec87a424ecd6f1 SHA1 ca7fe5cea65fb3392d1e81056a879831925502f2 SHA256 e35be18a01a9a24a2013e809c216decdbd5a66e2fec7ad38f6d32b28b6b85637
-EBUILD pingus-0.7.3.ebuild 1432 RMD160 a30760bf78d54699ddf548a9de747b394f4e38b2 SHA1 58ae90f483667b780094a7d15c6bb06570fb95e3 SHA256 d9e9d1f642e071148e115548808ca32360c8584ef0720f0081740c0c4841120e
-MISC ChangeLog 4521 RMD160 3b86aa7c6a6349749a8a58e1847115379cae2ce4 SHA1 598daee842bf2c84dd315fa6a71699240f4dace6 SHA256 f43e27606c6c8311674ea0d7a555e1a67e2a3396cea902171c3c86fe65a31bfe
+EBUILD pingus-0.7.3.ebuild 1203 RMD160 5a62c33f7ab7a139c63383d32c970d6d99b1d362 SHA1 e9d01b1212caba32445e78633e7bb8eff0c08edf SHA256 063e536754f30d73403028c2dd73a109466f2a308bf71394f41faaf8e1beeff6
+MISC ChangeLog 4619 RMD160 a8b0161b2dc8637f5635d6ab5ea8fbf87f0da432 SHA1 170dc30614e4dfa2469745d8deb56e1c92da766f SHA256 808d41620d22b9e790f02405e6c8cf951bb2c47cb9a46ace0de6082cd28b3ea0
MISC metadata.xml 1036 RMD160 ccb350bc7dae29efd8711bd3b1b8636360e45805 SHA1 361bd933c8c672f4bd625bd5263a112d66a19592 SHA256 0a0a3a34e8835dd9d091dec06a62b46d7193737768e5db7e044ae446c1551720
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() {