version bump (bug #71243) with patch from Thomas Matthijs to fix the game saving code.

Package-Manager: portage-2.0.51-r15

6 files changed, 184 insertions, 6 deletions

diff --git a/games-strategy/triplea/ChangeLog b/games-strategy/triplea/ChangeLog
index 63fe286576f6..f7bbd31d3ca9 100644
--- a/games-strategy/triplea/ChangeLog
+++ b/games-strategy/triplea/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/triplea
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/ChangeLog,v 1.13 2004/12/10 03:17:17 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/ChangeLog,v 1.14 2005/01/30 08:08:02 mr_bones_ Exp $
+
+*triplea-0.5.1.1 (30 Jan 2005)
+
+  30 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/triplea-0.5.1.1.patch, +triplea-0.5.1.1.ebuild:
+  version bump (bug #71243) with patch from Thomas Matthijs to fix the game
+  saving code.
 
   09 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> triplea-0.4.8.ebuild:
   fix deps and wrapper per bug #68134
diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest
index 31872e6718c0..cdcc36af5ed0 100644
--- a/games-strategy/triplea/Manifest
+++ b/games-strategy/triplea/Manifest
@@ -1,4 +1,7 @@
-MD5 2b9f1a36cf1bd5a8c5d2223c61210c7e ChangeLog 1749
+MD5 3c0fd0c78930c95ec55fb945b2347a83 ChangeLog 1985
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 a348cd0703a1a941d5256748d17c8a58 triplea-0.4.8.ebuild 1982
+MD5 4fd0ed029a59c1c88249727dc467ae10 triplea-0.4.8.ebuild 1982
+MD5 6fe482fc7cfcc44ebfacd997cc78976d triplea-0.5.1.1.ebuild 2120
+MD5 9a6bab7f4d8f6d017eb9fd91481706d1 files/digest-triplea-0.5.1.1 72
 MD5 b609ff3eb027151169803aa25b5edd75 files/digest-triplea-0.4.8 70
+MD5 7ffbd6e44e385dd4730e14206aae6cd8 files/triplea-0.5.1.1.patch 3254
diff --git a/games-strategy/triplea/files/digest-triplea-0.5.1.1 b/games-strategy/triplea/files/digest-triplea-0.5.1.1
new file mode 100644
index 000000000000..b0751e360855
--- /dev/null
+++ b/games-strategy/triplea/files/digest-triplea-0.5.1.1
@@ -0,0 +1 @@
+MD5 2d0c227f1b6656b8a7982e036dad9753 triplea_source_0_5_1_1.zip 6903301
diff --git a/games-strategy/triplea/files/triplea-0.5.1.1.patch b/games-strategy/triplea/files/triplea-0.5.1.1.patch
new file mode 100644
index 000000000000..e2763e4b187a
--- /dev/null
+++ b/games-strategy/triplea/files/triplea-0.5.1.1.patch
@@ -0,0 +1,79 @@
+--- src/games/strategy/engine/framework/GameRunner.java	2004-10-11 23:21:36.000000000 +0200
++++ src/games/strategy/engine/framework/GameRunner.java	2004-12-17 14:03:11.741188160 +0100
+@@ -142,9 +142,11 @@
+    */
+   public static File getRootFolder()
+   {
+-    //TODO this is a bit hokey, we assume that we are running
+-    //from the bin directory.
+-      return new File("..");
++	  String rootFolder = System.getProperty("triplea.root");
++	  if (rootFolder != null)
++		  return new File(rootFolder);
++	  else
++		  return new File("..");
+   }
+ 
+ 
+--- src/games/strategy/engine/data/GameParser.java	2004-12-17 15:49:52.083188280 +0100
++++ src/games/strategy/engine/data/GameParser.java	2004-12-17 15:49:58.714180216 +0100
+@@ -107,7 +107,7 @@
+     factory.setValidating(true);
+ 
+     //get the dtd location
+-    URL url = GameParser.class.getResource("../xml/");
++    URL url = GameParser.class.getResource("/games/strategy/engine/xml/");
+     String system = url.toExternalForm();
+ 
+     DocumentBuilder builder = factory.newDocumentBuilder();
+--- build.xml	2004-12-17 13:18:51.315634320 +0100
++++ build.xml	2004-12-17 13:25:03.583041072 +0100
+@@ -7,7 +7,9 @@
+ 
+     <path id="full.path">
+         <pathelement path="${junit.jar}"/>
+-        <pathelement path="lib\plastic-1.2.0.jar"/>
++               <fileset dir="lib">
++                       <include name="**/*.jar"/>
++               </fileset>
+         <pathelement path="${classpath}"/>
+         <pathelement path="classes/"/>
+     </path>
+@@ -58,6 +60,26 @@
+     <target name="compileClean" depends="clean,compile" description="Clean then compile"/>
+ 
+ 
++       <!-- jar -->
++       <target name="jar" depends="init,compile" description="create a jar file">
++               <jar destfile="triplea.jar">
++                      <fileset dir=".">
++                               <include name="triplea.properties"/>
++                       </fileset>
++                       <fileset dir="classes/">
++                               <include name="**/*.class"/>
++                               <exclude name="**/*Test.class"/>  <!-- dont put Test classes in the main distribution -->
++                               <include name="**/*.dtd"/>
++                               <include name="**/*.gif"/>
++                               <include name="**/*.png"/>
++                               <include name="**/*.txt"/>
++                               <include name="**/*.wav"/>
++                       </fileset>
++
++               </jar>
++       </target>
++
++
+     <!-- zip -->
+     <target name="zip" depends="init,compile" description="create a zip file for end users">
+         <mkdir dir="release" />
+--- src/games/strategy/triplea/ui/TerritoryData.java	2004-12-17 16:04:50.570597432 +0100
++++ src/games/strategy/triplea/ui/TerritoryData.java	2004-12-17 16:05:14.404974056 +0100
+@@ -84,7 +84,7 @@
+     {
+         try
+ 	{
+-	    String prefix = "../image/images/maps/"+mapDir+"/";
++	    String prefix = "/games/strategy/triplea/image/images/maps/"+mapDir+"/";
+ 
+ 	    m_place   = PointFileReaderWriter.readOneToMany(this.getClass().getResourceAsStream(prefix+PLACEMENT_FILE));
+ 	    m_polys   = PointFileReaderWriter.readOneToManyPolygons(this.getClass().getResourceAsStream(prefix+POLYGON_FILE));
diff --git a/games-strategy/triplea/triplea-0.4.8.ebuild b/games-strategy/triplea/triplea-0.4.8.ebuild
index 448c79673964..425e81025680 100644
--- a/games-strategy/triplea/triplea-0.4.8.ebuild
+++ b/games-strategy/triplea/triplea-0.4.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-0.4.8.ebuild,v 1.3 2004/12/10 03:17:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-0.4.8.ebuild,v 1.4 2005/01/30 08:08:02 mr_bones_ Exp $
 
 inherit games
 
diff --git a/games-strategy/triplea/triplea-0.5.1.1.ebuild b/games-strategy/triplea/triplea-0.5.1.1.ebuild
new file mode 100644
index 000000000000..801b8685f9aa
--- /dev/null
+++ b/games-strategy/triplea/triplea-0.5.1.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-0.5.1.1.ebuild,v 1.1 2005/01/30 08:08:02 mr_bones_ Exp $
+
+inherit java-utils java-pkg games
+
+MY_PV=${PV//\./_}
+DESCRIPTION="An open source clone of the popular Axis and Allies boardgame"
+HOMEPAGE="http://triplea.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_source_${MY_PV}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="jikes"
+
+RDEPEND="|| (
+	>=virtual/jdk-1.4
+	>=virtual/jre-1.4 )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	>=dev-java/ant-core-1.4.1
+	>=dev-java/jgoodies-looks-bin-1.2.0
+	dev-java/junit
+	jikes? ( >=dev-java/jikes-1.17 )"
+
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}.patch"
+
+	cd lib/
+	rm -f *.jar
+	java-pkg_jar-from jgoodies-looks-bin
+	cd ..
+
+
+	cat > "${T}/${PN}" <<-EOF
+		#!/bin/bash
+
+		cd "${GAMES_DATADIR}/${PN}"
+		java -Dtriplea.root="${GAMES_DATADIR}/${PN}" -cp \\
+			triplea.jar:\$(java-config -p jgoodies-looks-bin) \\
+			games.strategy.engine.framework.GameRunner
+	EOF
+
+	cat > "${T}/${PN}_ai" <<-EOF
+		#!/bin/bash
+
+		cd "${GAMES_DATADIR}/${PN}"
+		java -Dtriplea.ai=true -Dtriplea.root="${GAMES_DATADIR}/${PN}" -cp \\
+			triplea.jar:\$(java-config -p jgoodies-looks-bin) \\
+			games.strategy.engine.framework.GameRunner
+	EOF
+
+	# Repair bad path in .ant.properties (bug #47437)
+	sed -i \
+		-e "/^junit.jar/s:=.*:=$(java-config -p junit):" \
+			.ant.properties \
+			|| die "sed .ant.properties failed"
+
+	# The default savedGames directory is in the install root.  This
+	# sets it to use the users home directory.
+	echo "triplea.saveGamesInHomeDir=true" > triplea.properties
+}
+
+src_compile() {
+	local antflags="jar"
+
+	if use jikes ; then
+		antflags="${antflags} -Dbuild.compiler=jikes"
+	fi
+
+	ant ${antflags} || die "compile problem"
+}
+
+src_install () {
+	dogamesbin \
+		"${T}/${PN}" \
+		"${T}/${PN}_ai" \
+		|| die "dogamesbin failed"
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -R games/ triplea.jar "${D}${GAMES_DATADIR}/${PN}" || die "cp failed"
+	prepgamesdirs
+}