josm version bump and use java eclass

(Portage version: 2.2_rc1/cvs/Linux 2.6.26-git6 i686)

3 files changed, 56 insertions, 1 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/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"
+}