From 73ae598095a27020e5a1d127f5a0ff0c10b160db Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Fri, 14 Sep 2012 10:30:37 +0000
Subject: [PATCH] JOSM has got a newer version in the official tree

---
 sci-geosciences/josm/Manifest         |  2 -
 sci-geosciences/josm/josm-4667.ebuild | 54 ---------------------------
 2 files changed, 56 deletions(-)
 delete mode 100644 sci-geosciences/josm/Manifest
 delete mode 100644 sci-geosciences/josm/josm-4667.ebuild

diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
deleted file mode 100644
index 8590783..0000000
--- a/sci-geosciences/josm/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST josm-4667.tar.xz 15080308 RMD160 9e194899ac448052e455f64154f41413615d5070 SHA1 a091d0965f69e838a27da34b6a40d36a12b1bca4 SHA256 aad246602688e613ac2b0deb2390a8443b5b3e98206ff4e7c346dddd8b7e02e3
-EBUILD josm-4667.ebuild 1659 RMD160 b69fce9cac835cd1f55999e8c5883cf5074f2406 SHA1 e198686b79ed43ff0388693e47a61f7745b52f76 SHA256 1b8970def5b3a50fe69f80c5ba0b8ac454d4f82748ca39131d4248018cb92896
diff --git a/sci-geosciences/josm/josm-4667.ebuild b/sci-geosciences/josm/josm-4667.ebuild
deleted file mode 100644
index 7b4cabb..0000000
--- a/sci-geosciences/josm/josm-4667.ebuild
+++ /dev/null
@@ -1,54 +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-4550.ebuild,v 1.1 2011/11/24 18:55:06 hanno 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
-        >=dev-vcs/subversion-1.7"
-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-optimized
-}
-
-src_install() {
-	java-pkg_newjar "dist/${PN}-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"
-}