Version bump

Package-Manager: portage-2.1.2.4

diff --git a/games-strategy/freecol/ChangeLog b/games-strategy/freecol/ChangeLog
index d40ebd9072bcd203cae8f0db817a59928fcae3b5..34750c9906f4444f74ac365fcdf1fc77b805b468 100644 (file)
--- 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.14 2007/02/20 15:25:34 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.15 2007/04/20 12:27:55 nyhm Exp $
+
+*freecol-0.6.0 (20 Apr 2007)
+
+  20 Apr 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/freecol-0.6.0-home.patch, +freecol-0.6.0.ebuild:
+  Version bump
 
   20 Feb 2007; Simon Stelling <blubb@gentoo.org> freecol-0.5.3-r1.ebuild:
   mark ~amd64; bug 165110

diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index f0e869f7ba8dd1225bb8ce9d823b041808982b23..0d740b26c8b1e3c27bc8ca3e475a01baadc4fed4 100644 (file)
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freecol-0.5.3-build.patch 568 RMD160 98ac7013b4a9196a18858c1cc6373433b8383c02 SHA1 90e913edad128858b320bacb948584bb43d8031a SHA256 fca9bbe8f16c10593ddeaf7f32398fbd976a3c76b32c12589af8c062640397d4
 MD5 f017b07254962d322d7d771321bfe044 files/freecol-0.5.3-build.patch 568
 RMD160 98ac7013b4a9196a18858c1cc6373433b8383c02 files/freecol-0.5.3-build.patch 568
@@ -6,7 +9,12 @@ AUX freecol-0.5.3-home.patch 931 RMD160 6d9b11226f93de1abf2f080acf1afe6ec3ce9f2f
 MD5 5c8b81773ca70b44630b8f954a5a0856 files/freecol-0.5.3-home.patch 931
 RMD160 6d9b11226f93de1abf2f080acf1afe6ec3ce9f2f files/freecol-0.5.3-home.patch 931
 SHA256 6dd34ac819d1c3fc5b560c39cc431aa88f92874eed0023aa4a4b8a70e60fb13c files/freecol-0.5.3-home.patch 931
+AUX freecol-0.6.0-home.patch 931 RMD160 6d9b11226f93de1abf2f080acf1afe6ec3ce9f2f SHA1 5b2a6e9d30d0818db4abbcb203114fb7ad72c11d SHA256 6dd34ac819d1c3fc5b560c39cc431aa88f92874eed0023aa4a4b8a70e60fb13c
+MD5 5c8b81773ca70b44630b8f954a5a0856 files/freecol-0.6.0-home.patch 931
+RMD160 6d9b11226f93de1abf2f080acf1afe6ec3ce9f2f files/freecol-0.6.0-home.patch 931
+SHA256 6dd34ac819d1c3fc5b560c39cc431aa88f92874eed0023aa4a4b8a70e60fb13c files/freecol-0.6.0-home.patch 931
 DIST freecol-0.5.3-src.tar.gz 8239659 RMD160 ea9e48e7f3300359a4c235c99fb0a5235730943f SHA1 6af26395726c3a1f4d3c7675cbeb47427566ac22 SHA256 8532173044ec371bfc88376cbab2b9d5c638a216a065bb0f6351ee5b539ac0ac
+DIST freecol-0.6.0-src.tar.gz 21073021 RMD160 cd9553d56bff1568a61107df0510cf5afb63ab83 SHA1 937737366b10dabd9e0273f20fbc8aba81e1c8b6 SHA256 b4797b4accb82e289bc542669a77a8b33360e6eb8c6f390b756f572fc5d286b0
 EBUILD freecol-0.5.3-r1.ebuild 1323 RMD160 4f99a18a0664b5667c62c9e0dda4546897516873 SHA1 63a5c00034a88b2c4aad371c38cb4eaa8bbce8ff SHA256 c85c86fa1ad6706b73fd4ea1763149cea1ceb82aa73d544fb85a1e9d37928c4e
 MD5 850d44cc2f597d2db72e700112949bf0 freecol-0.5.3-r1.ebuild 1323
 RMD160 4f99a18a0664b5667c62c9e0dda4546897516873 freecol-0.5.3-r1.ebuild 1323
@@ -15,10 +23,14 @@ EBUILD freecol-0.5.3.ebuild 1107 RMD160 8c12a16312ca8b97f8473eb44802641d018ca214
 MD5 db6ac2ec2336b63f3e6fbe69df742f12 freecol-0.5.3.ebuild 1107
 RMD160 8c12a16312ca8b97f8473eb44802641d018ca214 freecol-0.5.3.ebuild 1107
 SHA256 b100d1e86394aa7bad40928cad49d3983e8081d357c3e902fbf943f0dccd9b87 freecol-0.5.3.ebuild 1107
-MISC ChangeLog 2245 RMD160 6564ec5a79aa7901515db9dddef6a59c54eae11a SHA1 b529ef2acc04d0840e8375b62e42010d049cfc48 SHA256 cc907f7db98616648ec7f094f2205d395c17cb2b6d99652261d6844c7a61c3ea
-MD5 54fe8b6028486c8e99014e4ee5fad8fb ChangeLog 2245
-RMD160 6564ec5a79aa7901515db9dddef6a59c54eae11a ChangeLog 2245
-SHA256 cc907f7db98616648ec7f094f2205d395c17cb2b6d99652261d6844c7a61c3ea ChangeLog 2245
+EBUILD freecol-0.6.0.ebuild 1280 RMD160 bb22e79c54bd778d4843d26bac84b09142232078 SHA1 6589a7e819e7a4b19ec797c130fcff3d81bbb8d6 SHA256 157613d04f9c4428b07ebc4ef7345310251b12b5f594de94eea303cce4ef06d9
+MD5 59d272c8a4f77db46a365a9a1a045775 freecol-0.6.0.ebuild 1280
+RMD160 bb22e79c54bd778d4843d26bac84b09142232078 freecol-0.6.0.ebuild 1280
+SHA256 157613d04f9c4428b07ebc4ef7345310251b12b5f594de94eea303cce4ef06d9 freecol-0.6.0.ebuild 1280
+MISC ChangeLog 2396 RMD160 c5d9d613f1ae127d2f3f8c69a904bec901ef8ae4 SHA1 49edc1557a46e3e139d300c2295eb6805102cb3d SHA256 1f0638b97fade3fce8469e851470f4304fd339122a8944933bd58ec8a8762309
+MD5 88f3edc3bdc5903ad6be2abeb9927a09 ChangeLog 2396
+RMD160 c5d9d613f1ae127d2f3f8c69a904bec901ef8ae4 ChangeLog 2396
+SHA256 1f0638b97fade3fce8469e851470f4304fd339122a8944933bd58ec8a8762309 ChangeLog 2396
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -29,3 +41,13 @@ SHA256 604c593df6cd3180d9f62217762389f45bcba889e998cd460ec8571b873ee344 files/di
 MD5 3788c05960c7203cf68d43244f8e75ce files/digest-freecol-0.5.3-r1 256
 RMD160 ebd19f51fdd5ddeff4af728af046da85619e7a9a files/digest-freecol-0.5.3-r1 256
 SHA256 604c593df6cd3180d9f62217762389f45bcba889e998cd460ec8571b873ee344 files/digest-freecol-0.5.3-r1 256
+MD5 d6f1c42358db06e8ab297365495546d4 files/digest-freecol-0.6.0 259
+RMD160 c04c75e1dad7f8c73c836b00c7d1526b843eec2d files/digest-freecol-0.6.0 259
+SHA256 07c02315cac71585d23c32961794ed23840c8edb0b257a6cadc19a134f557d90 files/digest-freecol-0.6.0 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGKLHWdz7hIScOURERAj8KAJ9oZeHixi1AaFe5nEv73DUJjKrO0gCgxIHe
+ur/gYfW3EB1ljWPfuYF32W4=
+=eOJE
+-----END PGP SIGNATURE-----

diff --git a/games-strategy/freecol/files/digest-freecol-0.6.0 b/games-strategy/freecol/files/digest-freecol-0.6.0
new file mode 100644 (file)
index 0000000..04527a2
--- /dev/null
+++ b/games-strategy/freecol/files/digest-freecol-0.6.0
@@ -0,0 +1,3 @@
+MD5 1b0a42f1cb2a9ea153e5e762013b5712 freecol-0.6.0-src.tar.gz 21073021
+RMD160 cd9553d56bff1568a61107df0510cf5afb63ab83 freecol-0.6.0-src.tar.gz 21073021
+SHA256 b4797b4accb82e289bc542669a77a8b33360e6eb8c6f390b756f572fc5d286b0 freecol-0.6.0-src.tar.gz 21073021

diff --git a/games-strategy/freecol/files/freecol-0.6.0-home.patch b/games-strategy/freecol/files/freecol-0.6.0-home.patch
new file mode 100644 (file)
index 0000000..01ee1f4
--- /dev/null
+++ b/games-strategy/freecol/files/freecol-0.6.0-home.patch
@@ -0,0 +1,22 @@
+--- 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/freecol-0.6.0.ebuild b/games-strategy/freecol/freecol-0.6.0.ebuild
new file mode 100644 (file)
index 0000000..db1869e
--- /dev/null
+++ b/games-strategy/freecol/freecol-0.6.0.ebuild
@@ -0,0 +1,60 @@
+# 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.6.0.ebuild,v 1.1 2007/04/20 12:27:55 nyhm Exp $
+
+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=""
+
+RDEPEND="dev-java/higlayout"
+DEPEND="${RDEPEND}
+       >=virtual/jdk-1.6
+       dev-java/ant"
+RDEPEND="${RDEPEND}
+       >=virtual/jre-1.6"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       rm -rf FreeCol.jar src/classes jars/*
+
+       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
+}
+
+src_compile() {
+       eant
+}
+
+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
+       doicon ${PN}.xpm
+       make_desktop_entry ${PN} FreeCol ${PN}.xpm
+       prepgamesdirs
+}