Use java-pkg_dolauncher to ensure >=jre-1.5 is used, bug #158643

Package-Manager: portage-2.1.2_rc4

diff --git a/games-strategy/triplea/ChangeLog b/games-strategy/triplea/ChangeLog
index 98e3538419d670c769c175a2814e81f5258e3743..1e6df3afb89e45b070b5dd2c6ae8d9895ee34a54 100644 (file)
--- a/games-strategy/triplea/ChangeLog
+++ b/games-strategy/triplea/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/triplea
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/ChangeLog,v 1.24 2006/11/10 18:04:28 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/ChangeLog,v 1.25 2006/12/24 18:36:43 nyhm Exp $
+
+  24 Dec 2006; Tristan Heaven <nyhm@gentoo.org> triplea-0.8.2.2.ebuild:
+  Use java-pkg_dolauncher to ensure >=jre-1.5 is used, bug #158643
 
 *triplea-0.8.2.2 (10 Nov 2006)
 

diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest
index 0cfbea29e0745b5d0a574e29437b64f4f7254dbd..c25d9df47638f7e76dfb4be7f7ce32c528e5a45b 100644 (file)
--- 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.8.2.2.ebuild 1410 RMD160 31ee53cf32aec96d3314526b5d361426b138f59c SHA1 82792b90bd6d0fe739d5bdfd959fbc66062aead7 SHA256 f1c8f011995ff1af1111b4643037069a41dccdcf64f76ee133c77c786a2940d2
-MD5 c063cd1db88082a1c6aa192ac2339a40 triplea-0.8.2.2.ebuild 1410
-RMD160 31ee53cf32aec96d3314526b5d361426b138f59c triplea-0.8.2.2.ebuild 1410
-SHA256 f1c8f011995ff1af1111b4643037069a41dccdcf64f76ee133c77c786a2940d2 triplea-0.8.2.2.ebuild 1410
-MISC ChangeLog 3205 RMD160 48ba943dc3b3710c55b17be5f98f7dd3ca321c46 SHA1 36cc8f8be1ae83ef9d79cdceff367e184e62027d SHA256 934781682c120b91f575a570c3b647d4e122200856a28a0edb2834980618333c
-MD5 46202a52c4d961253cc7c3c96eb3fbe3 ChangeLog 3205
-RMD160 48ba943dc3b3710c55b17be5f98f7dd3ca321c46 ChangeLog 3205
-SHA256 934781682c120b91f575a570c3b647d4e122200856a28a0edb2834980618333c ChangeLog 3205
+EBUILD triplea-0.8.2.2.ebuild 1438 RMD160 acb310079b0ca57fac6ba11b036fd9bbdbac7b21 SHA1 7d97fb8a577cf8a35e8b3e1087b7105c7d322bac SHA256 c3afefbcc36d135ec9a0c50ba77bf8f502e8926532060e8428d0ba9812fd44cb
+MD5 b740a6ffc98a3770847bd61584dabc53 triplea-0.8.2.2.ebuild 1438
+RMD160 acb310079b0ca57fac6ba11b036fd9bbdbac7b21 triplea-0.8.2.2.ebuild 1438
+SHA256 c3afefbcc36d135ec9a0c50ba77bf8f502e8926532060e8428d0ba9812fd44cb triplea-0.8.2.2.ebuild 1438
+MISC ChangeLog 3345 RMD160 734900307927fdc4d719467cfee4c8675ba67222 SHA1 3c8adeefe081b54df0b39aab298422efb6d1696a SHA256 6e9255f62f855194c170ee1b7c65ee8ee734c95d2aa8886916f5e45be8adde14
+MD5 008cec2d207b918de1dbc5004e24f6a6 ChangeLog 3345
+RMD160 734900307927fdc4d719467cfee4c8675ba67222 ChangeLog 3345
+SHA256 6e9255f62f855194c170ee1b7c65ee8ee734c95d2aa8886916f5e45be8adde14 ChangeLog 3345
 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 9cb78f2eb6249cc8234b525974136f47ccc8b8b59bd82fe5f7ed2ffb578b734e files/di
 MD5 d5df04fd5c20cef8c6d0f5ae384da22a files/digest-triplea-0.8.2.2 292
 RMD160 3f71fea942f76727f530b1b3a7ae4d94b5aa5df5 files/digest-triplea-0.8.2.2 292
 SHA256 5f9faffb2d2ae9e7e145d58b309e9701a668e3d3c60b97e6f13bec1a1c18c880 files/digest-triplea-0.8.2.2 292
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFjsjCdz7hIScOURERAiOgAJ9jkIUoBTRODUl+1aPQldP8f4FzQQCeNqhh
+4jZobFJjXXUuEoCu7EBbVdg=
+=/0/W
+-----END PGP SIGNATURE-----

diff --git a/games-strategy/triplea/triplea-0.8.2.2.ebuild b/games-strategy/triplea/triplea-0.8.2.2.ebuild
index 2f776d99af322321b3e715afff3b9f5cbdfa42f9..677bcf1c5ef096d59a9b0b593c8970888e40cb27 100644 (file)
--- a/games-strategy/triplea/triplea-0.8.2.2.ebuild
+++ b/games-strategy/triplea/triplea-0.8.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-0.8.2.2.ebuild,v 1.1 2006/11/10 18:04:28 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-0.8.2.2.ebuild,v 1.2 2006/12/24 18:36:43 nyhm Exp $
 
 inherit eutils java-ant-2 java-pkg-2 versionator games
 
@@ -25,10 +25,11 @@ S=${WORKDIR}/${PN}_${MY_PV}
 
 src_unpack() {
        unpack ${A}
-       cd "${S}"/lib
+       cd "${S}"
 
-       rm *.jar
-       java-pkg_jar-from jgoodies-looks-1.3 looks.jar looks-1.3.1.jar
+       rm lib/*.jar
+       java-pkg_jar-from jgoodies-looks-1.3 looks.jar lib/looks-1.3.1.jar
+       java-pkg_ensure-no-bundled-jars
 }
 
 src_compile() {
@@ -37,14 +38,13 @@ src_compile() {
 }
 
 src_install() {
-       games_make_wrapper ${PN} \
-               'java -cp classes:$(java-config -p jgoodies-looks-1.3) \
-                       games.strategy.engine.framework.GameRunner' \
-               "${GAMES_DATADIR}"/${PN}
-
        insinto "${GAMES_DATADIR}"/${PN}
        doins -r classes data games images maps || die "doins failed"
 
+       java-pkg_addcp "${GAMES_DATADIR}"/${PN}/classes
+       java-pkg_dolauncher ${PN} -into "${GAMES_PREFIX}" --main \
+               games.strategy.engine.framework.GameRunner
+
        newicon icons/triplea_icon.bmp ${PN}.bmp
        make_desktop_entry ${PN} TripleA /usr/share/pixmaps/${PN}.bmp