josm bump

Package-Manager: portage-2.1.11.18/cvs/Linux x86_64

3 files changed, 78 insertions, 15 deletions

diff --git a/sci-geosciences/josm/ChangeLog b/sci-geosciences/josm/ChangeLog
index 9cffd42d0191..e87dd7e97d62 100644
--- a/sci-geosciences/josm/ChangeLog
+++ b/sci-geosciences/josm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/josm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.43 2012/07/27 22:28:32 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.44 2012/09/19 10:20:59 hanno Exp $
+
+*josm-5485 (19 Sep 2012)
+
+  19 Sep 2012; Hanno Boeck <hanno@gentoo.org> +josm-5485.ebuild:
+  Version bump and svn snapshots need subversion dependency to create version
+  string.
 
 *josm-5356 (27 Jul 2012)
 
diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index a33a8ebff250..b07fdcbe1231 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -5,27 +5,29 @@ DIST josm-4203.tar.xz 6243924 SHA256 966917ebefd15f035c6972d026301c9ea4eeabfc628
 DIST josm-4550.tar.xz 14950388 SHA256 605aaaa2ca903a70a0abf1068fce8d0a349d8ea18d47c31bab1b2f5a3c5c9e60 SHA512 48a068648c2fccc4e1ec41b295f90dfeda62514dc2f7c3e63794de3bc7ba7b85b67e1be1df9deb67bde5207896e99aead30740c768866273ae03e4b0b0921d83 WHIRLPOOL d230dd2de3fb2daf9d8a74ed56f346590688c3bcd7d6f2c1e4cd988fdd9552c1caf7d49e3bfffbd4ef9fae995da873f559dbed568524db9f98be7cbbf1ce67e1
 DIST josm-5315.tar.xz 14243816 SHA256 94772dc907b8847b647da87e7db3fc0d116d338edb69f1abcb8e33a56aad41f0 SHA512 a0496a5946cb6a0d718ebea060b9049e354f54a0daef44f199b3c9ef916383d86d173212d5929b35060972f0a0d13cab41843aaed4c486d1285e153ec599bfad WHIRLPOOL b73d1f7b78c62e16d56c42b9797f3ecffcaeb1262cb76a460cba71576573baa7fac6ed9a37e1a3b5cdeaa9997f747067039df204f9151a141872a3c3bdcc4f61
 DIST josm-5356.tar.xz 14233552 SHA256 2bd6bdcaf2a98512e70cbd4d7263395160d608c6a06668d685d85efbbd6daf19 SHA512 6b3dc77cfdad552cedb763085b8de6c1e9c96efd545639c0048cb54272a5cb6074f9446e202e15476dfd1519f08044b3f6f7dab3d3da65aa3ea2da3f47358f8b WHIRLPOOL 1b5bbd4127f38c5a878396fc014b049aee94d47e0e70a4ec689a5f17b712dd5fc235024bcf7252e26a75d32361a2e432f56a0b0c0642066f3749bf7c6f8f9f7c
+DIST josm-5485.tar.xz 14243884 SHA256 f6167a12b60198c4063aff2bf37aca84cfcbc6f175a017d1db542038e4b393dd SHA512 43a43240593e624cf5cd754df051ed631043179309f9ab2acf31b426c96647ca1feb6e2abae21b15a00da67b5705e7462a5ce7616ce5d4ca05499f530fc7ade3 WHIRLPOOL f56585859a44c879731f85f85ff76da941b72a77d99bf827c1fb2256709a4eca864f3ab2b97629980b178f23fb1abca947355419a0982ef1869a0570247e1eb2
 EBUILD josm-4203.ebuild 1599 SHA256 af0ade62e78aaf0981f31b4d85a51c850d2615fbd45de096687726c23d7e2a6b SHA512 447f7c6efde37d2e1baa1b9c807c5f09bfcefffd57461662818cf6c634e2932f8a81a3723cdddfed1776228d96443db8a5b1db3c859e957634d86f860c18be99 WHIRLPOOL b56e1fdaf8d05c83872da8a9fdf45f401c1a77bf9c99cf22fc1fc35cfb43613e1ac8476ea7fa7adc8999b8dd99122d13b80244df308d5716b7f4a812fe61178c
 EBUILD josm-4550.ebuild 1627 SHA256 f15afe516eda25d4c881c3cb9c5e08336ec982c443d6ddaa9aea8ac786d6365d SHA512 dc291fcba2bf2b54578bb01a2d7bed0e5bfddde289e775b037ef8421ae7332eca3ec4728ab07b18b1ba078f32fe0f767018d0fb588ce10d8f8d8d8dbe4af65cb WHIRLPOOL 6af6a9ba54c69cd3623b74290d416609e9bbb36a6a9641266a37ae4d96bfef0a68415e021b8b96ba12e8cf7e435511888844b2c09cad015d0302363ccb349bb4
 EBUILD josm-5315.ebuild 1627 SHA256 a4ea292a723cb97dbea296a43511a9f5f4c95bdb9dfef52ceb13f12a2f2f3b02 SHA512 7f867faba2885067f72d32215b9101b348fd10d9b78682b4a51c26b810b6babdd61b05e0b82d949aef91e6bafeb9e6e7831130da42300aa2d64ac55b7c792fbc WHIRLPOOL f7c493ec0e3bf0beff3093f3a470318d32fc0d27eb53e822198b2ac02b8a66c40b82173a1b83138358baedc43c90e8a2bd474247e7a879a5806e25b0360969e3
 EBUILD josm-5356.ebuild 1627 SHA256 2024106b4560e393cb6fe89d329ebf6066c853f90a28be7c1b725603c607649c SHA512 400e2fbb6f8d7705768cd9d225155dcac6bcbbd946bbe5f39514a7a59717aab4e0c2121237a4fdfde21850cd3e4df93d56c3641dd439e21ac4bcbbe029d18596 WHIRLPOOL d5bd8db69299f1b090b6048b2adf540b3ce8128b3a8e0c8b1b8f35fc5339ad1f855332ef9e9453eba03391cbfe0b05fc2c36e4c543c03a56f08008b9cbd2e2e4
+EBUILD josm-5485.ebuild 1661 SHA256 925490989cb9e674be048ab3efff7279e9c72c1d47a06629b07d268071a1aa18 SHA512 a662baad94e022f7aaac3979bd95da76e0a60c07fc80db69666ecb35e2eef52b7efb6e835409e9dcbc6fa1a011db0d1e38397e5d6c3937fd40296e75b958df5c WHIRLPOOL 8f9d08d3e5163294ad51d2ab8e4d4090d7ac2c2007394e32c81480604fd284394161e7b6035011a46132203681e0f87ad6771744c532f95195bf00211f700239
 EBUILD josm-9999.ebuild 1599 SHA256 c50f6c5efee1bd05cc914496e2a830805ab24f6a2947002a76921144351d93d8 SHA512 9fc9f508a7f07efec0b81488f56955621e9b88e2adbd215de8c608436ca42b930d0fed73098e64766f030c681a2303b5d976c30c2513586c1ac882c665f21eba WHIRLPOOL e79792a632f5eb637b36cc341c251942ebd8331ffb8455b061073fbb705ebb28a5a6f1d290a594bc1ca1fd4b90b6b5d62380ae6f0d55ceb57036756b55da9c9c
-MISC ChangeLog 5678 SHA256 d661a708810e64d64fc4ffdccbb32759a9d0029a570b9ef2ce46b516d51cb6df SHA512 4c3f0c253d1d82353cac94c0a13d1cebf7814c4bdf9fdba6389959bc9318c53ce1181ebee14abe75876510ac9018811199abcbcbfa78386d5c7e123f1680a447 WHIRLPOOL 8f9957da48212158fe6a7945a8368b9fed224b7688008ae7d22686a3f8203be8990d31459cdc07978b46e7ea21ea7432e1b350e51a45a7ca3d99a25f64ca5553
+MISC ChangeLog 5858 SHA256 93b6694bbc8aceabfc20adba0640c96c5ea264d01a0bd9c21c53943ad71274a8 SHA512 dd66754b5732c61b1eca7243b9657313ae228bc0976bc8488da92f322071859c9618250031c7171cab85c5d7aa80a2842b345c3f2fc03c55e888a48f061a4f45 WHIRLPOOL b4fc81c7294c483aee3a88f38b15800ec336bc5e099529a54e907d8aa2907289bbaade42409fd90dce7e3516d9bcdb61e897d0d953620897152c12fd88c5557c
 MISC metadata.xml 237 SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7 SHA512 191be9fad0be4a967ecd9cfd2e0014aa60b3fa84f332973e42058ebb8051dd0a6b497df7b9fa055836a0786b5e88a18a0505e7dc69b385e0fb0b2c8e34679639 WHIRLPOOL 0d8b2ffeb2ea3c9e22059f9e9c5ba0c40d774df9df0cd2cc54d0d47758c4b275133d3571508008de5bfc1557de585bd9bed127692f3f056b61b1edecf6c8d0c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQExYXAAoJEKWIAHK7tR5CaBwQAKd0e+2+ukiCq4wbWoJ+5vqd
-SXJcVZAKLbnSvQOdYMRF58WfX8HBi4uJZDWJdkYU1MF2nuqszFibx6kc54/XfxTu
-09rnGVW953tolYmz/6o/kgglOmtWeqGkycbdQXIXgIO2myfEvI7v4eAaUBkyg2N9
-gXF2J4ZrLIM35LPSUFg/0uv91Zkb+UMxBuFWFnZlvSj9YXG48lEF6uDYLjnUNCRb
-fy83+SKTkpU203fMcxTYeluzGGeeGVnzSmpNKMYR8HDk/xtPyW9L6BwKI5xLfZwZ
-L2NFLcMvnW7oBHg15NYown9nQ6vqf2yjOyOPJ7CkdNtLU8q9lghJHFnQzo483suE
-i6vkkoF7TOj4hbVqXWbrM/07SfV0IRcqWvmsBJ3wjnFQNFyHHNMJkf4HR9xDGZJn
-lESNEP8LPcPgfVaKwMOPWfZZFNr/JoN0ZwXsKbD30G6fr/m6z6y6+EEnSQjLgyvS
-J9ZaVpsj0h++nIBE73x8TAdXI4OasKGyqIVo57yAqyqMchicTnGSRr3jSz47mhwy
-Q2ng/j8wa99kT/nQotndzQUxa+mkInGRzeec7Cnr69eKdz11K8oFqteQj6kxz7br
-/Z+dJP8PWrhFQCSt2k1hAWAAESeNMyuxLtCFc6/Xkano3nMXOHbVZOXuRU8aSGbb
-YWKb+vsWmz0l/RLideOi
-=mMjI
+iQIcBAEBCAAGBQJQWZyRAAoJEKWIAHK7tR5CnegP/1w/iuVLyB6vUGy6itkeV2gW
+whD4jhp/TLRluQrN//ZuPCZ3S/KA6xAJmK+rcdGBiyLKajClORhAvmELLhtriQ0S
+FDzIoinkBwry9rd+XL9om3bUbd30Tu8Po2mOAG//yGZe4E+8tnBbqvlZQotM+/fV
+YBeaZ8nu8YkSv9KY4whJnLzZ4sJdu/i4pxEWRXRQwgXobghI/waPMrK9Y1tVEyHc
+3x4TfLZ9ShaJdCZ/B8fn15gkwgN0uKuzzBUUMZECNmb/fKri0FrGfl4OtQgNE1MP
+8fHcBE0dexum/MC5v9keqhtTiuDJxNGYh0zSwUQj1I2b2g6qeUCzGaatWghMghGs
+HIC2af8avjZrE3uqESFV9QWwxSLS1fQZYsAX78xkJyRoXKUxHEwelYmOu9MQoHuy
+fj+lFD4LnotB5Lx4HzEYL1Y9Q2US4I5zhpsG0sJH2GBZG64lv0Rwaz4dR+JEMFEE
+nWCZ9AFV1VtLchsZX5PAmvaCVXU/aPdqCWxyqXUc46yMJFd94rnAOx55jX85QIoZ
+pnXe7bR3qrbOh+8Vw1d+JMwWdrlEsvHnxvoa6IwtNp9dslvoiDEebItBev3xXLzH
+RBKYgtwNPKSbhwMKcqAlCJE960X4NLmamOX9eJbPNQVO4DKzJecmi/gd6juKiaHe
+SrJnCwEH+V/2ivz9OsZ+
+=VHhh
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/josm/josm-5485.ebuild b/sci-geosciences/josm/josm-5485.ebuild
new file mode 100644
index 000000000000..0753bd40211c
--- /dev/null
+++ b/sci-geosciences/josm/josm-5485.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-5485.ebuild,v 1.1 2012/09/19 10:20:59 hanno Exp $
+
+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"
+[[ ${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"
+}