Version bump, switch to different source archives that allow building without svn

(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 0xA5880072BBB51E42)

1 files changed, 12 insertions, 13 deletions

diff --git a/sci-geosciences/josm/josm-9999.ebuild b/sci-geosciences/josm/josm-9999.ebuild
index 3f171c7a3715..24b2da6077dc 100644
--- a/sci-geosciences/josm/josm-9999.ebuild
+++ b/sci-geosciences/josm/josm-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild,v 1.1 2011/06/17 10:00:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild,v 1.2 2013/01/13 12:28:13 hanno Exp $
 
-EAPI=4
+EAPI=5
 
 JAVA_ANT_ENCODING=UTF-8
 
@@ -13,25 +13,24 @@ 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"
+[[ ${PV} == "9999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ ${PV} == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${P}"
 
 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
@@ -42,13 +41,13 @@ src_prepare() {
 }
 
 src_compile() {
-	eant dist
+	eant dist-optimized
 }
 
 src_install() {
-	java-pkg_newjar "dist/${PN}.jar" || die "java-pkg_newjar failed"
+	java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${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"
+	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
 }