summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games-strategy/freecol/ChangeLog8
-rw-r--r--games-strategy/freecol/files/digest-freecol-0.7.03
-rw-r--r--games-strategy/freecol/files/freecol-0.6.0-home.patch22
-rw-r--r--games-strategy/freecol/files/freecol-0.7.0-home.patch22
-rw-r--r--games-strategy/freecol/freecol-0.7.0.ebuild76
5 files changed, 108 insertions, 23 deletions
diff --git a/games-strategy/freecol/ChangeLog b/games-strategy/freecol/ChangeLog
index 882518b1ed4a..50b8a2df9886 100644
--- a/games-strategy/freecol/ChangeLog
+++ b/games-strategy/freecol/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for games-strategy/freecol
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.20 2007/05/25 21:09:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.21 2007/07/19 21:41:00 nyhm Exp $
+
+*freecol-0.7.0 (19 Jul 2007)
+
+ 19 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+ +files/freecol-0.7.0-home.patch, +freecol-0.7.0.ebuild:
+ Version bump by Claes Mogren, bug #185248
25 May 2007; Petteri Räty <betelgeuse@gentoo.org> -freecol-0.6.0.ebuild:
Remove version affected by bug #179788.
diff --git a/games-strategy/freecol/files/digest-freecol-0.7.0 b/games-strategy/freecol/files/digest-freecol-0.7.0
new file mode 100644
index 000000000000..64d26ba8b0c1
--- /dev/null
+++ b/games-strategy/freecol/files/digest-freecol-0.7.0
@@ -0,0 +1,3 @@
+MD5 89ded7c4c248d00241749eaf0a2a39e2 freecol-0.7.0-src.tar.gz 19663698
+RMD160 07736355fe40556868daf41b4d4c461da41e575d freecol-0.7.0-src.tar.gz 19663698
+SHA256 e49be5ae560f71aca184d9a880f2f3b297cb942d11aa6ab416468517309623d4 freecol-0.7.0-src.tar.gz 19663698
diff --git a/games-strategy/freecol/files/freecol-0.6.0-home.patch b/games-strategy/freecol/files/freecol-0.6.0-home.patch
deleted file mode 100644
index 01ee1f499d6f..000000000000
--- a/games-strategy/freecol/files/freecol-0.6.0-home.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/net/sf/freecol/common/logging/DefaultHandler.java
-+++ src/net/sf/freecol/common/logging/DefaultHandler.java
-@@ -21,7 +21,7 @@
- public static final String LICENSE = "http://www.gnu.org/licenses/gpl.html";
- 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;
-
---- src/net/sf/freecol/FreeCol.java
-+++ src/net/sf/freecol/FreeCol.java
-@@ -83,7 +83,7 @@
- if (!saveDirectory.exists()) {
- saveDirectory = new File("save");
- } else {
-- saveDirectory = new File(saveDirectory, "freecol" + FILE_SEP + "save");
-+ saveDirectory = new File(saveDirectory, ".freecol" + FILE_SEP + "save");
- }
-
- handleArgs(args);
diff --git a/games-strategy/freecol/files/freecol-0.7.0-home.patch b/games-strategy/freecol/files/freecol-0.7.0-home.patch
new file mode 100644
index 000000000000..f52e943e0c6b
--- /dev/null
+++ b/games-strategy/freecol/files/freecol-0.7.0-home.patch
@@ -0,0 +1,22 @@
+--- 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;
+
+--- src/net/sf/freecol/FreeCol.java
++++ src/net/sf/freecol/FreeCol.java
+@@ -314,7 +314,7 @@
+ private static void createAndSetDirectories() {
+ // TODO: The location of the save directory should be determined by the installer.;
+
+- File mainUserDirectory = new File(System.getProperty("user.home"), "freecol");
++ File mainUserDirectory = new File(System.getProperty("user.home"), ".freecol");
+ if (mainUserDirectory.exists() && mainUserDirectory.isFile()) {
+ logger.warning("Could not create .freecol under "
+ + System.getProperty("user.home") + " because there "
diff --git a/games-strategy/freecol/freecol-0.7.0.ebuild b/games-strategy/freecol/freecol-0.7.0.ebuild
new file mode 100644
index 000000000000..18b1eecaecd6
--- /dev/null
+++ b/games-strategy/freecol/freecol-0.7.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.7.0.ebuild,v 1.1 2007/07/19 21:41:00 nyhm 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 -v FreeCol.jar jars/* */*/*.jar || die
+
+ epatch "${FILESDIR}"/${P}-home.patch
+
+ sed -i "/Class-Path/s:jars/.*$:$(java-pkg_getjars higlayout):" \
+ src/MANIFEST.MF \
+ || die "sed failed"
+
+ cd jars
+ java-pkg_jar-from higlayout
+}
+
+# Default would be from games
+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 () {
+ insinto "${GAMES_DATADIR}"/${PN}
+ doins -r data || die "doins failed"
+
+ 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
+
+ dodoc README || die
+ doicon ${PN}.xpm || die
+ make_desktop_entry ${PN} FreeCol ${PN}.xpm || die
+ prepgamesdirs
+}