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

[Amy Winston]

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