public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2016-06-15  1:22 Joe Sapp
  0 siblings, 0 replies; 17+ messages in thread
From: Joe Sapp @ 2016-06-15  1:22 UTC (permalink / raw
  To: gentoo-commits

commit:     7c812c9f5f6ae73a760f021e39b37ff2ba747aaf
Author:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 01:22:02 2016 +0000
Commit:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 01:22:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c812c9f

sci-geosciences/josm: Version bump to 10327

Package-Manager: portage-2.3.0_rc1

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

diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index 5cbb181..5e3f56c 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,3 +1,4 @@
+DIST josm-10327.tar.gz 53601409 SHA256 d5ec24cb47c3e6c7423efe4eeedbe419c9d16b9764f9dfd491445b2d2b085630 SHA512 a7c0ecb0e9a8d76b26ab2a8d3e3f8a066133ce4de30eb32a645e0efb7772d5e4f52129804103c1ffe2816f8daf8937ad15fc915c7aad29f6a1897dc003bc521a WHIRLPOOL 3638921c85176678a26677581c8bc8b5aa5ea1babafe1f41d7458031d1a2b1c0189800395a29dd3c8117623918fe3f116fb26a3e39664e5dec6e2352a3df7b5c
 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-10327.ebuild b/sci-geosciences/josm/josm-10327.ebuild
new file mode 100644
index 0000000..ffdc8e0
--- /dev/null
+++ b/sci-geosciences/josm/josm-10327.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"
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2021-08-29 22:46 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2021-08-29 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     6c32c60da84b778583aaf7227bc9f0b24b15e89d
Author:     Guillaume Castagnino <casta <AT> xwing <DOT> info>
AuthorDate: Mon Sep  3 07:51:42 2018 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 22:43:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c32c60d

sci-geosciences/josm: josm now uses a svg icon

PR from the INODE64 Sistemas patch on gentoo bug #648838

Closes: https://github.com/gentoo/gentoo/pull/9771
Closes: https://bugs.gentoo.org/648838
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Signed-off-by: Guillaume Castagnino <casta <AT> xwing.info>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sci-geosciences/josm/josm-99999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/josm/josm-99999.ebuild b/sci-geosciences/josm/josm-99999.ebuild
index fb12e465c39..58def9eb19e 100644
--- a/sci-geosciences/josm/josm-99999.ebuild
+++ b/sci-geosciences/josm/josm-99999.ebuild
@@ -45,6 +45,6 @@ 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"
+	newicon images/logo.svg josm.svg || die "newicon failed"
 	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
 }


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2018-05-21 17:05 Aaron Bauman
  0 siblings, 0 replies; 17+ messages in thread
From: Aaron Bauman @ 2018-05-21 17:05 UTC (permalink / raw
  To: gentoo-commits

commit:     95583802e524c3723286401af01b845f2f393bed
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon May 21 10:27:03 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon May 21 17:02:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95583802

sci-geosciences/josm: use HTTPs

 sci-geosciences/josm/josm-10966.ebuild | 10 +++++-----
 sci-geosciences/josm/josm-99999.ebuild |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sci-geosciences/josm/josm-10966.ebuild b/sci-geosciences/josm/josm-10966.ebuild
index e143e67b42d..a357e498979 100644
--- a/sci-geosciences/josm/josm-10966.ebuild
+++ b/sci-geosciences/josm/josm-10966.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,16 +6,16 @@ EAPI=5
 JAVA_ANT_ENCODING=UTF-8
 
 [[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
-ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
+ESVN_REPO_URI="https://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/"
+HOMEPAGE="https://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}
+# svn co -r ${REVISION} https://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"
@@ -37,7 +37,7 @@ 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
+		# see also https://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"

diff --git a/sci-geosciences/josm/josm-99999.ebuild b/sci-geosciences/josm/josm-99999.ebuild
index 95317b08194..fb12e465c39 100644
--- a/sci-geosciences/josm/josm-99999.ebuild
+++ b/sci-geosciences/josm/josm-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,12 +6,12 @@ EAPI=5
 JAVA_ANT_ENCODING=UTF-8
 
 [[ ${PV} == "99999" ]] && SUBVERSION_ECLASS="subversion"
-ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
+ESVN_REPO_URI="https://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/"
+HOMEPAGE="https://josm.openstreetmap.de/"
 [[ ${PV} == "99999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"
 
 LICENSE="GPL-2"
@@ -30,7 +30,7 @@ src_prepare() {
 	if [[ ${PV} == "99999" ]]; then
 
 		# create-revision needs the compile directory to be a svn directory
-		# see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
+		# see also https://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"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2017-06-27  1:16 Joe Sapp
  0 siblings, 0 replies; 17+ messages in thread
From: Joe Sapp @ 2017-06-27  1:16 UTC (permalink / raw
  To: gentoo-commits

commit:     cff6c0b976c39b83f695be11b779d6ca8a24142e
Author:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 01:15:39 2017 +0000
Commit:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 01:15:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff6c0b9

sci-geosciences/josm: Remove 10327 per bug #606728

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sci-geosciences/josm/Manifest          |  1 -
 sci-geosciences/josm/josm-10327.ebuild | 68 ----------------------------------
 2 files changed, 69 deletions(-)

diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index 99cd1a033b3..3cdb3c8bc7d 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,2 +1 @@
-DIST josm-10327.tar.gz 53601409 SHA256 d5ec24cb47c3e6c7423efe4eeedbe419c9d16b9764f9dfd491445b2d2b085630 SHA512 a7c0ecb0e9a8d76b26ab2a8d3e3f8a066133ce4de30eb32a645e0efb7772d5e4f52129804103c1ffe2816f8daf8937ad15fc915c7aad29f6a1897dc003bc521a WHIRLPOOL 3638921c85176678a26677581c8bc8b5aa5ea1babafe1f41d7458031d1a2b1c0189800395a29dd3c8117623918fe3f116fb26a3e39664e5dec6e2352a3df7b5c
 DIST josm-10966.tar.gz 61397663 SHA256 2326bffc7cd3c92a8cd4bf627a8cd591e097eb17917564f57ba54f22d2a643f1 SHA512 a710e8c8b696955140a858dcb53184515a5c0d7b8cde71099258690b26cc980b903cfea2e4ef9b7fbf524e3b8a153f71d4464260294b0fdcf8941812ffe6b5ee WHIRLPOOL ba4f3fe811b3c4c5cc3b53d4ae311db10c10dff76bac89629bbbf369b15a39e43fed438b3c7afbf57a14996127b22167e6205c8a3f2b1161102918fde976314c

diff --git a/sci-geosciences/josm/josm-10327.ebuild b/sci-geosciences/josm/josm-10327.ebuild
deleted file mode 100644
index 8ae70d6671a..00000000000
--- a/sci-geosciences/josm/josm-10327.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2017-02-16 17:26 Agostino Sarubbo
  0 siblings, 0 replies; 17+ messages in thread
From: Agostino Sarubbo @ 2017-02-16 17:26 UTC (permalink / raw
  To: gentoo-commits

commit:     ba0dd6a63235868ddc73495d4b614adf67c8fd82
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 17:25:39 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 17:25:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0dd6a6

sci-geosciences/josm: x86 stable wrt bug #609514

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/josm/josm-10966.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/josm/josm-10966.ebuild b/sci-geosciences/josm/josm-10966.ebuild
index 0af8972c2b..82473a27e5 100644
--- a/sci-geosciences/josm/josm-10966.ebuild
+++ b/sci-geosciences/josm/josm-10966.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == "9999" ]] || \
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2017-02-16 17:16 Agostino Sarubbo
  0 siblings, 0 replies; 17+ messages in thread
From: Agostino Sarubbo @ 2017-02-16 17:16 UTC (permalink / raw
  To: gentoo-commits

commit:     676b99b1d0f4d09017234901a571957a60fcf85c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 17:16:08 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 17:16:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=676b99b1

sci-geosciences/josm: amd64 stable wrt bug #609514

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/josm/josm-10966.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/josm/josm-10966.ebuild b/sci-geosciences/josm/josm-10966.ebuild
index 629539ef03..0af8972c2b 100644
--- a/sci-geosciences/josm/josm-10966.ebuild
+++ b/sci-geosciences/josm/josm-10966.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,7 +26,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2016-10-21  1:18 Joe Sapp
  0 siblings, 0 replies; 17+ messages in thread
From: Joe Sapp @ 2016-10-21  1:18 UTC (permalink / raw
  To: gentoo-commits

commit:     d839ed3b5ce3fb486a10fb8628355604b63601be
Author:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 01:18:18 2016 +0000
Commit:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
CommitDate: Fri Oct 21 01:18:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d839ed3b

sci-geosciences/josm: Remove old versions

Package-Manager: portage-2.3.0

 sci-geosciences/josm/Manifest         |  3 --
 sci-geosciences/josm/josm-8800.ebuild | 69 -----------------------------------
 sci-geosciences/josm/josm-9060.ebuild | 69 -----------------------------------
 sci-geosciences/josm/josm-9900.ebuild | 69 -----------------------------------
 4 files changed, 210 deletions(-)

diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index eb296df..99cd1a0 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,5 +1,2 @@
 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-8800.ebuild b/sci-geosciences/josm/josm-8800.ebuild
deleted file mode 100644
index 967420b..00000000
--- a/sci-geosciences/josm/josm-8800.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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} == "99999" ]] && 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} == "99999" ]] || 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} == "99999" ]] || \
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-IUSE=""
-
-src_prepare() {
-
-	if [[ ${PV} == "99999" ]]; 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"
-}

diff --git a/sci-geosciences/josm/josm-9060.ebuild b/sci-geosciences/josm/josm-9060.ebuild
deleted file mode 100644
index 967420b..00000000
--- a/sci-geosciences/josm/josm-9060.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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} == "99999" ]] && 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} == "99999" ]] || 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} == "99999" ]] || \
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-IUSE=""
-
-src_prepare() {
-
-	if [[ ${PV} == "99999" ]]; 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"
-}

diff --git a/sci-geosciences/josm/josm-9900.ebuild b/sci-geosciences/josm/josm-9900.ebuild
deleted file mode 100644
index 967420b..00000000
--- a/sci-geosciences/josm/josm-9900.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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} == "99999" ]] && 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} == "99999" ]] || 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} == "99999" ]] || \
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-IUSE=""
-
-src_prepare() {
-
-	if [[ ${PV} == "99999" ]]; 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"
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2016-10-21  1:10 Joe Sapp
  0 siblings, 0 replies; 17+ messages in thread
From: Joe Sapp @ 2016-10-21  1:10 UTC (permalink / raw
  To: gentoo-commits

commit:     4db1c42678b21f1a1f5363a9513699de01872b0f
Author:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 01:09:43 2016 +0000
Commit:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
CommitDate: Fri Oct 21 01:09:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db1c426

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

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

diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index 5e3f56c..eb296df 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 00000000..629539e
--- /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"
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2016-10-18  0:44 Joe Sapp
  0 siblings, 0 replies; 17+ messages in thread
From: Joe Sapp @ 2016-10-18  0:44 UTC (permalink / raw
  To: gentoo-commits

commit:     855466c6d20d9d78e09fc1d05b8eed0cfbd0ebfd
Author:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 00:43:58 2016 +0000
Commit:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 00:43:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855466c6

sci-geosciences/josm: Update maintainer

Package-Manager: portage-2.3.0

 sci-geosciences/josm/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/josm/metadata.xml b/sci-geosciences/josm/metadata.xml
index 7cbda53..351807a 100644
--- a/sci-geosciences/josm/metadata.xml
+++ b/sci-geosciences/josm/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>hanno@gentoo.org</email>
+    <email>nixphoeni@gentoo.org</email>
   </maintainer>
 <maintainer type="project">
     <email>sci-geosciences@gentoo.org</email>


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2016-08-18  7:32 Amy Winston
  0 siblings, 0 replies; 17+ messages in thread
From: Amy Winston @ 2016-08-18  7:32 UTC (permalink / raw
  To: gentoo-commits

commit:     9bce79b4939d567d90661949373952fe16017530
Author:     Lorand Jakab <lojakab <AT> cisco <DOT> com>
AuthorDate: Wed Aug 17 22:16:08 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 07:31:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bce79b4

sci-geosciences/josm: Require Java 8 for 99999

Gentoo-Bug: 589970
Closes: #2099

 sci-geosciences/josm/josm-99999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/josm/josm-99999.ebuild b/sci-geosciences/josm/josm-99999.ebuild
index 046af6e4..45c8282 100644
--- a/sci-geosciences/josm/josm-99999.ebuild
+++ b/sci-geosciences/josm/josm-99999.ebuild
@@ -22,8 +22,8 @@ SLOT="0"
 [[ ${PV} == "99999" ]] || \
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
 
 IUSE=""
 


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2016-03-07  2:16 Joe Sapp
  0 siblings, 0 replies; 17+ messages in thread
From: Joe Sapp @ 2016-03-07  2:16 UTC (permalink / raw
  To: gentoo-commits

commit:     7f2278ca687badb547c905da79196c7ae5d97e50
Author:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  7 02:14:44 2016 +0000
Commit:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 02:14:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f2278ca

sci-geosciences/josm: Remove redundant S= line from live ebuild

Package-Manager: portage-2.2.27

 sci-geosciences/josm/josm-99999.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sci-geosciences/josm/josm-99999.ebuild b/sci-geosciences/josm/josm-99999.ebuild
index d181e3d..046af6e4 100644
--- a/sci-geosciences/josm/josm-99999.ebuild
+++ b/sci-geosciences/josm/josm-99999.ebuild
@@ -25,8 +25,6 @@ KEYWORDS="~amd64 ~x86"
 DEPEND=">=virtual/jdk-1.7"
 RDEPEND=">=virtual/jre-1.7"
 
-S="${WORKDIR}/${P}"
-
 IUSE=""
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2016-03-07  2:13 Joe Sapp
  0 siblings, 0 replies; 17+ messages in thread
From: Joe Sapp @ 2016-03-07  2:13 UTC (permalink / raw
  To: gentoo-commits

commit:     d55f46de4eb63a5ccb3fb974df74bd908de8b77e
Author:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  7 02:11:50 2016 +0000
Commit:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 02:11:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d55f46de

sci-geosciences/josm: Move live ebuild to a larger version to avoid conflicts with anticipated upcoming real versions

Package-Manager: portage-2.2.27

 sci-geosciences/josm/josm-8800.ebuild                        | 10 +++++-----
 sci-geosciences/josm/josm-9060.ebuild                        | 10 +++++-----
 sci-geosciences/josm/josm-9900.ebuild                        |  8 ++++----
 sci-geosciences/josm/{josm-9999.ebuild => josm-99999.ebuild} | 10 +++++-----
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/sci-geosciences/josm/josm-8800.ebuild b/sci-geosciences/josm/josm-8800.ebuild
index 167d07c..967420b 100644
--- a/sci-geosciences/josm/josm-8800.ebuild
+++ b/sci-geosciences/josm/josm-8800.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 JAVA_ANT_ENCODING=UTF-8
 
-[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+[[ ${PV} == "99999" ]] && 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
@@ -19,13 +19,13 @@ HOMEPAGE="http://josm.openstreetmap.de/"
 # 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"
+[[ ${PV} == "99999" ]] || 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" ]] || \
+[[ ${PV} == "99999" ]] || \
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.7"
@@ -35,7 +35,7 @@ IUSE=""
 
 src_prepare() {
 
-	if [[ ${PV} == "9999" ]]; then
+	if [[ ${PV} == "99999" ]]; then
 
 		# create-revision needs the compile directory to be a svn directory
 		# see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html

diff --git a/sci-geosciences/josm/josm-9060.ebuild b/sci-geosciences/josm/josm-9060.ebuild
index 167d07c..967420b 100644
--- a/sci-geosciences/josm/josm-9060.ebuild
+++ b/sci-geosciences/josm/josm-9060.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 JAVA_ANT_ENCODING=UTF-8
 
-[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+[[ ${PV} == "99999" ]] && 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
@@ -19,13 +19,13 @@ HOMEPAGE="http://josm.openstreetmap.de/"
 # 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"
+[[ ${PV} == "99999" ]] || 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" ]] || \
+[[ ${PV} == "99999" ]] || \
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.7"
@@ -35,7 +35,7 @@ IUSE=""
 
 src_prepare() {
 
-	if [[ ${PV} == "9999" ]]; then
+	if [[ ${PV} == "99999" ]]; then
 
 		# create-revision needs the compile directory to be a svn directory
 		# see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html

diff --git a/sci-geosciences/josm/josm-9900.ebuild b/sci-geosciences/josm/josm-9900.ebuild
index ffdc8e0..967420b 100644
--- a/sci-geosciences/josm/josm-9900.ebuild
+++ b/sci-geosciences/josm/josm-9900.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 JAVA_ANT_ENCODING=UTF-8
 
-[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+[[ ${PV} == "99999" ]] && 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
@@ -19,13 +19,13 @@ HOMEPAGE="http://josm.openstreetmap.de/"
 # 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"
+[[ ${PV} == "99999" ]] || 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" ]] || \
+[[ ${PV} == "99999" ]] || \
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.7"
@@ -35,7 +35,7 @@ IUSE=""
 
 src_prepare() {
 
-	if [[ ${PV} == "9999" ]]; then
+	if [[ ${PV} == "99999" ]]; then
 
 		# create-revision needs the compile directory to be a svn directory
 		# see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html

diff --git a/sci-geosciences/josm/josm-9999.ebuild b/sci-geosciences/josm/josm-99999.ebuild
similarity index 84%
rename from sci-geosciences/josm/josm-9999.ebuild
rename to sci-geosciences/josm/josm-99999.ebuild
index 221c044..d181e3d 100644
--- a/sci-geosciences/josm/josm-9999.ebuild
+++ b/sci-geosciences/josm/josm-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,20 +6,20 @@ EAPI=5
 
 JAVA_ANT_ENCODING=UTF-8
 
-[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+[[ ${PV} == "99999" ]] && 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.hboeck.de/${P}.tar.xz"
+[[ ${PV} == "99999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == "9999" ]] || \
+[[ ${PV} == "99999" ]] || \
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.7"
@@ -30,7 +30,7 @@ S="${WORKDIR}/${P}"
 IUSE=""
 
 src_prepare() {
-	if [[ ${PV} == "9999" ]]; then
+	if [[ ${PV} == "99999" ]]; then
 
 		# create-revision needs the compile directory to be a svn directory
 		# see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2016-03-07  2:07 Joe Sapp
  0 siblings, 0 replies; 17+ messages in thread
From: Joe Sapp @ 2016-03-07  2:07 UTC (permalink / raw
  To: gentoo-commits

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"
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2016-02-29 12:19 Amy Winston
  0 siblings, 0 replies; 17+ messages in thread
From: Amy Winston @ 2016-02-29 12:19 UTC (permalink / raw
  To: gentoo-commits

commit:     5a23937d14aa97892e6e2b99245e6daf92297cc1
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 12:17:48 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 12:17:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a23937d

sci-geosciences/josm: Drop old versions

Package-Manager: portage-2.2.26

 sci-geosciences/josm/Manifest         |  3 --
 sci-geosciences/josm/josm-5608.ebuild | 53 -------------------------
 sci-geosciences/josm/josm-6060.ebuild | 53 -------------------------
 sci-geosciences/josm/josm-7347.ebuild | 74 -----------------------------------
 4 files changed, 183 deletions(-)

diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index 1f98ebd..e202366 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,5 +1,2 @@
-DIST josm-5608.tar.xz 13873780 SHA256 8f57b6045b06a5a37a2f2c399bfc5da55074c3a3d770a9e4b234d9738d90f6ad SHA512 7d5d9a6eed50dd3d4bee490d135f4243dcd6698f1193246c74813d71e7b6d5178772ae157aa041696b2c4d3525823683c4aae201f5bf69b1574e5e8312831ee0 WHIRLPOOL 9f79c504a67f2d14afd42d22e3773348b9a65d3e8598219747bf6df0b58393781dae35b5b4d131fbede4966a2255ad9cb8a4f76880f3b8d111f582224cf134a7
-DIST josm-6060.tar.xz 13999664 SHA256 aa1f113164d5fa05c46419252d22bee59543049510855b4e4cdf46ff530d303e SHA512 bb52c254230fbbcf19a2197a2d9218a0985a73d94c7389665c0bd1943eedef1807073d2216507e8457a3091d228d08e2a62e9ac4eca8a3252e74e8c16f488a45 WHIRLPOOL 12dc5e05be4016412ebbc780d822b4a4bb3a56294e0ec1cec962b37b72be7bddf55fb07f5e10f273667c6adb5d433d999d1c310e3f5931bcb9677b1c774c4692
-DIST josm-7347.tar.gz 25495047 SHA256 8f7af0bc15ff59899b5f35de68e0a164becf820611ef46f27ce0f201b9069073 SHA512 fe338f3617e4099ed0f2745cba8ae80540c04360d5419ecdbbe165b3afd7a459b09b9bf9342b8a38388a3a8803844d1ad4af6f39395c034c68149ba8e244c3b1 WHIRLPOOL 534c04f5472e7c113a092a78e0a5fae0020f231156cd4a6db4c1fa4bc29d777a12d08132d0f90c51a0fb88b168f270f6ecf0f9d4f8ca988c6f02baa47d505d55
 DIST josm-8800.tar.gz 39442264 SHA256 50859314c18118e93788b511660012eb9eefc9e90653e72be999bc6aa0e24ea3 SHA512 3a002d49508386daaad656feff9e305734f3fdedfc7da29fd3f821a623c875f25f3855e1cc0a073cee119e66e7dc05f732b4eccf23a2cb1ae0a0eda9d5fc5f86 WHIRLPOOL 2ad4397d34d15efff1233aad593042a90a552574ecd1f89c6b7953133fd9803de348de9a27f89bdc509b3b691e9ce618e6b32a8aba669ed032768873a4a23a54
 DIST josm-9060.tar.gz 39757613 SHA256 a6be6ce30f48b9dde83b2a8489fa2b406394c7168763d66bc8d0f6110a3df6e6 SHA512 e5506cd38ba5dec88f66becfd7cdc33741ddebe8fc8cc31c0af20c818c2201a39936f27cad6cd6be9a5bbdbc69c52ccf0fd58f771477f537430dea68d89384bf WHIRLPOOL 13daab7bfa2f0c4b334e821a940f51ecba246c23bd4fe8f3fde3106f7048662ab94a2319117d4faa2b49c4341683ea036a9f69027b345653ae63735776268f8d

diff --git a/sci-geosciences/josm/josm-5608.ebuild b/sci-geosciences/josm/josm-5608.ebuild
deleted file mode 100644
index 573c66f..0000000
--- a/sci-geosciences/josm/josm-5608.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 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/"
-[[ ${PV} == "9999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"
-
-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.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}"
-
-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"
-	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"
-}

diff --git a/sci-geosciences/josm/josm-6060.ebuild b/sci-geosciences/josm/josm-6060.ebuild
deleted file mode 100644
index bab1795..0000000
--- a/sci-geosciences/josm/josm-6060.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 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/"
-[[ ${PV} == "9999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"
-
-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"
-
-S="${WORKDIR}/${P}"
-
-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"
-	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"
-}

diff --git a/sci-geosciences/josm/josm-7347.ebuild b/sci-geosciences/josm/josm-7347.ebuild
deleted file mode 100644
index e213242..0000000
--- a/sci-geosciences/josm/josm-7347.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 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"
-
-S="${WORKDIR}/${P}"
-
-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"
-
-		# Fix for josm bug #10325
-		epatch "${FILESDIR}/${P}-dist-optimized-fix.patch"
-
-	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"
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2015-11-27 19:54 Joe Sapp
  0 siblings, 0 replies; 17+ messages in thread
From: Joe Sapp @ 2015-11-27 19:54 UTC (permalink / raw
  To: gentoo-commits

commit:     23e3f616d477c93a39f3475a7becdc3b433f4aec
Author:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 19:52:15 2015 +0000
Commit:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 19:53:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e3f616

Bump sci-geosciences/josm to 9060

Package-Manager: portage-2.2.25

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

diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index 513e71b..1f98ebd 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -2,3 +2,4 @@ DIST josm-5608.tar.xz 13873780 SHA256 8f57b6045b06a5a37a2f2c399bfc5da55074c3a3d7
 DIST josm-6060.tar.xz 13999664 SHA256 aa1f113164d5fa05c46419252d22bee59543049510855b4e4cdf46ff530d303e SHA512 bb52c254230fbbcf19a2197a2d9218a0985a73d94c7389665c0bd1943eedef1807073d2216507e8457a3091d228d08e2a62e9ac4eca8a3252e74e8c16f488a45 WHIRLPOOL 12dc5e05be4016412ebbc780d822b4a4bb3a56294e0ec1cec962b37b72be7bddf55fb07f5e10f273667c6adb5d433d999d1c310e3f5931bcb9677b1c774c4692
 DIST josm-7347.tar.gz 25495047 SHA256 8f7af0bc15ff59899b5f35de68e0a164becf820611ef46f27ce0f201b9069073 SHA512 fe338f3617e4099ed0f2745cba8ae80540c04360d5419ecdbbe165b3afd7a459b09b9bf9342b8a38388a3a8803844d1ad4af6f39395c034c68149ba8e244c3b1 WHIRLPOOL 534c04f5472e7c113a092a78e0a5fae0020f231156cd4a6db4c1fa4bc29d777a12d08132d0f90c51a0fb88b168f270f6ecf0f9d4f8ca988c6f02baa47d505d55
 DIST josm-8800.tar.gz 39442264 SHA256 50859314c18118e93788b511660012eb9eefc9e90653e72be999bc6aa0e24ea3 SHA512 3a002d49508386daaad656feff9e305734f3fdedfc7da29fd3f821a623c875f25f3855e1cc0a073cee119e66e7dc05f732b4eccf23a2cb1ae0a0eda9d5fc5f86 WHIRLPOOL 2ad4397d34d15efff1233aad593042a90a552574ecd1f89c6b7953133fd9803de348de9a27f89bdc509b3b691e9ce618e6b32a8aba669ed032768873a4a23a54
+DIST josm-9060.tar.gz 39757613 SHA256 a6be6ce30f48b9dde83b2a8489fa2b406394c7168763d66bc8d0f6110a3df6e6 SHA512 e5506cd38ba5dec88f66becfd7cdc33741ddebe8fc8cc31c0af20c818c2201a39936f27cad6cd6be9a5bbdbc69c52ccf0fd58f771477f537430dea68d89384bf WHIRLPOOL 13daab7bfa2f0c4b334e821a940f51ecba246c23bd4fe8f3fde3106f7048662ab94a2319117d4faa2b49c4341683ea036a9f69027b345653ae63735776268f8d

diff --git a/sci-geosciences/josm/josm-9060.ebuild b/sci-geosciences/josm/josm-9060.ebuild
new file mode 100644
index 0000000..167d07c
--- /dev/null
+++ b/sci-geosciences/josm/josm-9060.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 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"
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2015-10-18 20:08 Joe Sapp
  0 siblings, 0 replies; 17+ messages in thread
From: Joe Sapp @ 2015-10-18 20:08 UTC (permalink / raw
  To: gentoo-commits

commit:     4b22f025d74e8327eba2f32167ec59ab29299b52
Author:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 20:07:17 2015 +0000
Commit:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 20:08:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b22f025

sci-geosciences/josm: Remove version 5485

Removed due to deprecated EAPI, and is probably unused.

Package-Manager: portage-2.2.23

 sci-geosciences/josm/Manifest         |  1 -
 sci-geosciences/josm/josm-5485.ebuild | 58 -----------------------------------
 2 files changed, 59 deletions(-)

diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index 2f74e60..513e71b 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,4 +1,3 @@
-DIST josm-5485.tar.xz 14243884 SHA256 f6167a12b60198c4063aff2bf37aca84cfcbc6f175a017d1db542038e4b393dd SHA512 43a43240593e624cf5cd754df051ed631043179309f9ab2acf31b426c96647ca1feb6e2abae21b15a00da67b5705e7462a5ce7616ce5d4ca05499f530fc7ade3 WHIRLPOOL f56585859a44c879731f85f85ff76da941b72a77d99bf827c1fb2256709a4eca864f3ab2b97629980b178f23fb1abca947355419a0982ef1869a0570247e1eb2
 DIST josm-5608.tar.xz 13873780 SHA256 8f57b6045b06a5a37a2f2c399bfc5da55074c3a3d770a9e4b234d9738d90f6ad SHA512 7d5d9a6eed50dd3d4bee490d135f4243dcd6698f1193246c74813d71e7b6d5178772ae157aa041696b2c4d3525823683c4aae201f5bf69b1574e5e8312831ee0 WHIRLPOOL 9f79c504a67f2d14afd42d22e3773348b9a65d3e8598219747bf6df0b58393781dae35b5b4d131fbede4966a2255ad9cb8a4f76880f3b8d111f582224cf134a7
 DIST josm-6060.tar.xz 13999664 SHA256 aa1f113164d5fa05c46419252d22bee59543049510855b4e4cdf46ff530d303e SHA512 bb52c254230fbbcf19a2197a2d9218a0985a73d94c7389665c0bd1943eedef1807073d2216507e8457a3091d228d08e2a62e9ac4eca8a3252e74e8c16f488a45 WHIRLPOOL 12dc5e05be4016412ebbc780d822b4a4bb3a56294e0ec1cec962b37b72be7bddf55fb07f5e10f273667c6adb5d433d999d1c310e3f5931bcb9677b1c774c4692
 DIST josm-7347.tar.gz 25495047 SHA256 8f7af0bc15ff59899b5f35de68e0a164becf820611ef46f27ce0f201b9069073 SHA512 fe338f3617e4099ed0f2745cba8ae80540c04360d5419ecdbbe165b3afd7a459b09b9bf9342b8a38388a3a8803844d1ad4af6f39395c034c68149ba8e244c3b1 WHIRLPOOL 534c04f5472e7c113a092a78e0a5fae0020f231156cd4a6db4c1fa4bc29d777a12d08132d0f90c51a0fb88b168f270f6ecf0f9d4f8ca988c6f02baa47d505d55

diff --git a/sci-geosciences/josm/josm-5485.ebuild b/sci-geosciences/josm/josm-5485.ebuild
deleted file mode 100644
index 068eefc..0000000
--- a/sci-geosciences/josm/josm-5485.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${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 "Utility;Science;Geoscience"
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/
@ 2015-10-18 20:08 Joe Sapp
  0 siblings, 0 replies; 17+ messages in thread
From: Joe Sapp @ 2015-10-18 20:08 UTC (permalink / raw
  To: gentoo-commits

commit:     9ac12213ad68dcbb6c050d9d656ae04e0ca9f7d5
Author:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 20:04:04 2015 +0000
Commit:     Joe Sapp <nixphoeni <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 20:08:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac12213

sci-geosciences/josm: Version bump to 8800

Package-Manager: portage-2.2.23

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

diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index a77ffa9..2f74e60 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -2,3 +2,4 @@ DIST josm-5485.tar.xz 14243884 SHA256 f6167a12b60198c4063aff2bf37aca84cfcbc6f175
 DIST josm-5608.tar.xz 13873780 SHA256 8f57b6045b06a5a37a2f2c399bfc5da55074c3a3d770a9e4b234d9738d90f6ad SHA512 7d5d9a6eed50dd3d4bee490d135f4243dcd6698f1193246c74813d71e7b6d5178772ae157aa041696b2c4d3525823683c4aae201f5bf69b1574e5e8312831ee0 WHIRLPOOL 9f79c504a67f2d14afd42d22e3773348b9a65d3e8598219747bf6df0b58393781dae35b5b4d131fbede4966a2255ad9cb8a4f76880f3b8d111f582224cf134a7
 DIST josm-6060.tar.xz 13999664 SHA256 aa1f113164d5fa05c46419252d22bee59543049510855b4e4cdf46ff530d303e SHA512 bb52c254230fbbcf19a2197a2d9218a0985a73d94c7389665c0bd1943eedef1807073d2216507e8457a3091d228d08e2a62e9ac4eca8a3252e74e8c16f488a45 WHIRLPOOL 12dc5e05be4016412ebbc780d822b4a4bb3a56294e0ec1cec962b37b72be7bddf55fb07f5e10f273667c6adb5d433d999d1c310e3f5931bcb9677b1c774c4692
 DIST josm-7347.tar.gz 25495047 SHA256 8f7af0bc15ff59899b5f35de68e0a164becf820611ef46f27ce0f201b9069073 SHA512 fe338f3617e4099ed0f2745cba8ae80540c04360d5419ecdbbe165b3afd7a459b09b9bf9342b8a38388a3a8803844d1ad4af6f39395c034c68149ba8e244c3b1 WHIRLPOOL 534c04f5472e7c113a092a78e0a5fae0020f231156cd4a6db4c1fa4bc29d777a12d08132d0f90c51a0fb88b168f270f6ecf0f9d4f8ca988c6f02baa47d505d55
+DIST josm-8800.tar.gz 39442264 SHA256 50859314c18118e93788b511660012eb9eefc9e90653e72be999bc6aa0e24ea3 SHA512 3a002d49508386daaad656feff9e305734f3fdedfc7da29fd3f821a623c875f25f3855e1cc0a073cee119e66e7dc05f732b4eccf23a2cb1ae0a0eda9d5fc5f86 WHIRLPOOL 2ad4397d34d15efff1233aad593042a90a552574ecd1f89c6b7953133fd9803de348de9a27f89bdc509b3b691e9ce618e6b32a8aba669ed032768873a4a23a54

diff --git a/sci-geosciences/josm/josm-8800.ebuild b/sci-geosciences/josm/josm-8800.ebuild
new file mode 100644
index 0000000..167d07c
--- /dev/null
+++ b/sci-geosciences/josm/josm-8800.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 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"
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2021-08-29 22:46 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-15  1:22 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/ Joe Sapp
  -- strict thread matches above, loose matches on Subject: below --
2021-08-29 22:46 Conrad Kostecki
2018-05-21 17:05 Aaron Bauman
2017-06-27  1:16 Joe Sapp
2017-02-16 17:26 Agostino Sarubbo
2017-02-16 17:16 Agostino Sarubbo
2016-10-21  1:18 Joe Sapp
2016-10-21  1:10 Joe Sapp
2016-10-18  0:44 Joe Sapp
2016-08-18  7:32 Amy Winston
2016-03-07  2:16 Joe Sapp
2016-03-07  2:13 Joe Sapp
2016-03-07  2:07 Joe Sapp
2016-02-29 12:19 Amy Winston
2015-11-27 19:54 Joe Sapp
2015-10-18 20:08 Joe Sapp
2015-10-18 20:08 Joe Sapp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox