Move the ai-patch to the mirrors because it has a cvs Id tag and thus breaks in gentoo cvs, thanks to Anton Romanov <theli@ukr.net> in bug 118221

(Portage version: 2.1_pre3-r1)

5 files changed, 15 insertions, 114 deletions

diff --git a/games-strategy/wargus/ChangeLog b/games-strategy/wargus/ChangeLog
index f776b42e1f76..57c8457e072b 100644
--- a/games-strategy/wargus/ChangeLog
+++ b/games-strategy/wargus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/wargus
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.2 2006/01/06 20:26:18 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.3 2006/01/08 15:12:25 genstef Exp $
+
+  08 Jan 2006; Stefan Schweizer <genstef@gentoo.org>
+  -files/wargus-2.1-ai.patch, wargus-2.1-r1.ebuild:
+  Move the ai-patch to the mirrors because it has a cvs Id tag and thus breaks
+  in gentoo cvs, thanks to Anton Romanov <theli@ukr.net> in bug 118221
 
 *wargus-2.1-r1 (06 Jan 2006)
 
diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
index 7ec684abd8d2..24ac6665a8c2 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -1,7 +1,6 @@
-MD5 d8c9a2435df4224c344912db62e0eddf ChangeLog 1018
-MD5 61b888b808517aa6595b4890528a89e3 files/digest-wargus-2.1-r1 119
-MD5 f2f8db86560df060e2ebaa387001a99d files/wargus-2.1-ai.patch 5935
+MD5 49e5cf2ee6e6cfe120252438e4c7e920 ChangeLog 1274
+MD5 79e74b4dc18fddaeec6d93d441d65005 files/digest-wargus-2.1-r1 185
 MD5 0ab572fde330c03c24f73f69d4708e6a files/wargus-2.1-aitransporter.patch 929
 MD5 dda80e07159e799ca5b26f211180139b files/wargus-2.1-humanbasespell.patch 1146
 MD5 59b69aef9a760073b02c82194eab4800 metadata.xml 263
-MD5 069026090b3bc5d32df9cfc72a2721ae wargus-2.1-r1.ebuild 1181
+MD5 a82b3313b4d7002680e6a1c25dfcd1ce wargus-2.1-r1.ebuild 1247
diff --git a/games-strategy/wargus/files/digest-wargus-2.1-r1 b/games-strategy/wargus/files/digest-wargus-2.1-r1
index f32b803e7ca0..02a2385bbb1d 100644
--- a/games-strategy/wargus/files/digest-wargus-2.1-r1
+++ b/games-strategy/wargus/files/digest-wargus-2.1-r1
@@ -1,2 +1,3 @@
+MD5 b3c9cdd49469a8586aeac2a647f894d3 wargus-2.1-ai.patch.bz2 1149
 MD5 571363cc79c5c532c48f31ad5c06398d wargus-2.1-src.tar.gz 542211
 MD5 734e1c171110e4f3c4fecd8f7fc09ca9 wargus.png 7561
diff --git a/games-strategy/wargus/files/wargus-2.1-ai.patch b/games-strategy/wargus/files/wargus-2.1-ai.patch
deleted file mode 100644
index e63b3c7837cc..000000000000
--- a/games-strategy/wargus/files/wargus-2.1-ai.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -ur wargusbaseunpatched/wargus-2.1/scripts/ai/campaign.lua wargusbaseaipatched/wargus-2.1/scripts/ai/campaign.lua
---- wargusbaseunpatched/wargus-2.1/scripts/ai/campaign.lua	2004-04-30 01:40:38.000000000 +0200
-+++ wargusbaseaipatched/wargus-2.1/scripts/ai/campaign.lua	2005-09-23 16:25:05.000000000 +0200
-@@ -26,7 +26,7 @@
- --      along with this program; if not, write to the Free Software
- --      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- --
----      $Id: wargus-2.1-ai.patch,v 1.1 2006/01/06 13:49:24 genstef Exp $
-+--      $Id: wargus-2.1-ai.patch,v 1.1 2006/01/06 13:49:24 genstef Exp $
- 
- --=============================================================================
- --  This AI script builds only workers and tankers and oil platform.
-@@ -92,10 +92,12 @@
-     function() return AiSet(AiTanker(), 1) end,
-     function() return AiWait(AiWorker()) end,
-     function() return AiNeed(AiPlatform()) end,
--    function() return AiForce(0, {AiDestroyer(), 2, AiSoldier(), 3, AiShooter(), 4, AiTransporter(), 4}) end,
--    function() return AiForce(1, {AiDestroyer(), 2, AiSoldier(), 3, AiShooter(), 4, AiTransporter(), 4}) end,
-+	function() return AiSet(AiTransport(), 4) end,
-+    function() return AiForce(0, {AiDestroyer(), 2, AiSoldier(), 3, AiShooter(), 4}) end,
-+    function() return AiForce(1, {AiDestroyer(), 2, AiSoldier(), 3, AiShooter(), 4}) end,
-     function() return AiSleep(27000) end,
--    function() return AiForce(1, {AiDestroyer(), 4, AiSoldier(), 10, AiShooter(), 8, AiTransporter(), 6}) end,
-+	function() return AiSet(AiTransport(), 6) end,
-+    function() return AiForce(1, {AiDestroyer(), 4, AiSoldier(), 10, AiShooter(), 8}) end,
-     function() return AiSleep(22000) end,
-     function() return AiSleep(22000) end,
-     function() return AiSleep(18000) end,
-@@ -166,12 +168,14 @@
-     function() return AiSet(AiTransporter(), 1) end,
-     function() return AiWait(AiWorker()) end,
-     function() return AiNeed(AiPlatform()) end,
--    function() return AiForce(0, {AiDestroyer(), 3, AiSoldier(), 4, AiShooter(), 3, AiTransporter(), 2}) end,
-+    function() return AiForce(0, {AiDestroyer(), 3, AiSoldier(), 4, AiShooter(), 3}) end,
-+	function() return AiSet(AiTransporter(), 3) end,
-     function() return AiSleep(3000) end,
-     function() return AiSleep(4000) end,
-     function() return AiSleep(4000) end,
-     function() return AiSleep(12000) end,
--    function() return AiForce(0, {AiDestroyer(), 4, AiSoldier(), 12, AiShooter(), 4, AiTransporter(), 4}) end,
-+    function() return AiForce(0, {AiDestroyer(), 4, AiSoldier(), 12, AiShooter(), 4}) end,
-+	function() return AiSet(AiTransporter(), 7) end,
-     function() return AiSleep(14000) end,
-     function() return AiSleep(12000) end,
-     function() return AiLoop(hum_05_loop_funcs, hum_05_loop_pos) end,
-@@ -254,7 +258,7 @@
- local hum_08_loop_funcs = {
-     function() print("Looping !") return false end,
-     function() return AiSleep(16000) end,
--    function() return AiForce(0, {AiSoldier(), 1, AiShooter(), 4, AiCavalry(), 3, AiCatapult, 1}) end,
-+    function() return AiForce(0, {AiSoldier(), 1, AiShooter(), 4, AiCavalry(), 3, AiCatapult(), 1}) end,
-     function() return AiSleep(14000) end,
-     function() return AiSleep(12000) end,
-     function() hum_08_loop_pos[player] = 0; return false end,
-@@ -270,12 +274,12 @@
-     function() return AiSleep(10000) end,
-     function() return AiSleep(15000) end,
-     function() return AiResearch(AiUpgradeCavalryMage()) end,
--    function() return AiResearch(AiCavalryMageSpell1) end,
--    function() return AiResearch(AiUpgradeMissile1) end,
-+    function() return AiResearch(AiCavalryMageSpell1()) end,
-+    function() return AiResearch(AiUpgradeMissile1()) end,
-     function() return AiForce(0, {AiSoldier(), 2, AiShooter(), 5, AiCavalry(), 4, AiCatapult(), 1}) end,
-     function() return AiSleep(15000) end,
--    function() return AiResearch(AiUpgradeWeapon1) end,
--    function() return AiResearch(AiUpgradeArmor1) end,
-+    function() return AiResearch(AiUpgradeWeapon1()) end,
-+    function() return AiResearch(AiUpgradeArmor1()) end,
-     function() return AiSleep(21000) end,
-     function() return AiResearch(AiUpgradeEliteShooter()) end,
-     function() return AiSleep(12000) end,
-@@ -314,7 +318,8 @@
-     function() print("Looping !") return false end,
-     function() return AiSleep(5000) end,
-     function() return AiForce(0, {AiSoldier(), 4, AiShooter(), 4, AiCavalry(), 4,
--	    AiCatapult(), 1, AiTransporter(), 1}) end,
-+	    AiCatapult(), 1}) end,
-+	function() return AiSet(AiTransporter(), 1) end,
-     function() return AiSleep(6000) end,
-     function() return AiForce(0, {AiDestroyer(), 3, AiBattleship(), 1}) end,
-     function() return AiSleep(5000) end,
-@@ -333,18 +338,19 @@
-     function() return AiWait(AiWorker()) end,
- 
-     function() return AiSet(AiTransporter(), 1) end,
--    function() return AiForce(0, {AiDestroyer(), 2, AiTransporter(), 1}) end,
-+    function() return AiForce(0, {AiDestroyer(), 2}) end,
-     function() return AiSleep(6000) end,
-     function() return AiForce(0, {AiSoldier(), 4, AiShooter(), 4,
--	    AiDestroyer(), 2, AiTransporter(), 1}) end,
-+	    AiDestroyer(), 2}) end,
- 
-     function() return AiResearch(AiUpgradeCavalryMage()) end,
-     function() return AiResearch(AiCavalryMageSpell1()) end,
-     function() return AiResearch(AiMageSpell1()) end,
-     function() return AiResearch(AiMageSpell2()) end,
-     function() return AiResearch(AiUpgradeMissile1()) end,
--
--    function() return AiForce(0, {AiSoldier(), 4, AiShooter(), 4, AiTransporter(), 1, AiDestroyer(), 2}) end,
-+ 
-+    function() return AiSet(AiTransporter(), 2) end,
-+    function() return AiForce(0, {AiSoldier(), 4, AiShooter(), 4, AiDestroyer(), 2}) end,
-     function() return AiResearch(AiUpgradeWeapon1()) end,
-     function() return AiSleep(4000) end,
-     function() return AiResearch(AiUpgradeArmor1()) end,
diff --git a/games-strategy/wargus/wargus-2.1-r1.ebuild b/games-strategy/wargus/wargus-2.1-r1.ebuild
index d026ec6c0dcc..d5b2dd0aff87 100644
--- a/games-strategy/wargus/wargus-2.1-r1.ebuild
+++ b/games-strategy/wargus/wargus-2.1-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 2004-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.1-r1.ebuild,v 1.2 2006/01/08 00:59:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.1-r1.ebuild,v 1.3 2006/01/08 15:12:25 genstef Exp $
 
 inherit eutils games
 
 DESCRIPTION="Warcraft II for the Stratagus game engine (Needs WC2 DOS CD)"
 HOMEPAGE="http://wargus.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz
-	http://dev.gentoo.org/~genstef/files/wargus.png"
+	http://dev.gentoo.org/~genstef/files/wargus.png
+	http://dev.gentoo.org/~genstef/files/dist/wargus-2.1-ai.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,10 +25,10 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${P}-src.tar.gz
+	unpack ${A/wargus.png}
 	cd "${S}"
 	epatch "${FILESDIR}"/wargus-2.1-humanbasespell.patch \
-		"${FILESDIR}"/wargus-2.1-ai.patch \
+		"${WORKDIR}"/wargus-2.1-ai.patch \
 		"${FILESDIR}"/wargus-2.1-aitransporter.patch
 }