--- /usr/portage/games-strategy/triplea/triplea-1.0.0.3.ebuild	2009-04-05 04:08:24.000000000 -0400
+++ triplea-1.2.5.5.ebuild	2011-01-10 08:02:17.000000000 -0500
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-1.0.0.3.ebuild,v 1.1 2008/07/08 19:26:10 mr_bones_ Exp $
+# $Id: $
+
+EAPI=2
 
 inherit eutils java-pkg-2 java-ant-2 versionator games
 
@@ -14,41 +16,32 @@
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="=dev-java/jgoodies-looks-2*
-	=dev-java/commons-httpclient-3*
+RDEPEND="dev-java/jgoodies-looks:2.0
+	dev-java/commons-httpclient:3
 	dev-java/apple-java-extensions-bin
 	dev-java/commons-logging
 	dev-java/commons-codec
 	=dev-java/junit-3.8*"
 DEPEND="${RDEPEND}
-	>=virtual/jdk-1.5
+	virtual/jdk:1.6
 	app-arch/unzip"
 RDEPEND="${RDEPEND}
-	>=virtual/jre-1.5"
+	virtual/jre:1.6"
 
-S=${WORKDIR}/${PN}_${MY_PV}
+S="${WORKDIR}/${PN}_${MY_PV}"
 
 pkg_setup() {
 	games_pkg_setup
 	java-pkg-2_pkg_setup
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e 's/getWindows/getMyWindows/' \
-		src/games/strategy/debug/Console.java \
-		|| die "sed Console.java failed"
-
+src_prepare() {
 	sed -i \
-		-e 's:/triplea/:/.triplea/:' \
-		src/games/strategy/engine/framework/ui/SaveGameFileChooser.java \
-		|| die "sed SaveGameFileChooser.java failed"
+		-e 's:"triplea":".triplea":g' \
+		src/games/strategy/engine/framework/GameRunner.java \
+		|| die "sed GameRunner.java failed"
 
-	rm -f lib/{junit.jar,derby_10_1_2.jar,looks-2.1.4.jar,AppleJavaExtensions.jar}
-	java-pkg_jar-from jgoodies-looks-2.0 looks.jar lib/looks-2.1.4.jar
+	rm -f lib/derby_10_1_2.jar
 	java-pkg_jar-from apple-java-extensions-bin AppleJavaExtensions.jar \
 		lib/AppleJavaExtensions.jar
 	java-pkg_jar-from commons-httpclient-3 commons-httpclient.jar \
@@ -57,14 +50,17 @@
 		lib/commons-logging-1.1.jar
 	java-pkg_jar-from commons-codec commons-codec.jar \
 		lib/commons-codec-1.3.jar
+  # Needs the substance package
+	#java-pkg_jar-from substance substance.jar \
+	#	lib/substance_5_3.jar
 	# installs the test files
 	java-pkg_jar-from --into lib junit
-	java-pkg_ensure-no-bundled-jars
+	#java-pkg_ensure-no-bundled-jars
 }
 
 src_compile() {
 	eant || die
-	echo "triplea.saveGamesInHomeDir=true" > classes/triplea.properties
+	echo "triplea.saveGamesInHomeDir=true" > data/triplea.properties
 	# The only target creating this is zip which does unjar etc
 	mkdir bin
 	cd classes
@@ -80,15 +76,20 @@
 
 src_install() {
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r bin data games images maps || die "doins failed"
+	doins -r bin data dice_servers images maps || die "doins failed"
 
 	java-pkg_regjar "${D}/${GAMES_DATADIR}"/${PN}/bin/*.jar
-	# TODO: add server launcher (see run-server.sh)
-	java-pkg_dolauncher ${PN} -into "${GAMES_PREFIX}" --main \
+	java-pkg_dolauncher ${PN} -into "${GAMES_PREFIX}" \
+		--java_args "-Xmx256m" --main \
 		games.strategy.engine.framework.GameRunner
+	java-pkg_dolauncher ${PN}-server -into "${GAMES_PREFIX}" \
+		--java_args "-server -Xmx64m -Dtriplea.lobby.port=3303 -Dtriplea.lobby.console=true" \
+		--main games.strategy.engine.lobby.server.LobbyServer
 
-	newicon data/games/strategy/engine/framework/ta_icon.png ${PN}.png
+	newicon icons/triplea_icon.png ${PN}.png
+	newicon icons/triplea_icon.png ${PN}-server.png
 	make_desktop_entry ${PN} TripleA
+	make_desktop_entry ${PN}-server TripleA-server
 
 	dodoc changelog.txt || die
 	dohtml -r doc/* readme.html || die