[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/

[Joe Sapp]

commit:     f0db684d56c33ce395ef757bf2daa36f32ca19fc
Author:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  7 02:04:46 2016 +0000
Commit:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 02:05:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0db684d

sci-geosciences/josm: Version bump to 9900

Package-Manager: portage-2.2.27

 sci-geosciences/josm/Manifest         |  1 +
 sci-geosciences/josm/josm-9900.ebuild | 69 +++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index e202366..5cbb181 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,2 +1,3 @@
 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-9900.ebuild 
b/sci-geosciences/josm/josm-9900.ebuild
new file mode 100644
index 0000000..ffdc8e0
--- /dev/null
+++ b/sci-geosciences/josm/josm-9900.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.7"
+RDEPEND=">=virtual/jre-1.7"
+
+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"
+}