Version bump to the latest. Drop older.

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

3 files changed, 61 insertions, 37 deletions

diff --git a/sci-geosciences/josm/ChangeLog b/sci-geosciences/josm/ChangeLog
index eb6de1a45fce..4fd57567ec97 100644
--- a/sci-geosciences/josm/ChangeLog
+++ b/sci-geosciences/josm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/josm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.38 2011/06/17 10:00:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.39 2011/07/06 12:23:37 scarabeus Exp $
+
+*josm-4201 (06 Jul 2011)
+
+  06 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> -josm-4064.ebuild,
+  +josm-4201.ebuild:
+  Version bump to the latest. Drop older.
 
 *josm-9999 (17 Jun 2011)
 
diff --git a/sci-geosciences/josm/josm-4064.ebuild b/sci-geosciences/josm/josm-4064.ebuild
deleted file mode 100644
index e75b2028950f..000000000000
--- a/sci-geosciences/josm/josm-4064.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-4064.ebuild,v 1.1 2011/06/08 11:40:49 scarabeus Exp $
-
-EAPI=4
-
-JAVA_ANT_ENCODING=UTF-8
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="http://josm.openstreetmap.de/"
-SRC_URI="http://josm.fabian-fingerle.de/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}"
-
-IUSE=""
-
-src_compile() {
-	eant dist
-}
-
-src_install() {
-	java-pkg_newjar "dist/${PN}.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 "Science;Geoscience"
-}
diff --git a/sci-geosciences/josm/josm-4201.ebuild b/sci-geosciences/josm/josm-4201.ebuild
new file mode 100644
index 000000000000..b02645e005e7
--- /dev/null
+++ b/sci-geosciences/josm/josm-4201.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-4201.ebuild,v 1.1 2011/07/06 12:23:37 scarabeus Exp $
+
+EAPI=4
+
+JAVA_ANT_ENCODING=UTF-8
+
+[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
+inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
+unset SUBVERSION_ECLASS
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+[[ ${PV} == "9999" ]] || SRC_URI="http://josm.fabian-fingerle.de/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ ${PV} == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+IUSE=""
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]]; then
+		sed -i \
+			-e "s:josm-custom.jar:josm.jar:" \
+			-e "s:josm-custom-optimized.jar:josm-optimized.jar:" \
+			build.xml || die "Sed failed"
+
+		# create-revision needs the compile directory to be a svn directory
+		# see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
+		sed -i \
+			-e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
+			build.xml || die "Sed failed"
+	fi
+}
+
+src_compile() {
+	eant dist
+}
+
+src_install() {
+	java-pkg_newjar "dist/${PN}.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 "Science;Geoscience"
+}