Gentoo Archives: gentoo-commits

From: Joe Sapp <nixphoeni@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
Date: Tue, 27 Jun 2017 01:16:23
Message-Id: 1498526139.cff6c0b976c39b83f695be11b779d6ca8a24142e.nixphoeni@gentoo
1 commit: cff6c0b976c39b83f695be11b779d6ca8a24142e
2 Author: Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 27 01:15:39 2017 +0000
4 Commit: Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 27 01:15:39 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff6c0b9
7
8 sci-geosciences/josm: Remove 10327 per bug #606728
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 sci-geosciences/josm/Manifest | 1 -
13 sci-geosciences/josm/josm-10327.ebuild | 68 ----------------------------------
14 2 files changed, 69 deletions(-)
15
16 diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
17 index 99cd1a033b3..3cdb3c8bc7d 100644
18 --- a/sci-geosciences/josm/Manifest
19 +++ b/sci-geosciences/josm/Manifest
20 @@ -1,2 +1 @@
21 -DIST josm-10327.tar.gz 53601409 SHA256 d5ec24cb47c3e6c7423efe4eeedbe419c9d16b9764f9dfd491445b2d2b085630 SHA512 a7c0ecb0e9a8d76b26ab2a8d3e3f8a066133ce4de30eb32a645e0efb7772d5e4f52129804103c1ffe2816f8daf8937ad15fc915c7aad29f6a1897dc003bc521a WHIRLPOOL 3638921c85176678a26677581c8bc8b5aa5ea1babafe1f41d7458031d1a2b1c0189800395a29dd3c8117623918fe3f116fb26a3e39664e5dec6e2352a3df7b5c
22 DIST josm-10966.tar.gz 61397663 SHA256 2326bffc7cd3c92a8cd4bf627a8cd591e097eb17917564f57ba54f22d2a643f1 SHA512 a710e8c8b696955140a858dcb53184515a5c0d7b8cde71099258690b26cc980b903cfea2e4ef9b7fbf524e3b8a153f71d4464260294b0fdcf8941812ffe6b5ee WHIRLPOOL ba4f3fe811b3c4c5cc3b53d4ae311db10c10dff76bac89629bbbf369b15a39e43fed438b3c7afbf57a14996127b22167e6205c8a3f2b1161102918fde976314c
23
24 diff --git a/sci-geosciences/josm/josm-10327.ebuild b/sci-geosciences/josm/josm-10327.ebuild
25 deleted file mode 100644
26 index 8ae70d6671a..00000000000
27 --- a/sci-geosciences/josm/josm-10327.ebuild
28 +++ /dev/null
29 @@ -1,68 +0,0 @@
30 -# Copyright 1999-2017 Gentoo Foundation
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=5
34 -
35 -JAVA_ANT_ENCODING=UTF-8
36 -
37 -[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
38 -ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
39 -inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
40 -unset SUBVERSION_ECLASS
41 -
42 -DESCRIPTION="Java-based editor for the OpenStreetMap project"
43 -HOMEPAGE="http://josm.openstreetmap.de/"
44 -# Upstream doesn't provide versioned tarballs, so we'll have to create one on our own:
45 -# REVISION=${PV}
46 -# mkdir -p josm-${REVISION}
47 -# svn co -r ${REVISION} http://josm.openstreetmap.de/svn/trunk/ josm-${REVISION}
48 -# cd josm-${REVISION} && ant init-svn-revision-xml && cd -
49 -# tar -cz --exclude=.svn -f /usr/portage/distfiles/josm-${REVISION}.tar.gz josm-${REVISION}
50 -[[ ${PV} == "9999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz"
51 -
52 -LICENSE="GPL-2"
53 -SLOT="0"
54 -
55 -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
56 -[[ ${PV} == "9999" ]] || \
57 -KEYWORDS="amd64 x86"
58 -
59 -DEPEND=">=virtual/jdk-1.7"
60 -RDEPEND=">=virtual/jre-1.7"
61 -
62 -IUSE=""
63 -
64 -src_prepare() {
65 -
66 - if [[ ${PV} == "9999" ]]; then
67 -
68 - # create-revision needs the compile directory to be a svn directory
69 - # see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
70 - sed -i \
71 - -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
72 - build.xml || die "sed failed"
73 -
74 - else
75 -
76 - # Remove dependency on git and svn just for generating a
77 - # revision - the tarball should already have REVISION.XML
78 - sed -i -e 's:, *init-git-revision-xml::g' \
79 - -e '/<exec[ \t].*"svn"[ \t].*/,+5{d;n;}' \
80 - -e 's:${svn.info.result}:1:' \
81 - build.xml || die "sed failed"
82 -
83 - fi
84 -
85 -}
86 -
87 -src_compile() {
88 - eant dist-optimized
89 -}
90 -
91 -src_install() {
92 - java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
93 - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
94 -
95 - newicon images/logo.png josm.png || die "newicon failed"
96 - make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
97 -}