From a895fb4806d28e423119c8560b6e81b46490e6c1 Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Fri, 16 Feb 2007 00:48:18 +0000 Subject: [PATCH] Fix from Arttu Valo for jdk-1.6, bug #164553 Package-Manager: portage-2.1.2-r9 --- games-strategy/triplea/ChangeLog | 5 +++- games-strategy/triplea/Manifest | 26 +++++++++++++------ games-strategy/triplea/triplea-0.9.0.2.ebuild | 9 +++++-- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/games-strategy/triplea/ChangeLog b/games-strategy/triplea/ChangeLog index 68d89b2084c9..28a8fd2a1ced 100644 --- a/games-strategy/triplea/ChangeLog +++ b/games-strategy/triplea/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-strategy/triplea # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/ChangeLog,v 1.28 2007/01/30 00:57:05 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/ChangeLog,v 1.29 2007/02/16 00:48:18 nyhm Exp $ + + 16 Feb 2007; Tristan Heaven triplea-0.9.0.2.ebuild: + Fix from Arttu Valo for jdk-1.6, bug #164553 30 Jan 2007; Vlastimil Babka triplea-0.9.0.2.ebuild: Put java-ant-2 after java-pkg-2 in inherit. diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest index f8e82a3dc2fd..ac753d700847 100644 --- a/games-strategy/triplea/Manifest +++ b/games-strategy/triplea/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX triplea-0.6.0.1-gentoo.patch 1956 RMD160 2a251f4416ae27fbb1cbcd5e35a58a17a852c66b SHA1 339716cfc1bce2f7c257df696a9ab33e89df692d SHA256 8534e6db39c42f2658210e2cb826f4262b7596a830f52902e6ec8842e04c0f9e MD5 c8d37e2b98977adc8b30d8ff6249486f files/triplea-0.6.0.1-gentoo.patch 1956 RMD160 2a251f4416ae27fbb1cbcd5e35a58a17a852c66b files/triplea-0.6.0.1-gentoo.patch 1956 @@ -8,14 +11,14 @@ EBUILD triplea-0.6.0.1.ebuild 1874 RMD160 51e9ebb3ece15aa37a6a144076cff16522ad88 MD5 7baa9978ac2af3a5acef12dd5016753a triplea-0.6.0.1.ebuild 1874 RMD160 51e9ebb3ece15aa37a6a144076cff16522ad8858 triplea-0.6.0.1.ebuild 1874 SHA256 e8b184602e65a03bc1d4aba9edf9be8975b7f6a767a63f5c94bf84f086b816a3 triplea-0.6.0.1.ebuild 1874 -EBUILD triplea-0.9.0.2.ebuild 1970 RMD160 4ecdf915e9983bb02623b7e5f44735af0fe6ce14 SHA1 2bf26f4e60754c85d664f84151b97c51103b6867 SHA256 d95cd3a71988762f568fd9811a2b8c2043854ec16ad6e4cd94b2e309598db116 -MD5 f64f6baf31c947da5b4d6ed821116956 triplea-0.9.0.2.ebuild 1970 -RMD160 4ecdf915e9983bb02623b7e5f44735af0fe6ce14 triplea-0.9.0.2.ebuild 1970 -SHA256 d95cd3a71988762f568fd9811a2b8c2043854ec16ad6e4cd94b2e309598db116 triplea-0.9.0.2.ebuild 1970 -MISC ChangeLog 3720 RMD160 fe5a2a877ccaac290bd1f15537a83573af2f68b5 SHA1 221a04685ba0ffc22a05917c68add4b2801cbe39 SHA256 6c8e8d3ff2faa48ea110be84b445cbc37815a49654ae02798a0ca49844fcb467 -MD5 2b15ce5b0d0141f8f5b58146a225c4da ChangeLog 3720 -RMD160 fe5a2a877ccaac290bd1f15537a83573af2f68b5 ChangeLog 3720 -SHA256 6c8e8d3ff2faa48ea110be84b445cbc37815a49654ae02798a0ca49844fcb467 ChangeLog 3720 +EBUILD triplea-0.9.0.2.ebuild 2117 RMD160 e0df7d472870c017c599b6c884d69fa4a857b928 SHA1 9aafa953af2a1dc4e52696da8801a81bd729813e SHA256 d12ae1ca0d0ef2c7f43052e99a4662b7c2a87cab54911329c3adda41de2bf009 +MD5 72239b96e6f1e5afc7b8c680a5d29f13 triplea-0.9.0.2.ebuild 2117 +RMD160 e0df7d472870c017c599b6c884d69fa4a857b928 triplea-0.9.0.2.ebuild 2117 +SHA256 d12ae1ca0d0ef2c7f43052e99a4662b7c2a87cab54911329c3adda41de2bf009 triplea-0.9.0.2.ebuild 2117 +MISC ChangeLog 3838 RMD160 d610d727bf9960c1e301dcda6241738e680b8796 SHA1 bff8ab196e15f8a8826df2b2b73a12321580e484 SHA256 7167e6763e7a767b36bed931d372664d7e353ab2cb66c544f2bb17735fe6affb +MD5 a1663eb085d977abf219a8ec6ba34fd3 ChangeLog 3838 +RMD160 d610d727bf9960c1e301dcda6241738e680b8796 ChangeLog 3838 +SHA256 7167e6763e7a767b36bed931d372664d7e353ab2cb66c544f2bb17735fe6affb ChangeLog 3838 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -26,3 +29,10 @@ SHA256 9f2c0ddb98471edb3cce75153c91484e3844d3fa010d930d0c5f7f433577e7d6 files/di MD5 3173e6a417d66d7836e495a15b0cc631 files/digest-triplea-0.9.0.2 295 RMD160 fa6f7dbc442cbe0a8745337252862d977e57e1af files/digest-triplea-0.9.0.2 295 SHA256 b8dda0aea521b2e7fa45d60d451558659b39f7226f384015260217d9d43ae0e8 files/digest-triplea-0.9.0.2 295 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF1P9cdz7hIScOURERAppVAKDp1DQXoshzqh5sVl24jzQARKRbIQCgnWKq +sWtMrxgFGZ73ORHb8HKQozw= +=JV3O +-----END PGP SIGNATURE----- diff --git a/games-strategy/triplea/triplea-0.9.0.2.ebuild b/games-strategy/triplea/triplea-0.9.0.2.ebuild index cdc6e5722ffa..bf1635ab98b5 100644 --- a/games-strategy/triplea/triplea-0.9.0.2.ebuild +++ b/games-strategy/triplea/triplea-0.9.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-0.9.0.2.ebuild,v 1.2 2007/01/30 00:57:05 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-0.9.0.2.ebuild,v 1.3 2007/02/16 00:48:18 nyhm Exp $ inherit eutils java-pkg-2 java-ant-2 versionator games @@ -31,10 +31,15 @@ src_unpack() { unpack ${A} cd "${S}" + sed -i \ + -e 's/getWindows/getMyWindows/' \ + src/games/strategy/debug/Console.java \ + || die "sed Console.java failed" + sed -i \ -e 's:/triplea/:/.triplea/:' \ src/games/strategy/engine/framework/ui/SaveGameFileChooser.java \ - || die "sed failed" + || die "sed SaveGameFileChooser.java failed" rm -f lib/{junit.jar,derby_10_1_2.jar} java-pkg_jar-from jgoodies-looks-2.0 looks.jar lib/looks-2.0.4.jar -- 2.26.2