summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-geosciences/josm
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-geosciences/josm')
-rw-r--r--sci-geosciences/josm/Manifest4
-rw-r--r--sci-geosciences/josm/files/josm-7347-dist-optimized-fix.patch34
-rw-r--r--sci-geosciences/josm/josm-5485.ebuild58
-rw-r--r--sci-geosciences/josm/josm-5608.ebuild53
-rw-r--r--sci-geosciences/josm/josm-6060.ebuild53
-rw-r--r--sci-geosciences/josm/josm-7347.ebuild74
-rw-r--r--sci-geosciences/josm/josm-9999.ebuild53
-rw-r--r--sci-geosciences/josm/metadata.xml8
8 files changed, 337 insertions, 0 deletions
diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
new file mode 100644
index 000000000000..a77ffa9bd79c
--- /dev/null
+++ b/sci-geosciences/josm/Manifest
@@ -0,0 +1,4 @@
+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/files/josm-7347-dist-optimized-fix.patch b/sci-geosciences/josm/files/josm-7347-dist-optimized-fix.patch
new file mode 100644
index 000000000000..7ad808c9c98d
--- /dev/null
+++ b/sci-geosciences/josm/files/josm-7347-dist-optimized-fix.patch
@@ -0,0 +1,34 @@
+Index: trunk/build.xml
+
+This is the fix for josm bug #7351, which affects Gentoo builds.
+===================================================================
+--- a/trunk/build.xml
++++ b/trunk/build.xml
+@@ -230,6 +230,8 @@
+ <compilerarg value="-Xlint:static"/>
+ <compilerarg value="-Xlint:try"/>
+ <compilerarg value="-Xlint:unchecked"/>
++ <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
++ <compilerarg value="-XDignore.symbol.file"/>
+ </javac>
+ <copy todir="build" failonerror="no" includeemptydirs="no">
+ <fileset dir="resources"/>
+@@ -419,7 +421,7 @@
+ -keep class JOSM
+ -keep class * extends org.openstreetmap.josm.io.FileImporter
+ -keep class * extends org.openstreetmap.josm.io.FileExporter
+- -keep class org.openstreetmap.josm.data.imagery.types.Adapter1
++ -keep class org.w3._2001.xmlschema.Adapter1
+ -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
+
+ -keepclassmembers enum * {
+@@ -432,7 +434,8 @@
+ public protected *;
+ }
+
+- # Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'. This notes should not be a problem as we don't use obfuscation
++ # Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'.
++ # This note should not be a problem as we don't use obfuscation
+ -dontnote
+ </proguard>
+ </target>
diff --git a/sci-geosciences/josm/josm-5485.ebuild b/sci-geosciences/josm/josm-5485.ebuild
new file mode 100644
index 000000000000..068eefcb9d1e
--- /dev/null
+++ b/sci-geosciences/josm/josm-5485.ebuild
@@ -0,0 +1,58 @@
+# 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"
+}
diff --git a/sci-geosciences/josm/josm-5608.ebuild b/sci-geosciences/josm/josm-5608.ebuild
new file mode 100644
index 000000000000..573c66f4cfb6
--- /dev/null
+++ b/sci-geosciences/josm/josm-5608.ebuild
@@ -0,0 +1,53 @@
+# 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
new file mode 100644
index 000000000000..bab1795ae45d
--- /dev/null
+++ b/sci-geosciences/josm/josm-6060.ebuild
@@ -0,0 +1,53 @@
+# 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
new file mode 100644
index 000000000000..e2132426a8a1
--- /dev/null
+++ b/sci-geosciences/josm/josm-7347.ebuild
@@ -0,0 +1,74 @@
+# 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"
+}
diff --git a/sci-geosciences/josm/josm-9999.ebuild b/sci-geosciences/josm/josm-9999.ebuild
new file mode 100644
index 000000000000..221c044ddd03
--- /dev/null
+++ b/sci-geosciences/josm/josm-9999.ebuild
@@ -0,0 +1,53 @@
+# 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/"
+[[ ${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/metadata.xml b/sci-geosciences/josm/metadata.xml
new file mode 100644
index 000000000000..3beda91ba209
--- /dev/null
+++ b/sci-geosciences/josm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>