From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 422991384B4 for ; Fri, 27 Nov 2015 19:54:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CC9821C06E; Fri, 27 Nov 2015 19:54:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1BF0E21C06E for ; Fri, 27 Nov 2015 19:54:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86E283404B1 for ; Fri, 27 Nov 2015 19:54:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C712E7 for ; Fri, 27 Nov 2015 19:54:15 +0000 (UTC) From: "Joe Sapp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joe Sapp" Message-ID: <1448654015.23e3f616d477c93a39f3475a7becdc3b433f4aec.nixphoeni@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/josm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/josm/Manifest sci-geosciences/josm/josm-9060.ebuild X-VCS-Directories: sci-geosciences/josm/ X-VCS-Committer: nixphoeni X-VCS-Committer-Name: Joe Sapp X-VCS-Revision: 23e3f616d477c93a39f3475a7becdc3b433f4aec X-VCS-Branch: master Date: Fri, 27 Nov 2015 19:54:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6b48f5f8-ca5b-4f9a-a93d-749e9d0790d1 X-Archives-Hash: 4586fbcc484b4c5aa5b5078f91b4d46a commit: 23e3f616d477c93a39f3475a7becdc3b433f4aec Author: Joe Sapp gentoo org> AuthorDate: Fri Nov 27 19:52:15 2015 +0000 Commit: Joe Sapp gentoo 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 '/