josm bump

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

3 files changed, 84 insertions, 23 deletions

diff --git a/sci-geosciences/josm/ChangeLog b/sci-geosciences/josm/ChangeLog
index 665022959fb3..4fd1b0782590 100644
--- a/sci-geosciences/josm/ChangeLog
+++ b/sci-geosciences/josm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/josm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.41 2011/11/24 18:55:06 hanno Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.42 2012/07/19 11:14:52 hanno Exp $
+
+*josm-5315 (19 Jul 2012)
+
+  19 Jul 2012; Hanno Boeck <hanno@gentoo.org> +josm-5315.ebuild:
+  Version bump.
 
 *josm-4550 (24 Nov 2011)
 
diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index 5931f33a6ec8..f25145282fa5 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,27 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST josm-4203.tar.xz 6243924 RMD160 fbb308b128be66698126c475ad1d025afa5aa727 SHA1 9177456b0566107f7352daad8b731b902d02c2bd SHA256 966917ebefd15f035c6972d026301c9ea4eeabfc62821b877a4d665cbb4fe13f
-DIST josm-4550.tar.xz 14950388 RMD160 0817f772aed51c7d76d3a58754a03e897f496354 SHA1 fed968dcbba1959a2e77f59a7a46eb5c36eea5e6 SHA256 605aaaa2ca903a70a0abf1068fce8d0a349d8ea18d47c31bab1b2f5a3c5c9e60
-EBUILD josm-4203.ebuild 1599 RMD160 8d025bc6bbb806e25b73536ca2efde2c9dfdb4f2 SHA1 a2d3714be719412026cb4e9dd32721c328152f44 SHA256 af0ade62e78aaf0981f31b4d85a51c850d2615fbd45de096687726c23d7e2a6b
-EBUILD josm-4550.ebuild 1627 RMD160 f2a13f9aa020c456a2b8e083475f62ad7435b936 SHA1 8c7180e5a2e2eefe0dadd55c5d7fc8953d68111c SHA256 f15afe516eda25d4c881c3cb9c5e08336ec982c443d6ddaa9aea8ac786d6365d
-EBUILD josm-9999.ebuild 1599 RMD160 32a3665110ec43ae40f068e6c8fea8e2ac24ce80 SHA1 375eb6d57b04dd28dff096249fac7b4f6f1ca68a SHA256 c50f6c5efee1bd05cc914496e2a830805ab24f6a2947002a76921144351d93d8
-MISC ChangeLog 5462 RMD160 7e1ed8a8c354567325d1a0196c1aa8016fcec016 SHA1 71a32405dd96295f6698d6078aff0bf51d6764b8 SHA256 0d6c56fe916373e9178fa94686254f769b4b7846a91fa9fdcef2304c5565965b
-MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
+DIST josm-4203.tar.xz 6243924 SHA256 966917ebefd15f035c6972d026301c9ea4eeabfc62821b877a4d665cbb4fe13f
+DIST josm-4550.tar.xz 14950388 SHA256 605aaaa2ca903a70a0abf1068fce8d0a349d8ea18d47c31bab1b2f5a3c5c9e60 SHA512 48a068648c2fccc4e1ec41b295f90dfeda62514dc2f7c3e63794de3bc7ba7b85b67e1be1df9deb67bde5207896e99aead30740c768866273ae03e4b0b0921d83 WHIRLPOOL d230dd2de3fb2daf9d8a74ed56f346590688c3bcd7d6f2c1e4cd988fdd9552c1caf7d49e3bfffbd4ef9fae995da873f559dbed568524db9f98be7cbbf1ce67e1
+DIST josm-5315.tar.xz 14243816 SHA256 94772dc907b8847b647da87e7db3fc0d116d338edb69f1abcb8e33a56aad41f0 SHA512 a0496a5946cb6a0d718ebea060b9049e354f54a0daef44f199b3c9ef916383d86d173212d5929b35060972f0a0d13cab41843aaed4c486d1285e153ec599bfad WHIRLPOOL b73d1f7b78c62e16d56c42b9797f3ecffcaeb1262cb76a460cba71576573baa7fac6ed9a37e1a3b5cdeaa9997f747067039df204f9151a141872a3c3bdcc4f61
+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-9999.ebuild 1599 SHA256 c50f6c5efee1bd05cc914496e2a830805ab24f6a2947002a76921144351d93d8 SHA512 9fc9f508a7f07efec0b81488f56955621e9b88e2adbd215de8c608436ca42b930d0fed73098e64766f030c681a2303b5d976c30c2513586c1ac882c665f21eba WHIRLPOOL e79792a632f5eb637b36cc341c251942ebd8331ffb8455b061073fbb705ebb28a5a6f1d290a594bc1ca1fd4b90b6b5d62380ae6f0d55ceb57036756b55da9c9c
+MISC ChangeLog 5570 SHA256 96c9cea031f540ba5925bfa58bd90b847e7e5b76a25d9dc55527ad06cfa3c6e0 SHA512 e0a71bd4d692327c899ff231a76d3072ac2beba13783f516f685a8d5a9b25f7164b84679783ba95e7c8070b1532d79eb35bd907314381063a495c7c53415758f WHIRLPOOL 3f767bf9884f1ca450a335fee4bc60932db6b99d38bb4d141d8b354c8a8ac1ae7de52b92c26d653a82e3bf480d67f523a108f6f424200f72d14124b10db12709
+MISC metadata.xml 237 SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7 SHA512 191be9fad0be4a967ecd9cfd2e0014aa60b3fa84f332973e42058ebb8051dd0a6b497df7b9fa055836a0786b5e88a18a0505e7dc69b385e0fb0b2c8e34679639 WHIRLPOOL 0d8b2ffeb2ea3c9e22059f9e9c5ba0c40d774df9df0cd2cc54d0d47758c4b275133d3571508008de5bfc1557de585bd9bed127692f3f056b61b1edecf6c8d0c8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOzpMLAAoJEKWIAHK7tR5CYAgP/RJ7toQ4e88hoORVXrh6P4jq
-cqahv773Qy/2VOt4fRc0pQEuqS7jPH9TjORYk5o3tOVF8+cGpakKr8H1CCI21F6n
-5/rKAUmY7xuXWi//A3xVGxyoZfiubuqP5oBU/ABFmhN8+xt0mz6Wthb57G9SFaQI
-puwxwMPJKR451oyCx6Jq0B+zYCmKe04aYHZuXOdDUZpVQIQYkhejmnqcWadTP3oB
-6+jkYb0BDzZWI6CB4fx079G3bI3tJR/c7SquBgOuA4onTp7sQ0jzl9hozxbnuRE3
-n0FWqBSa9VjX/5QUkwBKashgLMUZsjqNcaIA+2R01olki7FK/0RztXeQyvgjgxBm
-Tji0y4SgM1e3Hmuhxo5CqscKTUZCWxvNKiiA/HscVSwgwT/+bEnyLO3oGa0DKsps
-P4K/l463k0Z2I3VkfzP7Z2wOeir0GH7Wh3wZGxFo8tdVa7t/Mei2g8bnVY5CacFf
-wDuT2/1no7l2ZyCG1xD1b8fGGaC/nq0jeg2PyIWShXJ6w8BevYyYV44REgHQz2jD
-8g4kA4PaE/0btpn6S8Wt/I84eeCJZTuECToHZeVN65fGO2sztDqfyU4yfMcCwDOl
-PoOrGMRcUyjYztbVV+TEoKYAjcyeg43cUJKg1fYcJolv2snarvxr+76CXahIZ3e8
-liH/mkvuII954JmALQYK
-=0O2I
+iQIcBAEBCAAGBQJQB+wsAAoJEKWIAHK7tR5CLyUQALabJQZ+K9LtJ2n530HZ6WVo
+Tw/xiuoMaJTYqWnVXk1Nq53QSoNjI66IVZ48NRQaLAOzGLZ5LX20oZAtwFyNl9L4
+rggE92aTUZam+IXPfmMeIWcH7UShsxXJVN4sxJVlPjCGRjyWauvnpRQSiCKvGd49
+6N6Ooc7+wvqbdosR/VtrPWhfifNRoRHGuwtbxOm5ZOFUPxXbyFW4Fzu3T7YqFnsy
+TaiAuu0SZMgiAbKBYveEYJYf5Wfyoihj0UxXQjWMS0HqiRv0mip7CWh0Nn+qQBwk
+HQDG0rvEIeYufUjFjiBVX/pgd8GKJ+6949apUU3UKCNm3r6WPIQ995nX93vtNW7A
+aYbbjmmiNU0wdvxKLQXYbKiob91XVpX3nPRVyxP3h+uKb0kL3U8jhctd4EmmSD1V
+uO1lX7sfSlADCeHwYCusLjotZjSha/d5Tju8fzMY0dDrH2nz+iGNbysadu7AYZlo
+h/bNExMP+XfA0C8szDEoTEkzugJKR9Nwi09GMIlN1zkOOw4WZgFkyTo1SoC2lRsz
+Ribz65Tr/wTV20J/bPxyp+Y3PHFCsAD+mPqvhXHeTjaTIb50Az8APlD1vXcdIT/S
+H4Phk7RmitXx5Y828NUNsIOnrJjaM+XTh4uuzs/IDN7xB9fFPbaF/OQv/j26+Rg3
+INEvh+jacx1JAuNA3wxI
+=TKVz
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/josm/josm-5315.ebuild b/sci-geosciences/josm/josm-5315.ebuild
new file mode 100644
index 000000000000..795d9536d272
--- /dev/null
+++ b/sci-geosciences/josm/josm-5315.ebuild
@@ -0,0 +1,54 @@
+# 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-5315.ebuild,v 1.1 2012/07/19 11:14:52 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"
+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 "Science;Geoscience"
+}