Version bump, cf. bug #483114

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x35488453

5 files changed, 128 insertions, 20 deletions

diff --git a/sci-geosciences/josm/ChangeLog b/sci-geosciences/josm/ChangeLog
index c39ab9e2501b..f8a8d0ed13a9 100644
--- a/sci-geosciences/josm/ChangeLog
+++ b/sci-geosciences/josm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/josm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.47 2013/07/17 10:06:32 hanno Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.48 2014/09/06 19:37:21 nixphoeni Exp $
+
+*josm-7347 (06 Sep 2014)
+
+  06 Sep 2014; Joe Sapp <nixphoeni@gentoo.org> +josm-7347.ebuild,
+  +files/josm-7347-dist-optimized-fix.patch:
+  Version bump; thanks to Marcel Pennewiß, Elias Probst, Thomas Beutin, and
+  Jean-Claude Repetto on bug #483114
 
 *josm-6060 (17 Jul 2013)
 
diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index 078e681b6ddc..60babcbaaf3a 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,29 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX josm-7347-dist-optimized-fix.patch 1576 SHA256 cd1194e31d9ec5bea7edeec456259cfeaa2061e58a161043db807e206f116152 SHA512 5b90963001f32e34be570b03681bc9d962a7466129a7257e66d4ebf1ba665ba7df091e2555c4e9ffe436c60215e4b2ffbcfe6cb332539121b4400a942f8cc651 WHIRLPOOL 1537d1ad3d11d9820f40da2314d4c639ab3e926c18ffe9df0a7428faa8c1d925009b3a87f9a1e727c40c594994b71c3bcb1ee168885d6853f585db50433851bf
 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
 EBUILD josm-5485.ebuild 1737 SHA256 da37915de524b2c875e2fcb156c77ffa61642d6dd8baab526a209fc681e64766 SHA512 41138d851948be72450050ea464ae78563e84ef64f6c660701df131b0768b034b92dd95fc8515abdea42a6d85c476195f1fa781c8fead7b39e0c316190849f9a WHIRLPOOL 228a8b100a69cf37d13d88ce32d1f1dd72260d1b0330fe45aae2753a40ec4bb7de4405fa093c74f214c3edb29f33fdc5d9a3e655b2d807eb7838f4a7d2b05ba8
 EBUILD josm-5608.ebuild 1570 SHA256 b23477c1c65945b572ed150cb321a6a8786908619f3e814ea9c4c78da690fe39 SHA512 a65058cdf76c3f90db4cf022953c9a4f52ac072fd71cd1f8e22c4f88515e0d95deb4e55f4f8b0decd8418af1f5a1e3db5d2bebe83322acc7b551eb8f392dcab7 WHIRLPOOL e22e9b88d63d6b6fa01671f8e80be70be922d9120779ee5a583aef621f5c2c7e50cba95ab030e6798c345107bbca21b2ae66c3442c382fa93ca053927cdba70e
 EBUILD josm-6060.ebuild 1570 SHA256 d72b21f72f3a95e71614aad4205c737bb14dd5fb2fe530733b12fae2978f2735 SHA512 c6a2b4a17c74b041dfc3dcd4b6864cef52fbd2afe1a12e069ca1b0efa287f69bb03e9532d4c87b0a7d788934b5b8427a32e8ba8a2238e3ba7daa819d2ec59487 WHIRLPOOL 26a97f434c2259ef55b3ff2677f8e2c228561ed5b0e3821a85b59a69089819748c4efe4fb46a0261e93339828ad95bac0cfd98d6d4eeb79a9be7a06322d58573
-EBUILD josm-9999.ebuild 1570 SHA256 d706b6dc3d0ba4edb2b2464c1ce62c329bbdf623489f94ecd6ce39fc2a30fa49 SHA512 9ba44412a73a2cc78335a9ad2aab0dfc5e9be236f88952e8b52ebe85869a8e7f7b0b7be7cf1b6f90ddcb1fca52e4e8337f945906c185a3fd45ac9b5140cf50ca WHIRLPOOL c1b8b4e93b9c1829f114d6ae3f19fd0e17fe19687c6743a17668b835a5292eb1985d7f379fdb61532ab01b8061f8ca76a280b450388e46b06ddc1e51dac9a3fb
-MISC ChangeLog 6477 SHA256 c07c25f3b80c1889aec176a7879635dd2c3394a75e9b0958c1c092f63d5c4bf9 SHA512 a3d70de9e6125b3dc3df734818a19c81133272200d43b40d51655a5123b488a999eb6b29b66d2df100bd431c135fdae8b78a4293a99fe9aae5616649dd8d017b WHIRLPOOL 5a61664a3bf4d59cc3a21d066465cd80a6469ff5e3ab7de259b260bb0cd9eef8ebb5b9f76e8c18a2292aa3281038f125f76fc4c56a33754b1a58cd08fce9f172
+EBUILD josm-7347.ebuild 2304 SHA256 bfac44aa97f9c50b7349b8dea8ff14a9cfd767750523a0cffd6142a31b53218a SHA512 fdead2de2620ca4a93b52bbfc879027bbe723b924e1b059f25881587ffbca526b001dda7f09befab059f9e167321fc7244a1d807c8674450162329d5a5334b0d WHIRLPOOL 75fd02047b6489ebdc1654f5628f341181ab7695c97a6f596da2af3eceb3c2cebbc09cf8d7031a514f25f327b47f0d222885c18e3230b1d81e49afec4a1419c8
+EBUILD josm-9999.ebuild 1574 SHA256 1e8470009b29c40409a60f35d3d3189a53e39454312e34cda91999c7547db93b SHA512 d9463e1332f5c615d657e1b1c96f90ff3f08427cb8f828d3b2b324c2c5d76852d3b15f053a1c09b2983ad1dd7c24c18ea2bbc1f94cb1650e4ab92c6678c61e67 WHIRLPOOL 44e4911c1407ebe58d15537cf12fa2410fdda1acf477206802e2c7fc7562ef4587ff2746aeef21ed831c76efe4a893b0ce6905faf8c3faf5aaa7b014dc8ab90f
+MISC ChangeLog 6733 SHA256 c6d98960a2e3dd78cd7c10854a50b4517c27905a5ebe584f11ba423bd32e00ab SHA512 3879551a034d59d5e00bfde27f40eea9e0caab903ce1f0bfcfab054eb81deab002d0fc0065a8d87f3fad533851c304558d965ab975cdd4c2cc008c22927da1ea WHIRLPOOL e6d0d14720f3c935ab7ca36a73476fff84a904e6fba5dfa809f20856f447d5293f6eec3e3107db135c0ad862f4ee7f04b201f514df16192d4f02e39ea9519bfe
 MISC metadata.xml 237 SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7 SHA512 191be9fad0be4a967ecd9cfd2e0014aa60b3fa84f332973e42058ebb8051dd0a6b497df7b9fa055836a0786b5e88a18a0505e7dc69b385e0fb0b2c8e34679639 WHIRLPOOL 0d8b2ffeb2ea3c9e22059f9e9c5ba0c40d774df9df0cd2cc54d0d47758c4b275133d3571508008de5bfc1557de585bd9bed127692f3f056b61b1edecf6c8d0c8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJR5mylAAoJEKWIAHK7tR5CsmsP/1qD10ck3y4kDvwtBUjhBV2j
-0XSlt4bWNHVZsFnZIDMk+r6HMHkZsEemtrhmjK08QUv0/K6j5yeGjuhHfANm7TwR
-MxFOCE8KHzWvVpiOMeAunGzgVw48Hl5xSwfPtOCftQymPZ76Iaf1hrd0EuKBLXhJ
-sfoRYuPBGX6shNa7iEezBpIqoAg29kIN/RIUrfOyv0xteJcsxA2YZ4PqE9VhbjH/
-sG3nfzIhxNKKxhbnyAXMOJEouDOScA43n0GRNvks9vvgettfZtlAxo0NlUR8CmlV
-TZgq88rjiMTn2qpMqDCpMVM/Gur/ptQVkhK60kOH0ETfwyLH6nCTdzMr5OsYQc85
-dHrqtUVDUd0qhcnhOYr6uwb7raQOaM/OZI2de02MUO/PNXl8tcOidzLBDZ+wUD6R
-UWQhVlrkEW+efjIowT2JUkLdDn4NfHdhN4cSrVR3pfW5+qb4/VQo2TPEoYbWbFBq
-V+0jBv70mczpuvyeaeMtiR2mUoMHKTPCxHkmWOdGq0zrP+55cZdubxV0IXand6Zq
-UOieHzfrmBYQSOzFKuc5DV20qRBdR2PLWuab+/7IER+xsa3qVw9nN4DHZTx6tQ9/
-6cfqUEZ5JL4r0Xc4soQSNnCvAi76NbSEyHMvMXnbQcgiod8DhcZ86d/MogQY3RYD
-VnW6TQdVJ1l7zF5m3l1f
-=oVlO
+iF4EAREIAAYFAlQLYnoACgkQj3qgmDVIhFPPTQD/akJvohfQPmgxYedd9J5M821y
+OBXVcVOodIJX6ModotQA/i2B6Avc/B9PAsBdEwrYpD64DTkvmY4cQ9DAFruI+Qpz
+=pnEW
 -----END PGP SIGNATURE-----
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-7347.ebuild b/sci-geosciences/josm/josm-7347.ebuild
new file mode 100644
index 000000000000..ee4a6ce713cc
--- /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
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-7347.ebuild,v 1.1 2014/09/06 19:37:21 nixphoeni Exp $
+
+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
index 5305765e259a..e794b94a8ab2 100644
--- a/sci-geosciences/josm/josm-9999.ebuild
+++ b/sci-geosciences/josm/josm-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild,v 1.3 2013/07/17 10:06:32 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-9999.ebuild,v 1.4 2014/09/06 19:37:21 nixphoeni Exp $
 
 EAPI=5