summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-06-19 19:25:13 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-06-19 19:25:13 +0000
commitfd305bad3a14fa313d57d706ccf78d21440ad5a0 (patch)
treed0618462a77adecc5e78884b2596ef3ca2f78e21 /dev-games/crystalspace
parentNew prerelease. (diff)
downloadgentoo-2-fd305bad3a14fa313d57d706ccf78d21440ad5a0.tar.gz
gentoo-2-fd305bad3a14fa313d57d706ccf78d21440ad5a0.tar.bz2
gentoo-2-fd305bad3a14fa313d57d706ccf78d21440ad5a0.zip
Using x11-libs/wxGTK:2.8 (before was 2.6). Enabling parallel make
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'dev-games/crystalspace')
-rw-r--r--dev-games/crystalspace/ChangeLog5
-rw-r--r--dev-games/crystalspace/crystalspace-1.4.0.ebuild11
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index c564155c16bc..8771535bb553 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-games/crystalspace
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.43 2010/06/15 10:11:10 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.44 2010/06/19 19:25:13 tupone Exp $
+
+ 19 Jun 2010; Tupone Alfredo <tupone@gentoo.org> crystalspace-1.4.0.ebuild:
+ Using x11-libs/wxGTK:2.8 (before was 2.6). Enabling parallel make
15 Jun 2010; Tupone Alfredo <tupone@gentoo.org> crystalspace-1.4.0.ebuild:
Fix directory path in elog messages. Raised on bug #174742 by Guido
diff --git a/dev-games/crystalspace/crystalspace-1.4.0.ebuild b/dev-games/crystalspace/crystalspace-1.4.0.ebuild
index 7d4ca5ad62a3..35eb2a5e5e18 100644
--- a/dev-games/crystalspace/crystalspace-1.4.0.ebuild
+++ b/dev-games/crystalspace/crystalspace-1.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.2 2010/06/15 10:11:10 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.3 2010/06/19 19:25:13 tupone Exp $
EAPI=2
inherit eutils flag-o-matic multilib wxwidgets
@@ -32,7 +32,7 @@ RDEPEND="virtual/opengl
alsa? ( media-libs/alsa-lib )
mng? ( media-libs/libmng )
png? ( media-libs/libpng )
- wxwidgets? ( =x11-libs/wxGTK-2.6* )
+ wxwidgets? ( x11-libs/wxGTK:2.8[X,opengl] )
cegui? ( >=dev-games/cegui-0.5.0 )
3ds? ( media-libs/lib3ds )"
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
dev-lang/swig
dev-util/pkgconfig"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
src_prepare() {
# Installing doc conflict with dodoc on src_install
@@ -55,7 +55,7 @@ src_prepare() {
src_configure() {
if useq wxwidgets; then
- WX_GTK_VER=2.6
+ WX_GTK_VER="2.8"
need-wxwidgets gtk2
fi
@@ -93,7 +93,8 @@ src_configure() {
}
src_compile() {
- jam -q || die "compile failed"
+ local jamopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
+ jam -q ${jamopts} || die "compile failed"
}
src_install() {