sci-geosciences/josm: Version bump to 10966

This also bumps the required java version since josm now appears to depend on newer features.

Package-Manager: portage-2.3.0

2 files changed, 70 insertions, 0 deletions

diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index 5e3f56ce7145..eb296dfb07ef 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,4 +1,5 @@
 DIST josm-10327.tar.gz 53601409 SHA256 d5ec24cb47c3e6c7423efe4eeedbe419c9d16b9764f9dfd491445b2d2b085630 SHA512 a7c0ecb0e9a8d76b26ab2a8d3e3f8a066133ce4de30eb32a645e0efb7772d5e4f52129804103c1ffe2816f8daf8937ad15fc915c7aad29f6a1897dc003bc521a WHIRLPOOL 3638921c85176678a26677581c8bc8b5aa5ea1babafe1f41d7458031d1a2b1c0189800395a29dd3c8117623918fe3f116fb26a3e39664e5dec6e2352a3df7b5c
+DIST josm-10966.tar.gz 61397663 SHA256 2326bffc7cd3c92a8cd4bf627a8cd591e097eb17917564f57ba54f22d2a643f1 SHA512 a710e8c8b696955140a858dcb53184515a5c0d7b8cde71099258690b26cc980b903cfea2e4ef9b7fbf524e3b8a153f71d4464260294b0fdcf8941812ffe6b5ee WHIRLPOOL ba4f3fe811b3c4c5cc3b53d4ae311db10c10dff76bac89629bbbf369b15a39e43fed438b3c7afbf57a14996127b22167e6205c8a3f2b1161102918fde976314c
 DIST josm-8800.tar.gz 39442264 SHA256 50859314c18118e93788b511660012eb9eefc9e90653e72be999bc6aa0e24ea3 SHA512 3a002d49508386daaad656feff9e305734f3fdedfc7da29fd3f821a623c875f25f3855e1cc0a073cee119e66e7dc05f732b4eccf23a2cb1ae0a0eda9d5fc5f86 WHIRLPOOL 2ad4397d34d15efff1233aad593042a90a552574ecd1f89c6b7953133fd9803de348de9a27f89bdc509b3b691e9ce618e6b32a8aba669ed032768873a4a23a54
 DIST josm-9060.tar.gz 39757613 SHA256 a6be6ce30f48b9dde83b2a8489fa2b406394c7168763d66bc8d0f6110a3df6e6 SHA512 e5506cd38ba5dec88f66becfd7cdc33741ddebe8fc8cc31c0af20c818c2201a39936f27cad6cd6be9a5bbdbc69c52ccf0fd58f771477f537430dea68d89384bf WHIRLPOOL 13daab7bfa2f0c4b334e821a940f51ecba246c23bd4fe8f3fde3106f7048662ab94a2319117d4faa2b49c4341683ea036a9f69027b345653ae63735776268f8d
 DIST josm-9900.tar.gz 51719690 SHA256 39bd285ec5c461a73b864b26f30c659b15d296c80f503e0073bde3fbfad0998d SHA512 b32c63abd9b57c244de9f30f4f43cf1ef095f0bc4a21aa8e30d56e226f4e5efb97800be721c8331f6ad9bc780b63572a2801101afb7c252386e36c5ef2caff3b WHIRLPOOL f0b2595205e522b0e492ebd2680316e20baf529009dd497aa8b3dfb33a83c7e59de870cdfa923e58c109e0bd3a08a1ee043082293a194e2b93a589b8f12d1c85
diff --git a/sci-geosciences/josm/josm-10966.ebuild b/sci-geosciences/josm/josm-10966.ebuild
new file mode 100644
index 000000000000..629539ef03cc
--- /dev/null
+++ b/sci-geosciences/josm/josm-10966.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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/"
+# Upstream doesn't provide versioned tarballs, so we'll have to create one on our own:
+# REVISION=${PV}
+# mkdir -p josm-${REVISION}
+# svn co -r ${REVISION} http://josm.openstreetmap.de/svn/trunk/ josm-${REVISION}
+# cd josm-${REVISION} && ant init-svn-revision-xml && cd -
+# tar -cz  --exclude=.svn -f /usr/portage/distfiles/josm-${REVISION}.tar.gz josm-${REVISION}
+[[ ${PV} == "9999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+IUSE=""
+
+src_prepare() {
+
+	if [[ ${PV} == "9999" ]]; then
+
+		# 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"
+
+	else
+
+		# Remove dependency on git and svn just for generating a
+		# revision - the tarball should already have REVISION.XML
+		sed -i -e 's:, *init-git-revision-xml::g' \
+			-e '/<exec[ \t].*"svn"[ \t].*/,+5{d;n;}' \
+			-e 's:${svn.info.result}:1:' \
+			build.xml || die "sed failed"
+
+	fi
+
+}
+
+src_compile() {
+	eant dist-optimized
+}
+
+src_install() {
+	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 "Utility;Science;Geoscience"
+}