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
commit0c018960e3cdfd80b3cddba4d564340b6d2e71d5 (patch)
tree177bb736a23d2616cd7a7e0de7cf43017e55c0e9 /dev-games/crystalspace
parentNew prerelease. (diff)
downloadhistorical-0c018960e3cdfd80b3cddba4d564340b6d2e71d5.tar.gz
historical-0c018960e3cdfd80b3cddba4d564340b6d2e71d5.tar.bz2
historical-0c018960e3cdfd80b3cddba4d564340b6d2e71d5.zip
Using x11-libs/wxGTK:2.8 (before was 2.6). Enabling parallel make
Package-Manager: portage-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/Manifest4
-rw-r--r--dev-games/crystalspace/crystalspace-1.4.0.ebuild11
3 files changed, 12 insertions, 8 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/Manifest b/dev-games/crystalspace/Manifest
index 8aefa68f0b6d..7fd5c11ee166 100644
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -2,6 +2,6 @@ AUX crystalspace-1.2.1-libpng14.patch 450 RMD160 f9fe8361b5b3f01d03f6b0b15dae277
DIST crystalspace-src-1.2.1.tar.bz2 47313388 RMD160 0f6582a9c68694189811a574bc63b5ce1a6a1166 SHA1 0f1b5604b217dfd9f65f54caeef5362d0ab92203 SHA256 23312a5a0330b281f517555207fed151e3d08c1096bb0cc9dd72dcabdced1b10
DIST crystalspace-src-1.4.0.tar.bz2 45670477 RMD160 af89e74a96bac7f55079a6cdad7fd938a38af602 SHA1 10f4dd50c654ad9292602a91189a0ee78a8fe353 SHA256 a8e1bfc9328470121bfbc6cf98f2c310a34f6998978065aa2f6df7e02a0101ba
EBUILD crystalspace-1.2.1.ebuild 3403 RMD160 1269f0e0b83fbb5abad0594854e414f051c66e16 SHA1 1e7d3a10e630ed6858e29cbd26281bb61d9f1a91 SHA256 62a51af9706cd00625406917e73bd0f73a22e0e2855183c1852779f19ace357f
-EBUILD crystalspace-1.4.0.ebuild 3268 RMD160 50dcf58c43386b73f760b451d2ed7294415c35a0 SHA1 f7d9ab35e556ec955f7d2d2c4e4360ad05932f01 SHA256 3086329e7d1a3d9ad1176ff209378473617576811dec131dd84274d5e6171343
-MISC ChangeLog 6766 RMD160 8043024c7aa8dfa30534f106eaf60fe760005279 SHA1 e36a99a93ebbb3521c49a236dd756289eace76a5 SHA256 71ed8444781e4147d067c7744b6f249bbe74b5041d9bc6be7f778c81395d6357
+EBUILD crystalspace-1.4.0.ebuild 3388 RMD160 0e8b49318a2b59580bcb2cd1b293cf68547aa426 SHA1 1db4661fafdb7e4deb4699dcd76c012e9a27d0f5 SHA256 dd9043b59dc438103675e8d9096ee8d396d69c5d06725a0eaafdfd386df75b3c
+MISC ChangeLog 6912 RMD160 46370ea39e3e4e18ceca26626821b2c5f3fe7b7d SHA1 c2a9d236f47e3f19d5ad056ab569f7970dfb20ae SHA256 9009ccbc67a9818d58514a2c5d61f03229ac963998e0684e836b925583e709dc
MISC metadata.xml 1243 RMD160 1f23863f3940b9349b19a701d80f0888cc7b2242 SHA1 71931e463e50c1ab0af385a3c4d10d6ad5ed960a SHA256 f7125504551e256f5ceb9385b20e945f3717a1cda3dcf6f3ff5e9f88850025b0
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() {