josm bump

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 41 insertions, 61 deletions

diff --git a/sci-geosciences/josm/ChangeLog b/sci-geosciences/josm/ChangeLog
index 4b365c1602ca..8423df15bcbf 100644
--- a/sci-geosciences/josm/ChangeLog
+++ b/sci-geosciences/josm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/josm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.25 2009/05/04 20:10:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.26 2009/05/23 09:14:29 hanno Exp $
+
+*josm-1.607 (23 May 2009)
+
+  23 May 2009; Hanno Boeck <hanno@gentoo.org> +josm-1.607.ebuild:
+  Version bump.
 
 *josm-1.566 (04 May 2009)
 
diff --git a/sci-geosciences/josm/josm-1.479.ebuild b/sci-geosciences/josm/josm-1.479.ebuild
deleted file mode 100644
index 9d94e3226de8..000000000000
--- a/sci-geosciences/josm/josm-1.479.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-1.479.ebuild,v 1.1 2009/03/18 12:12:19 hanno Exp $
-
-inherit eutils java-pkg-2
-
-MY_P=${PN}-snapshot-${PV/./}
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="http://josm.openstreetmap.de/"
-SRC_URI="http://josm.openstreetmap.de/download/${MY_P}.jar"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND=">=virtual/jre-1.6"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}"
-
-IUSE=""
-
-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"
-
-	doicon "${FILESDIR}/josm.png" || die "doicon failed"
-	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Application"
-}
diff --git a/sci-geosciences/josm/josm-1.515.ebuild b/sci-geosciences/josm/josm-1.515.ebuild
deleted file mode 100644
index 9e0f0c9b8a91..000000000000
--- a/sci-geosciences/josm/josm-1.515.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-1.515.ebuild,v 1.1 2009/04/01 12:24:28 hanno Exp $
-
-inherit eutils java-pkg-2
-
-MY_P=${PN}-snapshot-${PV/./}
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="http://josm.openstreetmap.de/"
-SRC_URI="http://josm.openstreetmap.de/download/${MY_P}.jar"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND=">=virtual/jre-1.6"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}"
-
-IUSE=""
-
-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"
-
-	doicon "${FILESDIR}/josm.png" || die "doicon failed"
-	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Application"
-}
diff --git a/sci-geosciences/josm/josm-1.607.ebuild b/sci-geosciences/josm/josm-1.607.ebuild
new file mode 100644
index 000000000000..63c13932ca00
--- /dev/null
+++ b/sci-geosciences/josm/josm-1.607.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-1.607.ebuild,v 1.1 2009/05/23 09:14:29 hanno Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P=${PN}-${PV/./}
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+SRC_URI="http://josm.fabian-fingerle.de/${MY_P}.tar.lzma"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+IUSE=""
+
+src_compile() {
+	JAVA_ANT_ENCODING=UTF-8
+	eant dist
+}
+
+src_install() {
+	java-pkg_newjar "dist/${PN}-custom.jar" || die "java-pkg_newjar failed"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+	newicon images/logo.png josm.png || die "newicon failed"
+	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Application"
+}