josm version bump and use java eclass

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-git6 i686

4 files changed, 63 insertions, 5 deletions

diff --git a/sci-geosciences/josm/ChangeLog b/sci-geosciences/josm/ChangeLog
index 6ff02bdccd45..43c32c27bece 100644
--- a/sci-geosciences/josm/ChangeLog
+++ b/sci-geosciences/josm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/josm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.14 2008/07/12 10:55:21 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.15 2008/07/21 00:16:20 hanno Exp $
+
+*josm-1.5_p732 (21 Jul 2008)
+
+  21 Jul 2008; Hanno Boeck <hanno@gentoo.org> +files/josm-r1,
+  +josm-1.5_p732.ebuild:
+  Version bump, use java eclass.
 
 *josm-1.5_p704 (12 Jul 2008)
 
diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index cf60843c019a..510d5ea726a6 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -2,10 +2,12 @@
 Hash: SHA1
 
 AUX josm 286 RMD160 bf46c0074f216e0d08b6b2088183611183bba154 SHA1 408270f9bb069046337d0196413bd1c21c46b76d SHA256 f1253c0160c817e066b6db2a6f088b1ed52fd588c82b4466d27da768d6e5f365
+AUX josm-r1 298 RMD160 bdb869a4ffc5e0b87fe4cd640bf1769507cb6597 SHA1 9e95f99915a19fe791bdee0edd7229690373fdab SHA256 10ee3a842d98719606622f71744d6ec52eddc367189fe62e3a889d6a95ed0cf9
 AUX josm.png 1737 RMD160 81fc37d55d4b6b14f9a35c3ed89da3ecd7d538f2 SHA1 cd51f118224555727279536bb42a634afcef6626 SHA256 fed9c1ef73900e6a3cac162a4006ab8cd972ba29938a857e8af604779109c39f
 DIST josm-snapshot-621.jar 1542790 RMD160 db30e38c510def079a653ca6ad4af6783975c139 SHA1 f622a79892df33559cd406ff724c6057b688521e SHA256 e07a6b780c8c8c07ee308cf90bc05c10be7e6c9a524f3bdf783296c3c66ffc4b
 DIST josm-snapshot-677.jar 1700967 RMD160 ba5c4b7af141974ef32799c15b921a961f205196 SHA1 22991c605f3a6789e161467150f5553169d781cb SHA256 311f6402201656f3bdfd0655b407ffe72966db2b544568b34e79d78408b1f978
 DIST josm-snapshot-704.jar 1711192 RMD160 6a59d0d8f27ae0cb2d917757d8b3db0fe3118f6e SHA1 f84e7f13f0c5f03205da2d5905e18fa3de580184 SHA256 c738615eae8fa19d0839af31b9d334eabcbfbdc47facc3792a3e3ff9568ef6e3
+DIST josm-snapshot-732.jar 1746262 RMD160 e4020de6832a4394df3db215f4450621df05483b SHA1 99fc75a485b8bab9e0457e3532225f621701bc13 SHA256 2ff46e05b25a231e6eddc7aa37c288e5e6c1f6a46485f36b0a79dc81e5d03b2c
 DIST lang-de-20080321.jar 43678 RMD160 e4ac194e46f291045d69b80c575bfd412a23c70f SHA1 54aa0f9c56e45ca733c95a1d96004fc3a2e22119 SHA256 62d28671e4fa35a3451161ccf55a19e76c310f0c7c54ce2f03d30ec8a4816b25
 DIST lang-de-20080705.jar 75594 RMD160 448766ae25f2612cdd18e9d1e84f8809b9823f43 SHA1 4677f0e49a5d00a770e88f7732dec5a3d0c816b3 SHA256 5f73a785ec25d7764ec02e7a8301e5ad049cc00bf01fecd24ae3a4cae47ccdb8
 DIST lang-en_GB-20080207.jar 15384 RMD160 1cd109db687e376bd4b33189a5cceaf5fe379360 SHA1 608fea6a4d2c129392022df0e87781b47fb0a478 SHA256 92308d212a6cdaa0a1dda8bf9d97b0d95aa3c5ff42e6e2773b2fac64fbc54e88
@@ -14,12 +16,13 @@ DIST lang-ro-20080207.jar 23019 RMD160 3ccacf43f4a8be7080e9a64929b222e71565c59f
 EBUILD josm-1.5_p621.ebuild 1469 RMD160 ec4ce181ccc5e7dced498f272cc326488a80c2c7 SHA1 b98e1e73942fd502c7fea8bdf2217a84ff45423e SHA256 a6861390d6e1aef80a1612ebd334f97ecd19203248d0f4782a36c4e366c6980a
 EBUILD josm-1.5_p677.ebuild 1469 RMD160 1d3e91f79f847ee61fe4137d84a9e7a3eec02187 SHA1 84b8dca3758d0f64bcd6cee0a4df409f6ac83f10 SHA256 43cfa56ac02a2c231902ca39a711c7c50e0cbe7c98fbce57ae3bbff0388ff42b
 EBUILD josm-1.5_p704.ebuild 1469 RMD160 f39424a03403c376bed1cab78f033677c4a49f9f SHA1 1d469a5c9491cd54f361c12a0c6a14ba27551449 SHA256 9435f3b95062c4d17e3bdf78de203deb5e2b096f5f2aec92a1e0c6cffc5331a7
-MISC ChangeLog 1915 RMD160 f43b0a88ee3cf3c085ffbb28e36ea781dd766889 SHA1 766dd6a597297e252d105d318b93904f7cbaa248 SHA256 395af1a65be86e7f5aede72de9e1a51a170fdf47459d02aa364d662b2a5b3573
+EBUILD josm-1.5_p732.ebuild 1571 RMD160 49296665035fde518e8445ad9e022211bb629a4e SHA1 f503123858004385575609e6173f1751aa5b4e09 SHA256 1b1ff9e290dad2ab1596f5134bb6329c357032696702a1c82e2d8d6948a0bcc6
+MISC ChangeLog 2066 RMD160 8b3777c9c2e20e4d977cc30fbb5ecebbce556744 SHA1 6fd96a1cf022611c210a362d0264904ac3e0e4e2 SHA256 f7948efe1946484479b5c753b53074b441c7494f891d74779eefe8611fdd73a7
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh4jaMACgkQr2QksT29OyAUFgCfTd0ffFjFf+ZKumjyXmdCmMEt
-iK8Anj/1kkDwxCfa+GufqqYJ9HVp8JEy
-=+ow8
+iEYEARECAAYFAkiD1VoACgkQr2QksT29OyDolgCfVANXYLwKp/xhXjKQ1H8sMHuX
+1zkAn0EbOhbC7TAr1b9OMw9jr6wiLX38
+=GumB
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/josm/files/josm-r1 b/sci-geosciences/josm/files/josm-r1
new file mode 100755
index 000000000000..8d9783e45639
--- /dev/null
+++ b/sci-geosciences/josm/files/josm-r1
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -z "$http_proxy" ]; then
+	java -jar /usr/share/josm/lib/josm.jar
+else
+	proxy_port=`echo $http_proxy|sed -e 's/.*://g'`
+	proxy_host=`echo $http_proxy|sed -e 's!.*://\(.*\):.*!\1!g'`
+	java -Dhttp.proxyHost=$proxy_host -Dhttp.proxyPort=$proxy_port -jar /usr/share/josm/lib/josm.jar
+fi
diff --git a/sci-geosciences/josm/josm-1.5_p732.ebuild b/sci-geosciences/josm/josm-1.5_p732.ebuild
new file mode 100644
index 000000000000..7667975cd505
--- /dev/null
+++ b/sci-geosciences/josm/josm-1.5_p732.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-1.5_p732.ebuild,v 1.1 2008/07/21 00:16:20 hanno Exp $
+
+inherit eutils java-pkg-2
+
+MY_P=${PN}-snapshot-${PV/1.5_p/}
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+SRC_URI="http://josm.openstreetmap.de/download/${MY_P}.jar
+	linguas_de? ( mirror://gentoo/lang-de-20080705.jar )
+	linguas_en_GB? ( mirror://gentoo/lang-en_GB-20080207.jar )
+	linguas_fr? ( mirror://gentoo/lang-fr-20080207.jar )
+	linguas_ro? ( mirror://gentoo/lang-ro-20080207.jar )"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND=">=virtual/jre-1.6"
+S="${WORKDIR}"
+
+LINGUAS="en de"
+IUSE="linguas_de linguas_en_GB linguas_fr linguas_ro"
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}/${MY_P}.jar"
+
+	# Using the eclass doesn't let us support the http_proxy var,
+	# so we're using our own startscript for now.
+	#java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newbin "${FILESDIR}/${PN}-r1" "${PN}" || die "dobin failed"
+
+	insinto /usr/share/josm/plugins
+	use linguas_de && newins "${DISTDIR}/lang-de-20080705.jar" lang-de.jar
+	use linguas_en_GB && newins "${DISTDIR}/lang-en_GB-20080207.jar" lang-en_GB.jar
+	use linguas_fr && newins "${DISTDIR}/lang-fr-20080207.jar" lang-fr.jar
+	use linguas_ro && newins "${DISTDIR}/lang-ro-20080207.jar" lang-ro.jar
+
+	doicon "${FILESDIR}/josm.png" || die "doicon failed"
+	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Application"
+}