version bump (bug #255139)

Package-Manager: portage-2.1.6.7/cvs/Linux i686

5 files changed, 96 insertions, 7 deletions

diff --git a/games-strategy/freecol/ChangeLog b/games-strategy/freecol/ChangeLog
index e6c8b3f1d666..9755cf2e73aa 100644
--- a/games-strategy/freecol/ChangeLog
+++ b/games-strategy/freecol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/freecol
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.30 2008/06/16 20:48:23 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.31 2009/04/09 17:39:39 mr_bones_ Exp $
+
+*freecol-0.8.1 (09 Apr 2009)
+
+  09 Apr 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/freecol-0.8.1-home.patch, freecol-0.7.4.ebuild,
+  +freecol-0.8.1.ebuild:
+  version bump (bug #255139)
 
 *freecol-0.7.4 (16 Jun 2008)
 
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index c50fce2ab70c..009b2b787557 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1,8 +1,11 @@
 AUX freecol-0.7.1-home.patch 1063 RMD160 c06180604dc45318a88f04d8696c899d5bbd819b SHA1 ed977e8b51dc7d384198d2dbb2fd10e8388134ee SHA256 cd015054538f7856ae51882233e19e191daf23f4d4791065b05c4ec639e90dec
 AUX freecol-0.7.4-home.patch 1063 RMD160 c06180604dc45318a88f04d8696c899d5bbd819b SHA1 ed977e8b51dc7d384198d2dbb2fd10e8388134ee SHA256 cd015054538f7856ae51882233e19e191daf23f4d4791065b05c4ec639e90dec
+AUX freecol-0.8.1-home.patch 427 RMD160 323d27595f35b0e9b605bc410eb996ab0530e499 SHA1 ff5fc1fa0f149f5e7c65c0acb354428935767df6 SHA256 a532f005c7fc5f904bb98c696f983e9a239d26b38a4e41423f5e69e226d89834
 DIST freecol-0.7.1-src.tar.gz 19765230 RMD160 5c187f796835a9a53853b23ef0b75bddb3c40a80 SHA1 074b5145f7c7f97816bc03c4ade703703b495c4e SHA256 1c1cce5a2f91d47d89639e175d10cdcaa040ca916e3b64214c0ebeb935c0c153
 DIST freecol-0.7.4-src.tar.gz 20988647 RMD160 d969ad2bb85091c45f6b4142f38bd862e58a891c SHA1 2740299b902c939d8353a4fa3147644638d6a1c3 SHA256 5869450506015b8da36343a1a0cf2dcb8c64f0dc51ecb19bb9a212026eebb226
+DIST freecol-0.8.1-src.tar.gz 33937543 RMD160 4d2313befadc82b0d1deac482f91ed7b6912c0d6 SHA1 a75b252e703e4beb092660e8b36afcba262d7322 SHA256 c1dd5a44df93dd12dcc43dc73dbad1a7f66971f77a331d056291044eb5f31951
 EBUILD freecol-0.7.1.ebuild 1550 RMD160 d9a4294711bfbdd8698dea025daaf84ee5745071 SHA1 a385b5a184cc2670573c47a8250b24359ece11c4 SHA256 d2e13c5fe4f07b36a69fd6e134d879ae6d2e1a015b41c837b655f36a4a79eefa
-EBUILD freecol-0.7.4.ebuild 1504 RMD160 f796a082fd5c9ddbbc3a43de30c7e23ae8e998ec SHA1 97ab22e9d533aa6c62bf78c09d2bee975eb22dea SHA256 44da990bc410e135ab54d1de4c6f79fd16571b2d519ed0cc4ded7b225d07e754
-MISC ChangeLog 4621 RMD160 d87e8fa0c18bc5456d3114ca1e5d6b98aa6fca66 SHA1 da012750bfc23ecff865346763e10561a3d157a1 SHA256 dcd66078b3ad9e6c8b2fc184d9bfc45f59b8e9197faab78bbee67fedf69c2b3d
+EBUILD freecol-0.7.4.ebuild 1508 RMD160 10e1bb7f3ad59c72001747543486c38f1f6ee35b SHA1 742aa711a833c85c3e268093c3d531cf6b104b13 SHA256 aaf68b835074f7b780dcc3edc279cc5ffe11bbb98edab1c393cc5e92d99a4fa8
+EBUILD freecol-0.8.1.ebuild 1509 RMD160 d4a68ed9d0702715118653d52f43b3dea8b07446 SHA1 31d7a8b00d45e616a66be19007f622a93ce85d01 SHA256 6eeb8f03da7a18bac7e4f7fd141039cc2bc6c890f02529ea17ffe97139c8ab4a
+MISC ChangeLog 4823 RMD160 e2b0c5e9a670312b2dccbdd983de23af8d056e26 SHA1 a8652950185b8f283b81ab6b604b2a6fbe19acb0 SHA256 a0b2105f3ca460449c2612c643563482b238ffddd3193b6cfb3a4166decd64e7
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/freecol/files/freecol-0.8.1-home.patch b/games-strategy/freecol/files/freecol-0.8.1-home.patch
new file mode 100644
index 000000000000..c2af74e48f3b
--- /dev/null
+++ b/games-strategy/freecol/files/freecol-0.8.1-home.patch
@@ -0,0 +1,11 @@
+--- src/net/sf/freecol/common/logging/DefaultHandler.java
++++ src/net/sf/freecol/common/logging/DefaultHandler.java
+@@ -22,7 +22,7 @@
+ 
+     public static final String REVISION = "$Revision: 1.1 $";
+ 
+-    private static final String fileName = new String("FreeCol.log");
++    private static final String fileName = new String(System.getProperty("user.home") + "/.freecol/FreeCol.log");
+ 
+     private FileWriter fileWriter;
+ 
diff --git a/games-strategy/freecol/freecol-0.7.4.ebuild b/games-strategy/freecol/freecol-0.7.4.ebuild
index 42339e27e7b7..85db0b5b3286 100644
--- a/games-strategy/freecol/freecol-0.7.4.ebuild
+++ b/games-strategy/freecol/freecol-0.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.7.4.ebuild,v 1.1 2008/06/16 20:48:23 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.7.4.ebuild,v 1.2 2009/04/09 17:39:39 mr_bones_ Exp $
 
 WANT_ANT_TASKS="ant-nodeps"
 inherit eutils java-pkg-2 java-ant-2 games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-java/higlayout"
diff --git a/games-strategy/freecol/freecol-0.8.1.ebuild b/games-strategy/freecol/freecol-0.8.1.ebuild
new file mode 100644
index 000000000000..d6fbafbf4987
--- /dev/null
+++ b/games-strategy/freecol/freecol-0.8.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.8.1.ebuild,v 1.1 2009/04/09 17:39:39 mr_bones_ Exp $
+
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2 games
+
+DESCRIPTION="An open source clone of the game Colonization"
+HOMEPAGE="http://www.freecol.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-java/higlayout"
+DEPEND="${RDEPEND}
+	test? (
+		dev-java/ant-junit
+		dev-java/ant-trax
+	)
+	>=virtual/jdk-1.6"
+RDEPEND="${RDEPEND}
+	>=virtual/jre-1.6"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	games_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -fv $(find . -name '*.jar')
+	java-pkg_jar-from --into jars higlayout
+	epatch "${FILESDIR}"/${P}-home.patch
+	sed -i \
+		-e "/Class-Path/s:jars/.*\":$(java-pkg_getjars higlayout)\":" \
+		build.xml \
+		|| die "sed failed"
+}
+
+src_compile() {
+	eant
+}
+
+src_test() {
+	java-pkg_jar-from --into test/lib junit
+	ANT_TASKS="ant-junit ant-trax ant-nodeps" eant testall
+}
+
+src_install () {
+	java-pkg_jarinto "${GAMES_DATADIR}"/${PN}
+	java-pkg_dojar FreeCol.jar
+	java-pkg_dolauncher ${PN} \
+		-into "${GAMES_PREFIX}" \
+		--pwd "${GAMES_DATADIR}"/${PN} \
+		--java_args -Xmx512M
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r data || die "doins failed"
+	doicon ${PN}.xpm
+	make_desktop_entry ${PN} FreeCol
+	dodoc README
+	prepgamesdirs
+}