Also allow building <1.1.2 with ftjam for bug #188194

Package-Manager: portage-2.1.3.19

4 files changed, 31 insertions, 17 deletions

diff --git a/games-simulation/lincity-ng/ChangeLog b/games-simulation/lincity-ng/ChangeLog
index 08c858753c6e..15af900cdac1 100644
--- a/games-simulation/lincity-ng/ChangeLog
+++ b/games-simulation/lincity-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/lincity-ng
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity-ng/ChangeLog,v 1.11 2007/11/20 17:07:37 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity-ng/ChangeLog,v 1.12 2007/11/21 04:00:44 dirtyepic Exp $
+
+  21 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> lincity-ng-1.1.0.ebuild,
+  lincity-ng-1.1.1.ebuild:
+  Also allow building <1.1.2 with ftjam for bug #188194
 
   20 Nov 2007; Ferris McCormick <fmccor@gentoo.org> lincity-ng-1.1.2.ebuild:
   Add ~sparc and allow for ftjam as well as jam (builds and works with
diff --git a/games-simulation/lincity-ng/Manifest b/games-simulation/lincity-ng/Manifest
index c4866f7d3612..bd20c228d571 100644
--- a/games-simulation/lincity-ng/Manifest
+++ b/games-simulation/lincity-ng/Manifest
@@ -1,22 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST lincity-ng-1.1.0.tar.bz2 29580788 RMD160 d87d7f708cb91f753b2abfdb727851526d25fd44 SHA1 9d75d9a042c31f0ddbf605499c9e48f26d9a94ad SHA256 1850c37322f1628eac34eb38d75fd2dbb6f6a65678dac8317e7fe84d88820ea8
 DIST lincity-ng-1.1.1.tar.bz2 29567908 RMD160 00b92ddc994bcfe628303cb51415ea2fc4d148a5 SHA1 e88aa0f1dda53bbff98a43d9f59fe6c373d564b4 SHA256 77880e5b70bdf5ae717d12bca1966861190436d0fdbb37563dcb56d5e12c2a65
 DIST lincity-ng-1.1.2.tar.bz2 29567088 RMD160 e2cd3c3ab40d2238a2ba3fd15eba316da4eb3a6e SHA1 b2bd7f2e058ada133b452d9dddd8def0f2dbbaeb SHA256 6d69de4e1a7f2befef54168d5a29afaf1de85b0e63e4e7080a12b7646c3423f2
-EBUILD lincity-ng-1.1.0.ebuild 1227 RMD160 f1c0619ddc4b9c35228d842ce73b3a3e70ede64c SHA1 6369f0652aa581ec5c0140b8b8b5a100aa696ee7 SHA256 3f3eb78fe84b8dd3bbf5dc989a79393606a77193d0079104986b719ee1819f69
-MD5 35272470a60d89d6f6b5549eaf137501 lincity-ng-1.1.0.ebuild 1227
-RMD160 f1c0619ddc4b9c35228d842ce73b3a3e70ede64c lincity-ng-1.1.0.ebuild 1227
-SHA256 3f3eb78fe84b8dd3bbf5dc989a79393606a77193d0079104986b719ee1819f69 lincity-ng-1.1.0.ebuild 1227
-EBUILD lincity-ng-1.1.1.ebuild 1234 RMD160 8e35227b6f27992e186826eebcdc1aa5a43a765b SHA1 a1d4ee4d8f5370bae2afe0d44067b1d99e18fafd SHA256 b01af7a658edf59e11b81a31ea0f06ce902e721a8cb8cb06803a674c3f61c630
-MD5 4d521706698c7b3175eb15340842bd38 lincity-ng-1.1.1.ebuild 1234
-RMD160 8e35227b6f27992e186826eebcdc1aa5a43a765b lincity-ng-1.1.1.ebuild 1234
-SHA256 b01af7a658edf59e11b81a31ea0f06ce902e721a8cb8cb06803a674c3f61c630 lincity-ng-1.1.1.ebuild 1234
+EBUILD lincity-ng-1.1.0.ebuild 1254 RMD160 1bcb97e4d8e86268bfd73cb0562596c74404a496 SHA1 0b1c83259d6b7ff6c546f076fbcf89ef0f21d564 SHA256 f085d72e2ea8e74d21d24e7aafceb558ddddfa43c663152a8dbf7ac98d50aa38
+MD5 f6ce603406b6c70d3d120d0c1da3893c lincity-ng-1.1.0.ebuild 1254
+RMD160 1bcb97e4d8e86268bfd73cb0562596c74404a496 lincity-ng-1.1.0.ebuild 1254
+SHA256 f085d72e2ea8e74d21d24e7aafceb558ddddfa43c663152a8dbf7ac98d50aa38 lincity-ng-1.1.0.ebuild 1254
+EBUILD lincity-ng-1.1.1.ebuild 1256 RMD160 5919bbd5f138ea8484da9882bf71f96444396b6f SHA1 8451c22f56bb62b3c73a71e09f497cfa598619fa SHA256 cce1a58290cd26cf9fff0ac27b92ac041de656047ae3d94ca8dd8d1d4de7f954
+MD5 624ee0973ca38febaf369e3e911364ee lincity-ng-1.1.1.ebuild 1256
+RMD160 5919bbd5f138ea8484da9882bf71f96444396b6f lincity-ng-1.1.1.ebuild 1256
+SHA256 cce1a58290cd26cf9fff0ac27b92ac041de656047ae3d94ca8dd8d1d4de7f954 lincity-ng-1.1.1.ebuild 1256
 EBUILD lincity-ng-1.1.2.ebuild 1260 RMD160 a0b0fb36d9b6db4e89ae63298a39cbd73e02f754 SHA1 986922d6e5a839f14df9dbbf6ca1232b6d943542 SHA256 fa22edeff4830bdd2c6a6e7516ae6c9aea0c4d035a67db249746509073b3ee49
 MD5 9210f5a15d7b3bc3b9dcae2412fca8eb lincity-ng-1.1.2.ebuild 1260
 RMD160 a0b0fb36d9b6db4e89ae63298a39cbd73e02f754 lincity-ng-1.1.2.ebuild 1260
 SHA256 fa22edeff4830bdd2c6a6e7516ae6c9aea0c4d035a67db249746509073b3ee49 lincity-ng-1.1.2.ebuild 1260
-MISC ChangeLog 1713 RMD160 132ff2b01ab379c1ab4c0f74628df9c6abede15a SHA1 bd7d5f81142621f84e726c1886c591634c99d514 SHA256 8f1d6983af866bcee34bd4e86a5b2111b2480d8c7e7f3a747c866bec27cc57cb
-MD5 2bcba3eeaf7e0e7bda295bb4da5163f2 ChangeLog 1713
-RMD160 132ff2b01ab379c1ab4c0f74628df9c6abede15a ChangeLog 1713
-SHA256 8f1d6983af866bcee34bd4e86a5b2111b2480d8c7e7f3a747c866bec27cc57cb ChangeLog 1713
+MISC ChangeLog 1873 RMD160 2dab2e30e5f79b2d54d9b344d929c4a026356c1c SHA1 7d0c393db2037f2986ea09480075b5e3e20aac75 SHA256 32f54b8e8258dcbbf7dd2f4e4f3a27e27da5568c7f1952b26586339d64219dca
+MD5 1c45a663488af85aa5718aefc928c015 ChangeLog 1873
+RMD160 2dab2e30e5f79b2d54d9b344d929c4a026356c1c ChangeLog 1873
+SHA256 32f54b8e8258dcbbf7dd2f4e4f3a27e27da5568c7f1952b26586339d64219dca ChangeLog 1873
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -30,3 +33,10 @@ SHA256 92524fff62733f938602e11cc95dee9275b8cc9e54f51568c7ed754bc0366373 files/di
 MD5 1fffd4a6643d5647db1795d34c6e867b files/digest-lincity-ng-1.1.2 259
 RMD160 e00905811959ea59c8a1fcf5829e028674711204 files/digest-lincity-ng-1.1.2 259
 SHA256 de428d4201b1411bb5c7137883392d244b47308401f537b43db906d8179dd434 files/digest-lincity-ng-1.1.2 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHQ61yiqiDRvmkBmIRAm+zAKDZGp3RNlEbNCk3ji+XicujHXKB0wCgw6hT
+dodt0+PxjGbLOPyU2mVeXW4=
+=jBmb
+-----END PGP SIGNATURE-----
diff --git a/games-simulation/lincity-ng/lincity-ng-1.1.0.ebuild b/games-simulation/lincity-ng/lincity-ng-1.1.0.ebuild
index c576d6aed2e0..2d4b9c60da00 100644
--- a/games-simulation/lincity-ng/lincity-ng-1.1.0.ebuild
+++ b/games-simulation/lincity-ng/lincity-ng-1.1.0.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-simulation/lincity-ng/lincity-ng-1.1.0.ebuild,v 1.2 2007/03/15 12:12:50 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity-ng/lincity-ng-1.1.0.ebuild,v 1.3 2007/11/21 04:00:44 dirtyepic Exp $
 
 inherit eutils games
 
@@ -23,7 +23,7 @@ RDEPEND="virtual/opengl
 	dev-games/physfs"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	dev-util/jam"
+	|| ( dev-util/jam dev-util/ftjam )"
 
 pkg_setup() {
 	games_pkg_setup
diff --git a/games-simulation/lincity-ng/lincity-ng-1.1.1.ebuild b/games-simulation/lincity-ng/lincity-ng-1.1.1.ebuild
index 297346a5c8f2..5146de6ba107 100644
--- a/games-simulation/lincity-ng/lincity-ng-1.1.1.ebuild
+++ b/games-simulation/lincity-ng/lincity-ng-1.1.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/games-simulation/lincity-ng/lincity-ng-1.1.1.ebuild,v 1.1 2007/08/19 18:29:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity-ng/lincity-ng-1.1.1.ebuild,v 1.2 2007/11/21 04:00:44 dirtyepic Exp $
 
 inherit eutils games
 
@@ -23,7 +23,7 @@ RDEPEND="virtual/opengl
 	dev-games/physfs"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	dev-util/jam"
+	|| ( dev-util/jam dev-util/ftjam )"
 
 pkg_setup() {
 	games_pkg_setup