summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2007-11-21 02:08:16 +0000
committerRyan Hill <dirtyepic@gentoo.org>2007-11-21 02:08:16 +0000
commitb18b91d07f65381017edd2b34061baffd10b507b (patch)
tree0c5958e066143e7e6df72241f48ec9d1bd3b1915 /dev-games
parentAdd ~x86-fbsd keyword (bug #199825) (diff)
downloadgentoo-2-b18b91d07f65381017edd2b34061baffd10b507b.tar.gz
gentoo-2-b18b91d07f65381017edd2b34061baffd10b507b.tar.bz2
gentoo-2-b18b91d07f65381017edd2b34061baffd10b507b.zip
Allow building with ftjam for bug #188194
(Portage version: 2.1.3.19)
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/crystalspace/ChangeLog6
-rw-r--r--dev-games/crystalspace/crystalspace-1.0.1.ebuild4
-rw-r--r--dev-games/crystalspace/crystalspace-1.2.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index adc65c1a6a1b..ff1eb93677b7 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/crystalspace
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.36 2007/11/21 00:56:43 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.37 2007/11/21 02:08:16 dirtyepic Exp $
+
+ 21 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> crystalspace-1.0.1.ebuild,
+ crystalspace-1.2.ebuild:
+ Allow building with ftjam for bug #188194
21 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> crystalspace-1.0.1.ebuild,
crystalspace-1.2.ebuild:
diff --git a/dev-games/crystalspace/crystalspace-1.0.1.ebuild b/dev-games/crystalspace/crystalspace-1.0.1.ebuild
index 8071a043349a..b1e8b3290d52 100644
--- a/dev-games/crystalspace/crystalspace-1.0.1.ebuild
+++ b/dev-games/crystalspace/crystalspace-1.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.0.1.ebuild,v 1.7 2007/11/21 00:56:43 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.0.1.ebuild,v 1.8 2007/11/21 02:08:16 dirtyepic Exp $
inherit flag-o-matic java-pkg-opt-2 multilib wxwidgets
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
3ds? ( media-libs/lib3ds )
java? ( dev-java/ant-core
>=virtual/jdk-1.5 )
- dev-util/jam
+ || ( dev-util/jam dev-util/ftjam )
dev-lang/swig
dev-util/pkgconfig"
diff --git a/dev-games/crystalspace/crystalspace-1.2.ebuild b/dev-games/crystalspace/crystalspace-1.2.ebuild
index cd0b9b540dac..b5f2c6ed18d3 100644
--- a/dev-games/crystalspace/crystalspace-1.2.ebuild
+++ b/dev-games/crystalspace/crystalspace-1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.2.ebuild,v 1.4 2007/11/21 00:56:43 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.2.ebuild,v 1.5 2007/11/21 02:08:16 dirtyepic Exp $
inherit flag-o-matic java-pkg-opt-2 multilib wxwidgets
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
3ds? ( media-libs/lib3ds )
java? ( dev-java/ant-core
>=virtual/jdk-1.5 )
- dev-util/jam
+ || ( dev-util/jam dev-util/ftjam )
dev-lang/swig
dev-util/pkgconfig"