Allow building with ftjam for bug #188194

Package-Manager: portage-2.1.3.19

4 files changed, 24 insertions, 20 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/Manifest b/dev-games/crystalspace/Manifest
index fc0fa0ec9f9f..acd235a06de3 100644
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST crystalspace-src-1.0.1.tar.bz2 36581454 RMD160 e9cca632623fbc487bb39a8c088fa93aa78e23d4 SHA1 457958e4cc7d96272157e1c8be7a816620051714 SHA256 3042b1fdc5b4ac23c7a4799df232a8e2134fd215448e0785180759ebba7f9ab2
 DIST crystalspace-src-1.2.tar.bz2 44289716 RMD160 65b7ce13e8771ddf1e0f531102d18922ddb5404b SHA1 5a12fd0617f4d8d017016111e7b64ee3be423690 SHA256 d5249ae17dda1a492375c21a9a9769432552936d4996b0582f038adcd4497699
-EBUILD crystalspace-1.0.1.ebuild 3464 RMD160 e5ef8a3e678fe82e21a2fc76b64c5e1414ec84bb SHA1 dfe0cc4abe8fe39acc846ded0350a5c839859d57 SHA256 3d1f763d32b15ca7bb23d7006f33ecbce956a7c2ef5d0e522903f26d9dc8d36c
-MD5 9744339f4983297f858cb8ab7cf3cf54 crystalspace-1.0.1.ebuild 3464
-RMD160 e5ef8a3e678fe82e21a2fc76b64c5e1414ec84bb crystalspace-1.0.1.ebuild 3464
-SHA256 3d1f763d32b15ca7bb23d7006f33ecbce956a7c2ef5d0e522903f26d9dc8d36c crystalspace-1.0.1.ebuild 3464
-EBUILD crystalspace-1.2.ebuild 3447 RMD160 8220274bc6b45ece928680b231384edc6ae8ca7c SHA1 27661938e7d435f526968682f03236daf4bd3b69 SHA256 5de8ab5daa0eed8b1c29209d44e8f2e18b569d90e40c48b61e211ed281f6eed4
-MD5 3e08f5ba8a542f998cb8e0474be9b0db crystalspace-1.2.ebuild 3447
-RMD160 8220274bc6b45ece928680b231384edc6ae8ca7c crystalspace-1.2.ebuild 3447
-SHA256 5de8ab5daa0eed8b1c29209d44e8f2e18b569d90e40c48b61e211ed281f6eed4 crystalspace-1.2.ebuild 3447
-MISC ChangeLog 5645 RMD160 42b73fa3492c4e5172ad1698f4073ebe6481e342 SHA1 a227470c434970c9b159fdb3bd09089d550c5a7c SHA256 5e3730c049a471c069401ebd64ff9c0b1ebefa851c363a80cab743ebfdc74236
-MD5 db9a533fc5fe43528656720c73adea4b ChangeLog 5645
-RMD160 42b73fa3492c4e5172ad1698f4073ebe6481e342 ChangeLog 5645
-SHA256 5e3730c049a471c069401ebd64ff9c0b1ebefa851c363a80cab743ebfdc74236 ChangeLog 5645
+EBUILD crystalspace-1.0.1.ebuild 3486 RMD160 a7fcf5373db9b38001c8fbdc16333f2f02c7f275 SHA1 f4e5262e51584bdb685e89fa94941f918a7d00c1 SHA256 679bb9444d9c296f18f9b3123fe9c5c5986e845c2b88e337befb54bf2f13e70e
+MD5 2e2361703aec412c288437f6584bbcee crystalspace-1.0.1.ebuild 3486
+RMD160 a7fcf5373db9b38001c8fbdc16333f2f02c7f275 crystalspace-1.0.1.ebuild 3486
+SHA256 679bb9444d9c296f18f9b3123fe9c5c5986e845c2b88e337befb54bf2f13e70e crystalspace-1.0.1.ebuild 3486
+EBUILD crystalspace-1.2.ebuild 3469 RMD160 69ede3da6678c207c42e83464dff98a6c585df0b SHA1 5fa3547c7da93cddcd9089566ac0af056bdd7391 SHA256 c2c37d8e2ff81639287478eb45acab229c9904c1a930ffc08392ed3eb9287b78
+MD5 d9b022bcfc8fa0eb1e9ac58cc85ae040 crystalspace-1.2.ebuild 3469
+RMD160 69ede3da6678c207c42e83464dff98a6c585df0b crystalspace-1.2.ebuild 3469
+SHA256 c2c37d8e2ff81639287478eb45acab229c9904c1a930ffc08392ed3eb9287b78 crystalspace-1.2.ebuild 3469
+MISC ChangeLog 5792 RMD160 47130c72b32c4c64524ccdc7d759efd55c9bda2b SHA1 2f40688133f180abde8ca875f6c340b98a694de9 SHA256 e7b75071b4c2e11819c0b2a1cec823abe3875cfa4c2f5c8e480940b25f652e34
+MD5 48dc9971b3666738ff0104336d8dc960 ChangeLog 5792
+RMD160 47130c72b32c4c64524ccdc7d759efd55c9bda2b ChangeLog 5792
+SHA256 e7b75071b4c2e11819c0b2a1cec823abe3875cfa4c2f5c8e480940b25f652e34 ChangeLog 5792
 MISC metadata.xml 894 RMD160 6a8d44a2485691e6703d1fac4e82cc1e6014fd78 SHA1 8604581846e66f1693692e1f26c900966520c40c SHA256 c2610acafed8ca197c29e0b8816aa494830897181cd1e9b9f5d41ba4e7261fce
 MD5 99cd50e1c6a19868f504e0103d6bbd83 metadata.xml 894
 RMD160 6a8d44a2485691e6703d1fac4e82cc1e6014fd78 metadata.xml 894
@@ -28,7 +28,7 @@ SHA256 0c1464213c66495d218bacec7e7fa4529b2c8bece77df20a8d0c5fec82f72c13 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHQ4JRiqiDRvmkBmIRAo2nAJwNP14+DSVlAKYW7VotHZKs9ElIcQCeJFyH
-UDvaEFBwntF6TmtCHZvjSRo=
-=3CeG
+iD8DBQFHQ5MWiqiDRvmkBmIRAsPYAKDft2npJriqZPUaO/sphygI1oZvJACdF1bd
+TlV/d89N8ZHmr8RuGPnbpIc=
+=zBAG
 -----END PGP SIGNATURE-----
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"