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/cel/ChangeLog b/dev-games/cel/ChangeLog
index 7c957ed41589..93cc706d6fa5 100644
--- a/dev-games/cel/ChangeLog
+++ b/dev-games/cel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/cel
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cel/ChangeLog,v 1.23 2007/11/13 23:32:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cel/ChangeLog,v 1.24 2007/11/21 03:27:09 dirtyepic Exp $
+
+  21 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> cel-1.0.1.ebuild,
+  cel-1.2.ebuild:
+  Allow building with ftjam for bug #188194
 
   13 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> cel-1.0.1.ebuild:
   Changing ~amd64 to -amd64 due to bug #187093.
diff --git a/dev-games/cel/Manifest b/dev-games/cel/Manifest
index c2bc753c513f..113c370e1216 100644
--- a/dev-games/cel/Manifest
+++ b/dev-games/cel/Manifest
@@ -11,18 +11,18 @@ RMD160 925a1e280e8e1fcbb8219347407bdeb4734f74bd files/cel-1.0.1-amd64.patch 1199
 SHA256 970adfd49674a4f69443e8e93ad1f394c077e42082df0e7a1ac01bf5b35858c1 files/cel-1.0.1-amd64.patch 1199
 DIST cel-src-1.0.1.tar.bz2 4676833 RMD160 a29605249aa9c7a63b1dbbac1ee89ef0ee6009fc SHA1 fa7842a9fd560bf584607ad6675a4b86dcd9795b SHA256 8b936b0cd008a049c7fc0ccc3835e38328f11a1c1c00ac9c7b402988c4178dce
 DIST cel-src-1.2.tar.bz2 5304594 RMD160 409425b15fd308565fca25ab2ba3d3f8a64b30fe SHA1 b4539b8f315ee112edc7e56089fcd41b7946273b SHA256 00215779585632db4cc54cb29414d81c4832d99d1fc424e5a487f7a5407a6d6a
-EBUILD cel-1.0.1.ebuild 1197 RMD160 81419b312c5dded5332d6593181383d7b56021bc SHA1 e7076b39f6ebabdcfea46ad2b6a871ea542b4fc0 SHA256 e93139d19c826b250e18c9fdcbc995b4dad3412e6b62e32eae7c343e2c1d5cb1
-MD5 301bedc14b66f3360ea480b99ec0405f cel-1.0.1.ebuild 1197
-RMD160 81419b312c5dded5332d6593181383d7b56021bc cel-1.0.1.ebuild 1197
-SHA256 e93139d19c826b250e18c9fdcbc995b4dad3412e6b62e32eae7c343e2c1d5cb1 cel-1.0.1.ebuild 1197
-EBUILD cel-1.2.ebuild 1113 RMD160 7fb181a7ec5b980d6f4e8977b13dbcc553631d75 SHA1 b1f6b2dbc5f6c98896dbed019861a2244be4767a SHA256 0543ebd292b7c4944478f20f383d70c0e36e09247f52e3e9ee2aafb3e0c0bcfe
-MD5 f12260c41dc7566a871ea12beaf7b5bb cel-1.2.ebuild 1113
-RMD160 7fb181a7ec5b980d6f4e8977b13dbcc553631d75 cel-1.2.ebuild 1113
-SHA256 0543ebd292b7c4944478f20f383d70c0e36e09247f52e3e9ee2aafb3e0c0bcfe cel-1.2.ebuild 1113
-MISC ChangeLog 3518 RMD160 878d2aaa7a72846c155b89392fc3f7a23f46179d SHA1 20dacddc3f9e134c49f5756112671842e67e35fc SHA256 8680d0bbf59a5b30699fde2786be32ec5c8da3d568e4eb122d4ddea359e36c7c
-MD5 28bfc52e26a52d605e4c2ef0cecf30e0 ChangeLog 3518
-RMD160 878d2aaa7a72846c155b89392fc3f7a23f46179d ChangeLog 3518
-SHA256 8680d0bbf59a5b30699fde2786be32ec5c8da3d568e4eb122d4ddea359e36c7c ChangeLog 3518
+EBUILD cel-1.0.1.ebuild 1220 RMD160 1ac14fe9721951075804f289bbf5fecf2af0b555 SHA1 db752bd25cfb3669ce68ec1df86fb36d69c828c8 SHA256 721b7d7093be1c05e7a96f57cb6744236161534a9f56ebe958208c054d95856c
+MD5 a9f96272619631a32809d8d2cf4c46be cel-1.0.1.ebuild 1220
+RMD160 1ac14fe9721951075804f289bbf5fecf2af0b555 cel-1.0.1.ebuild 1220
+SHA256 721b7d7093be1c05e7a96f57cb6744236161534a9f56ebe958208c054d95856c cel-1.0.1.ebuild 1220
+EBUILD cel-1.2.ebuild 1138 RMD160 868c735cea78a5c1f4ddab85b3abf438edddea57 SHA1 e14c32f0034e81755fe77aba0b03ec754bc7e335 SHA256 8c60165ceede5cfcfd17a2766ca53c905de50e37e7b8e9d71fd1ae95b17c1098
+MD5 4e7ea7d0cf954f6102e81af278bcc9a4 cel-1.2.ebuild 1138
+RMD160 868c735cea78a5c1f4ddab85b3abf438edddea57 cel-1.2.ebuild 1138
+SHA256 8c60165ceede5cfcfd17a2766ca53c905de50e37e7b8e9d71fd1ae95b17c1098 cel-1.2.ebuild 1138
+MISC ChangeLog 3648 RMD160 3ad1eb419d4e8529fce34a4c6ce2c89547e55a94 SHA1 bd6d94d10a08ca383f3e2c76081debad0bf14348 SHA256 9fe1ffb0e758a80981beae52f0256ff34047d9e5846f7892fa6bbffbff7193a0
+MD5 1496b026fc6579aeb3950d7d28f3ca55 ChangeLog 3648
+RMD160 3ad1eb419d4e8529fce34a4c6ce2c89547e55a94 ChangeLog 3648
+SHA256 9fe1ffb0e758a80981beae52f0256ff34047d9e5846f7892fa6bbffbff7193a0 ChangeLog 3648
 MISC metadata.xml 398 RMD160 cd0484cb1d750c5b14eb94eed464a256795e79be SHA1 6b126437f9755f6523cc7296dad81d0cf012bc08 SHA256 703236cc1e34c051c20b9405c9a5ede349a4f6b609ef0b1261bfed49a2122485
 MD5 0d0c7092af47283862e3f45a5eb62f73 metadata.xml 398
 RMD160 cd0484cb1d750c5b14eb94eed464a256795e79be metadata.xml 398
@@ -36,7 +36,7 @@ SHA256 cad47c53042608174e863e98132b23f9709d7bf887c92ac842d7e45f12b780f0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHOjQQkT4lNIS36YERAq6lAJ9KfhZHn9xZnQg1r1moRi6ncQtjiACgweg5
-SgkI0dPdStZ27dMZ99RlZxQ=
-=rw+j
+iD8DBQFHQ6WaiqiDRvmkBmIRAlxdAJ4uGQWVEWkjIpRRewF6TYW/oNJWbgCggP4w
+3WaD+QmJeR2N1XHeT8rXQXM=
+=ElfQ
 -----END PGP SIGNATURE-----
diff --git a/dev-games/cel/cel-1.0.1.ebuild b/dev-games/cel/cel-1.0.1.ebuild
index 7a11fa59ded6..503464f53e9f 100644
--- a/dev-games/cel/cel-1.0.1.ebuild
+++ b/dev-games/cel/cel-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/cel/cel-1.0.1.ebuild,v 1.4 2007/11/13 23:32:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cel/cel-1.0.1.ebuild,v 1.5 2007/11/21 03:27:09 dirtyepic Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ IUSE="python"
 RDEPEND=">=dev-games/crystalspace-1.0
 	dev-games/hawknl"
 DEPEND="${RDEPEND}
-	dev-util/jam"
+	|| ( dev-util/jam dev-util/ftjam )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-games/cel/cel-1.2.ebuild b/dev-games/cel/cel-1.2.ebuild
index 948ead5765c2..bb47f8ef038e 100644
--- a/dev-games/cel/cel-1.2.ebuild
+++ b/dev-games/cel/cel-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/cel/cel-1.2.ebuild,v 1.2 2007/10/30 17:10:39 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cel/cel-1.2.ebuild,v 1.3 2007/11/21 03:27:09 dirtyepic Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ IUSE="python"
 RDEPEND=">=dev-games/crystalspace-1.1
 	dev-games/hawknl"
 DEPEND="${RDEPEND}
-	dev-util/jam"
+	|| ( dev-util/jam dev-util/ftjam )"
 
 S=${WORKDIR}/${MY_P}