Allow building with ftjam for bug #188194

Package-Manager: portage-2.1.3.19

3 files changed, 25 insertions, 12 deletions

diff --git a/games-engines/gargoyle/ChangeLog b/games-engines/gargoyle/ChangeLog
index 7164622fa2b6..ed428387dcf0 100644
--- a/games-engines/gargoyle/ChangeLog
+++ b/games-engines/gargoyle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-engines/gargoyle
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.7 2007/04/27 15:37:51 s4t4n Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.8 2007/11/21 03:42:37 dirtyepic Exp $
+
+  21 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> gargoyle-20060917-r1.ebuild:
+  Allow building with ftjam for bug #188194
 
   27 Apr 2007; Michele Noberasco <s4t4n@gentoo.org> gargoyle-20060917-r1.ebuild:
   Stable for x86.
diff --git a/games-engines/gargoyle/Manifest b/games-engines/gargoyle/Manifest
index b5f359ab4396..4c3ac648236a 100644
--- a/games-engines/gargoyle/Manifest
+++ b/games-engines/gargoyle/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX filename-friendliness-20060917.patch 6215 RMD160 dd87f7631933ee8e903e986459f6215b525c13d1 SHA1 28bc89c84b12e4a4373ba31904d3f6ed3d485c50 SHA256 ee70e785ae62e9715dd081e669099153ed764af0a9d364bbac1aa285dee27dda
 MD5 f5a6119306806e97f46f95f307229ff8 files/filename-friendliness-20060917.patch 6215
 RMD160 dd87f7631933ee8e903e986459f6215b525c13d1 files/filename-friendliness-20060917.patch 6215
@@ -7,14 +10,14 @@ MD5 c13d2cd7db7a29aacb7e71f9d41c0d9f files/level9-compilation-fix-20060917.patch
 RMD160 268e36e6ae00a339890a5a1e0f4a904e3bb602fa files/level9-compilation-fix-20060917.patch 1714
 SHA256 4ea12b9e7f638e479e4a2db8353ff12fc5ff43ca25780a4c062f9f0ae9e3d054 files/level9-compilation-fix-20060917.patch 1714
 DIST gargoyle-2006-09-17-source.zip 9714916 RMD160 86e832323f8da96004460c7fa5b1054717817884 SHA1 2a1f4fa08444761ecc32c28770f0af6d24b4eeb8 SHA256 3a39e8e8809a8d942bb5ae71b8f64e4f4f4ecbf2cd1e7de0ed40fd58ea2f7ce0
-EBUILD gargoyle-20060917-r1.ebuild 1737 RMD160 064dd0ccfeb2da9778f4d44a5d6cd0fddd68f964 SHA1 4d387da4b4d7795d262082a1cef186df47cb701b SHA256 b9e61031aafc360b0e4dc7ff070cbd599a9861f210aa47d9b26358fe4050e1a1
-MD5 c6baaffeadac5043decf5e34701e3150 gargoyle-20060917-r1.ebuild 1737
-RMD160 064dd0ccfeb2da9778f4d44a5d6cd0fddd68f964 gargoyle-20060917-r1.ebuild 1737
-SHA256 b9e61031aafc360b0e4dc7ff070cbd599a9861f210aa47d9b26358fe4050e1a1 gargoyle-20060917-r1.ebuild 1737
-MISC ChangeLog 1550 RMD160 d04efcf0772c6216dacd64ce36d03dd7bc74a69d SHA1 8b99f6cca8085f3424c165ce38a368dbb1b0eaed SHA256 d15ae2c0d2fb94bab99c11e3c584d6a803b0fca3e51e048a53d2bb2fd50bf93e
-MD5 9d6f225465311df5ec49c778a401eba1 ChangeLog 1550
-RMD160 d04efcf0772c6216dacd64ce36d03dd7bc74a69d ChangeLog 1550
-SHA256 d15ae2c0d2fb94bab99c11e3c584d6a803b0fca3e51e048a53d2bb2fd50bf93e ChangeLog 1550
+EBUILD gargoyle-20060917-r1.ebuild 1763 RMD160 efe6b4635855efe1a849e48c99b73364d7c0e156 SHA1 204722c8f4cfa84598367bc4701bae52018acb5d SHA256 81c365170d96b482467499933226b6e0a1f95779981d9d771c1dcac46cef7443
+MD5 7ab52ed0e9000889670447e21d7aa8c1 gargoyle-20060917-r1.ebuild 1763
+RMD160 efe6b4635855efe1a849e48c99b73364d7c0e156 gargoyle-20060917-r1.ebuild 1763
+SHA256 81c365170d96b482467499933226b6e0a1f95779981d9d771c1dcac46cef7443 gargoyle-20060917-r1.ebuild 1763
+MISC ChangeLog 1676 RMD160 aa648e9d0764dcb63ef34cdaefbc967a0c8d09ed SHA1 c142f598bdfa3279079d84c5080764d5b9606324 SHA256 3c4fca9bfac517d3b4fca4bed712cc601090c30345f7c332d5c5dc358cfdc729
+MD5 5cea16e8001009cc61282f446118f30b ChangeLog 1676
+RMD160 aa648e9d0764dcb63ef34cdaefbc967a0c8d09ed ChangeLog 1676
+SHA256 3c4fca9bfac517d3b4fca4bed712cc601090c30345f7c332d5c5dc358cfdc729 ChangeLog 1676
 MISC metadata.xml 252 RMD160 8ce3795bac9d4960615a67c32fb3994bfece325f SHA1 dfce1ee8158b18adf66bfee2988b2b1c796443a8 SHA256 76446769792843475165db424def28271c1aabc5d695d29ad30858e8055c7acd
 MD5 954c9d9d89dbb19ec5308b091de981b0 metadata.xml 252
 RMD160 8ce3795bac9d4960615a67c32fb3994bfece325f metadata.xml 252
@@ -22,3 +25,10 @@ SHA256 76446769792843475165db424def28271c1aabc5d695d29ad30858e8055c7acd metadata
 MD5 159afeacc933397c3fcefa6889c7df31 files/digest-gargoyle-20060917-r1 274
 RMD160 cab5ab3ac9ddcd644776f69df761a9a0c0d0fe29 files/digest-gargoyle-20060917-r1 274
 SHA256 7429b91f58b21d5ab9d8dbf625631ce519359e694fd8e097e0b2ab689b4c91ba files/digest-gargoyle-20060917-r1 274
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHQ6kyiqiDRvmkBmIRAh4dAKCulSlrNySss0qObXornRtg7iPVfwCff6u8
+T+En7yu8ClU1HQXWJ2drQ70=
+=02JE
+-----END PGP SIGNATURE-----
diff --git a/games-engines/gargoyle/gargoyle-20060917-r1.ebuild b/games-engines/gargoyle/gargoyle-20060917-r1.ebuild
index 20abdcd5fdf2..614885acd761 100644
--- a/games-engines/gargoyle/gargoyle-20060917-r1.ebuild
+++ b/games-engines/gargoyle/gargoyle-20060917-r1.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/games-engines/gargoyle/gargoyle-20060917-r1.ebuild,v 1.2 2007/04/27 15:37:51 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-20060917-r1.ebuild,v 1.3 2007/11/21 03:42:37 dirtyepic Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ RDEPEND=">=media-libs/freetype-2.1.9-r1
 	>=media-libs/sdl-mixer-1.2.7"
 
 DEPEND="${RDEPEND}
-	>=dev-util/jam-2.5-r3
+	|| ( >=dev-util/jam-2.5-r3 dev-util/ftjam )
 	app-arch/unzip"
 
 S=${WORKDIR}/${PN}